From 58f2a21771a3c50100cef8f8a70f67302542f4d9 Mon Sep 17 00:00:00 2001
From: Adam Nelson <1037107+nelsonag@users.noreply.github.com>
Date: Fri, 14 Mar 2025 11:57:33 -0500
Subject: [PATCH 001/203] Hotfix: Remove errant openmc.Settings.random_ray
 check and removed of not useful warning in MG mode (#3344)

---
 openmc/settings.py |  1 -
 src/scattdata.cpp  | 10 ----------
 2 files changed, 11 deletions(-)

diff --git a/openmc/settings.py b/openmc/settings.py
index ead2c0d00..17c24ba81 100644
--- a/openmc/settings.py
+++ b/openmc/settings.py
@@ -1174,7 +1174,6 @@ class Settings:
                             raise ValueError(
                                 f'Invalid domain type: {type(domain)}. Expected '
                                 'openmc.Material, openmc.Cell, or openmc.Universe.')
-                cv.check_type('adjoint', value, bool)
             elif key == 'sample_method':
                 cv.check_value('sample method', value,
                                ('prng', 'halton'))
diff --git a/src/scattdata.cpp b/src/scattdata.cpp
index 813f9e19b..21b18cbd9 100644
--- a/src/scattdata.cpp
+++ b/src/scattdata.cpp
@@ -37,22 +37,12 @@ void ScattData::base_init(int order, const xt::xtensor<int, 1>& in_gmin,
     mult[gin] = in_mult[gin];
 
     // Make sure the multiplicity does not have 0s
-    unsigned long int num_converted = 0;
     for (int go = 0; go < mult[gin].size(); go++) {
       if (mult[gin][go] == 0.) {
-        num_converted += 1;
         mult[gin][go] = 1.;
       }
     }
 
-    if (num_converted > 0) {
-      // Raise a warning to the user if we did have to do the conversion
-      std::string msg =
-        std::to_string(num_converted) +
-        " entries in the Multiplicity Matrix were changed from 0 to 1";
-      warning(msg);
-    }
-
     // Make sure the energy is normalized
     double norm = std::accumulate(energy[gin].begin(), energy[gin].end(), 0.);
 

From 08e7043f8d0cf3bfce5b47d468442079dd17de03 Mon Sep 17 00:00:00 2001
From: Kevin Sawatzky <66632997+nuclearkevin@users.noreply.github.com>
Date: Tue, 18 Mar 2025 16:19:15 -0500
Subject: [PATCH 002/203] Throw an error if a spherical harmonics order larger
 than 10 is provided. (#3354)

---
 src/tallies/filter_sph_harm.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/tallies/filter_sph_harm.cpp b/src/tallies/filter_sph_harm.cpp
index 7441f32fb..1989e6ef1 100644
--- a/src/tallies/filter_sph_harm.cpp
+++ b/src/tallies/filter_sph_harm.cpp
@@ -25,6 +25,9 @@ void SphericalHarmonicsFilter::set_order(int order)
   if (order < 0) {
     throw std::invalid_argument {
       "Spherical harmonics order must be non-negative."};
+  } else if (order > 10) {
+    throw std::invalid_argument {"Spherical harmonics orders greater than 10 "
+                                 "are currently not supported!"};
   }
   order_ = order;
   n_bins_ = (order_ + 1) * (order_ + 1);

From 18d9f9755190fc8bdcf51d6d5dba67531a42ce5d Mon Sep 17 00:00:00 2001
From: Joffrey Dorville <54550047+JoffreyDorville@users.noreply.github.com>
Date: Tue, 18 Mar 2025 16:25:48 -0500
Subject: [PATCH 003/203] Correcting the size of the displacement list in the
 SourceSite MPI interface object (#3356)

---
 src/initialize.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/initialize.cpp b/src/initialize.cpp
index 4b821bee1..c5803976b 100644
--- a/src/initialize.cpp
+++ b/src/initialize.cpp
@@ -157,7 +157,7 @@ void initialize_mpi(MPI_Comm intracomm)
 
   // Create bank datatype
   SourceSite b;
-  MPI_Aint disp[10];
+  MPI_Aint disp[11];
   MPI_Get_address(&b.r, &disp[0]);
   MPI_Get_address(&b.u, &disp[1]);
   MPI_Get_address(&b.E, &disp[2]);

From e23760b0264c66fb7bb373aa0596801e5209d920 Mon Sep 17 00:00:00 2001
From: Paul Romano <paul.k.romano@gmail.com>
Date: Wed, 19 Mar 2025 09:09:47 -0500
Subject: [PATCH 004/203] Add release notes for 0.15.2 (#3357)

---
 docs/source/releasenotes/0.15.2.rst | 20 ++++++++++++++++++++
 docs/source/releasenotes/index.rst  |  1 +
 2 files changed, 21 insertions(+)
 create mode 100644 docs/source/releasenotes/0.15.2.rst

diff --git a/docs/source/releasenotes/0.15.2.rst b/docs/source/releasenotes/0.15.2.rst
new file mode 100644
index 000000000..e72df37d3
--- /dev/null
+++ b/docs/source/releasenotes/0.15.2.rst
@@ -0,0 +1,20 @@
+====================
+What's New in 0.15.2
+====================
+
+.. currentmodule:: openmc
+
+-------
+Summary
+-------
+
+This is a hotfix release to fix an MPI-related bug that was inadvertently
+introduced in the prior release.
+
+---------------------------
+Bug Fixes and Small Changes
+---------------------------
+
+- Remove errant ``openmc.Settings.random_ray`` check and removed of not useful warning in MG mode (`#3344 <https://github.com/openmc-dev/openmc/pull/3344>`_)
+- Throw an error if a spherical harmonics order larger than 10 is provided. (`#3354 <https://github.com/openmc-dev/openmc/pull/3354>`_)
+- Correcting the size of the displacement list in the SourceSite MPI interface object (`#3356 <https://github.com/openmc-dev/openmc/pull/3356>`_)
diff --git a/docs/source/releasenotes/index.rst b/docs/source/releasenotes/index.rst
index 2927cc458..d24b83f9e 100644
--- a/docs/source/releasenotes/index.rst
+++ b/docs/source/releasenotes/index.rst
@@ -7,6 +7,7 @@ Release Notes
 .. toctree::
   :maxdepth: 1
 
+  0.15.2
   0.15.1
   0.15.0
   0.14.0

From 277390b220b363036193845302efdeb5f70387b1 Mon Sep 17 00:00:00 2001
From: Jonathan Shimwell <mail@jshimwell.com>
Date: Thu, 20 Mar 2025 08:00:34 -0400
Subject: [PATCH 005/203] added kg units to doc string in results class (#3358)

---
 openmc/deplete/results.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/openmc/deplete/results.py b/openmc/deplete/results.py
index 132ec572c..7427abd73 100644
--- a/openmc/deplete/results.py
+++ b/openmc/deplete/results.py
@@ -113,9 +113,9 @@ class Results(list):
         ----------
         mat : openmc.Material, str
             Material object or material id to evaluate
-        units : {'Bq', 'Bq/g', 'Bq/cm3'}
+        units : {'Bq', 'Bq/g', 'Bq/kg', 'Bq/cm3'}
             Specifies the type of activity to return, options include total
-            activity [Bq], specific [Bq/g] or volumetric activity [Bq/cm3].
+            activity [Bq], specific [Bq/g, Bq/kg] or volumetric activity [Bq/cm3].
         by_nuclide : bool
             Specifies if the activity should be returned for the material as a
             whole or per nuclide. Default is False.
@@ -231,9 +231,9 @@ class Results(list):
         ----------
         mat : openmc.Material, str
             Material object or material id to evaluate.
-        units : {'W', 'W/g', 'W/cm3'}
+        units : {'W', 'W/g', 'W/kg', 'W/cm3'}
             Specifies the units of decay heat to return. Options include total
-            heat [W], specific [W/g] or volumetric heat [W/cm3].
+            heat [W], specific [W/g, W/kg] or volumetric heat [W/cm3].
         by_nuclide : bool
             Specifies if the decay heat should be returned for the material as a
             whole or per nuclide. Default is False.

From 3f3649da086fd296cde37dcda9218514f8c16c98 Mon Sep 17 00:00:00 2001
From: Ahnaf Tahmid Chowdhury <ahnaf-tahmid@outlook.com>
Date: Sat, 22 Mar 2025 03:33:28 +0600
Subject: [PATCH 006/203] Handle Missing Tags in Versioning by Setting Default
 to 0 (#3359)

Co-authored-by: Micah Gale <mgale@fastmail.com>
Co-authored-by: Patrick Shriwise <pshriwise@gmail.com>
---
 cmake/Modules/GetVersionFromGit.cmake | 10 ++++++++--
 docs/source/devguide/workflow.rst     | 24 ++++++++++++++++++++++++
 2 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/cmake/Modules/GetVersionFromGit.cmake b/cmake/Modules/GetVersionFromGit.cmake
index 42b3725f2..3736955ff 100644
--- a/cmake/Modules/GetVersionFromGit.cmake
+++ b/cmake/Modules/GetVersionFromGit.cmake
@@ -37,11 +37,17 @@ if(EXISTS "${CMAKE_SOURCE_DIR}/.git" AND GIT_FOUND)
         WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
         OUTPUT_VARIABLE VERSION_STRING
         OUTPUT_STRIP_TRAILING_WHITESPACE
+        ERROR_QUIET
     )
 
-    # If no tags are found, instruct user to fetch them
+    # If no tags are found, set version to 0 and show a warning
     if(VERSION_STRING STREQUAL "")
-        message(FATAL_ERROR "No git tags found. Run 'git fetch --tags' and try again.")
+        set(VERSION_STRING "0.0.0")
+        message(WARNING 
+            "No git tags found. Version set to 0.0.0.\n"
+            "Run 'git fetch --tags' to ensure proper versioning.\n"
+            "For more information, see OpenMC developer documentation."
+        )
     endif()
 
     # Extract the commit hash
diff --git a/docs/source/devguide/workflow.rst b/docs/source/devguide/workflow.rst
index d600c236f..c49326a20 100644
--- a/docs/source/devguide/workflow.rst
+++ b/docs/source/devguide/workflow.rst
@@ -91,6 +91,30 @@ features and bug fixes. The general steps for contributing are as follows:
 6. After the pull request has been thoroughly vetted, it is merged back into the
    *develop* branch of openmc-dev/openmc.
 
+Setting Up Upstream Tracking (Required for Versioning)
+------------------------------------------------------
+
+By default, your fork **does not** include tags from the upstream OpenMC repository.  
+OpenMC relies on `git describe --tags` for versioning in source builds, and missing tags can lead  
+to incorrect version detection (i.e., ``0.0.0``). To ensure proper versioning, follow these steps:
+
+1. **Add the Upstream Repository**  
+   This allows you to fetch updates from the main OpenMC repository.
+
+   .. code-block:: sh
+
+       git remote add upstream https://github.com/openmc-dev/openmc.git
+
+2. **Fetch and Push Tags**  
+   Retrieve tags from the upstream repository and update your fork:
+
+   .. code-block:: sh
+
+       git fetch --tags upstream
+       git push --tags origin
+
+This ensures that both your **local** and **remote** fork have the correct versioning information.
+
 Private Development
 -------------------
 

From 24655dfd5db9fced3baad9ccc7197615e25ef520 Mon Sep 17 00:00:00 2001
From: Patrick Shriwise <pshriwise@gmail.com>
Date: Mon, 31 Mar 2025 09:29:30 -0500
Subject: [PATCH 007/203] Report plot ID instead of index for unsupported plot
 types in random ray mode (#3361)

---
 src/random_ray/random_ray_simulation.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/random_ray/random_ray_simulation.cpp b/src/random_ray/random_ray_simulation.cpp
index bf01d2f57..36517bee4 100644
--- a/src/random_ray/random_ray_simulation.cpp
+++ b/src/random_ray/random_ray_simulation.cpp
@@ -303,20 +303,21 @@ void validate_random_ray_inputs()
   for (int p = 0; p < model::plots.size(); p++) {
 
     // Get handle to OpenMC plot object
-    Plot* openmc_plot = dynamic_cast<Plot*>(model::plots[p].get());
+    const auto& openmc_plottable = model::plots[p];
+    Plot* openmc_plot = dynamic_cast<Plot*>(openmc_plottable.get());
 
     // Random ray plots only support voxel plots
     if (!openmc_plot) {
       warning(fmt::format(
         "Plot {} will not be used for end of simulation data plotting -- only "
         "voxel plotting is allowed in random ray mode.",
-        p));
+        openmc_plottable->id()));
       continue;
     } else if (openmc_plot->type_ != Plot::PlotType::voxel) {
       warning(fmt::format(
         "Plot {} will not be used for end of simulation data plotting -- only "
         "voxel plotting is allowed in random ray mode.",
-        p));
+        openmc_plottable->id()));
       continue;
     }
   }

From b67771a3d0451be6857e8459a6d2a15a476ec994 Mon Sep 17 00:00:00 2001
From: John Tramm <john.tramm@gmail.com>
Date: Tue, 1 Apr 2025 21:47:49 -0500
Subject: [PATCH 008/203] Random Ray AutoMagic Setup (#3351)

Co-authored-by: Paul Romano <paul.k.romano@gmail.com>
---
 .github/workflows/ci.yml                      |   5 +
 docs/source/io_formats/settings.rst           |   8 +
 docs/source/pythonapi/deplete.rst             |   8 +-
 docs/source/usersguide/random_ray.rst         | 212 +++++++-
 docs/source/usersguide/variance_reduction.rst |  75 +--
 .../openmc/random_ray/flat_source_domain.h    |  10 +
 openmc/model/model.py                         | 482 ++++++++++++++++++
 openmc/settings.py                            |  17 +-
 src/random_ray/flat_source_domain.cpp         |  55 ++
 src/random_ray/random_ray_simulation.cpp      |  44 +-
 src/settings.cpp                              |   9 +
 .../mgxs_library_ce_to_mg/test.py             |   9 +-
 .../mgxs_library_ce_to_mg_nuclides/test.py    |   9 +-
 .../random_ray_auto_convert/__init__.py       |   0
 .../infinite_medium/inputs_true.dat           |  64 +++
 .../infinite_medium/results_true.dat          |   2 +
 .../material_wise/inputs_true.dat             |  64 +++
 .../material_wise/results_true.dat            |   2 +
 .../stochastic_slab/inputs_true.dat           |  64 +++
 .../stochastic_slab/results_true.dat          |   2 +
 .../random_ray_auto_convert/test.py           |  54 ++
 .../__init__.py                               |   0
 .../inputs_true.dat                           |  65 +++
 .../results_true.dat                          |   2 +
 .../random_ray_diagonal_stabilization/test.py |  61 +++
 tools/ci/gha-install-dagmc.sh                 |   4 +-
 26 files changed, 1239 insertions(+), 88 deletions(-)
 create mode 100644 tests/regression_tests/random_ray_auto_convert/__init__.py
 create mode 100644 tests/regression_tests/random_ray_auto_convert/infinite_medium/inputs_true.dat
 create mode 100644 tests/regression_tests/random_ray_auto_convert/infinite_medium/results_true.dat
 create mode 100644 tests/regression_tests/random_ray_auto_convert/material_wise/inputs_true.dat
 create mode 100644 tests/regression_tests/random_ray_auto_convert/material_wise/results_true.dat
 create mode 100644 tests/regression_tests/random_ray_auto_convert/stochastic_slab/inputs_true.dat
 create mode 100644 tests/regression_tests/random_ray_auto_convert/stochastic_slab/results_true.dat
 create mode 100644 tests/regression_tests/random_ray_auto_convert/test.py
 create mode 100644 tests/regression_tests/random_ray_diagonal_stabilization/__init__.py
 create mode 100644 tests/regression_tests/random_ray_diagonal_stabilization/inputs_true.dat
 create mode 100644 tests/regression_tests/random_ray_diagonal_stabilization/results_true.dat
 create mode 100644 tests/regression_tests/random_ray_diagonal_stabilization/test.py

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 877ec6833..38a49b602 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -81,6 +81,11 @@ jobs:
       RDMAV_FORK_SAFE: 1
 
     steps:
+      - name: Setup cmake
+        uses: jwlawson/actions-setup-cmake@v2
+        with:
+          cmake-version: '3.31'
+
       - name: Checkout repository
         uses: actions/checkout@v4
         with:
diff --git a/docs/source/io_formats/settings.rst b/docs/source/io_formats/settings.rst
index a59d08049..cef9bf911 100644
--- a/docs/source/io_formats/settings.rst
+++ b/docs/source/io_formats/settings.rst
@@ -487,6 +487,14 @@ found in the :ref:`random ray user guide <random_ray>`.
 
         :type:
           The type of the domain. Can be ``material``, ``cell``, or ``universe``.
+  
+  :diagonal_stabilization_rho:
+    The rho factor for use with diagonal stabilization. This technique is
+    applied when negative diagonal (in-group) elements are detected in
+    the scattering matrix of input MGXS data, which is a common feature
+    of transport corrected MGXS data.
+
+    *Default*: 1.0
 
 ----------------------------------
 ``<resonance_scattering>`` Element
diff --git a/docs/source/pythonapi/deplete.rst b/docs/source/pythonapi/deplete.rst
index 5d02fa6b9..3967f1a18 100644
--- a/docs/source/pythonapi/deplete.rst
+++ b/docs/source/pythonapi/deplete.rst
@@ -78,20 +78,18 @@ A minimal example for performing depletion would be:
     >>> import openmc.deplete
     >>> geometry = openmc.Geometry.from_xml()
     >>> settings = openmc.Settings.from_xml()
-    >>> model = openmc.model.Model(geometry, settings)
+    >>> model = openmc.Model(geometry, settings)
 
     # Representation of a depletion chain
     >>> chain_file = "chain_casl.xml"
-    >>> operator = openmc.deplete.CoupledOperator(
-    ...     model, chain_file)
+    >>> operator = openmc.deplete.CoupledOperator(model, chain_file)
 
     # Set up 5 time steps of one day each
     >>> dt = [24 * 60 * 60] * 5
     >>> power = 1e6  # constant power of 1 MW
 
     # Deplete using mid-point predictor-corrector
-    >>> cecm = openmc.deplete.CECMIntegrator(
-    ...     operator, dt, power)
+    >>> cecm = openmc.deplete.CECMIntegrator(operator, dt, power)
     >>> cecm.integrate()
 
 Internal Classes and Functions
diff --git a/docs/source/usersguide/random_ray.rst b/docs/source/usersguide/random_ray.rst
index f28aed784..ce9821196 100644
--- a/docs/source/usersguide/random_ray.rst
+++ b/docs/source/usersguide/random_ray.rst
@@ -11,6 +11,76 @@ active batches <usersguide_batches>`. However, there are a couple of settings
 that are unique to the random ray solver and a few areas that the random ray
 run strategy differs, both of which will be described in this section.
 
+.. _quick_start:
+
+-----------
+Quick Start
+-----------
+
+While this page contains a comprehensive guide to the random ray solver and
+its various parameters, the process of converting an existing continuous energy
+Monte Carlo model to a random ray model can be largely automated via convenience
+functions in OpenMC's Python interface::
+
+  # Define continuous energy model as normal
+  model = openmc.Model()
+  ...
+
+  # Convert model to multigroup (will auto-generate MGXS library if needed)
+  model.convert_to_multigroup()
+
+  # Convert model to random ray and initialize random ray parameters
+  # to reasonable defaults based on the specifics of the geometry
+  model.convert_to_random_ray()
+
+  # (Optional) Overlay source region decomposition mesh to improve fidelity of the
+  # random ray solver. Adjust 'n' for fidelity vs runtime.
+  n = 100
+  mesh = openmc.RegularMesh()
+  mesh.dimension = (n, n, n)
+  mesh.lower_left = model.geometry.bounding_box.lower_left
+  mesh.upper_right = model.geometry.bounding_box.upper_right
+  model.settings.random_ray['source_region_meshes'] = [(mesh, [model.geometry.root_universe])]
+
+  # (Optional) Improve fidelity of the random ray solver by enabling linear sources
+  model.settings.random_ray['source_shape'] = 'linear'
+
+  # (Optional) Increase the number of rays/batch, to reduce uncertainty
+  model.settings.particles = 500
+
+The above strategy first converts the continuous energy model to a multigroup
+one using the :meth:`openmc.Model.convert_to_multigroup` method. By default,
+this will internally run a coarsely converged continuous energy Monte Carlo
+simulation to produce an estimated multigroup macroscopic cross section set for
+each material specified in the model, and store this data into a multigroup
+cross section library file (``mgxs.h5``) that can be used by the random ray
+solver.
+
+The :meth:`openmc.Model.convert_to_random_ray` method enables random ray mode
+and performs an analysis of the model geometry to determine reasonable values
+for all required parameters. If default behavior is not satisfactory, the user
+can manually adjust the settings in the :attr:`~openmc.Settings.random_ray`
+dictionary in the :class:`openmc.Settings` as described in the sections below.
+
+Finally a few optional steps are shown. The first (recommended) step overlays a
+mesh over the geometry to create smaller source regions so that source
+resolution improves and the random ray solver becomes more accurate. Varying the
+mesh resolution can be used to trade off between accuracy and runtime.
+High-fidelity fission reactor simulation may require source region sizes below 1
+cm, while larger fixed source problems with some tolerance for error may be able
+to use source regions of 10 or 100 cm.
+
+We also enable linear sources, which can improve the accuracy of the random ray
+solver and/or allow for a much coarser mesh resolution to be overlaid. Finally,
+the number of rays per batch is adjusted. The goal here is to ensure that the
+source region miss rate is below 1%, which is reported by OpenMC at the end of
+the simulation (or before via a warning if it is very high).
+
+.. warning::
+    If using a mesh filter for tallying or weight window generation, ensure that
+    the same mesh is used for source region decomposition via
+    ``model.settings.random_ray['source_region_meshes']``.
+
 ------------------------
 Enabling Random Ray Mode
 ------------------------
@@ -557,29 +627,118 @@ variety of problem types (or through a multidimensional parameter sweep of
 design variables) with only modest errors and at greatly reduced cost as
 compared to using only continuous energy Monte Carlo.
 
+~~~~~~~~~~~~
+The Easy Way
+~~~~~~~~~~~~
+
+The easiest way to generate a multigroup cross section library is to use the
+:meth:`openmc.Model.convert_to_multigroup` method. This method will
+automatically output a multigroup cross section library file (``mgxs.h5``) from
+a continuous energy Monte Carlo model and alter the material definitions in the
+model to use these multigroup cross sections. An example is given below::
+
+  # Assume we already have a working continuous energy model
+  model.convert_to_multigroup(
+      method="material_wise",
+      groups="CASMO-2",
+      nparticles=2000,
+      overwrite_mgxs_library=False,
+      mgxs_path="mgxs.h5",
+      correction=None
+  )
+
+The most important parameter to set is the ``method`` parameter, which can be
+either "stochastic_slab", "material_wise", or "infinite_medium". An overview
+of these methods is given below:
+
+.. list-table:: Comparison of Automatic MGXS Generation Methods
+   :header-rows: 1
+   :widths: 10 30 30 30
+
+   * - Method
+     - Description
+     - Pros
+     - Cons
+   * - ``material_wise`` (default)
+     - * Higher Fidelity
+       * Runs a CE simulation with the original geometry and source, tallying
+         cross sections with a material filter.
+     - * Typically the most accurate of the three methods
+       * Accurately captures (averaged over the full problem domain)
+         both spatial and resonance self shielding effects
+     - * Potentially slower as the full geometry must be run
+       * If a material is only present far from the source and doesn't get tallied
+         to in the CE simulation, the MGXS will be zero for that material.
+   * - ``stochastic_slab``
+     - * Medium Fidelity
+       * Runs a CE simulation with a greatly simplified geometry, where materials
+         are randomly assigned to layers in a 1D "stochastic slab sandwich" geometry
+     - * Still captures resonant self shielding and resonance effects between materials
+       * Fast due to the simplified geometry
+       * Able to produce cross section data for all materials, regardless of how
+         far they are from the source in the original geometry
+     - * Does not capture most spatial self shielding effects, e.g., no lattice physics.
+   * - ``infinite_medium``
+     - * Lower Fidelity
+       * Runs one CE simulation per material independently. Each simulation is just
+         an infinite medium slowing down problem, with an assumed external source term.
+     - * Simple
+     - * Poor accuracy (no spatial information, no lattice physics, no resonance effects
+         between materials)
+       * May hang if a material has a k-infinity greater than 1.0
+
+When selecting a non-default energy group structure, you can manually define
+group boundaries or specify the name of a known group structure (a list of which
+can be found at :data:`openmc.mgxs.GROUP_STRUCTURES`). The ``nparticles``
+parameter can be adjusted upward to improve the fidelity of the generated cross
+section library. The ``correction`` parameter can be set to ``"P0"`` to enable
+P0 transport correction. The ``overwrite_mgxs_library`` parameter can be set to
+``True`` to overwrite an existing MGXS library file, or ``False`` to skip
+generation and use an existing library file.
+
+.. note::
+    MGXS transport correction (via setting the ``correction`` parameter in the
+    :meth:`openmc.Model.convert_to_multigroup` method to ``"P0"``) may
+    result in negative in-group scattering cross sections, which can cause
+    numerical instability. To mitigate this, during a random ray solve OpenMC
+    will automatically apply
+    `diagonal stabilization <https://doi.org/10.1016/j.anucene.2018.10.036>`_
+    with a :math:`\rho` default value of 1.0, which can be adjusted with the
+    ``settings.random_ray['diagonal_stabilization_rho']`` parameter.
+
+Ultimately, the methods described above are all just approximations.
+Approximations in the generated MGXS data will fundamentally limit the potential
+accuracy of the random ray solver. However, the methods described above are all
+useful in that they can provide a good starting point for a random ray
+simulation, and if more fidelity is needed the user may wish to follow the
+instructions below or experiment with transport correction techniques to improve
+the fidelity of the generated MGXS data.
+
+~~~~~~~~~~~~
+The Hard Way
+~~~~~~~~~~~~
+
 We give here a quick summary of how to produce a multigroup cross section data
 file (``mgxs.h5``) from a starting point of a typical continuous energy Monte
-Carlo input file. Notably, continuous energy input files define materials as a
-mixture of nuclides with different densities, whereas multigroup materials are
-simply defined by which name they correspond to in a ``mgxs.h5`` library file.
+Carlo model. Notably, continuous energy models define materials as a mixture of
+nuclides with different densities, whereas multigroup materials are simply
+defined by which name they correspond to in a ``mgxs.h5`` library file.
 
 To generate the cross section data, we begin with a continuous energy Monte
-Carlo input deck and add in the required tallies that will be needed to generate
-our library. In this example, we will specify material-wise cross sections and a
-two group energy decomposition::
+Carlo model and add in the tallies that are needed to generate our library. In
+this example, we will specify material-wise cross sections and a two-group
+energy decomposition::
 
   # Define geometry
   ...
-  ...
   geometry = openmc.Geometry()
   ...
-  ...
 
   # Initialize MGXS library with a finished OpenMC geometry object
   mgxs_lib = openmc.mgxs.Library(geometry)
 
   # Pick energy group structure
-  groups = openmc.mgxs.EnergyGroups(openmc.mgxs.GROUP_STRUCTURES['CASMO-2'])
+  groups = openmc.mgxs.EnergyGroups('CASMO-2')
   mgxs_lib.energy_groups = groups
 
   # Disable transport correction
@@ -587,7 +746,7 @@ two group energy decomposition::
 
   # Specify needed cross sections for random ray
   mgxs_lib.mgxs_types = ['total', 'absorption', 'nu-fission', 'fission',
-                      'nu-scatter matrix', 'multiplicity matrix', 'chi']
+                         'nu-scatter matrix', 'multiplicity matrix', 'chi']
 
   # Specify a "cell" domain type for the cross section tally filters
   mgxs_lib.domain_type = "material"
@@ -614,13 +773,13 @@ two group energy decomposition::
   ...
 
 When selecting an energy decomposition, you can manually define group boundaries
-or pick out a group structure already known to OpenMC (a list of which can be
-found at :class:`openmc.mgxs.GROUP_STRUCTURES`). Once the above input deck has
-been run, the resulting statepoint file will contain the needed flux and
-reaction rate tally data so that a MGXS library file can be generated. Below is
-the postprocessing script needed to generate the ``mgxs.h5`` library file given
-a statepoint file (e.g., ``statepoint.100.h5``) file and summary file (e.g.,
-``summary.h5``) that resulted from running our previous example::
+or specify the name of known group structure (a list of which can be found at
+:data:`openmc.mgxs.GROUP_STRUCTURES`). Once the above model has been run, the
+resulting statepoint file will contain the needed flux and reaction rate tally
+data so that a MGXS library file can be generated. Below is the postprocessing
+script needed to generate the ``mgxs.h5`` library file given a statepoint file
+(e.g., ``statepoint.100.h5``) file and summary file (e.g., ``summary.h5``) that
+resulted from running our previous example::
 
   import openmc
 
@@ -628,10 +787,7 @@ a statepoint file (e.g., ``statepoint.100.h5``) file and summary file (e.g.,
   geom = summary.geometry
   mats = summary.materials
 
-  statepoint_filename = 'statepoint.100.h5'
-  sp = openmc.StatePoint(statepoint_filename)
-
-  groups = openmc.mgxs.EnergyGroups(openmc.mgxs.GROUP_STRUCTURES['CASMO-2'])
+  groups = openmc.mgxs.EnergyGroups('CASMO-2')
   mgxs_lib = openmc.mgxs.Library(geom)
   mgxs_lib.energy_groups = groups
   mgxs_lib.correction = None
@@ -653,10 +809,10 @@ a statepoint file (e.g., ``statepoint.100.h5``) file and summary file (e.g.,
   # Construct all tallies needed for the multi-group cross section library
   mgxs_lib.build_library()
 
-  mgxs_lib.load_from_statepoint(sp)
+  with openmc.StatePoint('statepoint.100.h5') as sp:
+      mgxs_lib.load_from_statepoint(sp)
 
-  names = []
-  for mat in mgxs_lib.domains: names.append(mat.name)
+  names = [mat.name for mat in mgxs_lib.domains]
 
   # Create a MGXS File which can then be written to disk
   mgxs_file = mgxs_lib.create_mg_library(xs_type='macro', xsdata_names=names)
@@ -665,8 +821,8 @@ a statepoint file (e.g., ``statepoint.100.h5``) file and summary file (e.g.,
   mgxs_file.export_to_hdf5("mgxs.h5")
 
 Notably, the postprocessing script needs to match the same
-:class:`openmc.mgxs.Library` settings that were used to generate the tallies,
-but otherwise is able to discern the rest of the simulation details from the
+:class:`openmc.mgxs.Library` settings that were used to generate the tallies but
+is otherwise  able to discern the rest of the simulation details from the
 statepoint and summary files. Once the postprocessing script is successfully
 run, the ``mgxs.h5`` file can be loaded by subsequent runs of OpenMC.
 
@@ -701,11 +857,11 @@ multigroup library instead of defining their isotopic contents, as::
     water_data = openmc.Macroscopic('Hot borated water')
 
     # Instantiate some Materials and register the appropriate Macroscopic objects
-    fuel= openmc.Material(name='UO2 (2.4%)')
+    fuel = openmc.Material(name='UO2 (2.4%)')
     fuel.set_density('macro', 1.0)
     fuel.add_macroscopic(fuel_data)
 
-    water= openmc.Material(name='Hot borated water')
+    water = openmc.Material(name='Hot borated water')
     water.set_density('macro', 1.0)
     water.add_macroscopic(water_data)
 
diff --git a/docs/source/usersguide/variance_reduction.rst b/docs/source/usersguide/variance_reduction.rst
index f8ee9c35c..3256fa35f 100644
--- a/docs/source/usersguide/variance_reduction.rst
+++ b/docs/source/usersguide/variance_reduction.rst
@@ -88,59 +88,66 @@ random ray mode can be found in the :ref:`Random Ray User Guide <random_ray>`.
     ray solver. A high level overview of the current workflow for generation of
     weight windows with FW-CADIS using random ray is given below.
 
-1. Produce approximate multigroup cross section data (stored in a ``mgxs.h5``
-   library). There is more information on generating multigroup cross sections
-   via OpenMC in the :ref:`multigroup materials <create_mgxs>` user guide, and a
-   specific example of generating cross section data for use with random ray in
-   the :ref:`random ray MGXS guide <mgxs_gen>`.
+1. Begin by making a deepy copy of your continuous energy Python model and then
+   convert the copy to be multigroup and use the random ray transport solver.
+   The conversion process can largely be automated as described in more detail
+   in the :ref:`random ray quick start guide <quick_start>`, summarized below::
 
-2. Make a copy of your continuous energy Python input file. You'll edit the new
-   file to work in multigroup mode with random ray for producing weight windows.
+    # Define continuous energy model
+    ce_model = openmc.pwr_pin_cell() # example, replace with your model
 
-3. Adjust the material definitions in your new multigroup Python file to utilize
-   the multigroup cross sections instead of nuclide-wise continuous energy data.
-   There is a specific example of making this conversion in the :ref:`random ray
-   MGXS guide <mgxs_gen>`.
+    # Make a copy to convert to multigroup and random ray
+    model = copy.deepcopy(ce_model)
 
-4. Configure OpenMC to run in random ray mode (by adding several standard random
-   ray input flags and settings to the :attr:`openmc.Settings.random_ray`
-   dictionary). More information can be found in the  :ref:`Random Ray User
-   Guide <random_ray>`.
+    # Convert model to multigroup (will auto-generate MGXS library if needed)
+    model.convert_to_multigroup()
 
-5. Add in a :class:`~openmc.WeightWindowGenerator` in a similar manner as for
+    # Convert model to random ray and initialize random ray parameters
+    # to reasonable defaults based on the specifics of the geometry
+    model.convert_to_random_ray()
+
+    # (Optional) Overlay source region decomposition mesh to improve fidelity of the
+    # random ray solver. Adjust 'n' for fidelity vs runtime.
+    n = 10
+    mesh = openmc.RegularMesh()
+    mesh.dimension = (n, n, n)
+    mesh.lower_left = model.geometry.bounding_box.lower_left
+    mesh.upper_right = model.geometry.bounding_box.upper_right
+    model.settings.random_ray['source_region_meshes'] = [(mesh, [model.geometry.root_universe])]
+
+    # (Optional) Improve fidelity of the random ray solver by enabling linear sources
+    model.settings.random_ray['source_shape'] = 'linear'
+
+    # (Optional) Increase the number of rays/batch, to reduce uncertainty
+    model.settings.particles = 500
+
+   If you need to improve the fidelity of the MGXS library, there is more
+   information on generating multigroup cross sections via OpenMC in the
+   :ref:`random ray MGXS guide <mgxs_gen>`.
+
+2. Add in a :class:`~openmc.WeightWindowGenerator` in a similar manner as for
    MAGIC generation with Monte Carlo and set the :attr:`method` attribute set to
    ``"fw_cadis"``::
 
-       # Define weight window spatial mesh
-       ww_mesh = openmc.RegularMesh()
-       ww_mesh.dimension = (10, 10, 10)
-       ww_mesh.lower_left = (0.0, 0.0, 0.0)
-       ww_mesh.upper_right = (100.0, 100.0, 100.0)
-
-       # Create weight window object and adjust parameters
+       # Create weight window object and adjust parameters, using the same mesh
+       # we used for source region decomposition
        wwg = openmc.WeightWindowGenerator(
            method='fw_cadis',
-           mesh=ww_mesh,
+           mesh=mesh,
            max_realizations=settings.batches
        )
 
        # Add generator to openmc.settings object
        settings.weight_window_generators = wwg
 
-
 .. warning::
     If using FW-CADIS weight window generation, ensure that the selected weight
     window mesh does not subdivide any source regions in the problem. This can
-    be ensured by assigning the weight window tally mesh to the root universe so
-    as to create source region boundaries that conform to the mesh, as in the
-    example below.
+    be ensured by using the same mesh for both source region subdivision (i.e.,
+    assigning to ``model.settings.random_ray['source_region_meshes']``) and for
+    weight window generation.
 
-::
-    
-    root = model.geometry.root_universe    
-    settings.random_ray['source_region_meshes'] = [(ww_mesh, [root])]
-
-6. When running your multigroup random ray input deck, OpenMC will automatically
+3. When running your multigroup random ray input deck, OpenMC will automatically
    run a forward solve followed by an adjoint solve, with a
    ``weight_windows.h5`` file generated at the end. The ``weight_windows.h5``
    file will contain FW-CADIS generated weight windows. This file can be used in
diff --git a/include/openmc/random_ray/flat_source_domain.h b/include/openmc/random_ray/flat_source_domain.h
index 39d87d663..656b0354a 100644
--- a/include/openmc/random_ray/flat_source_domain.h
+++ b/include/openmc/random_ray/flat_source_domain.h
@@ -58,6 +58,7 @@ public:
   SourceRegionHandle get_subdivided_source_region_handle(
     int64_t sr, int mesh_bin, Position r, double dist, Direction u);
   void finalize_discovered_source_regions();
+  void apply_transport_stabilization();
   int64_t n_source_regions() const
   {
     return source_regions_.n_source_regions();
@@ -71,6 +72,9 @@ public:
   // Static Data members
   static bool volume_normalized_flux_tallies_;
   static bool adjoint_; // If the user wants outputs based on the adjoint flux
+  static double
+    diagonal_stabilization_rho_; // Adjusts strength of diagonal stabilization
+                                 // for transport corrected MGXS data
 
   // Static variables to store source region meshes and domains
   static std::unordered_map<int, vector<std::pair<Source::DomainType, int>>>
@@ -127,6 +131,12 @@ public:
   std::unordered_map<SourceRegionKey, int64_t, SourceRegionKey::HashFunctor>
     source_region_map_;
 
+  // If transport corrected MGXS data is being used, there may be negative
+  // in-group scattering cross sections that can result in instability in MOC
+  // and random ray if used naively. This flag enables a stabilization
+  // technique.
+  bool is_transport_stabilization_needed_ {false};
+
 protected:
   //----------------------------------------------------------------------------
   // Methods
diff --git a/openmc/model/model.py b/openmc/model/model.py
index e8558f4ad..260059f4a 100644
--- a/openmc/model/model.py
+++ b/openmc/model/model.py
@@ -1,9 +1,12 @@
 from __future__ import annotations
 from collections.abc import Iterable, Sequence
+import copy
 from functools import lru_cache
 from pathlib import Path
 import math
 from numbers import Integral, Real
+import random
+import re
 from tempfile import NamedTemporaryFile, TemporaryDirectory
 import warnings
 
@@ -1439,3 +1442,482 @@ class Model:
             self.materials = openmc.Materials(
                 self.geometry.get_all_materials().values()
             )
+
+    def _generate_infinite_medium_mgxs(self, groups, nparticles, mgxs_path, correction):
+        """Generate a MGXS library by running multiple OpenMC simulations, each
+        representing an infinite medium simulation of a single isolated
+        material. A discrete source is used to sample particles, with an equal
+        strength spread across each of the energy groups. This is a highly naive
+        method that ignores all spatial self shielding effects and all resonance
+        shielding effects between materials.
+
+        Parameters
+        ----------
+        groups : openmc.mgxs.EnergyGroups
+            Energy group structure for the MGXS.
+        mgxs_path : path-like
+            Filename for the MGXS HDF5 file.
+        """
+        warnings.warn("The infinite medium method of generating MGXS may hang "
+                      "if a material has a k-infinity > 1.0.")
+        mgxs_sets = []
+        for material in self.materials:
+            openmc.reset_auto_ids()
+            model = openmc.Model()
+
+            # Set materials on the model
+            model.materials = [material]
+
+            # Settings
+            model.settings.batches = 100
+            model.settings.particles = nparticles
+            model.settings.run_mode = 'fixed source'
+
+            # Make a discrete source that is uniform over the bins of the group structure
+            n_groups = groups.num_groups
+            midpoints = []
+            strengths = []
+            for i in range(n_groups):
+                bounds = groups.get_group_bounds(i+1)
+                midpoints.append((bounds[0] + bounds[1]) / 2.0)
+                strengths.append(1.0)
+
+            energy_distribution = openmc.stats.Discrete(x=midpoints, p=strengths)
+            model.settings.source = openmc.IndependentSource(
+                space=openmc.stats.Point(), energy=energy_distribution)
+            model.settings.output = {'summary': True, 'tallies': False}
+
+            # Geometry
+            box = openmc.model.RectangularPrism(
+                100000.0, 100000.0, boundary_type='reflective')
+            name = material.name
+            infinite_cell = openmc.Cell(name=name, fill=material, region=-box)
+            infinite_universe = openmc.Universe(name=name, cells=[infinite_cell])
+            model.geometry.root_universe = infinite_universe
+
+            # Add MGXS Tallies
+
+            # Initialize MGXS library with a finished OpenMC geometry object
+            mgxs_lib = openmc.mgxs.Library(model.geometry)
+
+            # Pick energy group structure
+            mgxs_lib.energy_groups = groups
+
+            # Disable transport correction
+            mgxs_lib.correction = correction
+
+            # Specify needed cross sections for random ray
+            if correction == 'P0':
+                mgxs_lib.mgxs_types = [
+                    'nu-transport', 'absorption', 'nu-fission', 'fission',
+                    'consistent nu-scatter matrix', 'multiplicity matrix', 'chi'
+                ]
+            elif correction is None:
+                mgxs_lib.mgxs_types = [
+                    'total', 'absorption', 'nu-fission', 'fission',
+                    'consistent nu-scatter matrix', 'multiplicity matrix', 'chi'
+                ]
+
+            # Specify a "cell" domain type for the cross section tally filters
+            mgxs_lib.domain_type = "material"
+
+            # Specify the cell domains over which to compute multi-group cross sections
+            mgxs_lib.domains = model.geometry.get_all_materials().values()
+
+            # Do not compute cross sections on a nuclide-by-nuclide basis
+            mgxs_lib.by_nuclide = False
+
+            # Check the library - if no errors are raised, then the library is satisfactory.
+            mgxs_lib.check_library_for_openmc_mgxs()
+
+            # Construct all tallies needed for the multi-group cross section library
+            mgxs_lib.build_library()
+
+            # Create a "tallies.xml" file for the MGXS Library
+            mgxs_lib.add_to_tallies_file(model.tallies, merge=True)
+
+            # Run
+            statepoint_filename = model.run()
+
+            # Load MGXS
+            with openmc.StatePoint(statepoint_filename) as sp:
+                mgxs_lib.load_from_statepoint(sp)
+
+            # Create a MGXS File which can then be written to disk
+            mgxs_set = mgxs_lib.get_xsdata(domain=material, xsdata_name=name)
+            mgxs_sets.append(mgxs_set)
+
+        # Write the file to disk
+        mgxs_file = openmc.MGXSLibrary(energy_groups=groups)
+        for mgxs_set in mgxs_sets:
+            mgxs_file.add_xsdata(mgxs_set)
+        mgxs_file.export_to_hdf5(mgxs_path)
+
+    @staticmethod
+    def _create_stochastic_slab_geometry(materials, cell_thickness=1.0, num_repeats=100):
+        """Create a geometry representing a stochastic "sandwich" of materials in a
+        layered slab geometry. To reduce the impact of the order of materials in
+        the slab, the materials are applied to 'num_repeats' different randomly
+        positioned layers of 'cell_thickness' each.
+
+        Parameters
+        ----------
+        materials : list of openmc.Material
+            List of materials to assign. Each material will appear exactly num_repeats times,
+            then the ordering is randomly shuffled.
+        cell_thickness : float, optional
+            Thickness of each lattice cell in x (default 1.0 cm).
+        num_repeats : int, optional
+            Number of repeats for each material (default 100).
+
+        Returns
+        -------
+        geometry : openmc.Geometry
+            The constructed geometry.
+        box : openmc.stats.Box
+            A spatial sampling distribution covering the full slab domain.
+        """
+        if not materials:
+            raise ValueError("At least one material must be provided.")
+
+        num_materials = len(materials)
+        total_cells = num_materials * num_repeats
+        total_width = total_cells * cell_thickness
+
+        # Generate an infinite cell/universe for each material
+        universes = []
+        for i in range(num_materials):
+            cell = openmc.Cell(fill=materials[i])
+            universes.append(openmc.Universe(cells=[cell]))
+
+        # Make a list of randomized material idx assignments for the stochastic slab
+        assignments = list(range(num_materials)) * num_repeats
+        random.seed(42)
+        random.shuffle(assignments)
+
+        # Create a list of the (randomized) universe assignments to be used
+        # when defining the problem lattice.
+        lattice_entries = [universes[m] for m in assignments]
+
+        # Create the RectLattice for the 1D material variation in x.
+        lattice = openmc.RectLattice()
+        lattice.pitch = (cell_thickness, total_width, total_width)
+        lattice.lower_left = (0.0, 0.0, 0.0)
+        lattice.universes = [[lattice_entries]]
+        lattice.outer = universes[0]
+
+        # Define the six outer surfaces with reflective boundary conditions
+        rpp = openmc.model.RectangularParallelepiped(
+            0.0, total_width, 0.0, total_width, 0.0, total_width,
+            boundary_type='reflective'
+        )
+
+        # Create an outer cell that fills with the lattice.
+        outer_cell = openmc.Cell(fill=lattice, region=-rpp)
+
+        # Build the geometry
+        geometry = openmc.Geometry([outer_cell])
+
+        # Define the spatial distribution that covers the full cubic domain
+        box = openmc.stats.Box(*outer_cell.bounding_box)
+
+        return geometry, box
+
+    def _generate_stochastic_slab_mgxs(self, groups, nparticles, mgxs_path, correction) -> None:
+        """Generate MGXS assuming a stochastic "sandwich" of materials in a layered
+        slab geometry. While geometry-specific spatial shielding effects are not
+        captured, this method can be useful when the geometry has materials only
+        found far from the source region that the "material_wise" method would
+        not be capable of generating cross sections for. Conversely, this method
+        will generate cross sections for all materials in the problem regardless
+        of type. If this is a fixed source problem, a discrete source is used to
+        sample particles, with an equal strength spread across each of the
+        energy groups.
+
+        Parameters
+        ----------
+        groups : openmc.mgxs.EnergyGroups
+            Energy group structure for the MGXS.
+        mgxs_path : path-like
+            Filename for the MGXS HDF5 file.
+        """
+        openmc.reset_auto_ids()
+        model = openmc.Model()
+        model.materials = self.materials
+
+        # Settings
+        model.settings.batches = 200
+        model.settings.inactive = 100
+        model.settings.particles = nparticles
+        model.settings.output = {'summary': True, 'tallies': False}
+        model.settings.run_mode = self.settings.run_mode
+
+        # Stochastic slab geometry
+        model.geometry, spatial_distribution = Model._create_stochastic_slab_geometry(
+            model.materials)
+
+        # Make a discrete source that is uniform over the bins of the group structure
+        n_groups = groups.num_groups
+        midpoints = []
+        strengths = []
+        for i in range(n_groups):
+            bounds = groups.get_group_bounds(i+1)
+            midpoints.append((bounds[0] + bounds[1]) / 2.0)
+            strengths.append(1.0)
+
+        energy_distribution = openmc.stats.Discrete(x=midpoints, p=strengths)
+        model.settings.source = [openmc.IndependentSource(
+            space=spatial_distribution, energy=energy_distribution, strength=1.0)]
+
+        model.settings.output = {'summary': True, 'tallies': False}
+
+        # Add MGXS Tallies
+
+        # Initialize MGXS library with a finished OpenMC geometry object
+        mgxs_lib = openmc.mgxs.Library(model.geometry)
+
+        # Pick energy group structure
+        mgxs_lib.energy_groups = groups
+
+        # Disable transport correction
+        mgxs_lib.correction = correction
+
+       # Specify needed cross sections for random ray
+        if correction == 'P0':
+            mgxs_lib.mgxs_types = ['nu-transport', 'absorption', 'nu-fission', 'fission',
+                                   'consistent nu-scatter matrix', 'multiplicity matrix', 'chi']
+        elif correction is None:
+            mgxs_lib.mgxs_types = ['total', 'absorption', 'nu-fission', 'fission',
+                                   'consistent nu-scatter matrix', 'multiplicity matrix', 'chi']
+
+        # Specify a "cell" domain type for the cross section tally filters
+        mgxs_lib.domain_type = "material"
+
+        # Specify the cell domains over which to compute multi-group cross sections
+        mgxs_lib.domains = model.geometry.get_all_materials().values()
+
+        # Do not compute cross sections on a nuclide-by-nuclide basis
+        mgxs_lib.by_nuclide = False
+
+        # Check the library - if no errors are raised, then the library is satisfactory.
+        mgxs_lib.check_library_for_openmc_mgxs()
+
+        # Construct all tallies needed for the multi-group cross section library
+        mgxs_lib.build_library()
+
+        # Create a "tallies.xml" file for the MGXS Library
+        mgxs_lib.add_to_tallies_file(model.tallies, merge=True)
+
+        # Run
+        statepoint_filename = model.run()
+
+        # Load MGXS
+        with openmc.StatePoint(statepoint_filename) as sp:
+            mgxs_lib.load_from_statepoint(sp)
+
+        names = [mat.name for mat in mgxs_lib.domains]
+
+        # Create a MGXS File which can then be written to disk
+        mgxs_file = mgxs_lib.create_mg_library(xs_type='macro', xsdata_names=names)
+        mgxs_file.export_to_hdf5(mgxs_path)
+
+    def _generate_material_wise_mgxs(self, groups, nparticles, mgxs_path, correction) -> None:
+        """Generate a material-wise MGXS library for the model by running the
+        original continuous energy OpenMC simulation of the full material
+        geometry and source, and tally MGXS data for each material. This method
+        accurately conserves reaction rates totaled over the entire simulation
+        domain. However, when the geometry has materials only found far from the
+        source region, it is possible the Monte Carlo solver may not be able to
+        score any tallies to these material types, thus resulting in zero cross
+        section values for these materials. For such cases, the "stochastic
+        slab" method may be more appropriate.
+
+        Parameters
+        ----------
+        groups : openmc.mgxs.EnergyGroups
+            Energy group structure for the MGXS.
+        mgxs_path : str
+            Filename for the MGXS HDF5 file.
+        """
+        openmc.reset_auto_ids()
+        model = copy.deepcopy(self)
+        model.tallies = openmc.Tallies()
+
+        # Settings
+        model.settings.batches = 200
+        model.settings.inactive = 100
+        model.settings.particles = nparticles
+        model.settings.output = {'summary': True, 'tallies': False}
+
+        # Add MGXS Tallies
+
+        # Initialize MGXS library with a finished OpenMC geometry object
+        mgxs_lib = openmc.mgxs.Library(model.geometry)
+
+        # Pick energy group structure
+        mgxs_lib.energy_groups = groups
+
+        # Disable transport correction
+        mgxs_lib.correction = correction
+
+        # Specify needed cross sections for random ray
+        if correction == 'P0':
+            mgxs_lib.mgxs_types = [
+                'nu-transport', 'absorption', 'nu-fission', 'fission',
+                'consistent nu-scatter matrix', 'multiplicity matrix', 'chi'
+            ]
+        elif correction is None:
+            mgxs_lib.mgxs_types = [
+                'total', 'absorption', 'nu-fission', 'fission',
+                'consistent nu-scatter matrix', 'multiplicity matrix', 'chi'
+            ]
+
+        # Specify a "cell" domain type for the cross section tally filters
+        mgxs_lib.domain_type = "material"
+
+        # Specify the cell domains over which to compute multi-group cross sections
+        mgxs_lib.domains = model.geometry.get_all_materials().values()
+
+        # Do not compute cross sections on a nuclide-by-nuclide basis
+        mgxs_lib.by_nuclide = False
+
+        # Check the library - if no errors are raised, then the library is satisfactory.
+        mgxs_lib.check_library_for_openmc_mgxs()
+
+        # Construct all tallies needed for the multi-group cross section library
+        mgxs_lib.build_library()
+
+        # Create a "tallies.xml" file for the MGXS Library
+        mgxs_lib.add_to_tallies_file(model.tallies, merge=True)
+
+        # Run
+        statepoint_filename = model.run()
+
+        # Load MGXS
+        with openmc.StatePoint(statepoint_filename) as sp:
+            mgxs_lib.load_from_statepoint(sp)
+
+        names = [mat.name for mat in mgxs_lib.domains]
+
+        # Create a MGXS File which can then be written to disk
+        mgxs_file = mgxs_lib.create_mg_library(
+            xs_type='macro', xsdata_names=names)
+        mgxs_file.export_to_hdf5(mgxs_path)
+
+    def convert_to_multigroup(self, method="material_wise", groups='CASMO-2',
+                              nparticles=2000, overwrite_mgxs_library=False,
+                              mgxs_path: PathLike = "mgxs.h5", correction=None):
+        """Convert all materials from continuous energy to multigroup.
+
+        If no MGXS data library file is found, generate one using one or more
+        continuous energy Monte Carlo simulations.
+
+        Parameters
+        ----------
+        method : {"material_wise", "stochastic_slab", "infinite_medium"}, optional
+            Method to generate the MGXS.
+        groups : openmc.mgxs.EnergyGroups or str, optional
+            Energy group structure for the MGXS or the name of the group
+            structure (based on keys from openmc.mgxs.GROUP_STRUCTURES).
+        mgxs_path : str, optional
+            Filename of the mgxs.h5 library file.
+        correction : str, optional
+            Transport correction to apply to the MGXS. Options are None and
+            "P0".
+        """
+        if isinstance(groups, str):
+            groups = openmc.mgxs.EnergyGroups(groups)
+
+        # Make sure all materials have a name, and that the name is a valid HDF5
+        # dataset name
+        for material in self.materials:
+            if material.name is None:
+                material.name = f"material {material.id}"
+            material.name = re.sub(r'[^a-zA-Z0-9]', '_', material.name)
+
+        # If needed, generate the needed MGXS data library file
+        if not Path(mgxs_path).is_file() or overwrite_mgxs_library:
+            if method == "infinite_medium":
+                self._generate_infinite_medium_mgxs(
+                    groups, nparticles, mgxs_path, correction)
+            elif method == "material_wise":
+                self._generate_material_wise_mgxs(
+                    groups, nparticles, mgxs_path, correction)
+            elif method == "stochastic_slab":
+                self._generate_stochastic_slab_mgxs(
+                    groups, nparticles, mgxs_path, correction)
+            else:
+                raise ValueError(
+                    f'MGXS generation method "{method}" not recognized')
+        else:
+            print(f'Existing MGXS library file "{mgxs_path}" will be used')
+
+        # Convert all continuous energy materials to multigroup
+        self.materials.cross_sections = mgxs_path
+        for material in self.materials:
+            material.set_density('macro', 1.0)
+            material._nuclides = []
+            material._sab = []
+            material.add_macroscopic(material.name)
+
+        self.settings.energy_mode = 'multi-group'
+
+    def convert_to_random_ray(self):
+        """Convert a multigroup model to use random ray.
+
+        This method determines values for the needed settings and adds them to
+        the settings.random_ray dictionary so as to enable random ray mode. The
+        settings that are populated are:
+
+        - 'ray_source' (openmc.IndependentSource): Where random ray starting
+          points are sampled from.
+        - 'distance_inactive' (float): The "dead zone" distance at the beginning
+          of the ray.
+        - 'distance_active' (float): The "active" distance of the ray
+        - 'particles' (int): Number of rays to simulate
+
+        The method will determine reasonable defaults for each of the above
+        variables based on analysis of the model's geometry. The function will
+        have no effect if the random ray dictionary is already defined in the
+        model settings.
+        """
+        # If the random ray dictionary is already set, don't overwrite it
+        if self.settings.random_ray:
+            warnings.warn("Random ray conversion skipped as "
+                          "settings.random_ray dictionary is already set.")
+            return
+
+        if self.settings.energy_mode != 'multi-group':
+            raise ValueError(
+                "Random ray conversion failed: energy mode must be "
+                "'multi-group'. Use convert_to_multigroup() first."
+            )
+
+        # Helper function for detecting infinity
+        def _replace_infinity(value):
+            if np.isinf(value):
+                return 1.0 if value > 0 else -1.0
+            return value
+
+        # Get a bounding box for sampling rays. We can utilize the geometry's bounding box
+        # though for 2D problems we need to detect the infinities and replace them with an
+        # arbitrary finite value.
+        bounding_box = self.geometry.bounding_box
+        lower_left = [_replace_infinity(v) for v in bounding_box.lower_left]
+        upper_right = [_replace_infinity(v) for v in bounding_box.upper_right]
+        uniform_dist_ray = openmc.stats.Box(lower_left, upper_right)
+        rr_source = openmc.IndependentSource(space=uniform_dist_ray)
+        self.settings.random_ray['ray_source'] = rr_source
+
+        # For the dead zone and active length, a reasonable guess is the larger of either:
+        # 1) The maximum chord length through the geometry (as defined by its bounding box)
+        # 2) 30 cm
+        # Then, set the active length to be 5x longer than the dead zone length, for the sake of efficiency.
+        chord_length = np.array(upper_right) - np.array(lower_left)
+        max_length = max(np.linalg.norm(chord_length), 30.0)
+
+        self.settings.random_ray['distance_inactive'] = max_length
+        self.settings.random_ray['distance_active'] = 5 * max_length
+
+        # Take a wild guess as to how many rays are needed
+        self.settings.particles = 2 * int(max_length)
diff --git a/openmc/settings.py b/openmc/settings.py
index 17c24ba81..a2bf51a51 100644
--- a/openmc/settings.py
+++ b/openmc/settings.py
@@ -187,6 +187,17 @@ class Settings:
             or openmc.Universe. The mesh will be applied to the listed domains
             to subdivide source regions so as to improve accuracy and/or conform
             with tally meshes.
+        :diagonal_stabilization_rho:
+            The rho factor for use with diagonal stabilization. This technique is
+            applied when negative diagonal (in-group) elements are detected in
+            the scattering matrix of input MGXS data, which is a common feature
+            of transport corrected MGXS data. The default is 1.0, which ensures
+            no negative diagonal elements are present in the iteration matrix and
+            thus stabilizes the simulation. A value of 0.0 will disable diagonal
+            stabilization. Values between 0.0 and 1.0 will apply a degree of
+            stabilization, which may be desirable as stronger diagonal stabilization
+            also tends to dampen the convergence rate of the solver, thus requiring
+            more iterations to converge.
 
         .. versionadded:: 0.15.0
     resonance_scattering : dict
@@ -1177,6 +1188,10 @@ class Settings:
             elif key == 'sample_method':
                 cv.check_value('sample method', value,
                                ('prng', 'halton'))
+            elif key == 'diagonal_stabilization_rho':
+                cv.check_type('diagonal stabilization rho', value, Real)
+                cv.check_greater_than('diagonal stabilization rho',
+                                      value, 0.0, True)
             else:
                 raise ValueError(f'Unable to set random ray to "{key}" which is '
                                  'unsupported by OpenMC')
@@ -2018,7 +2033,7 @@ class Settings:
         if elem is not None:
             self.random_ray = {}
             for child in elem:
-                if child.tag in ('distance_inactive', 'distance_active'):
+                if child.tag in ('distance_inactive', 'distance_active', 'diagonal_stabilization_rho'):
                     self.random_ray[child.tag] = float(child.text)
                 elif child.tag == 'source':
                     source = SourceBase.from_xml_element(child)
diff --git a/src/random_ray/flat_source_domain.cpp b/src/random_ray/flat_source_domain.cpp
index 33651574f..ff8e5d232 100644
--- a/src/random_ray/flat_source_domain.cpp
+++ b/src/random_ray/flat_source_domain.cpp
@@ -30,6 +30,7 @@ RandomRayVolumeEstimator FlatSourceDomain::volume_estimator_ {
   RandomRayVolumeEstimator::HYBRID};
 bool FlatSourceDomain::volume_normalized_flux_tallies_ {false};
 bool FlatSourceDomain::adjoint_ {false};
+double FlatSourceDomain::diagonal_stabilization_rho_ {1.0};
 std::unordered_map<int, vector<std::pair<Source::DomainType, int>>>
   FlatSourceDomain::mesh_domain_map_;
 
@@ -1106,6 +1107,11 @@ void FlatSourceDomain::flatten_xs()
           double sigma_s =
             m.get_xs(MgxsType::NU_SCATTER, g_in, &g_out, NULL, NULL, t, a);
           sigma_s_.push_back(sigma_s);
+          // For transport corrected XS data, diagonal elements may be negative.
+          // In this case, set a flag to enable transport stabilization for the
+          // simulation.
+          if (g_out == g_in && sigma_s < 0.0)
+            is_transport_stabilization_needed_ = true;
         }
       } else {
         sigma_t_.push_back(0);
@@ -1427,4 +1433,53 @@ void FlatSourceDomain::finalize_discovered_source_regions()
   discovered_source_regions_.clear();
 }
 
+// This is the "diagonal stabilization" technique developed by Gunow et al. in:
+//
+// Geoffrey Gunow, Benoit Forget, Kord Smith, Stabilization of multi-group
+// neutron transport with transport-corrected cross-sections, Annals of Nuclear
+// Energy, Volume 126, 2019, Pages 211-219, ISSN 0306-4549,
+// https://doi.org/10.1016/j.anucene.2018.10.036.
+void FlatSourceDomain::apply_transport_stabilization()
+{
+  // Don't do anything if all in-group scattering
+  // cross sections are positive
+  if (!is_transport_stabilization_needed_) {
+    return;
+  }
+
+  // Apply the stabilization factor to all source elements
+#pragma omp parallel for
+  for (int64_t sr = 0; sr < n_source_regions(); sr++) {
+    int material = source_regions_.material(sr);
+    if (material == MATERIAL_VOID) {
+      continue;
+    }
+    for (int g = 0; g < negroups_; g++) {
+      // Only apply stabilization if the diagonal (in-group) scattering XS is
+      // negative
+      double sigma_s =
+        sigma_s_[material * negroups_ * negroups_ + g * negroups_ + g];
+      if (sigma_s < 0.0) {
+        double sigma_t = sigma_t_[material * negroups_ + g];
+        double phi_new = source_regions_.scalar_flux_new(sr, g);
+        double phi_old = source_regions_.scalar_flux_old(sr, g);
+
+        // Equation 18 in the above Gunow et al. 2019 paper. For a default
+        // rho of 1.0, this ensures there are no negative diagonal elements
+        // in the iteration matrix. A lesser rho could be used (or exposed
+        // as a user input parameter) to reduce the negative impact on
+        // convergence rate though would need to be experimentally tested to see
+        // if it doesn't become unstable. rho = 1.0 is good as it gives the
+        // highest assurance of stability, and the impacts on convergence rate
+        // are pretty mild.
+        double D = diagonal_stabilization_rho_ * sigma_s / sigma_t;
+
+        // Equation 16 in the above Gunow et al. 2019 paper
+        source_regions_.scalar_flux_new(sr, g) =
+          (phi_new - D * phi_old) / (1.0 - D);
+      }
+    }
+  }
+}
+
 } // namespace openmc
diff --git a/src/random_ray/random_ray_simulation.cpp b/src/random_ray/random_ray_simulation.cpp
index 36517bee4..60b00a5be 100644
--- a/src/random_ray/random_ray_simulation.cpp
+++ b/src/random_ray/random_ray_simulation.cpp
@@ -478,6 +478,9 @@ void RandomRaySimulation::simulate()
       // Add source to scalar flux, compute number of FSR hits
       int64_t n_hits = domain_->add_source_to_scalar_flux();
 
+      // Apply transport stabilization factors
+      domain_->apply_transport_stabilization();
+
       if (settings::run_mode == RunMode::EIGENVALUE) {
         // Compute random ray k-eff
         k_eff_ = domain_->compute_k_eff(k_eff_);
@@ -577,17 +580,23 @@ void RandomRaySimulation::print_results_random_ray(
     header("Simulation Statistics", 4);
     fmt::print(
       " Total Iterations                  = {}\n", settings::n_batches);
-    fmt::print(" Flat Source Regions (FSRs)        = {}\n", n_source_regions);
     fmt::print(
-      " FSRs Containing External Sources  = {}\n", n_external_source_regions);
+      " Number of Rays per Iteration      = {}\n", settings::n_particles);
+    fmt::print(" Inactive Distance                 = {} cm\n",
+      RandomRay::distance_inactive_);
+    fmt::print(" Active Distance                   = {} cm\n",
+      RandomRay::distance_active_);
+    fmt::print(" Source Regions (SRs)              = {}\n", n_source_regions);
+    fmt::print(
+      " SRs Containing External Sources   = {}\n", n_external_source_regions);
     fmt::print(" Total Geometric Intersections     = {:.4e}\n",
       static_cast<double>(total_geometric_intersections));
     fmt::print("   Avg per Iteration               = {:.4e}\n",
       static_cast<double>(total_geometric_intersections) / settings::n_batches);
-    fmt::print("   Avg per Iteration per FSR       = {:.2f}\n",
+    fmt::print("   Avg per Iteration per SR        = {:.2f}\n",
       static_cast<double>(total_geometric_intersections) /
         static_cast<double>(settings::n_batches) / n_source_regions);
-    fmt::print(" Avg FSR Miss Rate per Iteration   = {:.4f}%\n", avg_miss_rate);
+    fmt::print(" Avg SR Miss Rate per Iteration    = {:.4f}%\n", avg_miss_rate);
     fmt::print(" Energy Groups                     = {}\n", negroups);
     fmt::print(
       " Total Integrations                = {:.4e}\n", total_integrations);
@@ -613,6 +622,33 @@ void RandomRaySimulation::print_results_random_ray(
     std::string adjoint_true = (FlatSourceDomain::adjoint_) ? "ON" : "OFF";
     fmt::print(" Adjoint Flux Mode                 = {}\n", adjoint_true);
 
+    std::string shape;
+    switch (RandomRay::source_shape_) {
+    case RandomRaySourceShape::FLAT:
+      shape = "Flat";
+      break;
+    case RandomRaySourceShape::LINEAR:
+      shape = "Linear";
+      break;
+    case RandomRaySourceShape::LINEAR_XY:
+      shape = "Linear XY";
+      break;
+    default:
+      fatal_error("Invalid random ray source shape");
+    }
+    fmt::print(" Source Shape                      = {}\n", shape);
+    std::string sample_method =
+      (RandomRay::sample_method_ == RandomRaySampleMethod::PRNG) ? "PRNG"
+                                                                 : "Halton";
+    fmt::print(" Sample Method                     = {}\n", sample_method);
+
+    if (domain_->is_transport_stabilization_needed_) {
+      fmt::print(" Transport XS Stabilization Used   = YES (rho = {:.3f})\n",
+        FlatSourceDomain::diagonal_stabilization_rho_);
+    } else {
+      fmt::print(" Transport XS Stabilization Used   = NO\n");
+    }
+
     header("Timing Statistics", 4);
     show_time("Total time for initialization", time_initialize.elapsed());
     show_time("Reading cross sections", time_read_xs.elapsed(), 1);
diff --git a/src/settings.cpp b/src/settings.cpp
index 49b6590ec..53fcdec38 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -345,6 +345,15 @@ void get_run_parameters(pugi::xml_node node_base)
         }
       }
     }
+    if (check_for_node(random_ray_node, "diagonal_stabilization_rho")) {
+      FlatSourceDomain::diagonal_stabilization_rho_ = std::stod(
+        get_node_value(random_ray_node, "diagonal_stabilization_rho"));
+      if (FlatSourceDomain::diagonal_stabilization_rho_ < 0.0 ||
+          FlatSourceDomain::diagonal_stabilization_rho_ > 1.0) {
+        fatal_error("Random ray diagonal stabilization rho factor must be "
+                    "between 0 and 1");
+      }
+    }
   }
 }
 
diff --git a/tests/regression_tests/mgxs_library_ce_to_mg/test.py b/tests/regression_tests/mgxs_library_ce_to_mg/test.py
index 4dff67323..48a715997 100644
--- a/tests/regression_tests/mgxs_library_ce_to_mg/test.py
+++ b/tests/regression_tests/mgxs_library_ce_to_mg/test.py
@@ -40,8 +40,8 @@ class MGXSTestHarness(PyAPITestHarness):
 
         # Build MG Inputs
         # Get data needed to execute Library calculations.
-        sp = openmc.StatePoint(self._sp_name)
-        self.mgxs_lib.load_from_statepoint(sp)
+        with openmc.StatePoint(self._sp_name) as sp:
+            self.mgxs_lib.load_from_statepoint(sp)
         self._model.mgxs_file, self._model.materials, \
             self._model.geometry = self.mgxs_lib.create_mg_mode()
 
@@ -55,11 +55,6 @@ class MGXSTestHarness(PyAPITestHarness):
         self._model.export_to_model_xml()
         self._model.mgxs_file.export_to_hdf5()
 
-        # Enforce closing statepoint and summary files so HDF5
-        # does not throw an error during the next OpenMC execution
-        sp._f.close()
-        sp._summary._f.close()
-
         # Re-run MG mode.
         if config['mpi']:
             mpi_args = [config['mpiexec'], '-n', config['mpi_np']]
diff --git a/tests/regression_tests/mgxs_library_ce_to_mg_nuclides/test.py b/tests/regression_tests/mgxs_library_ce_to_mg_nuclides/test.py
index ee0cdf0d9..a77ad2429 100644
--- a/tests/regression_tests/mgxs_library_ce_to_mg_nuclides/test.py
+++ b/tests/regression_tests/mgxs_library_ce_to_mg_nuclides/test.py
@@ -40,8 +40,8 @@ class MGXSTestHarness(PyAPITestHarness):
 
         # Build MG Inputs
         # Get data needed to execute Library calculations.
-        sp = openmc.StatePoint(self._sp_name)
-        self.mgxs_lib.load_from_statepoint(sp)
+        with openmc.StatePoint(self._sp_name) as sp:
+            self.mgxs_lib.load_from_statepoint(sp)
         self._model.mgxs_file, self._model.materials, \
             self._model.geometry = self.mgxs_lib.create_mg_mode()
 
@@ -55,11 +55,6 @@ class MGXSTestHarness(PyAPITestHarness):
         self._model.export_to_model_xml()
         self._model.mgxs_file.export_to_hdf5()
 
-        # Enforce closing statepoint and summary files so HDF5
-        # does not throw an error during the next OpenMC execution
-        sp._f.close()
-        sp._summary._f.close()
-
         # Re-run MG mode.
         if config['mpi']:
             mpi_args = [config['mpiexec'], '-n', config['mpi_np']]
diff --git a/tests/regression_tests/random_ray_auto_convert/__init__.py b/tests/regression_tests/random_ray_auto_convert/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/regression_tests/random_ray_auto_convert/infinite_medium/inputs_true.dat b/tests/regression_tests/random_ray_auto_convert/infinite_medium/inputs_true.dat
new file mode 100644
index 000000000..02be4ea7a
--- /dev/null
+++ b/tests/regression_tests/random_ray_auto_convert/infinite_medium/inputs_true.dat
@@ -0,0 +1,64 @@
+<?xml version='1.0' encoding='utf-8'?>
+<model>
+  <materials>
+    <cross_sections>mgxs.h5</cross_sections>
+    <material depletable="true" id="1" name="UO2__2_4__">
+      <density units="macro" value="1.0"/>
+      <macroscopic name="UO2__2_4__"/>
+    </material>
+    <material id="2" name="Zircaloy">
+      <density units="macro" value="1.0"/>
+      <macroscopic name="Zircaloy"/>
+    </material>
+    <material id="3" name="Hot_borated_water">
+      <density units="macro" value="1.0"/>
+      <macroscopic name="Hot_borated_water"/>
+    </material>
+  </materials>
+  <geometry>
+    <cell id="1" material="1" name="Fuel" region="-1" universe="0"/>
+    <cell id="2" material="2" name="Cladding" region="1 -2" universe="0"/>
+    <cell id="3" material="3" name="Water" region="2 3 -4 5 -6" universe="0"/>
+    <surface coeffs="0 0 0.39218" id="1" name="Fuel OR" type="z-cylinder"/>
+    <surface coeffs="0 0 0.4572" id="2" name="Clad OR" type="z-cylinder"/>
+    <surface boundary="reflective" coeffs="-0.63" id="3" name="left" type="x-plane"/>
+    <surface boundary="reflective" coeffs="0.63" id="4" name="right" type="x-plane"/>
+    <surface boundary="reflective" coeffs="-0.63" id="5" name="bottom" type="y-plane"/>
+    <surface boundary="reflective" coeffs="0.63" id="6" name="top" type="y-plane"/>
+  </geometry>
+  <settings>
+    <run_mode>eigenvalue</run_mode>
+    <particles>100</particles>
+    <batches>10</batches>
+    <inactive>5</inactive>
+    <source particle="neutron" strength="1.0" type="independent">
+      <space type="box">
+        <parameters>-0.63 -0.63 -1 0.63 0.63 1</parameters>
+      </space>
+      <constraints>
+        <fissionable>true</fissionable>
+      </constraints>
+    </source>
+    <energy_mode>multi-group</energy_mode>
+    <random_ray>
+      <source particle="neutron" strength="1.0" type="independent">
+        <space type="box">
+          <parameters>-0.63 -0.63 -1.0 0.63 0.63 1.0</parameters>
+        </space>
+      </source>
+      <distance_inactive>30.0</distance_inactive>
+      <distance_active>150.0</distance_active>
+      <source_region_meshes>
+        <mesh id="1">
+          <domain id="0" type="universe"/>
+        </mesh>
+      </source_region_meshes>
+      <source_shape>linear</source_shape>
+    </random_ray>
+    <mesh id="1">
+      <dimension>2 2</dimension>
+      <lower_left>-0.63 -0.63</lower_left>
+      <upper_right>0.63 0.63</upper_right>
+    </mesh>
+  </settings>
+  </model>
diff --git a/tests/regression_tests/random_ray_auto_convert/infinite_medium/results_true.dat b/tests/regression_tests/random_ray_auto_convert/infinite_medium/results_true.dat
new file mode 100644
index 000000000..a0d7fc545
--- /dev/null
+++ b/tests/regression_tests/random_ray_auto_convert/infinite_medium/results_true.dat
@@ -0,0 +1,2 @@
+k-combined:
+7.796949E-01 1.055316E-02
diff --git a/tests/regression_tests/random_ray_auto_convert/material_wise/inputs_true.dat b/tests/regression_tests/random_ray_auto_convert/material_wise/inputs_true.dat
new file mode 100644
index 000000000..02be4ea7a
--- /dev/null
+++ b/tests/regression_tests/random_ray_auto_convert/material_wise/inputs_true.dat
@@ -0,0 +1,64 @@
+<?xml version='1.0' encoding='utf-8'?>
+<model>
+  <materials>
+    <cross_sections>mgxs.h5</cross_sections>
+    <material depletable="true" id="1" name="UO2__2_4__">
+      <density units="macro" value="1.0"/>
+      <macroscopic name="UO2__2_4__"/>
+    </material>
+    <material id="2" name="Zircaloy">
+      <density units="macro" value="1.0"/>
+      <macroscopic name="Zircaloy"/>
+    </material>
+    <material id="3" name="Hot_borated_water">
+      <density units="macro" value="1.0"/>
+      <macroscopic name="Hot_borated_water"/>
+    </material>
+  </materials>
+  <geometry>
+    <cell id="1" material="1" name="Fuel" region="-1" universe="0"/>
+    <cell id="2" material="2" name="Cladding" region="1 -2" universe="0"/>
+    <cell id="3" material="3" name="Water" region="2 3 -4 5 -6" universe="0"/>
+    <surface coeffs="0 0 0.39218" id="1" name="Fuel OR" type="z-cylinder"/>
+    <surface coeffs="0 0 0.4572" id="2" name="Clad OR" type="z-cylinder"/>
+    <surface boundary="reflective" coeffs="-0.63" id="3" name="left" type="x-plane"/>
+    <surface boundary="reflective" coeffs="0.63" id="4" name="right" type="x-plane"/>
+    <surface boundary="reflective" coeffs="-0.63" id="5" name="bottom" type="y-plane"/>
+    <surface boundary="reflective" coeffs="0.63" id="6" name="top" type="y-plane"/>
+  </geometry>
+  <settings>
+    <run_mode>eigenvalue</run_mode>
+    <particles>100</particles>
+    <batches>10</batches>
+    <inactive>5</inactive>
+    <source particle="neutron" strength="1.0" type="independent">
+      <space type="box">
+        <parameters>-0.63 -0.63 -1 0.63 0.63 1</parameters>
+      </space>
+      <constraints>
+        <fissionable>true</fissionable>
+      </constraints>
+    </source>
+    <energy_mode>multi-group</energy_mode>
+    <random_ray>
+      <source particle="neutron" strength="1.0" type="independent">
+        <space type="box">
+          <parameters>-0.63 -0.63 -1.0 0.63 0.63 1.0</parameters>
+        </space>
+      </source>
+      <distance_inactive>30.0</distance_inactive>
+      <distance_active>150.0</distance_active>
+      <source_region_meshes>
+        <mesh id="1">
+          <domain id="0" type="universe"/>
+        </mesh>
+      </source_region_meshes>
+      <source_shape>linear</source_shape>
+    </random_ray>
+    <mesh id="1">
+      <dimension>2 2</dimension>
+      <lower_left>-0.63 -0.63</lower_left>
+      <upper_right>0.63 0.63</upper_right>
+    </mesh>
+  </settings>
+  </model>
diff --git a/tests/regression_tests/random_ray_auto_convert/material_wise/results_true.dat b/tests/regression_tests/random_ray_auto_convert/material_wise/results_true.dat
new file mode 100644
index 000000000..ebf510cfc
--- /dev/null
+++ b/tests/regression_tests/random_ray_auto_convert/material_wise/results_true.dat
@@ -0,0 +1,2 @@
+k-combined:
+7.375068E-01 7.015839E-03
diff --git a/tests/regression_tests/random_ray_auto_convert/stochastic_slab/inputs_true.dat b/tests/regression_tests/random_ray_auto_convert/stochastic_slab/inputs_true.dat
new file mode 100644
index 000000000..02be4ea7a
--- /dev/null
+++ b/tests/regression_tests/random_ray_auto_convert/stochastic_slab/inputs_true.dat
@@ -0,0 +1,64 @@
+<?xml version='1.0' encoding='utf-8'?>
+<model>
+  <materials>
+    <cross_sections>mgxs.h5</cross_sections>
+    <material depletable="true" id="1" name="UO2__2_4__">
+      <density units="macro" value="1.0"/>
+      <macroscopic name="UO2__2_4__"/>
+    </material>
+    <material id="2" name="Zircaloy">
+      <density units="macro" value="1.0"/>
+      <macroscopic name="Zircaloy"/>
+    </material>
+    <material id="3" name="Hot_borated_water">
+      <density units="macro" value="1.0"/>
+      <macroscopic name="Hot_borated_water"/>
+    </material>
+  </materials>
+  <geometry>
+    <cell id="1" material="1" name="Fuel" region="-1" universe="0"/>
+    <cell id="2" material="2" name="Cladding" region="1 -2" universe="0"/>
+    <cell id="3" material="3" name="Water" region="2 3 -4 5 -6" universe="0"/>
+    <surface coeffs="0 0 0.39218" id="1" name="Fuel OR" type="z-cylinder"/>
+    <surface coeffs="0 0 0.4572" id="2" name="Clad OR" type="z-cylinder"/>
+    <surface boundary="reflective" coeffs="-0.63" id="3" name="left" type="x-plane"/>
+    <surface boundary="reflective" coeffs="0.63" id="4" name="right" type="x-plane"/>
+    <surface boundary="reflective" coeffs="-0.63" id="5" name="bottom" type="y-plane"/>
+    <surface boundary="reflective" coeffs="0.63" id="6" name="top" type="y-plane"/>
+  </geometry>
+  <settings>
+    <run_mode>eigenvalue</run_mode>
+    <particles>100</particles>
+    <batches>10</batches>
+    <inactive>5</inactive>
+    <source particle="neutron" strength="1.0" type="independent">
+      <space type="box">
+        <parameters>-0.63 -0.63 -1 0.63 0.63 1</parameters>
+      </space>
+      <constraints>
+        <fissionable>true</fissionable>
+      </constraints>
+    </source>
+    <energy_mode>multi-group</energy_mode>
+    <random_ray>
+      <source particle="neutron" strength="1.0" type="independent">
+        <space type="box">
+          <parameters>-0.63 -0.63 -1.0 0.63 0.63 1.0</parameters>
+        </space>
+      </source>
+      <distance_inactive>30.0</distance_inactive>
+      <distance_active>150.0</distance_active>
+      <source_region_meshes>
+        <mesh id="1">
+          <domain id="0" type="universe"/>
+        </mesh>
+      </source_region_meshes>
+      <source_shape>linear</source_shape>
+    </random_ray>
+    <mesh id="1">
+      <dimension>2 2</dimension>
+      <lower_left>-0.63 -0.63</lower_left>
+      <upper_right>0.63 0.63</upper_right>
+    </mesh>
+  </settings>
+  </model>
diff --git a/tests/regression_tests/random_ray_auto_convert/stochastic_slab/results_true.dat b/tests/regression_tests/random_ray_auto_convert/stochastic_slab/results_true.dat
new file mode 100644
index 000000000..2f444fad3
--- /dev/null
+++ b/tests/regression_tests/random_ray_auto_convert/stochastic_slab/results_true.dat
@@ -0,0 +1,2 @@
+k-combined:
+7.499679E-01 8.107614E-03
diff --git a/tests/regression_tests/random_ray_auto_convert/test.py b/tests/regression_tests/random_ray_auto_convert/test.py
new file mode 100644
index 000000000..fa7f2f17f
--- /dev/null
+++ b/tests/regression_tests/random_ray_auto_convert/test.py
@@ -0,0 +1,54 @@
+import os
+
+import openmc
+from openmc.examples import pwr_pin_cell
+from openmc import RegularMesh
+from openmc.utility_funcs import change_directory
+import pytest
+
+from tests.testing_harness import TolerantPyAPITestHarness
+
+
+class MGXSTestHarness(TolerantPyAPITestHarness):
+    def _cleanup(self):
+        super()._cleanup()
+        f = 'mgxs.h5'
+        if os.path.exists(f):
+            os.remove(f)
+
+
+@pytest.mark.parametrize("method", ["material_wise", "stochastic_slab", "infinite_medium"])
+def test_random_ray_auto_convert(method):
+    with change_directory(method):
+        openmc.reset_auto_ids()
+
+        # Start with a normal continuous energy model
+        model = pwr_pin_cell()
+
+        # Convert to a multi-group model
+        model.convert_to_multigroup(
+            method=method, groups='CASMO-2', nparticles=30,
+            overwrite_mgxs_library=False, mgxs_path="mgxs.h5"
+        )
+
+        # Convert to a random ray model
+        model.convert_to_random_ray()
+
+        # Set the number of particles
+        model.settings.particles = 100
+
+        # Overlay a basic 2x2 mesh
+        n = 2
+        mesh = RegularMesh()
+        mesh.dimension = (n, n)
+        bbox = model.geometry.bounding_box
+        mesh.lower_left = (bbox.lower_left[0], bbox.lower_left[1])
+        mesh.upper_right = (bbox.upper_right[0], bbox.upper_right[1])
+        model.settings.random_ray['source_region_meshes'] = [
+            (mesh, [model.geometry.root_universe])]
+
+        # Set the source shape to linear
+        model.settings.random_ray['source_shape'] = 'linear'
+
+        harness = MGXSTestHarness('statepoint.10.h5', model)
+        harness.main()
diff --git a/tests/regression_tests/random_ray_diagonal_stabilization/__init__.py b/tests/regression_tests/random_ray_diagonal_stabilization/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/regression_tests/random_ray_diagonal_stabilization/inputs_true.dat b/tests/regression_tests/random_ray_diagonal_stabilization/inputs_true.dat
new file mode 100644
index 000000000..4d4ed76dc
--- /dev/null
+++ b/tests/regression_tests/random_ray_diagonal_stabilization/inputs_true.dat
@@ -0,0 +1,65 @@
+<?xml version='1.0' encoding='utf-8'?>
+<model>
+  <materials>
+    <cross_sections>mgxs.h5</cross_sections>
+    <material depletable="true" id="1" name="UO2__2_4__">
+      <density units="macro" value="1.0"/>
+      <macroscopic name="UO2__2_4__"/>
+    </material>
+    <material id="2" name="Zircaloy">
+      <density units="macro" value="1.0"/>
+      <macroscopic name="Zircaloy"/>
+    </material>
+    <material id="3" name="Hot_borated_water">
+      <density units="macro" value="1.0"/>
+      <macroscopic name="Hot_borated_water"/>
+    </material>
+  </materials>
+  <geometry>
+    <cell id="1" material="1" name="Fuel" region="-1" universe="0"/>
+    <cell id="2" material="2" name="Cladding" region="1 -2" universe="0"/>
+    <cell id="3" material="3" name="Water" region="2 3 -4 5 -6" universe="0"/>
+    <surface coeffs="0 0 0.39218" id="1" name="Fuel OR" type="z-cylinder"/>
+    <surface coeffs="0 0 0.4572" id="2" name="Clad OR" type="z-cylinder"/>
+    <surface boundary="reflective" coeffs="-0.63" id="3" name="left" type="x-plane"/>
+    <surface boundary="reflective" coeffs="0.63" id="4" name="right" type="x-plane"/>
+    <surface boundary="reflective" coeffs="-0.63" id="5" name="bottom" type="y-plane"/>
+    <surface boundary="reflective" coeffs="0.63" id="6" name="top" type="y-plane"/>
+  </geometry>
+  <settings>
+    <run_mode>eigenvalue</run_mode>
+    <particles>100</particles>
+    <batches>20</batches>
+    <inactive>15</inactive>
+    <source particle="neutron" strength="1.0" type="independent">
+      <space type="box">
+        <parameters>-0.63 -0.63 -1 0.63 0.63 1</parameters>
+      </space>
+      <constraints>
+        <fissionable>true</fissionable>
+      </constraints>
+    </source>
+    <energy_mode>multi-group</energy_mode>
+    <random_ray>
+      <source particle="neutron" strength="1.0" type="independent">
+        <space type="box">
+          <parameters>-0.63 -0.63 -1.0 0.63 0.63 1.0</parameters>
+        </space>
+      </source>
+      <distance_inactive>30.0</distance_inactive>
+      <distance_active>150.0</distance_active>
+      <source_region_meshes>
+        <mesh id="1">
+          <domain id="0" type="universe"/>
+        </mesh>
+      </source_region_meshes>
+      <source_shape>linear</source_shape>
+      <diagonal_stabilization_rho>0.5</diagonal_stabilization_rho>
+    </random_ray>
+    <mesh id="1">
+      <dimension>2 2</dimension>
+      <lower_left>-0.63 -0.63</lower_left>
+      <upper_right>0.63 0.63</upper_right>
+    </mesh>
+  </settings>
+  </model>
diff --git a/tests/regression_tests/random_ray_diagonal_stabilization/results_true.dat b/tests/regression_tests/random_ray_diagonal_stabilization/results_true.dat
new file mode 100644
index 000000000..c6ce6aab9
--- /dev/null
+++ b/tests/regression_tests/random_ray_diagonal_stabilization/results_true.dat
@@ -0,0 +1,2 @@
+k-combined:
+7.152917E-01 1.430362E-02
diff --git a/tests/regression_tests/random_ray_diagonal_stabilization/test.py b/tests/regression_tests/random_ray_diagonal_stabilization/test.py
new file mode 100644
index 000000000..c7a1c9f7c
--- /dev/null
+++ b/tests/regression_tests/random_ray_diagonal_stabilization/test.py
@@ -0,0 +1,61 @@
+import os
+
+from openmc.examples import pwr_pin_cell
+from openmc import RegularMesh
+
+from tests.testing_harness import TolerantPyAPITestHarness
+
+
+class MGXSTestHarness(TolerantPyAPITestHarness):
+    def _cleanup(self):
+        super()._cleanup()
+        f = 'mgxs.h5'
+        if os.path.exists(f):
+            os.remove(f)
+
+
+def test_random_ray_diagonal_stabilization():
+    # Start with a normal continuous energy model
+    model = pwr_pin_cell()
+
+    # Convert to a multi-group model, with 70 group XS
+    # and transport correction enabled. This will generate
+    # MGXS data with some negatives on the diagonal, in order
+    # to trigger diagonal correction.
+    model.convert_to_multigroup(
+        method='material_wise', groups='CASMO-70', nparticles=30,
+        overwrite_mgxs_library=True, mgxs_path="mgxs.h5", correction='P0'
+    )
+
+    # Convert to a random ray model
+    model.convert_to_random_ray()
+
+    # Set the number of particles
+    model.settings.particles = 100
+
+    # Overlay a basic 2x2 mesh
+    n = 2
+    mesh = RegularMesh()
+    mesh.dimension = (n, n)
+    bbox = model.geometry.bounding_box
+    mesh.lower_left = (bbox.lower_left[0], bbox.lower_left[1])
+    mesh.upper_right = (bbox.upper_right[0], bbox.upper_right[1])
+    model.settings.random_ray['source_region_meshes'] = [
+        (mesh, [model.geometry.root_universe])]
+
+    # Set the source shape to linear
+    model.settings.random_ray['source_shape'] = 'linear'
+
+    # Explicitly set the diagonal stabilization rho (default is otherwise 1.0).
+    # Note that if we set this to 0.0 (thus distabling stabilization), the
+    # problem should fail due to instability, so this is actually a good test
+    # problem.
+    model.settings.random_ray['diagonal_stabilization_rho'] = 0.5
+
+    # If rho was 0.0, the instability would cause failure after iteration 14,
+    # so we go a little past that.
+    model.settings.inactive = 15
+    model.settings.batches = 20
+
+    harness = MGXSTestHarness('statepoint.20.h5', model)
+    harness.main()
diff --git a/tools/ci/gha-install-dagmc.sh b/tools/ci/gha-install-dagmc.sh
index 82759c9bc..8d0648a50 100755
--- a/tools/ci/gha-install-dagmc.sh
+++ b/tools/ci/gha-install-dagmc.sh
@@ -3,7 +3,7 @@
 set -ex
 
 # MOAB Variables
-MOAB_BRANCH='Version5.1.0'
+MOAB_BRANCH='5.5.1'
 MOAB_REPO='https://bitbucket.org/fathomteam/moab/'
 MOAB_INSTALL_DIR=$HOME/MOAB/
 
@@ -19,7 +19,7 @@ cd $HOME
 mkdir MOAB && cd MOAB
 git clone -b $MOAB_BRANCH $MOAB_REPO
 mkdir build && cd build
-cmake ../moab -DENABLE_HDF5=ON -DENABLE_NETCDF=ON -DBUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_PREFIX=$MOAB_INSTALL_DIR -DENABLE_BLASLAPACK=OFF
+cmake ../moab -DENABLE_HDF5=ON -DENABLE_NETCDF=ON -DBUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_PREFIX=$MOAB_INSTALL_DIR
 make -j && make -j install
 rm -rf $HOME/MOAB/moab $HOME/MOAB/build
 

From 07f5334616c2ca92ad0a04dfa8c900e080509f70 Mon Sep 17 00:00:00 2001
From: John Tramm <john.tramm@gmail.com>
Date: Wed, 2 Apr 2025 00:40:07 -0500
Subject: [PATCH 009/203] Random Ray Point Source Locator (#3360)

Co-authored-by: Paul Romano <paul.k.romano@gmail.com>
---
 docs/source/methods/random_ray.rst            |   3 +-
 docs/source/usersguide/random_ray.rst         |   9 +-
 .../openmc/random_ray/flat_source_domain.h    |   8 +-
 src/random_ray/flat_source_domain.cpp         | 119 ++++++--
 src/random_ray/random_ray_simulation.cpp      |  23 +-
 .../__init__.py                               |   0
 .../inputs_true.dat                           | 253 ++++++++++++++++++
 .../results_true.dat                          |   9 +
 .../random_ray_point_source_locator/test.py   |  44 +++
 9 files changed, 435 insertions(+), 33 deletions(-)
 create mode 100644 tests/regression_tests/random_ray_point_source_locator/__init__.py
 create mode 100644 tests/regression_tests/random_ray_point_source_locator/inputs_true.dat
 create mode 100644 tests/regression_tests/random_ray_point_source_locator/results_true.dat
 create mode 100644 tests/regression_tests/random_ray_point_source_locator/test.py

diff --git a/docs/source/methods/random_ray.rst b/docs/source/methods/random_ray.rst
index eb22b0544..41f95f0a9 100644
--- a/docs/source/methods/random_ray.rst
+++ b/docs/source/methods/random_ray.rst
@@ -1052,7 +1052,8 @@ random ray and Monte Carlo, however.
   regions. Thus, in the OpenMC implementation of random ray, particle sources
   are restricted to being volumetric and isotropic, although different energy
   spectrums are supported. Fixed sources can be applied to specific materials,
-  cells, or universes.
+  cells, or universes. Point sources are "smeared" to fill the volume of the
+  source region that contains the point source coordinate.
 
 - **Inactive batches:** In Monte Carlo, use of a fixed source implies that all
   batches are active batches, as there is no longer a need to develop a fission
diff --git a/docs/source/usersguide/random_ray.rst b/docs/source/usersguide/random_ray.rst
index ce9821196..138ae910c 100644
--- a/docs/source/usersguide/random_ray.rst
+++ b/docs/source/usersguide/random_ray.rst
@@ -919,9 +919,12 @@ Monte Carlo solver.
 Currently, all of the following conditions must be met for the particle source
 to be valid in random ray mode:
 
-- One or more domain ids must be specified that indicate which cells, universes,
-  or materials the source applies to. This implicitly limits the source type to
-  being volumetric. This is specified via the ``domains`` constraint placed on the
+- Either a point source must be used, or a domain constraint must be specified
+  that indicates which cells, universes, or materials the source applies to. In
+  either case, this implicitly limits the source type to being volumetric, as
+  even in the point source case the source will be "smeared" throughout the
+  source region that contains the point source coordinate. A source domain is
+  specified via the ``domains`` constraint placed on the
   :class:`openmc.IndependentSource` Python class.
 - The source must be isotropic (default for a source)
 - The source must use a discrete (i.e., multigroup) energy distribution. The
diff --git a/include/openmc/random_ray/flat_source_domain.h b/include/openmc/random_ray/flat_source_domain.h
index 656b0354a..9fdd55875 100644
--- a/include/openmc/random_ray/flat_source_domain.h
+++ b/include/openmc/random_ray/flat_source_domain.h
@@ -131,6 +131,12 @@ public:
   std::unordered_map<SourceRegionKey, int64_t, SourceRegionKey::HashFunctor>
     source_region_map_;
 
+  // Map that relates a SourceRegionKey to the external source index. This map
+  // is used to check if there are any point sources within a subdivided source
+  // region at the time it is discovered.
+  std::unordered_map<SourceRegionKey, int64_t, SourceRegionKey::HashFunctor>
+    point_source_map_;
+
   // If transport corrected MGXS data is being used, there may be negative
   // in-group scattering cross sections that can result in instability in MOC
   // and random ray if used naively. This flag enables a stabilization
@@ -141,7 +147,7 @@ protected:
   //----------------------------------------------------------------------------
   // Methods
   void apply_external_source_to_source_region(
-    Discrete* discrete, double strength_factor, int64_t sr);
+    Discrete* discrete, double strength_factor, SourceRegionHandle& srh);
   void apply_external_source_to_cell_instances(int32_t i_cell,
     Discrete* discrete, double strength_factor, int target_material_id,
     const vector<int32_t>& instances);
diff --git a/src/random_ray/flat_source_domain.cpp b/src/random_ray/flat_source_domain.cpp
index ff8e5d232..8ab30abf2 100644
--- a/src/random_ray/flat_source_domain.cpp
+++ b/src/random_ray/flat_source_domain.cpp
@@ -946,17 +946,16 @@ void FlatSourceDomain::output_to_vtk() const
 }
 
 void FlatSourceDomain::apply_external_source_to_source_region(
-  Discrete* discrete, double strength_factor, int64_t sr)
+  Discrete* discrete, double strength_factor, SourceRegionHandle& srh)
 {
-  source_regions_.external_source_present(sr) = 1;
+  srh.external_source_present() = 1;
 
   const auto& discrete_energies = discrete->x();
   const auto& discrete_probs = discrete->prob();
 
   for (int i = 0; i < discrete_energies.size(); i++) {
     int g = data::mg.get_group_index(discrete_energies[i]);
-    source_regions_.external_source(sr, g) +=
-      discrete_probs[i] * strength_factor;
+    srh.external_source(g) += discrete_probs[i] * strength_factor;
   }
 }
 
@@ -980,8 +979,9 @@ void FlatSourceDomain::apply_external_source_to_cell_instances(int32_t i_cell,
     if (target_material_id == C_NONE ||
         cell_material_id == target_material_id) {
       int64_t source_region = source_region_offsets_[i_cell] + j;
-      apply_external_source_to_source_region(
-        discrete, strength_factor, source_region);
+      SourceRegionHandle srh =
+        source_regions_.get_source_region_handle(source_region);
+      apply_external_source_to_source_region(discrete, strength_factor, srh);
     }
   }
 }
@@ -1023,34 +1023,88 @@ void FlatSourceDomain::convert_external_sources()
 {
   // Loop over external sources
   for (int es = 0; es < model::external_sources.size(); es++) {
+
+    // Extract source information
     Source* s = model::external_sources[es].get();
     IndependentSource* is = dynamic_cast<IndependentSource*>(s);
     Discrete* energy = dynamic_cast<Discrete*>(is->energy());
     const std::unordered_set<int32_t>& domain_ids = is->domain_ids();
-
     double strength_factor = is->strength();
 
-    if (is->domain_type() == Source::DomainType::MATERIAL) {
-      for (int32_t material_id : domain_ids) {
-        for (int i_cell = 0; i_cell < model::cells.size(); i_cell++) {
-          apply_external_source_to_cell_and_children(
-            i_cell, energy, strength_factor, material_id);
+    // If there is no domain constraint specified, then this must be a point
+    // source. In this case, we need to find the source region that contains the
+    // point source and apply or relate it to the external source.
+    if (is->domain_ids().size() == 0) {
+
+      // Extract the point source coordinate and find the base source region at
+      // that point
+      auto sp = dynamic_cast<SpatialPoint*>(is->space());
+      GeometryState gs;
+      gs.r() = sp->r();
+      gs.r_last() = sp->r();
+      gs.u() = {1.0, 0.0, 0.0};
+      bool found = exhaustive_find_cell(gs);
+      if (!found) {
+        fatal_error(fmt::format("Could not find cell containing external "
+                                "point source at {}",
+          sp->r()));
+      }
+      int i_cell = gs.lowest_coord().cell;
+      int64_t sr = source_region_offsets_[i_cell] + gs.cell_instance();
+
+      if (RandomRay::mesh_subdivision_enabled_) {
+        // If mesh subdivision is enabled, we need to determine which subdivided
+        // mesh bin the point source coordinate is in as well
+        int mesh_idx = source_regions_.mesh(sr);
+        int mesh_bin;
+        if (mesh_idx == C_NONE) {
+          mesh_bin = 0;
+        } else {
+          mesh_bin = model::meshes[mesh_idx]->get_bin(gs.r());
         }
+        // With the source region and mesh bin known, we can use the
+        // accompanying SourceRegionKey as a key into a map that stores the
+        // corresponding external source index for the point source. Notably, we
+        // do not actually apply the external source to any source regions here,
+        // as if mesh subdivision is enabled, they haven't actually been
+        // discovered & initilized yet. When discovered, they will read from the
+        // point_source_map to determine if there are any point source terms
+        // that should be applied.
+        SourceRegionKey key {sr, mesh_bin};
+        point_source_map_[key] = es;
+      } else {
+        // If we are not using mesh subdivision, we can apply the external
+        // source directly to the source region as we do for volumetric domain
+        // constraint sources.
+        SourceRegionHandle srh = source_regions_.get_source_region_handle(sr);
+        apply_external_source_to_source_region(energy, strength_factor, srh);
       }
-    } else if (is->domain_type() == Source::DomainType::CELL) {
-      for (int32_t cell_id : domain_ids) {
-        int32_t i_cell = model::cell_map[cell_id];
-        apply_external_source_to_cell_and_children(
-          i_cell, energy, strength_factor, C_NONE);
-      }
-    } else if (is->domain_type() == Source::DomainType::UNIVERSE) {
-      for (int32_t universe_id : domain_ids) {
-        int32_t i_universe = model::universe_map[universe_id];
-        Universe& universe = *model::universes[i_universe];
-        for (int32_t i_cell : universe.cells_) {
+
+    } else {
+      // If not a point source, then use the volumetric domain constraints to
+      // determine which source regions to apply the external source to.
+      if (is->domain_type() == Source::DomainType::MATERIAL) {
+        for (int32_t material_id : domain_ids) {
+          for (int i_cell = 0; i_cell < model::cells.size(); i_cell++) {
+            apply_external_source_to_cell_and_children(
+              i_cell, energy, strength_factor, material_id);
+          }
+        }
+      } else if (is->domain_type() == Source::DomainType::CELL) {
+        for (int32_t cell_id : domain_ids) {
+          int32_t i_cell = model::cell_map[cell_id];
           apply_external_source_to_cell_and_children(
             i_cell, energy, strength_factor, C_NONE);
         }
+      } else if (is->domain_type() == Source::DomainType::UNIVERSE) {
+        for (int32_t universe_id : domain_ids) {
+          int32_t i_universe = model::universe_map[universe_id];
+          Universe& universe = *model::universes[i_universe];
+          for (int32_t i_cell : universe.cells_) {
+            apply_external_source_to_cell_and_children(
+              i_cell, energy, strength_factor, C_NONE);
+          }
+        }
       }
     }
   } // End loop over external sources
@@ -1399,6 +1453,25 @@ SourceRegionHandle FlatSourceDomain::get_subdivided_source_region_handle(
     sr_key, {base_source_regions_.get_source_region_handle(sr), sr});
   discovered_source_regions_.unlock(sr_key);
   SourceRegionHandle handle {*sr_ptr};
+
+  // Check if the new source region contains a point source and apply it if so
+  auto it2 = point_source_map_.find(sr_key);
+  if (it2 != point_source_map_.end()) {
+    int es = it2->second;
+    auto s = model::external_sources[es].get();
+    auto is = dynamic_cast<IndependentSource*>(s);
+    auto energy = dynamic_cast<Discrete*>(is->energy());
+    double strength_factor = is->strength();
+    apply_external_source_to_source_region(energy, strength_factor, handle);
+    int material = handle.material();
+    if (material != MATERIAL_VOID) {
+      for (int g = 0; g < negroups_; g++) {
+        double sigma_t = sigma_t_[material * negroups_ + g];
+        handle.external_source(g) /= sigma_t;
+      }
+    }
+  }
+
   return handle;
 }
 
diff --git a/src/random_ray/random_ray_simulation.cpp b/src/random_ray/random_ray_simulation.cpp
index 60b00a5be..b831efcd9 100644
--- a/src/random_ray/random_ray_simulation.cpp
+++ b/src/random_ray/random_ray_simulation.cpp
@@ -281,10 +281,21 @@ void validate_random_ray_inputs()
           "allowed in random ray mode.");
       }
 
-      // Validate that a domain ID was specified
-      if (is->domain_ids().size() == 0) {
-        fatal_error("Fixed sources must be specified by domain "
-                    "id (cell, material, or universe) in random ray mode.");
+      // Validate that a domain ID was specified OR that it is a point source
+      auto sp = dynamic_cast<SpatialPoint*>(is->space());
+      if (is->domain_ids().size() == 0 && !sp) {
+        fatal_error("Fixed sources must be point source or spatially "
+                    "constrained by domain id (cell, material, or universe) in "
+                    "random ray mode.");
+      } else if (is->domain_ids().size() > 0 && sp) {
+        // If both a domain constraint and a non-default point source location
+        // are specified, notify user that domain constraint takes precedence.
+        if (sp->r().x == 0.0 && sp->r().y == 0.0 && sp->r().z == 0.0) {
+          warning("Fixed source has both a domain constraint and a point "
+                  "type spatial distribution. The domain constraint takes "
+                  "precedence in random ray mode -- point source coordinate "
+                  "will be ignored.");
+        }
       }
 
       // Check that a discrete energy distribution was used
@@ -393,12 +404,12 @@ RandomRaySimulation::RandomRaySimulation()
 
 void RandomRaySimulation::apply_fixed_sources_and_mesh_domains()
 {
+  domain_->apply_meshes();
   if (settings::run_mode == RunMode::FIXED_SOURCE) {
     // Transfer external source user inputs onto random ray source regions
     domain_->convert_external_sources();
     domain_->count_external_source_regions();
   }
-  domain_->apply_meshes();
 }
 
 void RandomRaySimulation::prepare_fixed_sources_adjoint(
@@ -517,6 +528,8 @@ void RandomRaySimulation::simulate()
     finalize_generation();
     finalize_batch();
   } // End random ray power iteration loop
+
+  domain_->count_external_source_regions();
 }
 
 void RandomRaySimulation::output_simulation_results() const
diff --git a/tests/regression_tests/random_ray_point_source_locator/__init__.py b/tests/regression_tests/random_ray_point_source_locator/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/regression_tests/random_ray_point_source_locator/inputs_true.dat b/tests/regression_tests/random_ray_point_source_locator/inputs_true.dat
new file mode 100644
index 000000000..9c7cd4ab5
--- /dev/null
+++ b/tests/regression_tests/random_ray_point_source_locator/inputs_true.dat
@@ -0,0 +1,253 @@
+<?xml version='1.0' encoding='utf-8'?>
+<model>
+  <materials>
+    <cross_sections>mgxs.h5</cross_sections>
+    <material id="1" name="source">
+      <density units="macro" value="1.0"/>
+      <macroscopic name="source"/>
+    </material>
+    <material id="2" name="void">
+      <density units="macro" value="1.0"/>
+      <macroscopic name="void"/>
+    </material>
+    <material id="3" name="absorber">
+      <density units="macro" value="1.0"/>
+      <macroscopic name="absorber"/>
+    </material>
+  </materials>
+  <geometry>
+    <cell id="1" material="1" name="infinite source region" universe="1"/>
+    <cell id="2" material="2" name="infinite void region" universe="2"/>
+    <cell id="3" material="3" name="infinite absorber region" universe="3"/>
+    <cell fill="4" id="4" universe="5"/>
+    <cell fill="5" id="5" name="full domain" region="1 -2 3 -4 5 -6" universe="6"/>
+    <lattice id="4">
+      <pitch>2.5 2.5 2.5</pitch>
+      <dimension>12 12 12</dimension>
+      <lower_left>0.0 0.0 0.0</lower_left>
+      <universes>
+3 3 3 3 3 3 3 3 3 3 3 3 
+3 3 3 3 3 3 3 3 3 3 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+1 1 2 2 2 2 2 2 2 2 3 3 
+1 1 2 2 2 2 2 2 2 2 3 3 
+
+3 3 3 3 3 3 3 3 3 3 3 3 
+3 3 3 3 3 3 3 3 3 3 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+1 1 2 2 2 2 2 2 2 2 3 3 
+1 1 2 2 2 2 2 2 2 2 3 3 
+
+3 3 3 3 3 3 3 3 3 3 3 3 
+3 3 3 3 3 3 3 3 3 3 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+
+3 3 3 3 3 3 3 3 3 3 3 3 
+3 3 3 3 3 3 3 3 3 3 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+
+3 3 3 3 3 3 3 3 3 3 3 3 
+3 3 3 3 3 3 3 3 3 3 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+
+3 3 3 3 3 3 3 3 3 3 3 3 
+3 3 3 3 3 3 3 3 3 3 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+
+3 3 3 3 3 3 3 3 3 3 3 3 
+3 3 3 3 3 3 3 3 3 3 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+
+3 3 3 3 3 3 3 3 3 3 3 3 
+3 3 3 3 3 3 3 3 3 3 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+
+3 3 3 3 3 3 3 3 3 3 3 3 
+3 3 3 3 3 3 3 3 3 3 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+
+3 3 3 3 3 3 3 3 3 3 3 3 
+3 3 3 3 3 3 3 3 3 3 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+
+3 3 3 3 3 3 3 3 3 3 3 3 
+3 3 3 3 3 3 3 3 3 3 3 3 
+3 3 3 3 3 3 3 3 3 3 3 3 
+3 3 3 3 3 3 3 3 3 3 3 3 
+3 3 3 3 3 3 3 3 3 3 3 3 
+3 3 3 3 3 3 3 3 3 3 3 3 
+3 3 3 3 3 3 3 3 3 3 3 3 
+3 3 3 3 3 3 3 3 3 3 3 3 
+3 3 3 3 3 3 3 3 3 3 3 3 
+3 3 3 3 3 3 3 3 3 3 3 3 
+3 3 3 3 3 3 3 3 3 3 3 3 
+3 3 3 3 3 3 3 3 3 3 3 3 
+
+3 3 3 3 3 3 3 3 3 3 3 3 
+3 3 3 3 3 3 3 3 3 3 3 3 
+3 3 3 3 3 3 3 3 3 3 3 3 
+3 3 3 3 3 3 3 3 3 3 3 3 
+3 3 3 3 3 3 3 3 3 3 3 3 
+3 3 3 3 3 3 3 3 3 3 3 3 
+3 3 3 3 3 3 3 3 3 3 3 3 
+3 3 3 3 3 3 3 3 3 3 3 3 
+3 3 3 3 3 3 3 3 3 3 3 3 
+3 3 3 3 3 3 3 3 3 3 3 3 
+3 3 3 3 3 3 3 3 3 3 3 3 
+3 3 3 3 3 3 3 3 3 3 3 3 </universes>
+    </lattice>
+    <surface boundary="reflective" coeffs="0.0" id="1" type="x-plane"/>
+    <surface boundary="vacuum" coeffs="30.0" id="2" type="x-plane"/>
+    <surface boundary="reflective" coeffs="0.0" id="3" type="y-plane"/>
+    <surface boundary="vacuum" coeffs="30.0" id="4" type="y-plane"/>
+    <surface boundary="reflective" coeffs="0.0" id="5" type="z-plane"/>
+    <surface boundary="vacuum" coeffs="30.0" id="6" type="z-plane"/>
+  </geometry>
+  <settings>
+    <run_mode>fixed source</run_mode>
+    <particles>90</particles>
+    <batches>30</batches>
+    <inactive>15</inactive>
+    <source particle="neutron" strength="3.14" type="independent">
+      <space type="point">
+        <parameters>2.5 2.5 2.5</parameters>
+      </space>
+      <energy type="discrete">
+        <parameters>100.0 1.0</parameters>
+      </energy>
+    </source>
+    <energy_mode>multi-group</energy_mode>
+    <random_ray>
+      <distance_active>500.0</distance_active>
+      <distance_inactive>100.0</distance_inactive>
+      <source particle="neutron" strength="1.0" type="independent">
+        <space type="box">
+          <parameters>0.0 0.0 0.0 30.0 30.0 30.0</parameters>
+        </space>
+      </source>
+      <volume_normalized_flux_tallies>True</volume_normalized_flux_tallies>
+      <source_region_meshes>
+        <mesh id="1">
+          <domain id="6" type="universe"/>
+        </mesh>
+      </source_region_meshes>
+    </random_ray>
+    <mesh id="1">
+      <dimension>30 30 30</dimension>
+      <lower_left>0.0 0.0 0.0</lower_left>
+      <upper_right>30.0 30.0 30.0</upper_right>
+    </mesh>
+  </settings>
+  <tallies>
+    <filter id="3" type="material">
+      <bins>1</bins>
+    </filter>
+    <filter id="2" type="material">
+      <bins>2</bins>
+    </filter>
+    <filter id="1" type="material">
+      <bins>3</bins>
+    </filter>
+    <tally id="3" name="Source Tally">
+      <filters>3</filters>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="2" name="Void Tally">
+      <filters>2</filters>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="1" name="Absorber Tally">
+      <filters>1</filters>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+  </tallies>
+</model>
diff --git a/tests/regression_tests/random_ray_point_source_locator/results_true.dat b/tests/regression_tests/random_ray_point_source_locator/results_true.dat
new file mode 100644
index 000000000..1785dda57
--- /dev/null
+++ b/tests/regression_tests/random_ray_point_source_locator/results_true.dat
@@ -0,0 +1,9 @@
+tally 1:
+2.633900E+00
+2.948207E+00
+tally 2:
+1.440463E-01
+3.294032E-03
+tally 3:
+9.425207E-03
+1.089748E-05
diff --git a/tests/regression_tests/random_ray_point_source_locator/test.py b/tests/regression_tests/random_ray_point_source_locator/test.py
new file mode 100644
index 000000000..fd3d8a18f
--- /dev/null
+++ b/tests/regression_tests/random_ray_point_source_locator/test.py
@@ -0,0 +1,44 @@
+import os
+
+import openmc
+from openmc.examples import random_ray_three_region_cube
+
+from tests.testing_harness import TolerantPyAPITestHarness
+
+
+class MGXSTestHarness(TolerantPyAPITestHarness):
+    def _cleanup(self):
+        super()._cleanup()
+        f = 'mgxs.h5'
+        if os.path.exists(f):
+            os.remove(f)
+
+
+def test_random_ray_point_source_locator():
+    model = random_ray_three_region_cube()
+
+    # Overlay subdivided SR mesh to reduce resolution from 2.5cm -> 1cm
+    width = 30.0
+    mesh = openmc.RegularMesh()
+    mesh.dimension = (30, 30, 30)
+    mesh.lower_left = (0.0, 0.0, 0.0)
+    mesh.upper_right = (width, width, width)
+    model.settings.random_ray['source_region_meshes'] = [
+        (mesh, [model.geometry.root_universe]),
+    ]
+
+    # Define a point source
+    strengths = [1.0]
+    midpoints = [100.0]
+    energy_distribution = openmc.stats.Discrete(x=midpoints, p=strengths)
+    spatial_distribution = openmc.stats.Point([2.5, 2.5, 2.5])
+    source = openmc.IndependentSource(
+        energy=energy_distribution, space=spatial_distribution, strength=3.14)
+    model.settings.source = [source]
+
+    # Settings
+    model.settings.inactive = 15
+    model.settings.batches = 30
+
+    harness = MGXSTestHarness('statepoint.30.h5', model)
+    harness.main()

From cdc254ccf4245282d5aff19bd769daf180ef1a37 Mon Sep 17 00:00:00 2001
From: John Tramm <john.tramm@gmail.com>
Date: Thu, 10 Apr 2025 12:31:33 -0500
Subject: [PATCH 010/203] Fix for Issue Loading MGXS Data Files with LLVM 20 or
 Newer (#3368)

Co-authored-by: Paul Romano <paul.k.romano@gmail.com>
---
 src/mgxs.cpp | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/mgxs.cpp b/src/mgxs.cpp
index eae3e5817..a88d2c196 100644
--- a/src/mgxs.cpp
+++ b/src/mgxs.cpp
@@ -99,7 +99,21 @@ void Mgxs::metadata_from_hdf5(hid_t xs_id, const vector<double>& temperature,
   case TemperatureMethod::NEAREST:
     // Determine actual temperatures to read
     for (const auto& T : temperature) {
-      auto i_closest = xt::argmin(xt::abs(temps_available - T))[0];
+      // Determine the closest temperature value
+      // NOTE: the below block could be replaced with the following line,
+      // though this gives a runtime error if using LLVM 20 or newer,
+      // likely due to a bug in xtensor.
+      // auto i_closest = xt::argmin(xt::abs(temps_available - T))[0];
+      double closest = std::numeric_limits<double>::max();
+      int i_closest = 0;
+      for (int i = 0; i < temps_available.size(); i++) {
+        double diff = std::abs(temps_available[i] - T);
+        if (diff < closest) {
+          closest = diff;
+          i_closest = i;
+        }
+      }
+
       double temp_actual = temps_available[i_closest];
       if (std::fabs(temp_actual - T) < settings::temperature_tolerance) {
         if (std::find(temps_to_read.begin(), temps_to_read.end(),

From bd95b52f4d711fd3e62ec80fed9a4f1d1778198f Mon Sep 17 00:00:00 2001
From: Jonathan Shimwell <mail@jshimwell.com>
Date: Fri, 11 Apr 2025 23:35:30 +0200
Subject: [PATCH 011/203] Add check for equal value bins in an EnergyFilter
 (#3372)

---
 openmc/filter.py                 |  4 ++--
 tests/unit_tests/test_filters.py | 18 ++++++++++++++++++
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/openmc/filter.py b/openmc/filter.py
index 35a7e7c7e..755777c5e 100644
--- a/openmc/filter.py
+++ b/openmc/filter.py
@@ -1238,7 +1238,7 @@ class RealFilter(Filter):
             cv.check_type('filter value', v1, Real)
 
             # Make sure that each tuple has values that are increasing
-            if v1 < v0:
+            if v1 <= v0:
                 raise ValueError(f'Values {v0} and {v1} appear to be out of '
                                  'order')
 
@@ -1384,7 +1384,7 @@ class EnergyFilter(RealFilter):
     ----------
     values : Iterable of Real
         A list of values for which each successive pair constitutes a range of
-        energies in [eV] for a single bin
+        energies in [eV] for a single bin. Entries must be positive and ascending.
     filter_id : int
         Unique identifier for the filter
 
diff --git a/tests/unit_tests/test_filters.py b/tests/unit_tests/test_filters.py
index 55bb62075..c3b737192 100644
--- a/tests/unit_tests/test_filters.py
+++ b/tests/unit_tests/test_filters.py
@@ -294,3 +294,21 @@ def test_tabular_from_energyfilter():
 
     tab = efilter.get_tabular(values=np.array([10, 10, 5]), interpolation='linear-linear')
     assert tab.interpolation == 'linear-linear'
+
+
+def test_energy_filter():
+
+    # testing that bins descending value raises error
+    msg = "Values 1.0 and 0.5 appear to be out of order"
+    with raises(ValueError, match=msg):
+        openmc.EnergyFilter([0.0, 1.0, 0.5])
+
+    # testing that bins with same value raises error
+    msg = "Values 0.25 and 0.25 appear to be out of order"
+    with raises(ValueError, match=msg):
+        openmc.EnergyFilter([0.0, 0.25, 0.25])
+
+    # testing that negative bins values raises error
+    msg = 'Unable to set "filter value" to "-1.2" since it is less than "0.0"'
+    with raises(ValueError, match=msg):
+        openmc.EnergyFilter([-1.2, 0.25, 0.5])

From c1a4d43da81ea0e04f063ae450d44133e3d72b9c Mon Sep 17 00:00:00 2001
From: Paul Romano <paul.k.romano@gmail.com>
Date: Fri, 11 Apr 2025 18:43:27 -0500
Subject: [PATCH 012/203] Add methods on Material class for waste disposal
 rating / classification (#3366)

Co-authored-by: Ethan Peterson <eepeterson3@gmail.com>
---
 openmc/material.py                            | 100 ++++++-
 openmc/waste.py                               | 279 ++++++++++++++++++
 tests/unit_tests/test_material.py             |   6 +
 tests/unit_tests/test_waste_classification.py |  98 ++++++
 4 files changed, 475 insertions(+), 8 deletions(-)
 create mode 100644 openmc/waste.py
 create mode 100644 tests/unit_tests/test_waste_classification.py

diff --git a/openmc/material.py b/openmc/material.py
index f40ac805f..9677fbba3 100644
--- a/openmc/material.py
+++ b/openmc/material.py
@@ -18,6 +18,7 @@ import openmc.checkvalue as cv
 from ._xml import clean_indentation, reorder_attributes
 from .mixin import IDManagerMixin
 from .utility_funcs import input_path
+from . import waste
 from openmc.checkvalue import PathLike
 from openmc.stats import Univariate, Discrete, Mixture
 from openmc.data.data import _get_element_symbol
@@ -30,6 +31,7 @@ DENSITY_UNITS = ('g/cm3', 'g/cc', 'kg/m3', 'atom/b-cm', 'atom/cm3', 'sum',
 # Smallest normalized floating point number
 _SMALLEST_NORMAL = sys.float_info.min
 
+_BECQUEREL_PER_CURIE = 3.7e10
 
 NuclideTuple = namedtuple('NuclideTuple', ['name', 'percent', 'percent_type'])
 
@@ -1058,7 +1060,6 @@ class Material(IDManagerMixin):
             nuc_densities.append(nuc.percent)
             nuc_density_types.append(nuc.percent_type)
 
-        nucs = np.array(nucs)
         nuc_densities = np.array(nuc_densities)
         nuc_density_types = np.array(nuc_density_types)
 
@@ -1137,17 +1138,16 @@ class Material(IDManagerMixin):
 
     def get_activity(self, units: str = 'Bq/cm3', by_nuclide: bool = False,
                      volume: float | None = None) -> dict[str, float] | float:
-        """Returns the activity of the material or for each nuclide in the
-        material in units of [Bq], [Bq/g], [Bq/kg] or [Bq/cm3].
+        """Returns the activity of the material or of each nuclide within.
 
         .. versionadded:: 0.13.1
 
         Parameters
         ----------
-        units : {'Bq', 'Bq/g', 'Bq/kg', 'Bq/cm3'}
+        units : {'Bq', 'Bq/g', 'Bq/kg', 'Bq/cm3', 'Ci', 'Ci/m3'}
             Specifies the type of activity to return, options include total
-            activity [Bq], specific [Bq/g, Bq/kg] or volumetric activity
-            [Bq/cm3]. Default is volumetric activity [Bq/cm3].
+            activity [Bq,Ci], specific [Bq/g, Bq/kg] or volumetric activity
+            [Bq/cm3,Ci/m3]. Default is volumetric activity [Bq/cm3].
         by_nuclide : bool
             Specifies if the activity should be returned for the material as a
             whole or per nuclide. Default is False.
@@ -1165,17 +1165,24 @@ class Material(IDManagerMixin):
             of the material is returned as a float.
         """
 
-        cv.check_value('units', units, {'Bq', 'Bq/g', 'Bq/kg', 'Bq/cm3'})
+        cv.check_value('units', units, {'Bq', 'Bq/g', 'Bq/kg', 'Bq/cm3', 'Ci', 'Ci/m3'})
         cv.check_type('by_nuclide', by_nuclide, bool)
 
+        if volume is None:
+            volume = self.volume
+
         if units == 'Bq':
-            multiplier = volume if volume is not None else self.volume
+            multiplier = volume
         elif units == 'Bq/cm3':
             multiplier = 1
         elif units == 'Bq/g':
             multiplier = 1.0 / self.get_mass_density()
         elif units == 'Bq/kg':
             multiplier = 1000.0 / self.get_mass_density()
+        elif units == 'Ci':
+            multiplier = volume / _BECQUEREL_PER_CURIE
+        elif units == 'Ci/m3':
+            multiplier = 1e6 / _BECQUEREL_PER_CURIE
 
         activity = {}
         for nuclide, atoms_per_bcm in self.get_nuclide_atom_densities().items():
@@ -1316,6 +1323,83 @@ class Material(IDManagerMixin):
             raise ValueError("Volume must be set in order to determine mass.")
         return volume*self.get_mass_density(nuclide)
 
+    def waste_classification(self, metal: bool = False) -> str:
+        """Classify the material for near-surface waste disposal.
+
+        This method determines a waste classification for the material based on
+        the NRC regulations (10 CFR 61.55). Note that the NRC regulations do not
+        consider many long-lived radionuclides relevant to fusion systems; for
+        fusion applications, it is recommended to calculate a waste disposal
+        rating based on limits by Fetter et al. using the
+        :meth:`~openmc.Material.waste_disposal_rating` method.
+
+        Parameters
+        ----------
+        metal : bool, optional
+            Whether or not the material is in metal form.
+
+        Returns
+        -------
+        str
+            The waste disposal classification, which can be "Class A", "Class
+            B", "Class C", or "GTCC" (greater than class C).
+
+        """
+        return waste._waste_classification(self, metal=metal)
+
+    def waste_disposal_rating(
+            self,
+            limits: str | dict[str, float] = 'Fetter',
+            metal: bool = False,
+        ) -> float:
+        """Return the waste disposal rating for the material.
+
+        This method returns a waste disposal rating for the material based on a
+        set of specific activity limits. The waste disposal rating is a single
+        number that represents the sum of the ratios of the specific activity
+        for each radionuclide in the material against a nuclide-specific limit.
+        A value less than 1.0 indicates that the material "meets" the limits
+        whereas a value greater than 1.0 exceeds the limits.
+
+        Note that the limits for NRC do not consider many long-lived
+        radionuclides relevant to fusion systems. A paper by `Fetter et al.
+        <https://doi.org/10.1016/0920-3796(90)90104-E>`_ applies the NRC
+        methodology to calculate specific activity limits for an expanded set of
+        radionuclides.
+
+        Parameters
+        ----------
+        limits : str or dict, optional
+            The name of a predefined set of specific activity limits or a
+            dictionary that contains specific activity limits for radionuclides,
+            where keys are nuclide names and values are activities in units of
+            [Ci/m3]. The predefined options are:
+
+            - 'Fetter': Uses limits from Fetter et al. (1990)
+            - 'NRC_long': Uses the 10 CFR 61.55 limits for long-lived
+              radionuclides
+            - 'NRC_short_A': Uses the 10 CFR 61.55 class A limits for
+              short-lived radionuclides
+            - 'NRC_short_B': Uses the 10 CFR 61.55 class B limits for
+              short-lived radionuclides
+            - 'NRC_short_C': Uses the 10 CFR 61.55 class C limits for
+              short-lived radionuclides
+        metal : bool, optional
+            Whether or not the material is in metal form (only applicable for
+            NRC based limits)
+
+        Returns
+        -------
+        float
+            The waste disposal rating for the material.
+
+        See also
+        --------
+        Material.waste_classification()
+
+        """
+        return waste._waste_disposal_rating(self, limits, metal)
+
     def clone(self, memo: dict | None = None) -> Material:
         """Create a copy of this material with a new unique ID.
 
diff --git a/openmc/waste.py b/openmc/waste.py
new file mode 100644
index 000000000..7dd45b8e3
--- /dev/null
+++ b/openmc/waste.py
@@ -0,0 +1,279 @@
+from __future__ import annotations
+
+import openmc
+from openmc.data import half_life
+
+
+def _waste_classification(mat: openmc.Material, metal: bool = True) -> str:
+    """Classify a material for near-surface waste disposal.
+
+    This method determines a waste classification for a material based on the
+    NRC regulations (10 CFR 61.55).
+
+    Parameters
+    ----------
+    mat : openmc.Material
+        The material to classify.
+    metal : bool, optional
+        Whether or not the material is in metal form. This changes the
+        acceptable limits in Tables 1 and 2 for certain nuclides.
+
+    Returns
+    -------
+    str
+        The waste disposal classification, which can be "Class A", "Class B",
+        "Class C", or "GTCC" (greater than class C).
+
+    """
+    # Determine metrics based on Tables 1 and 2 using sum of fractions rule for
+    # mixture of radionuclides from §61.55(a)(7)
+    ratio1 = _waste_disposal_rating(mat, 'NRC_long', metal=metal)
+    ratio2 = [
+        _waste_disposal_rating(mat, 'NRC_short_A', metal=metal),
+        _waste_disposal_rating(mat, 'NRC_short_B', metal=metal),
+        _waste_disposal_rating(mat, 'NRC_short_C', metal=metal),
+    ]
+
+    # Determine which nuclides are present in Table 1 and Table 2
+    table1_nuclides_present = (ratio1 > 0.0)
+    table2_nuclides_present = any(x > 0.0 for x in ratio2)
+
+    # Helper function for classifying based on Table 2
+    def classify_table2(col1, col2, col3):
+        if col1 < 1.0:
+            return "Class A"
+        elif col2 < 1.0:
+            return "Class B"
+        elif col3 < 1.0:
+            return "Class C"
+        else:
+            return "GTCC"
+
+    if table1_nuclides_present and table2_nuclides_present:
+        # Classification based on §61.55(a)(5)
+        if ratio1 < 0.1:
+            return classify_table2(*ratio2)
+        elif ratio1 < 1.0:
+            return "Class C" if ratio2[2] < 1.0 else "GTCC"
+        else:
+            return "GTCC"
+
+    elif table1_nuclides_present:
+        # Classification based on §61.55(a)(3)
+        if ratio1 < 0.1:
+            return "Class A"
+        elif ratio1 < 1.0:
+            return "Class C"
+        else:
+            return "GTCC"
+
+    elif table2_nuclides_present:
+        # Classification based on §61.55(a)(4)
+        return classify_table2(*ratio2)
+
+    else:
+        # Classification based on §61.55(a)(6)
+        return "Class A"
+
+
+def _waste_disposal_rating(
+        mat: openmc.Material,
+        limits: str | dict[str, float] = 'Fetter',
+        metal: bool = False,
+    ) -> float:
+    """Return the waste disposal rating for a material.
+
+    This method returns a waste disposal rating for the material based on a set
+    of specific activity limits. The waste disposal rating is a single number
+    that represents the sum of the ratios of the specific activity for each
+    radionuclide in the material against a nuclide-specific limit. A value less
+    than 1.0 indicates that the material "meets" the limits whereas a value
+    greater than 1.0 exceeds the limits.
+
+    Parameters
+    ----------
+    mat : openmc.Material
+        The material to classify.
+    limits : str or dict, optional
+        The name of a predefined set of specific activity limits or a dictionary
+        that contains specific activity limits for radionuclides, where keys are
+        nuclide names and values are activities in units of [Ci/m3]. The
+        predefined options are:
+
+        - 'Fetter': Uses limits from Fetter et al. (1990)
+        - 'NRC_long': Uses the 10 CFR 61.55 limits for long-lived radionuclides
+        - 'NRC_short_A': Uses the 10 CFR 61.55 class A limits for short-lived
+          radionuclides
+        - 'NRC_short_B': Uses the 10 CFR 61.55 class B limits for short-lived
+          radionuclides
+        - 'NRC_short_C': Uses the 10 CFR 61.55 class C limits for short-lived
+          radionuclides
+    metal : bool, optional
+        Whether or not the material is in metal form (only applicable for NRC
+        based limits)
+
+    Returns
+    -------
+    float
+        The waste disposal rating for the material.
+
+    """
+    if limits == 'Fetter':
+        # Specific activity limits for radionuclides with half-lives between 5
+        # years and 1e12 years from Table 2 in Fetter
+        limits = {
+            "Be10": 5.0e3,
+            "C14": 6.0e2,
+            "Al26": 9.0e-2,
+            "Si32": 6.0e2,
+            "Cl36": 1.0e1,
+            "Ar39": 2.0e4,
+            "Ar42": 2.0e4,
+            "K40": 2.0e0,
+            "Ca41": 1.0e4,
+            "Ti44": 2.0e2,
+            "Fe60": 1.0e-1,
+            "Co60": 3.0e8,
+            "Ni59": 9.0e2,
+            "Ni63": 7.0e5,
+            "Se79": 5.0e1,
+            "Kr81": 3.0e1,
+            "Sr90": 8.0e5,
+            "Nb91": 2.0e2,
+            "Nb92": 2.0e-1,
+            "Nb94": 2.0e-1,
+            "Mo93": 4.0e3,
+            "Tc97": 4.0e-1,
+            "Tc98": 1.0e-2,
+            "Tc99": 6.0e-2,
+            "Pd107": 9.0e2,
+            "Ag108_m1": 3.0e0,
+            "Sn121_m1": 7.0e5,
+            "Sn126": 1.0e-1,
+            "I129": 2.0e0,
+            "Cs137": 5.0e4,
+            "Ba133": 2.0e8,
+            "La137": 2.0e2,
+            "Sm151": 5.0e7,
+            "Eu150_m1": 3.0e3,
+            "Eu152": 3.0e5,
+            "Eu154": 5.0e6,
+            "Gd148": 2.0e5,
+            "Gd150": 2.0e3,
+            "Tb157": 5.0e3,
+            "Tb158": 4.0e0,
+            "Dy154": 1.0e3,
+            "Ho166_m1": 2.0e-1,
+            "Hf178_m1": 9.0e3,
+            "Hf182": 2.0e-1,
+            "Re186_m1": 2.0e1,
+            "Ir192_m1": 1.0e0,
+            "Pt193": 2.0e8,
+            "Hg194": 5.0e-1,
+            "Pb202": 6.0e-1,
+            "Pb210": 3.0e7,
+            "Bi207": 9.0e3,
+            "Bi208": 8.0e-2,
+            "Bi210_m1": 1.0e0,
+            "Po209": 3.0e3,
+            "Ra226": 1.0e-1,
+            "Ra228": 3.0e7,
+            "Ac227": 5.0e5,
+            "Th229": 2.0e0,
+            "Th230": 3.0e-1,
+            "Th232": 1.0e-1,
+            "Pa231": 7.0e-1,
+            "U232": 3.0e1,
+            "U233": 2.0e1,
+            "U234": 9.0e1,
+            "U235": 2.0e0,
+            "Np236": 1.0e0,
+            "Np237": 1.0e0,
+            "Pu238": 7.0e4,
+            "Pu239": 1.0e3,
+            "Pu240": 1.0e3,
+            "Pu241": 2.0e3,
+            "Pu242": 1.0e3,
+            "Pu244": 9.0e-1,
+            "Am241": 5.0e1,
+            "Am242_m1": 3.0e2,
+            "Am243": 2.0e0,
+            "Cm243": 6.0e2,
+            "Cm244": 5.0e5,
+            "Cm245": 5.0e0,
+            "Cm246": 8.0e2,
+            "Cm248": 8.0e2,
+        }
+
+    elif limits == 'NRC_long':
+        # Specific activity limits for long-lived radionuclides from Table 1 in
+        # 10 CFR 61.55 in Ci/m3.
+        limits = {
+            'C14': 8.0,
+            'Tc99': 3.0,
+            'I129': 0.08,
+        }
+        if metal:
+            limits['C14'] = 80.0
+            limits['Ni59'] = 220.0
+            limits['Nb94'] = 0.2
+
+        # Convert values in nCi/g to Ci/m3
+        factor = (1e6 * mat.get_mass_density()) / 1e9
+        limits.update({
+            'Pu241': 3500.0 * factor,
+            'Cm242': 20000.0 * factor,
+            'Np237': 100.0 * factor,
+            'Pu238': 100.0 * factor,
+            'Pu239': 100.0 * factor,
+            'Pu240': 100.0 * factor,
+            'Pu242': 100.0 * factor,
+            'Pu244': 100.0 * factor,
+            'Am241': 100.0 * factor,
+            'Am243': 100.0 * factor,
+            'Cm243': 100.0 * factor,
+            'Cm244': 100.0 * factor,
+            'Cm245': 100.0 * factor,
+            'Cm246': 100.0 * factor,
+            'Cm247': 100.0 * factor,
+            'Cm248': 100.0 * factor,
+            'Bk247': 100.0 * factor,
+            'Cf249': 100.0 * factor,
+            'Cf250': 100.0 * factor,
+            'Cf251': 100.0 * factor,
+        })
+
+    elif limits == 'NRC_short_A':
+        # Get Class A specific activity limits for short-lived radionuclides
+        # from Table 2 in 10 CFR 61.55
+        limits = {
+            'H3': 40.0,
+            'Co60': 700.0,
+            'Ni63': 35.0 if metal else 3.5,
+            'Sr90': 0.04,
+            'Cs137': 1.0
+        }
+
+        # Add radionuclides with half-lives < 5 years to limits for class A
+        five_years = 60.0 * 60.0 * 24.0 * 365.25 * 5.0
+        for nuc in mat.get_nuclides():
+            if half_life(nuc) is not None and half_life(nuc) < five_years:
+                limits[nuc] = 700.0
+
+    elif limits == 'NRC_short_B':
+        # Get Class B specific activity limits for short-lived radionuclides
+        # from Table 2 in 10 CFR 61.55
+        limits = {'Ni63': 700.0 if metal else 70.0, 'Sr90': 150.0, 'Cs137': 44.0}
+
+    elif limits == 'NRC_short_C':
+        # Get Class C specific activity limits for short-lived radionuclides
+        # from Table 2 in 10 CFR 61.55
+        limits = {'Ni63': 7000.0 if metal else 700.0, 'Sr90': 7000.0, 'Cs137': 4600.0}
+
+    # Calculate the sum of the fractions of the activity of each radionuclide
+    # compared to the specified limits
+    ratio = 0.0
+    for nuc, ci_m3 in mat.get_activity(units="Ci/m3", by_nuclide=True).items():
+        if nuc in limits:
+            ratio += ci_m3 / limits[nuc]
+    return ratio
diff --git a/tests/unit_tests/test_material.py b/tests/unit_tests/test_material.py
index cb71cd09b..8ad579563 100644
--- a/tests/unit_tests/test_material.py
+++ b/tests/unit_tests/test_material.py
@@ -590,6 +590,12 @@ def test_get_activity():
     # Test with volume specified as argument
     assert pytest.approx(m4.get_activity(units='Bq', volume=1.0)) == 355978108155965.94*3/2
 
+    # Test units based on Ci
+    bq = m4.get_activity(units='Bq')
+    m3 = m4.volume * 1e-6
+    assert (ci := m4.get_activity(units='Ci')) == pytest.approx(bq/3.7e10)
+    assert m4.get_activity(units='Ci/m3') == pytest.approx(ci/m3)
+
 
 def test_get_decay_heat():
     # Set chain file for testing
diff --git a/tests/unit_tests/test_waste_classification.py b/tests/unit_tests/test_waste_classification.py
new file mode 100644
index 000000000..dd692cc4b
--- /dev/null
+++ b/tests/unit_tests/test_waste_classification.py
@@ -0,0 +1,98 @@
+import random
+
+import openmc
+import pytest
+
+
+@pytest.mark.parametrize("metal", [False, True])
+def test_waste_classification_long(metal):
+    """Test classification when determined by long-lived radionuclides"""
+    f = 10.0 if metal else 1.0
+    limit = 8.0*f
+    mat = openmc.Material()
+    mat.add_nuclide('C14', 1e-9*f)
+    assert mat.get_activity('Ci/m3') < 0.1 * limit
+    assert mat.waste_classification(metal=metal) == 'Class A'
+
+    mat = openmc.Material()
+    mat.add_nuclide('C14', 1e-8*f)
+    assert 0.1 * limit < mat.get_activity('Ci/m3') < limit
+    assert mat.waste_classification(metal=metal) == 'Class C'
+
+    mat = openmc.Material()
+    mat.add_nuclide('C14', 1e-7*f)
+    assert mat.get_activity('Ci/m3') > limit
+    assert mat.waste_classification(metal=metal) == 'GTCC'
+
+
+@pytest.mark.parametrize("metal", [False, True])
+def test_waste_classification_short(metal):
+    """Test classification when determined by short-lived radionuclides"""
+    f = 10.0 if metal else 1.0
+    col1, col2, col3 = 3.5*f, 70.0*f, 700.0*f
+
+    mat = openmc.Material()
+    mat.add_nuclide('Ni63', 1e-10*f)
+    assert mat.get_activity('Ci/m3') < col1
+    assert mat.waste_classification(metal=metal) == 'Class A'
+
+    mat = openmc.Material()
+    mat.add_nuclide('Ni63', 1e-10*10*f)
+    assert col1 < mat.get_activity('Ci/m3') < col2
+    assert mat.waste_classification(metal=metal) == 'Class B'
+
+    mat = openmc.Material()
+    mat.add_nuclide('Ni63', 1e-10*200*f)
+    assert col2 < mat.get_activity('Ci/m3') < col3
+    assert mat.waste_classification(metal=metal) == 'Class C'
+
+    mat = openmc.Material()
+    mat.add_nuclide('Ni63', 1e-10*2000*f)
+    assert mat.get_activity('Ci/m3') > col3
+    assert mat.waste_classification(metal=metal) == 'GTCC'
+
+
+def test_waste_classification_mix():
+    """Test classification when determined by a mix of radionuclides"""
+    # Check example from 10 CFR 61.55 with mix of Sr90 and Cs137
+    mat = openmc.Material()
+    mat.add_nuclide('Sr90', 2.425e-9)
+    mat.add_nuclide('Cs137', 1.115e-9)
+
+    # In example, activity of Sr90 is 50.0 Ci/m3 and Cs137 is 22.0 Ci/m3
+    activity = mat.get_activity(units='Ci/m3', by_nuclide=True)
+    assert activity['Sr90'] == pytest.approx(50.0, 0.01)
+    assert activity['Cs137'] == pytest.approx(22.0, 0.01)
+
+    # According to example, the waste should be class B
+    assert mat.waste_classification() == 'Class B'
+
+
+def test_waste_rating_fetter():
+    """Test waste classification using the Fetter limits"""
+    # For Tc99, Fetter has a more strict limit. Here, we create a material with
+    # Tc99 at 1 Ci/m3 which exceeds Fetter but not NRC
+    density = 3.5561e-7
+    mat = openmc.Material()
+    mat.add_nuclide('Tc99', density)
+    assert mat.get_activity('Ci/m3') == pytest.approx(1.0, 1e-3)
+    assert mat.waste_disposal_rating(limits='NRC_short_C') < 1.0
+    assert mat.waste_disposal_rating(limits='Fetter') > 1.0
+
+    # With a lower density, it should be Class C under Fetter limits and Class A
+    # under NRC limits
+    mat = openmc.Material()
+    mat.add_nuclide('Tc99', 5.0e-2*density)
+    assert mat.waste_disposal_rating(limits='NRC_short_A') < 1.0
+    assert mat.waste_disposal_rating(limits='Fetter') < 1.0
+
+
+def test_waste_disposal_rating():
+    """Test waste_disposal_rating method"""
+    mat = openmc.Material()
+    mat.add_nuclide('K40', random.random())
+
+    # Check for correct classification based on actual activity
+    ci_m3 = mat.get_activity('Ci/m3')
+    assert mat.waste_disposal_rating(limits={'K40': 2*ci_m3}) < 1.0
+    assert mat.waste_disposal_rating(limits={'K40': 0.5*ci_m3}) > 1.0

From 47ca2916aa85a2909a5f6e0a3442ab7c581894b1 Mon Sep 17 00:00:00 2001
From: Joffrey Dorville <54550047+JoffreyDorville@users.noreply.github.com>
Date: Mon, 14 Apr 2025 09:07:48 -0500
Subject: [PATCH 013/203] Kinetics parameters using Iterated Fission
 Probability (#3133)

Co-authored-by: Paul Romano <paul.k.romano@gmail.com>
---
 CMakeLists.txt                              |   1 +
 docs/source/usersguide/index.rst            |   1 +
 docs/source/usersguide/kinetics.rst         | 110 ++++++++++
 docs/source/usersguide/tallies.rst          |  18 ++
 include/openmc/bank.h                       |   8 +
 include/openmc/constants.h                  |   8 +-
 include/openmc/ifp.h                        | 188 +++++++++++++++++
 include/openmc/particle_data.h              |   7 +
 include/openmc/settings.h                   |  15 +-
 openmc/lib/tally.py                         |   4 +-
 openmc/settings.py                          |  29 +++
 src/bank.cpp                                |  28 +++
 src/eigenvalue.cpp                          |  82 +++++++-
 src/finalize.cpp                            |   3 +-
 src/ifp.cpp                                 | 216 ++++++++++++++++++++
 src/output.cpp                              |   3 +
 src/particle.cpp                            |   6 +-
 src/physics.cpp                             |   5 +
 src/reaction.cpp                            |   3 +
 src/settings.cpp                            |  17 ++
 src/simulation.cpp                          |   6 +
 src/tallies/tally.cpp                       |  63 ++++++
 src/tallies/tally_scoring.cpp               |  51 +++++
 tests/regression_tests/ifp/__init__.py      |   0
 tests/regression_tests/ifp/inputs_true.dat  |  33 +++
 tests/regression_tests/ifp/results_true.dat |   9 +
 tests/regression_tests/ifp/test.py          |  45 ++++
 tests/unit_tests/test_ifp.py                |  49 +++++
 28 files changed, 1002 insertions(+), 6 deletions(-)
 create mode 100644 docs/source/usersguide/kinetics.rst
 create mode 100644 include/openmc/ifp.h
 create mode 100644 src/ifp.cpp
 create mode 100644 tests/regression_tests/ifp/__init__.py
 create mode 100644 tests/regression_tests/ifp/inputs_true.dat
 create mode 100644 tests/regression_tests/ifp/results_true.dat
 create mode 100644 tests/regression_tests/ifp/test.py
 create mode 100644 tests/unit_tests/test_ifp.py

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 461abe508..8cb03a1a1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -343,6 +343,7 @@ list(APPEND libopenmc_SOURCES
   src/geometry.cpp
   src/geometry_aux.cpp
   src/hdf5_interface.cpp
+  src/ifp.cpp
   src/initialize.cpp
   src/lattice.cpp
   src/material.cpp
diff --git a/docs/source/usersguide/index.rst b/docs/source/usersguide/index.rst
index aef9b1a1c..5f8e0197e 100644
--- a/docs/source/usersguide/index.rst
+++ b/docs/source/usersguide/index.rst
@@ -22,6 +22,7 @@ essential aspects of using OpenMC to perform simulations.
     plots
     depletion
     decay_sources
+    kinetics
     scripts
     processing
     parallel
diff --git a/docs/source/usersguide/kinetics.rst b/docs/source/usersguide/kinetics.rst
new file mode 100644
index 000000000..bdf26d341
--- /dev/null
+++ b/docs/source/usersguide/kinetics.rst
@@ -0,0 +1,110 @@
+.. _kinetics:
+
+===================
+Kinetics parameters
+===================
+
+OpenMC has the capability to estimate the following adjoint-weighted effective
+generation time :math:`\Lambda_{\text{eff}}` and the effective delayed neutron
+fraction :math:`\beta_{\text{eff}}`. These parameters are calculated using the
+iterated fission probability (IFP) method [Hurwitz_1964]_ based on a similar
+approach as in `Serpent 2 <https://doi.org/10.1016/j.anucene.2013.10.032>`_. The
+implementation in OpenMC is limited to eigenvalue calculations and is described
+in more details in [Dorville_2025]_.
+
+----------------------------------
+Iterated Fission Probability (IFP)
+----------------------------------
+
+With IFP, additional information needs to be recorded during the simulation
+compared to a typical eigenvalue calculation. OpenMC stores an additional
+set of values (neutron lifetime or delayed neutron group number for
+:math:`\Lambda_{\text{eff}}` or :math:`\beta_{\text{eff}}`, respectively)
+for every fission neutron simulated. Each set of values corresponds to
+the values that are associated to the :math:`N_{\text{gen}}` direct ancestors
+of any given fission neutron.
+
+:math:`N_{\text{gen}}` is referred to as the number of generations in the
+IFP method and corresponds to the number of generations between the birth of
+a fission neutron and the time its score is added to the IFP tally. By default,
+OpenMC considers 10 generations but this value can be modified by the user via
+the ``ifp_n_generation`` settings in the Python API::
+
+    settings.ifp_n_generation = 5
+
+``ifp_n_generation`` should be greater than 0, but should also be lower than
+or equal to the number of inactive batches declared for the calculation.
+The respect of these constraints is verified by OpenMC before any calculation.
+
+OpenMC will automatically detect the type of data that needs to be stored based
+on the tally scores selected by the user. This guarantees that only information
+of interest are stored during a simulation and avoids using extra memory when
+only one parameter is needed. The following table shows the tally scores that
+are needed to compute kinetics parameters in OpenMC:
+
+.. table:: **OpenMC tally scores needed to calculate adjoint-weighted kinetics parameters**
+    :align: center
+
+    =============================== ============================ ========================== ========
+    OpenMC tally score \\ Parameter :math:`\Lambda_{\text{eff}}` :math:`\beta_{\text{eff}}` Both
+    =============================== ============================ ========================== ========
+    ``ifp-time-numerator``          X                                                       X
+    ``ifp-beta-numerator``                                       X                          X
+    ``ifp-denominator``             X                            X                          X
+    =============================== ============================ ========================== ========
+
+|
+
+.. note:: Because the memory footprint of additional data is generally non-negligible
+    with IFP, it is recommended to choose the value for ``ifp_n_generation`` carefully.
+    For example, using one generation for both kinetics parameters corresponds to store
+    one additional integer (for the delayed neutron group number used with
+    :math:`\beta_{\text{eff}}`) and one floating point value (for the neutron lifetime
+    used with :math:`\Lambda_{\text{eff}}`) for every fission neutron simulated once the
+    asymptotic regime is reached.
+
+-----------------------------
+Obtaining kinetics parameters
+-----------------------------
+
+Here is an example showing how to declare the three available IFP scores in a
+single tally::
+
+    tally = openmc.Tally(name="ifp-scores")
+    tally.scores = [
+        "ifp-time-numerator",
+        "ifp-beta-numerator",
+        "ifp-denominator"
+    ]
+
+The effective generation time :math:`\Lambda_{\text{eff}}` is calculated
+by dividing the result of the ``ifp-time-numerator`` score by the one obtained
+for ``ifp-denominator`` and by the :math:`k_{\text{eff}}` of the simulation:
+
+.. math::
+    :label: lambda_eff
+
+    \Lambda_{\text{eff}} = \frac{S_{\text{ifp-time-numerator}}}{S_{\text{ifp-denominator}} \times k_{\text{eff}}}
+
+The effective delayed neutron fraction :math:`\beta_{\text{eff}}` is calculated
+by dividing the result of the ``ifp-beta-numerator`` score by the one obtained
+for ``ifp-denominator``:
+
+.. math::
+    :label: beta_eff
+
+    \beta_{\text{eff}} = \frac{S_{\text{ifp-beta-numerator}}}{S_{\text{ifp-denominator}}}
+
+.. only:: html
+
+   .. rubric:: References
+
+.. [Hurwitz_1964] H. Hurwitz Jr., "Naval Reactors Physics Handbook", volume 1, p. 864.
+    Radkowsky, A. (Ed.), Naval Reactors, Division of Reactor Development, U.S.
+    Atomic Energy Commission (1964).
+
+.. [Dorville_2025] J. Dorville, L. Labrie-Cleary, and P. K. Romano, "Implementation
+    of the Iterated Fission Probability Method in OpenMC to Compute Adjoint-Weighted
+    Kinetics Parameters", International Conference on Mathematics and Computational
+    Methods Applied to Nuclear Science and Engineering (M&C 2025), Denver, April 27-30,
+    2025 (to be presented).
diff --git a/docs/source/usersguide/tallies.rst b/docs/source/usersguide/tallies.rst
index 02328af58..e3b4e508b 100644
--- a/docs/source/usersguide/tallies.rst
+++ b/docs/source/usersguide/tallies.rst
@@ -322,6 +322,24 @@ The following tables show all valid scores:
     |                      |particle. Note that this score can only be combined|
     |                      |with a cell filter and an energy filter.           |
     +----------------------+---------------------------------------------------+
+    |ifp-time-numerator    |Adjoint-weighted lifetime of neutron produced by   |
+    |                      |fission in units of seconds per source particle.   |
+    |                      |This score is used to compute kinetics parameters  |
+    |                      |using the iterated fission probability (IFP)       |
+    |                      |method.                                            |
+    +----------------------+---------------------------------------------------+
+    |ifp-beta-numerator    |Adjoint-weighted number of delayed fission events  |
+    |                      |in units of number of delayed fission event per    |
+    |                      |source particle. This score is used to compute     |
+    |                      |kinetics parameters using the iterated fission     |
+    |                      |probability (IFP) method.                          |
+    +----------------------+---------------------------------------------------+
+    |ifp-denominator       |Weights corresponding to the number of fission     |
+    |                      |events in units of number of fission event per     |
+    |                      |source particle. This score is used to compute     |
+    |                      |kinetics parameters using the iterated fission     |
+    |                      |probability (IFP) method.                          |
+    +----------------------+---------------------------------------------------+
 
 .. _usersguide_tally_normalization:
 
diff --git a/include/openmc/bank.h b/include/openmc/bank.h
index 95386514d..fd8fbd73e 100644
--- a/include/openmc/bank.h
+++ b/include/openmc/bank.h
@@ -22,6 +22,14 @@ extern SharedArray<SourceSite> surf_source_bank;
 
 extern SharedArray<SourceSite> fission_bank;
 
+extern vector<vector<int>> ifp_source_delayed_group_bank;
+
+extern vector<vector<double>> ifp_source_lifetime_bank;
+
+extern vector<vector<int>> ifp_fission_delayed_group_bank;
+
+extern vector<vector<double>> ifp_fission_lifetime_bank;
+
 extern vector<int64_t> progeny_per_particle;
 
 } // namespace simulation
diff --git a/include/openmc/constants.h b/include/openmc/constants.h
index 2a7ce1990..252194528 100644
--- a/include/openmc/constants.h
+++ b/include/openmc/constants.h
@@ -312,7 +312,10 @@ enum TallyScore {
   SCORE_FISS_Q_PROMPT = -14,      // prompt fission Q-value
   SCORE_FISS_Q_RECOV = -15,       // recoverable fission Q-value
   SCORE_DECAY_RATE = -16,         // delayed neutron precursor decay rate
-  SCORE_PULSE_HEIGHT = -17        // pulse-height
+  SCORE_PULSE_HEIGHT = -17,       // pulse-height
+  SCORE_IFP_TIME_NUM = -18,       // IFP lifetime numerator
+  SCORE_IFP_BETA_NUM = -19,       // IFP delayed fraction numerator
+  SCORE_IFP_DENOM = -20           // IFP common denominator
 };
 
 // Global tally parameters
@@ -322,6 +325,9 @@ enum class GlobalTally { K_COLLISION, K_ABSORPTION, K_TRACKLENGTH, LEAKAGE };
 // Miscellaneous
 constexpr int C_NONE {-1};
 
+// Default value of generation for IFP
+constexpr int DEFAULT_IFP_N_GENERATION {10};
+
 // Interpolation rules
 enum class Interpolation {
   histogram = 1,
diff --git a/include/openmc/ifp.h b/include/openmc/ifp.h
new file mode 100644
index 000000000..633a262d5
--- /dev/null
+++ b/include/openmc/ifp.h
@@ -0,0 +1,188 @@
+#ifndef OPENMC_IFP_H
+#define OPENMC_IFP_H
+
+#include "openmc/message_passing.h"
+#include "openmc/particle.h"
+#include "openmc/particle_data.h"
+#include "openmc/settings.h"
+
+namespace openmc {
+
+//! Check the value of the IFP parameter for beta effective or both.
+//!
+//! \return true if "BetaEffective" or "Both", false otherwise.
+bool is_beta_effective_or_both();
+
+//! Check the value of the IFP parameter for generation time or both.
+//!
+//! \return true if "GenerationTime" or "Both", false otherwise.
+bool is_generation_time_or_both();
+
+//! Resize IFP vectors
+//!
+//! \param[in,out] delayed_groups List of delayed group numbers
+//! \param[in,out] lifetimes List of lifetimes
+//! \param[in] n  Dimension to resize vectors
+template<typename T, typename U>
+void resize_ifp_data(vector<T>& delayed_groups, vector<U>& lifetimes, int64_t n)
+{
+  if (is_beta_effective_or_both()) {
+    delayed_groups.resize(n);
+  }
+  if (is_generation_time_or_both()) {
+    lifetimes.resize(n);
+  }
+}
+
+//! Update a list of values by adding a new value if the size
+//! of the list can accomodate the new value or by shifting all
+//! values to the left (removing the first value of the list
+//! and adding the new value at the end of the list).
+//!
+//! \param[in] value Value to add to the list
+//! \param[in] data Initial version of the list
+//! \return Updated list
+template<typename T>
+vector<T> _ifp(const T& value, const vector<T>& data)
+{
+  vector<T> updated;
+  size_t source_idx = data.size();
+
+  if (source_idx < settings::ifp_n_generation) {
+    updated.resize(source_idx + 1);
+    for (size_t i = 0; i < source_idx; i++) {
+      updated[i] = data[i];
+    }
+    updated[source_idx] = value;
+  } else if (source_idx == settings::ifp_n_generation) {
+    updated.resize(source_idx);
+    for (size_t i = 0; i < source_idx - 1; i++) {
+      updated[i] = data[i + 1];
+    }
+    updated[source_idx - 1] = value;
+  }
+  return updated;
+}
+
+//! \brief Iterated Fission Probability (IFP) method.
+//!
+//! Add the IFP information in the IFP banks using the same index
+//! as the one used to append the fission site to the fission bank.
+//! Multithreading protection is guaranteed by the index returned by the
+//! thread_safe_append call in physics.cpp.
+//!
+//! Needs to be done after the delayed group is found.
+//!
+//! \param[in] p Particle
+//! \param[in] site Fission site
+//! \param[in] idx Bank index from the thread_safe_append call in physics.cpp
+void ifp(const Particle& p, const SourceSite& site, int64_t idx);
+
+//! Resize the IFP banks used in the simulation
+void resize_simulation_ifp_banks();
+
+//! Retrieve IFP data from the IFP fission banks.
+//!
+//! \param[in] i_bank Index in the fission banks
+//! \param[in,out] delayed_groups Delayed group numbers
+//! \param[in,out] lifetimes Lifetimes lists
+void copy_ifp_data_from_fission_banks(
+  int i_bank, vector<int>& delayed_groups, vector<double>& lifetimes);
+
+#ifdef OPENMC_MPI
+
+//! Deserialization information for transfer of IFP data using MPI
+struct DeserializationInfo {
+  int64_t index_local; //!< local index
+  int64_t n;           //!< number of sites sent
+};
+
+//! Broadcast the number of generation determined by the size of the first
+//! element on the first processor.
+//!
+//! \param[in] n_generation Number of generations
+//! \param[in] delayed_groups List of delayed group numbers lists
+//! \param[in] lifetimes List of lifetimes lists
+void broadcast_ifp_n_generation(int& n_generation,
+  const vector<vector<int>>& delayed_groups,
+  const vector<vector<double>>& lifetimes);
+
+//! Send IFP data using MPI.
+//!
+//! \param[in] idx Index of the first site
+//! \param[in] n Number of sites to send
+//! \param[in] n_generation Number of generations
+//! \param[in] neighbor Index of the neighboring processor
+//! \param[in] requests MPI requests
+//! \param[in] delayed_groups List of delayed group numbers lists
+//! \param[out] send_delayed_groups Delayed group numbers buffer
+//! \param[in] lifetimes List of lifetimes lists
+//! \param[out] send_lifetimes Lifetimes buffer
+void send_ifp_info(int64_t idx, int64_t n, int n_generation, int neighbor,
+  vector<MPI_Request>& requests, const vector<vector<int>>& delayed_groups,
+  vector<int>& send_delayed_groups, const vector<vector<double>>& lifetimes,
+  vector<double>& send_lifetimes);
+
+//! Receive IFP data using MPI.
+//!
+//! \param[in] idx Index of the first site
+//! \param[in] n Number of sites to receive
+//! \param[in] n_generation Number of generations
+//! \param[in] neighbor Index of the neighboring processor
+//! \param[in] requests MPI requests
+//! \param[in] delayed_groups List of delayed group numbers
+//! \param[in] lifetimes List of lifetimes
+//! \param[out] deserialization Information to deserialize the received data
+void receive_ifp_data(int64_t idx, int64_t n, int n_generation, int neighbor,
+  vector<MPI_Request>& requests, vector<int>& delayed_groups,
+  vector<double>& lifetimes, vector<DeserializationInfo>& deserialization);
+
+//! Copy partial IFP data from local lists to source banks.
+//!
+//! \param[in] idx Index of the first site
+//! \param[in] n Number of sites to copy
+//! \param[in] i_bank Index in the IFP source banks
+//! \param[in] delayed_groups List of delayed group numbers lists
+//! \param[in] lifetimes List of lifetimes lists
+void copy_partial_ifp_data_to_source_banks(int64_t idx, int n, int64_t i_bank,
+  const vector<vector<int>>& delayed_groups,
+  const vector<vector<double>>& lifetimes);
+
+//! Deserialize IFP information received using MPI and store it in
+//! the IFP source banks.
+//!
+//! \param[in] n_generation Number of generations
+//! \param[out] deserialization Information to deserialize the received data
+//! \param[in] delayed_groups List of delayed group numbers
+//! \param[in] lifetimes List of lifetimes
+void deserialize_ifp_info(int n_generation,
+  const vector<DeserializationInfo>& deserialization,
+  const vector<int>& delayed_groups, const vector<double>& lifetimes);
+
+#endif
+
+//! Copy IFP temporary vectors to source banks.
+//!
+//! \param[in] delayed_groups List of delayed group numbers lists
+//! \param[in] lifetimes List of lifetimes lists
+void copy_complete_ifp_data_to_source_banks(
+  const vector<vector<int>>& delayed_groups,
+  const vector<vector<double>>& lifetimes);
+
+//! Allocate temporary vectors for IFP data.
+//!
+//! \param[in,out] delayed_groups List of delayed group numbers lists
+//! \param[in,out] lifetimes List of delayed group numbers lists
+void allocate_temporary_vector_ifp(
+  vector<vector<int>>& delayed_groups, vector<vector<double>>& lifetimes);
+
+//! Copy local IFP data to IFP fission banks.
+//!
+//! \param[in] delayed_groups_ptr Pointer to delayed group numbers
+//! \param[in] lifetimes_ptr Pointer to lifetimes
+void copy_ifp_data_to_fission_banks(
+  const vector<int>* delayed_groups_ptr, const vector<double>* lifetimes_ptr);
+
+} // namespace openmc
+
+#endif // OPENMC_IFP_H
diff --git a/include/openmc/particle_data.h b/include/openmc/particle_data.h
index 15ae57893..1570b780b 100644
--- a/include/openmc/particle_data.h
+++ b/include/openmc/particle_data.h
@@ -454,6 +454,9 @@ private:
 
   int cell_born_ {-1};
 
+  // Iterated Fission Probability
+  double lifetime_ {0.0}; //!< neutron lifetime [s]
+
   int n_collision_ {0};
 
   bool write_track_ {false};
@@ -560,6 +563,10 @@ public:
   double& time_last() { return time_last_; }
   const double& time_last() const { return time_last_; }
 
+  // Particle lifetime
+  double& lifetime() { return lifetime_; }
+  const double& lifetime() const { return lifetime_; }
+
   // What event took place, described in greater detail below
   TallyEvent& event() { return event_; }
   const TallyEvent& event() const { return event_; }
diff --git a/include/openmc/settings.h b/include/openmc/settings.h
index f3aff08b0..9017b2d08 100644
--- a/include/openmc/settings.h
+++ b/include/openmc/settings.h
@@ -24,6 +24,14 @@ enum class SSWCellType {
   To,
 };
 
+// Type of IFP parameters
+enum class IFPParameter {
+  None,
+  Both,
+  BetaEffective,
+  GenerationTime,
+};
+
 //==============================================================================
 // Global variable declarations
 //==============================================================================
@@ -42,7 +50,8 @@ extern bool
   delayed_photon_scaling;   //!< Scale fission photon yield to include delayed
 extern "C" bool entropy_on; //!< calculate Shannon entropy?
 extern "C" bool
-  event_based; //!< use event-based mode (instead of history-based)
+  event_based;      //!< use event-based mode (instead of history-based)
+extern bool ifp_on; //!< Use IFP for kinetics parameters?
 extern bool legendre_to_tabular; //!< convert Legendre distributions to tabular?
 extern bool material_cell_offsets;   //!< create material cells offsets?
 extern "C" bool output_summary;      //!< write summary.h5?
@@ -112,6 +121,10 @@ extern array<double, 4>
   energy_cutoff; //!< Energy cutoff in [eV] for each particle type
 extern array<double, 4>
   time_cutoff; //!< Time cutoff in [s] for each particle type
+extern int
+  ifp_n_generation; //!< Number of generation for Iterated Fission Probability
+extern IFPParameter
+  ifp_parameter; //!< Parameter to calculate for Iterated Fission Probability
 extern int
   legendre_to_tabular_points; //!< number of points to convert Legendres
 extern int max_order;         //!< Maximum Legendre order for multigroup data
diff --git a/openmc/lib/tally.py b/openmc/lib/tally.py
index d0b34aedc..c17b16597 100644
--- a/openmc/lib/tally.py
+++ b/openmc/lib/tally.py
@@ -104,7 +104,9 @@ _SCORES = {
     -5: 'absorption', -6: 'fission', -7: 'nu-fission', -8: 'kappa-fission',
     -9: 'current', -10: 'events', -11: 'delayed-nu-fission',
     -12: 'prompt-nu-fission', -13: 'inverse-velocity', -14: 'fission-q-prompt',
-    -15: 'fission-q-recoverable', -16: 'decay-rate', -17: 'pulse-height'
+    -15: 'fission-q-recoverable', -16: 'decay-rate', -17: 'pulse-height',
+    -18: 'ifp-time-numerator', -19: 'ifp-beta-numerator',
+    -20: 'ifp-denominator',
 }
 _ESTIMATORS = {
     0: 'analog', 1: 'tracklength', 2: 'collision'
diff --git a/openmc/settings.py b/openmc/settings.py
index a2bf51a51..6fb36f3fc 100644
--- a/openmc/settings.py
+++ b/openmc/settings.py
@@ -86,6 +86,9 @@ class Settings:
         .. versionadded:: 0.12
     generations_per_batch : int
         Number of generations per batch
+    ifp_n_generation : int
+        Number of generations to consider for the Iterated Fission Probability
+        method.
     max_lost_particles : int
         Maximum number of lost particles
 
@@ -375,6 +378,9 @@ class Settings:
 
         self._output = None
 
+        # Iterated Fission Probability
+        self._ifp_n_generation = None
+
         # Output options
         self._statepoint = {}
         self._sourcepoint = {}
@@ -826,6 +832,17 @@ class Settings:
         cv.check_less_than('verbosity', verbosity, 10, True)
         self._verbosity = verbosity
 
+    @property
+    def ifp_n_generation(self) -> int:
+        return self._ifp_n_generation
+
+    @ifp_n_generation.setter
+    def ifp_n_generation(self, ifp_n_generation: int):
+        if ifp_n_generation is not None:
+            cv.check_type("number of generations", ifp_n_generation, Integral)
+            cv.check_greater_than("number of generations", ifp_n_generation, 0)
+        self._ifp_n_generation = ifp_n_generation
+
     @property
     def tabular_legendre(self) -> dict:
         return self._tabular_legendre
@@ -1455,6 +1472,11 @@ class Settings:
             element = ET.SubElement(root, "no_reduce")
             element.text = str(self._no_reduce).lower()
 
+    def _create_ifp_n_generation_subelement(self, root):
+        if self._ifp_n_generation is not None:
+            element = ET.SubElement(root, "ifp_n_generation")
+            element.text = str(self._ifp_n_generation)
+
     def _create_tabular_legendre_subelements(self, root):
         if self.tabular_legendre:
             element = ET.SubElement(root, "tabular_legendre")
@@ -1888,6 +1910,11 @@ class Settings:
         if text is not None:
             self.verbosity = int(text)
 
+    def _ifp_n_generation_from_xml_element(self, root):
+        text = get_text(root, 'ifp_n_generation')
+        if text is not None:
+            self.ifp_n_generation = int(text)
+
     def _tabular_legendre_from_xml_element(self, root):
         elem = root.find('tabular_legendre')
         if elem is not None:
@@ -2116,6 +2143,7 @@ class Settings:
         self._create_trigger_subelement(element)
         self._create_no_reduce_subelement(element)
         self._create_verbosity_subelement(element)
+        self._create_ifp_n_generation_subelement(element)
         self._create_tabular_legendre_subelements(element)
         self._create_temperature_subelements(element)
         self._create_trace_subelement(element)
@@ -2225,6 +2253,7 @@ class Settings:
         settings._trigger_from_xml_element(elem)
         settings._no_reduce_from_xml_element(elem)
         settings._verbosity_from_xml_element(elem)
+        settings._ifp_n_generation_from_xml_element(elem)
         settings._tabular_legendre_from_xml_element(elem)
         settings._temperature_from_xml_element(elem)
         settings._trace_from_xml_element(elem)
diff --git a/src/bank.cpp b/src/bank.cpp
index 8d00d5440..9955939f6 100644
--- a/src/bank.cpp
+++ b/src/bank.cpp
@@ -1,6 +1,7 @@
 #include "openmc/bank.h"
 #include "openmc/capi.h"
 #include "openmc/error.h"
+#include "openmc/ifp.h"
 #include "openmc/message_passing.h"
 #include "openmc/simulation.h"
 #include "openmc/vector.h"
@@ -26,6 +27,14 @@ SharedArray<SourceSite> surf_source_bank;
 // function.
 SharedArray<SourceSite> fission_bank;
 
+vector<vector<int>> ifp_source_delayed_group_bank;
+
+vector<vector<double>> ifp_source_lifetime_bank;
+
+vector<vector<int>> ifp_fission_delayed_group_bank;
+
+vector<vector<double>> ifp_fission_lifetime_bank;
+
 // Each entry in this vector corresponds to the number of progeny produced
 // this generation for the particle located at that index. This vector is
 // used to efficiently sort the fission bank after each iteration.
@@ -43,6 +52,10 @@ void free_memory_bank()
   simulation::surf_source_bank.clear();
   simulation::fission_bank.clear();
   simulation::progeny_per_particle.clear();
+  simulation::ifp_source_delayed_group_bank.clear();
+  simulation::ifp_source_lifetime_bank.clear();
+  simulation::ifp_fission_delayed_group_bank.clear();
+  simulation::ifp_fission_lifetime_bank.clear();
 }
 
 void init_fission_bank(int64_t max)
@@ -82,6 +95,8 @@ void sort_fission_bank()
   // over provisioned, so we can use that as scratch space.
   SourceSite* sorted_bank;
   vector<SourceSite> sorted_bank_holder;
+  vector<vector<int>> sorted_ifp_delayed_group_bank;
+  vector<vector<double>> sorted_ifp_lifetime_bank;
 
   // If there is not enough space, allocate a temporary vector and point to it
   if (simulation::fission_bank.size() >
@@ -92,6 +107,11 @@ void sort_fission_bank()
     sorted_bank = &simulation::fission_bank[simulation::fission_bank.size()];
   }
 
+  if (settings::ifp_on) {
+    allocate_temporary_vector_ifp(
+      sorted_ifp_delayed_group_bank, sorted_ifp_lifetime_bank);
+  }
+
   // Use parent and progeny indices to sort fission bank
   for (int64_t i = 0; i < simulation::fission_bank.size(); i++) {
     const auto& site = simulation::fission_bank[i];
@@ -102,11 +122,19 @@ void sort_fission_bank()
                   "shared fission bank size.");
     }
     sorted_bank[idx] = site;
+    if (settings::ifp_on) {
+      copy_ifp_data_from_fission_banks(
+        i, sorted_ifp_delayed_group_bank[idx], sorted_ifp_lifetime_bank[idx]);
+    }
   }
 
   // Copy sorted bank into the fission bank
   std::copy(sorted_bank, sorted_bank + simulation::fission_bank.size(),
     simulation::fission_bank.data());
+  if (settings::ifp_on) {
+    copy_ifp_data_to_fission_banks(
+      sorted_ifp_delayed_group_bank.data(), sorted_ifp_lifetime_bank.data());
+  }
 }
 
 //==============================================================================
diff --git a/src/eigenvalue.cpp b/src/eigenvalue.cpp
index 8669d76f9..2685bbe98 100644
--- a/src/eigenvalue.cpp
+++ b/src/eigenvalue.cpp
@@ -11,6 +11,7 @@
 #include "openmc/constants.h"
 #include "openmc/error.h"
 #include "openmc/hdf5_interface.h"
+#include "openmc/ifp.h"
 #include "openmc/math_functions.h"
 #include "openmc/mesh.h"
 #include "openmc/message_passing.h"
@@ -153,8 +154,17 @@ void synchronize_bank()
   // 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;
+
   vector<SourceSite> temp_sites(3 * simulation::work_per_rank);
 
+  // Temporary banks for IFP
+  vector<vector<int>> temp_delayed_groups;
+  vector<vector<double>> temp_lifetimes;
+  if (settings::ifp_on) {
+    resize_ifp_data(
+      temp_delayed_groups, temp_lifetimes, 3 * simulation::work_per_rank);
+  }
+
   for (int64_t i = 0; i < simulation::fission_bank.size(); i++) {
     const auto& site = simulation::fission_bank[i];
 
@@ -165,6 +175,10 @@ void synchronize_bank()
     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;
       }
     }
@@ -172,6 +186,10 @@ void synchronize_bank()
     // 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;
     }
   }
@@ -188,6 +206,8 @@ void synchronize_bank()
   MPI_Exscan(&index_temp, &start, 1, MPI_INT64_T, MPI_SUM, mpi::intracomm);
   finish = start + index_temp;
 
+  // TODO: protect for MPI_Exscan at rank 0
+
   // Allocate space for bank_position if this hasn't been done yet
   int64_t bank_position[mpi::n_procs];
   MPI_Allgather(
@@ -211,9 +231,15 @@ void synchronize_bank()
       // 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;
       }
     }
@@ -229,15 +255,32 @@ void synchronize_bank()
   // ==========================================================================
   // SEND BANK SITES TO NEIGHBORS
 
+  // IFP number of generation
+  int ifp_n_generation;
+  if (settings::ifp_on) {
+    broadcast_ifp_n_generation(
+      ifp_n_generation, temp_delayed_groups, temp_lifetimes);
+  }
+
   int64_t index_local = 0;
   vector<MPI_Request> requests;
 
+  // IFP send buffers
+  vector<int> send_delayed_groups;
+  vector<double> send_lifetimes;
+
   if (start < settings::n_particles) {
     // Determine the index of the processor which has the first part of the
     // source_bank for the local processor
     int neighbor = upper_bound_index(
       simulation::work_index.begin(), simulation::work_index.end(), start);
 
+    // Resize IFP send buffers
+    if (settings::ifp_on && mpi::n_procs > 1) {
+      resize_ifp_data(send_delayed_groups, send_lifetimes,
+        ifp_n_generation * 3 * simulation::work_per_rank);
+    }
+
     while (start < finish) {
       // Determine the number of sites to send
       int64_t n =
@@ -250,6 +293,13 @@ void synchronize_bank()
         MPI_Isend(&temp_sites[index_local], static_cast<int>(n),
           mpi::source_site, neighbor, mpi::rank, mpi::intracomm,
           &requests.back());
+
+        if (settings::ifp_on) {
+          // Send IFP data
+          send_ifp_info(index_local, n, ifp_n_generation, neighbor, requests,
+            temp_delayed_groups, send_delayed_groups, temp_lifetimes,
+            send_lifetimes);
+        }
       }
 
       // Increment all indices
@@ -271,6 +321,11 @@ void synchronize_bank()
   start = simulation::work_index[mpi::rank];
   index_local = 0;
 
+  // IFP receive buffers
+  vector<int> recv_delayed_groups;
+  vector<double> recv_lifetimes;
+  vector<DeserializationInfo> deserialization_info;
+
   // Determine what process has the source sites that will need to be stored at
   // the beginning of this processor's source bank.
 
@@ -282,6 +337,12 @@ void synchronize_bank()
       upper_bound_index(bank_position, bank_position + mpi::n_procs, start);
   }
 
+  // Resize IFP receive buffers
+  if (settings::ifp_on && mpi::n_procs > 1) {
+    resize_ifp_data(recv_delayed_groups, recv_lifetimes,
+      ifp_n_generation * simulation::work_per_rank);
+  }
+
   while (start < simulation::work_index[mpi::rank + 1]) {
     // Determine how many sites need to be received
     int64_t n;
@@ -301,13 +362,24 @@ void synchronize_bank()
       MPI_Irecv(&simulation::source_bank[index_local], static_cast<int>(n),
         mpi::source_site, neighbor, neighbor, mpi::intracomm, &requests.back());
 
+      if (settings::ifp_on) {
+        // Receive IFP data
+        receive_ifp_data(index_local, n, ifp_n_generation, neighbor, requests,
+          recv_delayed_groups, recv_lifetimes, deserialization_info);
+      }
+
     } else {
-      // If the source sites are on this procesor, we can simply copy them
+      // If the source sites are on this processor, we can simply copy them
       // from the temp_sites bank
 
       index_temp = start - bank_position[mpi::rank];
       std::copy(&temp_sites[index_temp], &temp_sites[index_temp + n],
         &simulation::source_bank[index_local]);
+
+      if (settings::ifp_on) {
+        copy_partial_ifp_data_to_source_banks(
+          index_temp, n, index_local, temp_delayed_groups, temp_lifetimes);
+      }
     }
 
     // Increment all indices
@@ -323,9 +395,17 @@ void synchronize_bank()
   int n_request = requests.size();
   MPI_Waitall(n_request, requests.data(), MPI_STATUSES_IGNORE);
 
+  if (settings::ifp_on) {
+    deserialize_ifp_info(ifp_n_generation, deserialization_info,
+      recv_delayed_groups, recv_lifetimes);
+  }
+
 #else
   std::copy(temp_sites.data(), temp_sites.data() + settings::n_particles,
     simulation::source_bank.begin());
+  if (settings::ifp_on) {
+    copy_complete_ifp_data_to_source_banks(temp_delayed_groups, temp_lifetimes);
+  }
 #endif
 
   simulation::time_bank_sendrecv.stop();
diff --git a/src/finalize.cpp b/src/finalize.cpp
index ed3d0e7f4..54aa1d1d9 100644
--- a/src/finalize.cpp
+++ b/src/finalize.cpp
@@ -171,8 +171,9 @@ int openmc_finalize()
 
   // Free all MPI types
 #ifdef OPENMC_MPI
-  if (mpi::source_site != MPI_DATATYPE_NULL)
+  if (mpi::source_site != MPI_DATATYPE_NULL) {
     MPI_Type_free(&mpi::source_site);
+  }
 #endif
 
   openmc_reset_random_ray();
diff --git a/src/ifp.cpp b/src/ifp.cpp
new file mode 100644
index 000000000..1f81f26f6
--- /dev/null
+++ b/src/ifp.cpp
@@ -0,0 +1,216 @@
+#include "openmc/ifp.h"
+
+#include "openmc/bank.h"
+#include "openmc/message_passing.h"
+#include "openmc/particle.h"
+#include "openmc/particle_data.h"
+#include "openmc/settings.h"
+#include "openmc/simulation.h"
+#include "openmc/vector.h"
+
+namespace openmc {
+
+bool is_beta_effective_or_both()
+{
+  if (settings::ifp_parameter == IFPParameter::BetaEffective ||
+      settings::ifp_parameter == IFPParameter::Both) {
+    return true;
+  }
+  return false;
+}
+
+bool is_generation_time_or_both()
+{
+  if (settings::ifp_parameter == IFPParameter::GenerationTime ||
+      settings::ifp_parameter == IFPParameter::Both) {
+    return true;
+  }
+  return false;
+}
+
+void ifp(const Particle& p, const SourceSite& site, int64_t idx)
+{
+  if (is_beta_effective_or_both()) {
+    const auto& delayed_groups =
+      simulation::ifp_source_delayed_group_bank[p.current_work() - 1];
+    simulation::ifp_fission_delayed_group_bank[idx] =
+      _ifp(site.delayed_group, delayed_groups);
+  }
+  if (is_generation_time_or_both()) {
+    const auto& lifetimes =
+      simulation::ifp_source_lifetime_bank[p.current_work() - 1];
+    simulation::ifp_fission_lifetime_bank[idx] = _ifp(p.lifetime(), lifetimes);
+  }
+}
+
+void resize_simulation_ifp_banks()
+{
+  resize_ifp_data(simulation::ifp_source_delayed_group_bank,
+    simulation::ifp_source_lifetime_bank, simulation::work_per_rank);
+  resize_ifp_data(simulation::ifp_fission_delayed_group_bank,
+    simulation::ifp_fission_lifetime_bank, 3 * simulation::work_per_rank);
+}
+
+void copy_ifp_data_from_fission_banks(
+  int i_bank, vector<int>& delayed_groups, vector<double>& lifetimes)
+{
+  if (is_beta_effective_or_both()) {
+    delayed_groups = simulation::ifp_fission_delayed_group_bank[i_bank];
+  }
+  if (is_generation_time_or_both()) {
+    lifetimes = simulation::ifp_fission_lifetime_bank[i_bank];
+  }
+}
+
+#ifdef OPENMC_MPI
+
+void broadcast_ifp_n_generation(int& n_generation,
+  const vector<vector<int>>& delayed_groups,
+  const vector<vector<double>>& lifetimes)
+{
+  if (mpi::rank == 0) {
+    if (is_beta_effective_or_both()) {
+      n_generation = static_cast<int>(delayed_groups[0].size());
+    } else {
+      n_generation = static_cast<int>(lifetimes[0].size());
+    }
+  }
+  MPI_Bcast(&n_generation, 1, MPI_INT, 0, mpi::intracomm);
+}
+
+void send_ifp_info(int64_t idx, int64_t n, int n_generation, int neighbor,
+  vector<MPI_Request>& requests, const vector<vector<int>>& delayed_groups,
+  vector<int>& send_delayed_groups, const vector<vector<double>>& lifetimes,
+  vector<double>& send_lifetimes)
+{
+  // Copy data in send buffers
+  for (int i = idx; i < idx + n; i++) {
+    if (is_beta_effective_or_both()) {
+      std::copy(delayed_groups[i].begin(), delayed_groups[i].end(),
+        send_delayed_groups.begin() + i * n_generation);
+    }
+    if (is_generation_time_or_both()) {
+      std::copy(lifetimes[i].begin(), lifetimes[i].end(),
+        send_lifetimes.begin() + i * n_generation);
+    }
+  }
+  // Send delayed groups
+  if (is_beta_effective_or_both()) {
+    requests.emplace_back();
+    MPI_Isend(&send_delayed_groups[n_generation * idx],
+      n_generation * static_cast<int>(n), MPI_INT, neighbor, mpi::rank,
+      mpi::intracomm, &requests.back());
+  }
+  // Send lifetimes
+  if (is_generation_time_or_both()) {
+    requests.emplace_back();
+    MPI_Isend(&send_lifetimes[n_generation * idx],
+      n_generation * static_cast<int>(n), MPI_DOUBLE, neighbor, mpi::rank,
+      mpi::intracomm, &requests.back());
+  }
+}
+
+void receive_ifp_data(int64_t idx, int64_t n, int n_generation, int neighbor,
+  vector<MPI_Request>& requests, vector<int>& delayed_groups,
+  vector<double>& lifetimes, vector<DeserializationInfo>& deserialization)
+{
+  // Receive delayed groups
+  if (is_beta_effective_or_both()) {
+    requests.emplace_back();
+    MPI_Irecv(&delayed_groups[n_generation * idx],
+      n_generation * static_cast<int>(n), MPI_INT, neighbor, neighbor,
+      mpi::intracomm, &requests.back());
+  }
+  // Receive lifetimes
+  if (is_generation_time_or_both()) {
+    requests.emplace_back();
+    MPI_Irecv(&lifetimes[n_generation * idx],
+      n_generation * static_cast<int>(n), MPI_DOUBLE, neighbor, neighbor,
+      mpi::intracomm, &requests.back());
+  }
+  // Deserialization info to reconstruct data later
+  DeserializationInfo info = {idx, n};
+  deserialization.push_back(info);
+}
+
+void copy_partial_ifp_data_to_source_banks(int64_t idx, int n, int64_t i_bank,
+  const vector<vector<int>>& delayed_groups,
+  const vector<vector<double>>& lifetimes)
+{
+  if (is_beta_effective_or_both()) {
+    std::copy(&delayed_groups[idx], &delayed_groups[idx + n],
+      &simulation::ifp_source_delayed_group_bank[i_bank]);
+  }
+  if (is_generation_time_or_both()) {
+    std::copy(&lifetimes[idx], &lifetimes[idx + n],
+      &simulation::ifp_source_lifetime_bank[i_bank]);
+  }
+}
+
+void deserialize_ifp_info(int n_generation,
+  const vector<DeserializationInfo>& deserialization,
+  const vector<int>& delayed_groups, const vector<double>& lifetimes)
+{
+  for (auto info : deserialization) {
+    int64_t index_local = info.index_local;
+    int64_t n = info.n;
+
+    for (int i = index_local; i < index_local + n; i++) {
+      if (is_beta_effective_or_both()) {
+        vector<int> delayed_groups_received(
+          delayed_groups.begin() + n_generation * i,
+          delayed_groups.begin() + n_generation * (i + 1));
+        simulation::ifp_source_delayed_group_bank[i] = delayed_groups_received;
+      }
+      if (is_generation_time_or_both()) {
+        vector<double> lifetimes_received(lifetimes.begin() + n_generation * i,
+          lifetimes.begin() + n_generation * (i + 1));
+        simulation::ifp_source_lifetime_bank[i] = lifetimes_received;
+      }
+    }
+  }
+}
+
+#endif
+
+void copy_complete_ifp_data_to_source_banks(
+  const vector<vector<int>>& delayed_groups,
+  const vector<vector<double>>& lifetimes)
+{
+  if (is_beta_effective_or_both()) {
+    std::copy(delayed_groups.data(),
+      delayed_groups.data() + settings::n_particles,
+      simulation::ifp_source_delayed_group_bank.begin());
+  }
+  if (is_generation_time_or_both()) {
+    std::copy(lifetimes.data(), lifetimes.data() + settings::n_particles,
+      simulation::ifp_source_lifetime_bank.begin());
+  }
+}
+
+void allocate_temporary_vector_ifp(
+  vector<vector<int>>& delayed_groups, vector<vector<double>>& lifetimes)
+{
+  if (is_beta_effective_or_both()) {
+    delayed_groups.resize(simulation::fission_bank.size());
+  }
+  if (is_generation_time_or_both()) {
+    lifetimes.resize(simulation::fission_bank.size());
+  }
+}
+
+void copy_ifp_data_to_fission_banks(const vector<int>* const delayed_groups_ptr,
+  const vector<double>* lifetimes_ptr)
+{
+  if (is_beta_effective_or_both()) {
+    std::copy(delayed_groups_ptr,
+      delayed_groups_ptr + simulation::fission_bank.size(),
+      simulation::ifp_fission_delayed_group_bank.data());
+  }
+  if (is_generation_time_or_both()) {
+    std::copy(lifetimes_ptr, lifetimes_ptr + simulation::fission_bank.size(),
+      simulation::ifp_fission_lifetime_bank.data());
+  }
+}
+
+} // namespace openmc
diff --git a/src/output.cpp b/src/output.cpp
index e20868efb..baaf682a1 100644
--- a/src/output.cpp
+++ b/src/output.cpp
@@ -593,6 +593,9 @@ const std::unordered_map<int, const char*> score_names = {
   {SCORE_FISS_Q_RECOV, "Recoverable fission power"},
   {SCORE_CURRENT, "Current"},
   {SCORE_PULSE_HEIGHT, "pulse-height"},
+  {SCORE_IFP_TIME_NUM, "IFP lifetime numerator"},
+  {SCORE_IFP_BETA_NUM, "IFP delayed fraction numerator"},
+  {SCORE_IFP_DENOM, "IFP common denominator"},
 };
 
 //! Create an ASCII output file showing all tally results.
diff --git a/src/particle.cpp b/src/particle.cpp
index c51011d6b..324276d15 100644
--- a/src/particle.cpp
+++ b/src/particle.cpp
@@ -116,6 +116,7 @@ void Particle::from_source(const SourceSite* src)
   n_collision() = 0;
   fission() = false;
   zero_flux_derivs();
+  lifetime() = 0.0;
 
   // Copy attributes from source bank site
   type() = src->particle;
@@ -235,7 +236,9 @@ void Particle::event_advance()
   for (int j = 0; j < n_coord(); ++j) {
     coord(j).r += distance * coord(j).u;
   }
-  this->time() += distance / this->speed();
+  double dt = distance / this->speed();
+  this->time() += dt;
+  this->lifetime() += dt;
 
   // Kill particle if its time exceeds the cutoff
   bool hit_time_boundary = false;
@@ -243,6 +246,7 @@ void Particle::event_advance()
   if (time() > time_cutoff) {
     double dt = time() - time_cutoff;
     time() = time_cutoff;
+    lifetime() = time_cutoff;
 
     double push_back_distance = speed() * dt;
     this->move_distance(-push_back_distance);
diff --git a/src/physics.cpp b/src/physics.cpp
index 72c04a5ca..a8e5b9e81 100644
--- a/src/physics.cpp
+++ b/src/physics.cpp
@@ -8,6 +8,7 @@
 #include "openmc/eigenvalue.h"
 #include "openmc/endf.h"
 #include "openmc/error.h"
+#include "openmc/ifp.h"
 #include "openmc/material.h"
 #include "openmc/math_functions.h"
 #include "openmc/message_passing.h"
@@ -233,6 +234,10 @@ void create_fission_sites(Particle& p, int i_nuclide, const Reaction& rx)
         // Break out of loop as no more sites can be added to fission bank
         break;
       }
+      // Iterated Fission Probability (IFP) method
+      if (settings::ifp_on) {
+        ifp(p, site, idx);
+      }
     } else {
       p.secondary_bank().push_back(site);
     }
diff --git a/src/reaction.cpp b/src/reaction.cpp
index 971473438..d96790c6d 100644
--- a/src/reaction.cpp
+++ b/src/reaction.cpp
@@ -202,6 +202,9 @@ std::unordered_map<int, std::string> REACTION_NAME_MAP {
   {SCORE_FISS_Q_PROMPT, "fission-q-prompt"},
   {SCORE_FISS_Q_RECOV, "fission-q-recoverable"},
   {SCORE_PULSE_HEIGHT, "pulse-height"},
+  {SCORE_IFP_TIME_NUM, "ifp-time-numerator"},
+  {SCORE_IFP_BETA_NUM, "ifp-beta-numerator"},
+  {SCORE_IFP_DENOM, "ifp-denominator"},
   // Normal ENDF-based reactions
   {TOTAL_XS, "(n,total)"},
   {ELASTIC, "(n,elastic)"},
diff --git a/src/settings.cpp b/src/settings.cpp
index 53fcdec38..c135fa339 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -52,6 +52,7 @@ bool create_fission_neutrons {true};
 bool delayed_photon_scaling {true};
 bool entropy_on {false};
 bool event_based {false};
+bool ifp_on {false};
 bool legendre_to_tabular {true};
 bool material_cell_offsets {true};
 bool output_summary {true};
@@ -106,6 +107,8 @@ int max_particle_events {1000000};
 ElectronTreatment electron_treatment {ElectronTreatment::TTB};
 array<double, 4> energy_cutoff {0.0, 1000.0, 0.0, 0.0};
 array<double, 4> time_cutoff {INFTY, INFTY, INFTY, INFTY};
+int ifp_n_generation {-1};
+IFPParameter ifp_parameter {IFPParameter::None};
 int legendre_to_tabular_points {C_NONE};
 int max_order {0};
 int n_log_bins {8000};
@@ -1059,6 +1062,20 @@ void read_settings_xml(pugi::xml_node root)
     temperature_range[1] = range.at(1);
   }
 
+  // Check for user value for the number of generation of the Iterated Fission
+  // Probability (IFP) method
+  if (check_for_node(root, "ifp_n_generation")) {
+    ifp_n_generation = std::stoi(get_node_value(root, "ifp_n_generation"));
+    if (ifp_n_generation <= 0) {
+      fatal_error("'ifp_n_generation' must be greater than 0.");
+    }
+    // Avoid tallying 0 if IFP logs are not complete when active cycles start
+    if (ifp_n_generation > n_inactive) {
+      fatal_error("'ifp_n_generation' must be lower than or equal to the "
+                  "number of inactive cycles.");
+    }
+  }
+
   // Check for tabular_legendre options
   if (check_for_node(root, "tabular_legendre")) {
     // Get pointer to tabular_legendre node
diff --git a/src/simulation.cpp b/src/simulation.cpp
index 74a7dbe63..e4521c06d 100644
--- a/src/simulation.cpp
+++ b/src/simulation.cpp
@@ -7,6 +7,7 @@
 #include "openmc/error.h"
 #include "openmc/event.h"
 #include "openmc/geometry_aux.h"
+#include "openmc/ifp.h"
 #include "openmc/material.h"
 #include "openmc/mcpl_interface.h"
 #include "openmc/message_passing.h"
@@ -335,6 +336,11 @@ void allocate_banks()
 
     // Allocate fission bank
     init_fission_bank(3 * simulation::work_per_rank);
+
+    // Allocate IFP bank
+    if (settings::ifp_on) {
+      resize_simulation_ifp_banks();
+    }
   }
 
   if (settings::surf_source_write) {
diff --git a/src/tallies/tally.cpp b/src/tallies/tally.cpp
index 96d684f71..35805b20d 100644
--- a/src/tallies/tally.cpp
+++ b/src/tallies/tally.cpp
@@ -180,6 +180,64 @@ Tally::Tally(pugi::xml_node node)
     fatal_error(fmt::format("No scores specified on tally {}.", id_));
   }
 
+  // Set IFP if needed
+  if (!settings::ifp_on) {
+    // Determine if this tally has an IFP score
+    bool has_ifp_score = false;
+    for (int score : scores_) {
+      if (score == SCORE_IFP_TIME_NUM || score == SCORE_IFP_BETA_NUM ||
+          score == SCORE_IFP_DENOM) {
+        has_ifp_score = true;
+        break;
+      }
+    }
+
+    // Check for errors
+    if (has_ifp_score) {
+      if (settings::run_mode == RunMode::EIGENVALUE) {
+        if (settings::ifp_n_generation < 0) {
+          settings::ifp_n_generation = DEFAULT_IFP_N_GENERATION;
+          warning(fmt::format(
+            "{} generations will be used for IFP (default value). It can be "
+            "changed using the 'ifp_n_generation' settings.",
+            settings::ifp_n_generation));
+        }
+        if (settings::ifp_n_generation > settings::n_inactive) {
+          fatal_error("'ifp_n_generation' must be lower than or equal to the "
+                      "number of inactive cycles.");
+        }
+        settings::ifp_on = true;
+      } else {
+        fatal_error(
+          "Iterated Fission Probability can only be used in an eigenvalue "
+          "calculation.");
+      }
+    }
+  }
+
+  // Set IFP parameters if needed
+  if (settings::ifp_on) {
+    for (int score : scores_) {
+      switch (score) {
+      case SCORE_IFP_TIME_NUM:
+        if (settings::ifp_parameter == IFPParameter::None) {
+          settings::ifp_parameter = IFPParameter::GenerationTime;
+        } else if (settings::ifp_parameter == IFPParameter::BetaEffective) {
+          settings::ifp_parameter = IFPParameter::Both;
+        }
+        break;
+      case SCORE_IFP_BETA_NUM:
+      case SCORE_IFP_DENOM:
+        if (settings::ifp_parameter == IFPParameter::None) {
+          settings::ifp_parameter = IFPParameter::BetaEffective;
+        } else if (settings::ifp_parameter == IFPParameter::GenerationTime) {
+          settings::ifp_parameter = IFPParameter::Both;
+        }
+        break;
+      }
+    }
+  }
+
   // Check if tally is compatible with particle type
   if (!settings::photon_transport) {
     for (int score : scores_) {
@@ -585,7 +643,12 @@ void Tally::set_scores(const vector<std::string>& scores)
           }
         }
       }
+      break;
 
+    case SCORE_IFP_TIME_NUM:
+    case SCORE_IFP_BETA_NUM:
+    case SCORE_IFP_DENOM:
+      estimator_ = TallyEstimator::COLLISION;
       break;
     }
 
diff --git a/src/tallies/tally_scoring.cpp b/src/tallies/tally_scoring.cpp
index 02cb48567..5c6386fb4 100644
--- a/src/tallies/tally_scoring.cpp
+++ b/src/tallies/tally_scoring.cpp
@@ -4,6 +4,7 @@
 #include "openmc/capi.h"
 #include "openmc/constants.h"
 #include "openmc/error.h"
+#include "openmc/ifp.h"
 #include "openmc/material.h"
 #include "openmc/mgxs_interface.h"
 #include "openmc/nuclide.h"
@@ -890,6 +891,56 @@ void score_general_ce_nonanalog(Particle& p, int i_tally, int start_index,
         score_fission_q(p, score_bin, tally, flux, i_nuclide, atom_density);
       break;
 
+    case SCORE_IFP_TIME_NUM:
+      if (settings::ifp_on) {
+        if ((p.type() == Type::neutron) && (p.fission())) {
+          if (is_generation_time_or_both()) {
+            const auto& lifetimes =
+              simulation::ifp_source_lifetime_bank[p.current_work() - 1];
+            if (lifetimes.size() == settings::ifp_n_generation) {
+              score = lifetimes[0] * p.wgt_last();
+            }
+          }
+        }
+      }
+      break;
+
+    case SCORE_IFP_BETA_NUM:
+      if (settings::ifp_on) {
+        if ((p.type() == Type::neutron) && (p.fission())) {
+          if (is_beta_effective_or_both()) {
+            const auto& delayed_groups =
+              simulation::ifp_source_delayed_group_bank[p.current_work() - 1];
+            if (delayed_groups.size() == settings::ifp_n_generation) {
+              if (delayed_groups[0] > 0) {
+                score = p.wgt_last();
+              }
+            }
+          }
+        }
+      }
+      break;
+
+    case SCORE_IFP_DENOM:
+      if (settings::ifp_on) {
+        if ((p.type() == Type::neutron) && (p.fission())) {
+          int ifp_data_size;
+          if (is_beta_effective_or_both()) {
+            ifp_data_size = static_cast<int>(
+              simulation::ifp_source_delayed_group_bank[p.current_work() - 1]
+                .size());
+          } else {
+            ifp_data_size = static_cast<int>(
+              simulation::ifp_source_lifetime_bank[p.current_work() - 1]
+                .size());
+          }
+          if (ifp_data_size == settings::ifp_n_generation) {
+            score = p.wgt_last();
+          }
+        }
+      }
+      break;
+
     case N_2N:
     case N_3N:
     case N_4N:
diff --git a/tests/regression_tests/ifp/__init__.py b/tests/regression_tests/ifp/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/regression_tests/ifp/inputs_true.dat b/tests/regression_tests/ifp/inputs_true.dat
new file mode 100644
index 000000000..a3a3f1d77
--- /dev/null
+++ b/tests/regression_tests/ifp/inputs_true.dat
@@ -0,0 +1,33 @@
+<?xml version='1.0' encoding='utf-8'?>
+<model>
+  <materials>
+    <material depletable="true" id="1" name="core">
+      <density units="g/cm3" value="16.0"/>
+      <nuclide ao="1.0" name="U235"/>
+    </material>
+  </materials>
+  <geometry>
+    <cell id="1" material="1" region="-1" universe="1"/>
+    <surface boundary="vacuum" coeffs="0.0 0.0 0.0 10.0" id="1" type="sphere"/>
+  </geometry>
+  <settings>
+    <run_mode>eigenvalue</run_mode>
+    <particles>1000</particles>
+    <batches>20</batches>
+    <inactive>5</inactive>
+    <source particle="neutron" strength="1.0" type="independent">
+      <space type="box">
+        <parameters>-10.0 -10.0 -10.0 10.0 10.0 10.0</parameters>
+      </space>
+      <constraints>
+        <fissionable>true</fissionable>
+      </constraints>
+    </source>
+    <ifp_n_generation>5</ifp_n_generation>
+  </settings>
+  <tallies>
+    <tally id="1" name="ifp-scores">
+      <scores>ifp-time-numerator ifp-beta-numerator ifp-denominator</scores>
+    </tally>
+  </tallies>
+</model>
diff --git a/tests/regression_tests/ifp/results_true.dat b/tests/regression_tests/ifp/results_true.dat
new file mode 100644
index 000000000..a74e2bd78
--- /dev/null
+++ b/tests/regression_tests/ifp/results_true.dat
@@ -0,0 +1,9 @@
+k-combined:
+1.007452E+00 5.705278E-03
+tally 1:
+8.996235E-08
+5.461421E-16
+4.800000E-02
+4.680000E-04
+1.512000E+01
+1.526063E+01
diff --git a/tests/regression_tests/ifp/test.py b/tests/regression_tests/ifp/test.py
new file mode 100644
index 000000000..6969a54c4
--- /dev/null
+++ b/tests/regression_tests/ifp/test.py
@@ -0,0 +1,45 @@
+"""Test the Iterated Fission Probability (IFP) method to compute adjoint-weighted
+kinetics parameters using dedicated tallies."""
+
+import openmc
+import pytest
+
+from tests.testing_harness import PyAPITestHarness
+
+
+@pytest.fixture()
+def ifp_model():
+    model = openmc.Model()
+
+    # Material
+    material = openmc.Material(name="core")
+    material.add_nuclide("U235", 1.0)
+    material.set_density('g/cm3', 16.0)
+
+    # Geometry
+    radius = 10.0
+    sphere = openmc.Sphere(r=radius, boundary_type="vacuum")
+    cell = openmc.Cell(region=-sphere, fill=material)
+    model.geometry = openmc.Geometry([cell])
+
+    # Settings
+    model.settings.particles = 1000
+    model.settings.batches = 20
+    model.settings.inactive = 5
+    model.settings.ifp_n_generation = 5
+
+    space = openmc.stats.Box(*cell.bounding_box)
+    model.settings.source = openmc.IndependentSource(
+        space=space, constraints={'fissionable': True})
+
+    # Tally IFP scores
+    tally = openmc.Tally(name="ifp-scores")
+    tally.scores = ["ifp-time-numerator", "ifp-beta-numerator", "ifp-denominator"]
+    model.tallies = [tally]
+
+    return model
+
+
+def test_iterated_fission_probability(ifp_model):
+    harness = PyAPITestHarness("statepoint.20.h5", model=ifp_model)
+    harness.main()
diff --git a/tests/unit_tests/test_ifp.py b/tests/unit_tests/test_ifp.py
new file mode 100644
index 000000000..8d0fd9801
--- /dev/null
+++ b/tests/unit_tests/test_ifp.py
@@ -0,0 +1,49 @@
+"""Test the Iterated Fission Probability (IFP) method to compute adjoint-weighted
+kinetics parameters using dedicated tallies."""
+
+import pytest
+import openmc
+
+
+def test_xml_serialization(run_in_tmpdir):
+    """Check that a simple use case can be written and read in XML."""
+    parameter = 5
+    settings = openmc.Settings()
+    settings.ifp_n_generation = parameter
+    settings.export_to_xml()
+
+    read_settings = openmc.Settings.from_xml()
+    assert read_settings.ifp_n_generation == parameter
+
+
+@pytest.fixture(scope="module")
+def geometry():
+    openmc.reset_auto_ids()
+    material = openmc.Material()
+    material.add_nuclide("U235", 1.0)
+    sphere = openmc.Sphere(r=1.0, boundary_type="vacuum")
+    cell = openmc.Cell(region=-sphere, fill=material)
+    return openmc.Geometry([cell])
+
+
+@pytest.mark.parametrize(
+    "options, error",
+    [
+        ({"ifp_n_generation": 0}, ValueError),
+        ({"ifp_n_generation": -1}, ValueError),
+        ({"run_mode": "fixed source"}, RuntimeError),
+        ({"inactive": 5, "ifp_n_generation": 6}, RuntimeError),
+        ({"inactive": 9}, RuntimeError)
+    ],
+)
+def test_exceptions(options, error, run_in_tmpdir, geometry):
+    """Test settings configuration that should return an error."""
+    with pytest.raises(error):
+        settings = openmc.Settings(**options)
+        settings.particles = 100
+        settings.batches = 15
+        tally = openmc.Tally(name="ifp-scores")
+        tally.scores = ["ifp-time-numerator", "ifp-beta-numerator", "ifp-denominator"]
+        tallies = openmc.Tallies([tally])
+        model = openmc.Model(geometry=geometry, settings=settings, tallies=tallies)
+        model.run()

From a1134409863361c553014150949695407dea8287 Mon Sep 17 00:00:00 2001
From: John Tramm <john.tramm@gmail.com>
Date: Tue, 22 Apr 2025 12:17:04 -0500
Subject: [PATCH 014/203] Small Fixes to Allow Random Ray to Work with DAGMC
 (#3374)

Co-authored-by: Patrick Shriwise <pshriwise@gmail.com>
---
 openmc/model/model.py                    | 121 +++++++++++++++--------
 src/random_ray/random_ray.cpp            |   2 +-
 src/random_ray/random_ray_simulation.cpp |   4 +-
 3 files changed, 84 insertions(+), 43 deletions(-)

diff --git a/openmc/model/model.py b/openmc/model/model.py
index 260059f4a..9ff574ec6 100644
--- a/openmc/model/model.py
+++ b/openmc/model/model.py
@@ -263,7 +263,7 @@ class Model:
         return model
 
     def init_lib(self, threads=None, geometry_debug=False, restart_file=None,
-                 tracks=False, output=True, event_based=None, intracomm=None):
+                 tracks=False, output=True, event_based=None, intracomm=None, directory=None):
         """Initializes the model in memory via the C API
 
         .. versionadded:: 0.13.0
@@ -291,6 +291,8 @@ class Model:
             the Settings will be used.
         intracomm : mpi4py.MPI.Intracomm or None, optional
             MPI intracommunicator
+        directory : str or None, optional
+            Directory to write XML files to. Defaults to None.
         """
 
         import openmc.lib
@@ -304,7 +306,8 @@ class Model:
         args = _process_CLI_arguments(
             volume=False, geometry_debug=geometry_debug,
             restart_file=restart_file, threads=threads, tracks=tracks,
-            event_based=event_based)
+            event_based=event_based, path_input=directory)
+
         # Args adds the openmc_exec command in the first entry; remove it
         args = args[1:]
 
@@ -318,7 +321,10 @@ class Model:
             self._intracomm = DummyCommunicator()
 
         if self._intracomm.rank == 0:
-            self.export_to_xml()
+            if directory is not None:
+                self.export_to_xml(directory=directory)
+            else:
+                self.export_to_xml()
         self._intracomm.barrier()
 
         # We cannot pass DummyCommunicator to openmc.lib.init so pass instead
@@ -1443,7 +1449,7 @@ class Model:
                 self.geometry.get_all_materials().values()
             )
 
-    def _generate_infinite_medium_mgxs(self, groups, nparticles, mgxs_path, correction):
+    def _generate_infinite_medium_mgxs(self, groups, nparticles, mgxs_path, correction, directory):
         """Generate a MGXS library by running multiple OpenMC simulations, each
         representing an infinite medium simulation of a single isolated
         material. A discrete source is used to sample particles, with an equal
@@ -1455,8 +1461,15 @@ class Model:
         ----------
         groups : openmc.mgxs.EnergyGroups
             Energy group structure for the MGXS.
-        mgxs_path : path-like
+        nparticles : int
+            Number of particles to simulate per batch when generating MGXS.
+        mgxs_path : str
             Filename for the MGXS HDF5 file.
+        correction : str
+            Transport correction to apply to the MGXS. Options are None and
+            "P0".
+        directory : str
+            Directory to run the simulation in, so as to contain XML files.
         """
         warnings.warn("The infinite medium method of generating MGXS may hang "
                       "if a material has a k-infinity > 1.0.")
@@ -1537,7 +1550,7 @@ class Model:
             mgxs_lib.add_to_tallies_file(model.tallies, merge=True)
 
             # Run
-            statepoint_filename = model.run()
+            statepoint_filename = model.run(cwd=directory)
 
             # Load MGXS
             with openmc.StatePoint(statepoint_filename) as sp:
@@ -1623,7 +1636,7 @@ class Model:
 
         return geometry, box
 
-    def _generate_stochastic_slab_mgxs(self, groups, nparticles, mgxs_path, correction) -> None:
+    def _generate_stochastic_slab_mgxs(self, groups, nparticles, mgxs_path, correction, directory) -> None:
         """Generate MGXS assuming a stochastic "sandwich" of materials in a layered
         slab geometry. While geometry-specific spatial shielding effects are not
         captured, this method can be useful when the geometry has materials only
@@ -1638,8 +1651,15 @@ class Model:
         ----------
         groups : openmc.mgxs.EnergyGroups
             Energy group structure for the MGXS.
-        mgxs_path : path-like
+        nparticles : int
+            Number of particles to simulate per batch when generating MGXS.
+        mgxs_path : str
             Filename for the MGXS HDF5 file.
+        correction : str
+            Transport correction to apply to the MGXS. Options are None and
+            "P0".
+        directory : str
+            Directory to run the simulation in, so as to contain XML files.
         """
         openmc.reset_auto_ids()
         model = openmc.Model()
@@ -1709,7 +1729,7 @@ class Model:
         mgxs_lib.add_to_tallies_file(model.tallies, merge=True)
 
         # Run
-        statepoint_filename = model.run()
+        statepoint_filename = model.run(cwd=directory)
 
         # Load MGXS
         with openmc.StatePoint(statepoint_filename) as sp:
@@ -1721,7 +1741,7 @@ class Model:
         mgxs_file = mgxs_lib.create_mg_library(xs_type='macro', xsdata_names=names)
         mgxs_file.export_to_hdf5(mgxs_path)
 
-    def _generate_material_wise_mgxs(self, groups, nparticles, mgxs_path, correction) -> None:
+    def _generate_material_wise_mgxs(self, groups, nparticles, mgxs_path, correction, directory) -> None:
         """Generate a material-wise MGXS library for the model by running the
         original continuous energy OpenMC simulation of the full material
         geometry and source, and tally MGXS data for each material. This method
@@ -1736,8 +1756,15 @@ class Model:
         ----------
         groups : openmc.mgxs.EnergyGroups
             Energy group structure for the MGXS.
+        nparticles : int
+            Number of particles to simulate per batch when generating MGXS.
         mgxs_path : str
             Filename for the MGXS HDF5 file.
+        correction : str
+            Transport correction to apply to the MGXS. Options are None and
+            "P0".
+        directory : str
+            Directory to run the simulation in, so as to contain XML files.
         """
         openmc.reset_auto_ids()
         model = copy.deepcopy(self)
@@ -1791,7 +1818,7 @@ class Model:
         mgxs_lib.add_to_tallies_file(model.tallies, merge=True)
 
         # Run
-        statepoint_filename = model.run()
+        statepoint_filename = model.run(cwd=directory)
 
         # Load MGXS
         with openmc.StatePoint(statepoint_filename) as sp:
@@ -1828,39 +1855,53 @@ class Model:
         if isinstance(groups, str):
             groups = openmc.mgxs.EnergyGroups(groups)
 
-        # Make sure all materials have a name, and that the name is a valid HDF5
-        # dataset name
-        for material in self.materials:
-            if material.name is None:
-                material.name = f"material {material.id}"
-            material.name = re.sub(r'[^a-zA-Z0-9]', '_', material.name)
+        # Do all work (including MGXS generation) in a temporary directory
+        # to avoid polluting the working directory with residual XML files
+        with TemporaryDirectory() as tmpdir:
 
-        # If needed, generate the needed MGXS data library file
-        if not Path(mgxs_path).is_file() or overwrite_mgxs_library:
-            if method == "infinite_medium":
-                self._generate_infinite_medium_mgxs(
-                    groups, nparticles, mgxs_path, correction)
-            elif method == "material_wise":
-                self._generate_material_wise_mgxs(
-                    groups, nparticles, mgxs_path, correction)
-            elif method == "stochastic_slab":
-                self._generate_stochastic_slab_mgxs(
-                    groups, nparticles, mgxs_path, correction)
+            # Determine if there are DAGMC universes in the model. If so, we need to synchronize
+            # the dagmc materials with cells.
+            # TODO: Can this be done without having to init/finalize?
+            for univ in self.geometry.get_all_universes().values():
+                if isinstance(univ, openmc.DAGMCUniverse):
+                    self.init_lib(directory=tmpdir)
+                    self.sync_dagmc_universes()
+                    self.finalize_lib()
+                    break
+            
+            # Make sure all materials have a name, and that the name is a valid HDF5
+            # dataset name
+            for material in self.materials:
+                if material.name is None:
+                    material.name = f"material {material.id}"
+                material.name = re.sub(r'[^a-zA-Z0-9]', '_', material.name)
+
+            # If needed, generate the needed MGXS data library file
+            if not Path(mgxs_path).is_file() or overwrite_mgxs_library:
+                if method == "infinite_medium":
+                    self._generate_infinite_medium_mgxs(
+                        groups, nparticles, mgxs_path, correction, tmpdir)
+                elif method == "material_wise":
+                    self._generate_material_wise_mgxs(
+                        groups, nparticles, mgxs_path, correction, tmpdir)
+                elif method == "stochastic_slab":
+                    self._generate_stochastic_slab_mgxs(
+                        groups, nparticles, mgxs_path, correction, tmpdir)
+                else:
+                    raise ValueError(
+                        f'MGXS generation method "{method}" not recognized')
             else:
-                raise ValueError(
-                    f'MGXS generation method "{method}" not recognized')
-        else:
-            print(f'Existing MGXS library file "{mgxs_path}" will be used')
+                print(f'Existing MGXS library file "{mgxs_path}" will be used')
 
-        # Convert all continuous energy materials to multigroup
-        self.materials.cross_sections = mgxs_path
-        for material in self.materials:
-            material.set_density('macro', 1.0)
-            material._nuclides = []
-            material._sab = []
-            material.add_macroscopic(material.name)
+            # Convert all continuous energy materials to multigroup
+            self.materials.cross_sections = mgxs_path
+            for material in self.materials:
+                material.set_density('macro', 1.0)
+                material._nuclides = []
+                material._sab = []
+                material.add_macroscopic(material.name)
 
-        self.settings.energy_mode = 'multi-group'
+            self.settings.energy_mode = 'multi-group'
 
     def convert_to_random_ray(self):
         """Convert a multigroup model to use random ray.
diff --git a/src/random_ray/random_ray.cpp b/src/random_ray/random_ray.cpp
index 9a9d1394a..532840f1f 100644
--- a/src/random_ray/random_ray.cpp
+++ b/src/random_ray/random_ray.cpp
@@ -277,7 +277,7 @@ void RandomRay::event_advance_ray()
   boundary() = distance_to_boundary(*this);
   double distance = boundary().distance;
 
-  if (distance <= 0.0) {
+  if (distance < 0.0) {
     mark_as_lost("Negative transport distance detected for particle " +
                  std::to_string(id()));
     return;
diff --git a/src/random_ray/random_ray_simulation.cpp b/src/random_ray/random_ray_simulation.cpp
index b831efcd9..40a08c3af 100644
--- a/src/random_ray/random_ray_simulation.cpp
+++ b/src/random_ray/random_ray_simulation.cpp
@@ -196,8 +196,8 @@ void validate_random_ray_inputs()
                   "supported in random ray mode.");
     }
     if (material.get_xsdata().size() > 1) {
-      fatal_error("Non-isothermal MGXS detected. Only isothermal XS data sets "
-                  "supported in random ray mode.");
+      warning("Non-isothermal MGXS detected. Only isothermal XS data sets "
+              "supported in random ray mode. Using lowest temperature.");
     }
     for (int g = 0; g < data::mg.num_energy_groups_; g++) {
       if (material.exists_in_model) {

From 5dd6ff6527b073aa214806e01f82f24447593fec Mon Sep 17 00:00:00 2001
From: Patrick Shriwise <pshriwise@gmail.com>
Date: Tue, 22 Apr 2025 23:00:44 -0500
Subject: [PATCH 015/203] Fix negative distances from bins_crossed for
 CylindricalMesh (#3370)

---
 include/openmc/mesh.h                         |  5 ---
 src/mesh.cpp                                  | 37 +++++++++----------
 .../filter_mesh/inputs_true.dat               |  4 +-
 tests/regression_tests/filter_mesh/test.py    |  3 +-
 tests/unit_tests/test_cylindrical_mesh.py     | 11 ++++--
 tests/unit_tests/test_spherical_mesh.py       |  2 -
 6 files changed, 29 insertions(+), 33 deletions(-)

diff --git a/include/openmc/mesh.h b/include/openmc/mesh.h
index 8faf45f1b..5a727c2b6 100644
--- a/include/openmc/mesh.h
+++ b/include/openmc/mesh.h
@@ -138,9 +138,6 @@ public:
   //! Perform any preparation needed to support point location within the mesh
   virtual void prepare_for_point_location() {};
 
-  //! Update a position to the local coordinates of the mesh
-  virtual void local_coords(Position& r) const {};
-
   //! Return a position in the local coordinates of the mesh
   virtual Position local_coords(const Position& r) const { return r; };
 
@@ -427,8 +424,6 @@ public:
   PeriodicStructuredMesh() = default;
   PeriodicStructuredMesh(pugi::xml_node node) : StructuredMesh {node} {};
 
-  void local_coords(Position& r) const override { r -= origin_; };
-
   Position local_coords(const Position& r) const override
   {
     return r - origin_;
diff --git a/src/mesh.cpp b/src/mesh.cpp
index 101da7468..8280177ac 100644
--- a/src/mesh.cpp
+++ b/src/mesh.cpp
@@ -915,6 +915,11 @@ void StructuredMesh::raytrace_mesh(
   if (total_distance == 0.0 && settings::solver_type != SolverType::RANDOM_RAY)
     return;
 
+  // keep a copy of the original global position to pass to get_indices,
+  // which performs its own transformation to local coordinates
+  Position global_r = r0;
+  Position local_r = local_coords(r0);
+
   const int n = n_dimension_;
 
   // Flag if position is inside the mesh
@@ -925,7 +930,7 @@ void StructuredMesh::raytrace_mesh(
 
   // Calculate index of current cell. Offset the position a tiny bit in
   // direction of flight
-  MeshIndex ijk = get_indices(r0 + TINY_BIT * u, in_mesh);
+  MeshIndex ijk = get_indices(global_r + TINY_BIT * u, in_mesh);
 
   // if track is very short, assume that it is completely inside one cell.
   // Only the current cell will score and no surfaces
@@ -936,16 +941,10 @@ void StructuredMesh::raytrace_mesh(
     return;
   }
 
-  // translate start and end positions,
-  // this needs to come after the get_indices call because it does its own
-  // translation
-  local_coords(r0);
-  local_coords(r1);
-
   // Calculate initial distances to next surfaces in all three dimensions
   std::array<MeshDistance, 3> distances;
   for (int k = 0; k < n; ++k) {
-    distances[k] = distance_to_grid_boundary(ijk, k, r0, u, 0.0);
+    distances[k] = distance_to_grid_boundary(ijk, k, local_r, u, 0.0);
   }
 
   // Loop until r = r1 is eventually reached
@@ -975,7 +974,7 @@ void StructuredMesh::raytrace_mesh(
       // The two other directions are still valid!
       ijk[k] = distances[k].next_index;
       distances[k] =
-        distance_to_grid_boundary(ijk, k, r0, u, traveled_distance);
+        distance_to_grid_boundary(ijk, k, local_r, u, traveled_distance);
 
       // Check if we have left the interior of the mesh
       in_mesh = ((ijk[k] >= 1) && (ijk[k] <= shape_[k]));
@@ -1005,10 +1004,10 @@ void StructuredMesh::raytrace_mesh(
 
       // Calculate the new cell index and update all distances to next
       // surfaces.
-      ijk = get_indices(r0 + (traveled_distance + TINY_BIT) * u, in_mesh);
+      ijk = get_indices(global_r + (traveled_distance + TINY_BIT) * u, in_mesh);
       for (int k = 0; k < n; ++k) {
         distances[k] =
-          distance_to_grid_boundary(ijk, k, r0, u, traveled_distance);
+          distance_to_grid_boundary(ijk, k, local_r, u, traveled_distance);
       }
 
       // If inside the mesh, Tally inward current
@@ -1482,7 +1481,7 @@ std::string CylindricalMesh::get_mesh_type() const
 StructuredMesh::MeshIndex CylindricalMesh::get_indices(
   Position r, bool& in_mesh) const
 {
-  local_coords(r);
+  r = local_coords(r);
 
   Position mapped_r;
   mapped_r[0] = std::hypot(r.x, r.y);
@@ -1630,23 +1629,21 @@ StructuredMesh::MeshDistance CylindricalMesh::distance_to_grid_boundary(
   const MeshIndex& ijk, int i, const Position& r0, const Direction& u,
   double l) const
 {
-  Position r = r0 - origin_;
-
   if (i == 0) {
 
     return std::min(
-      MeshDistance(ijk[i] + 1, true, find_r_crossing(r, u, l, ijk[i])),
-      MeshDistance(ijk[i] - 1, false, find_r_crossing(r, u, l, ijk[i] - 1)));
+      MeshDistance(ijk[i] + 1, true, find_r_crossing(r0, u, l, ijk[i])),
+      MeshDistance(ijk[i] - 1, false, find_r_crossing(r0, u, l, ijk[i] - 1)));
 
   } else if (i == 1) {
 
     return std::min(MeshDistance(sanitize_phi(ijk[i] + 1), true,
-                      find_phi_crossing(r, u, l, ijk[i])),
+                      find_phi_crossing(r0, u, l, ijk[i])),
       MeshDistance(sanitize_phi(ijk[i] - 1), false,
-        find_phi_crossing(r, u, l, ijk[i] - 1)));
+        find_phi_crossing(r0, u, l, ijk[i] - 1)));
 
   } else {
-    return find_z_crossing(r, u, l, ijk[i]);
+    return find_z_crossing(r0, u, l, ijk[i]);
   }
 }
 
@@ -1762,7 +1759,7 @@ std::string SphericalMesh::get_mesh_type() const
 StructuredMesh::MeshIndex SphericalMesh::get_indices(
   Position r, bool& in_mesh) const
 {
-  local_coords(r);
+  r = local_coords(r);
 
   Position mapped_r;
   mapped_r[0] = r.norm();
diff --git a/tests/regression_tests/filter_mesh/inputs_true.dat b/tests/regression_tests/filter_mesh/inputs_true.dat
index 0667c0341..4995749bb 100644
--- a/tests/regression_tests/filter_mesh/inputs_true.dat
+++ b/tests/regression_tests/filter_mesh/inputs_true.dat
@@ -54,8 +54,8 @@
     <mesh id="5" type="cylindrical">
       <r_grid>0.0 0.4411764705882353 0.8823529411764706 1.3235294117647058 1.7647058823529411 2.2058823529411766 2.6470588235294117 3.0882352941176467 3.5294117647058822 3.9705882352941178 4.411764705882353 4.852941176470588 5.294117647058823 5.735294117647059 6.1764705882352935 6.617647058823529 7.0588235294117645 7.5</r_grid>
       <phi_grid>0.0 0.3490658503988659 0.6981317007977318 1.0471975511965976 1.3962634015954636 1.7453292519943295 2.0943951023931953 2.443460952792061 2.792526803190927 3.141592653589793 3.490658503988659 3.839724354387525 4.1887902047863905 4.537856055185257 4.886921905584122 5.235987755982989 5.585053606381854 5.93411945678072 6.283185307179586</phi_grid>
-      <z_grid>-7.5 -6.5625 -5.625 -4.6875 -3.75 -2.8125 -1.875 -0.9375 0.0 0.9375 1.875 2.8125 3.75 4.6875 5.625 6.5625 7.5</z_grid>
-      <origin>0.0 0.0 0.0</origin>
+      <z_grid>0.0 0.9375 1.875 2.8125 3.75 4.6875 5.625 6.5625 7.5 8.4375 9.375 10.3125 11.25 12.1875 13.125 14.0625 15.0</z_grid>
+      <origin>0.0 0.0 -7.5</origin>
     </mesh>
     <mesh id="6" type="spherical">
       <r_grid>0.0 0.4411764705882353 0.8823529411764706 1.3235294117647058 1.7647058823529411 2.2058823529411766 2.6470588235294117 3.0882352941176467 3.5294117647058822 3.9705882352941178 4.411764705882353 4.852941176470588 5.294117647058823 5.735294117647059 6.1764705882352935 6.617647058823529 7.0588235294117645 7.5</r_grid>
diff --git a/tests/regression_tests/filter_mesh/test.py b/tests/regression_tests/filter_mesh/test.py
index 6214e0486..165ba2a0c 100644
--- a/tests/regression_tests/filter_mesh/test.py
+++ b/tests/regression_tests/filter_mesh/test.py
@@ -61,9 +61,10 @@ def model():
     np.testing.assert_allclose(recti_mesh.volumes, recti_mesh_exp_vols)
 
     cyl_mesh = openmc.CylindricalMesh(
+        origin=(0, 0, -7.5),
         r_grid=np.linspace(0, 7.5, 18),
         phi_grid=np.linspace(0, 2*pi, 19),
-        z_grid=np.linspace(-7.5, 7.5, 17),
+        z_grid=np.linspace(0, 15, 17),
     )
     dr = 0.5 * np.diff(np.linspace(0, 7.5, 18)**2)
     dp = np.full(cyl_mesh.dimension[1], 2*pi / 18)
diff --git a/tests/unit_tests/test_cylindrical_mesh.py b/tests/unit_tests/test_cylindrical_mesh.py
index b408bc0e9..645269825 100644
--- a/tests/unit_tests/test_cylindrical_mesh.py
+++ b/tests/unit_tests/test_cylindrical_mesh.py
@@ -49,6 +49,7 @@ def model():
 
     return openmc.Model(geometry=geom, settings=settings, tallies=tallies)
 
+
 def test_origin_read_write_to_xml(run_in_tmpdir, model):
     """Tests that the origin attribute can be written and read back to XML
     """
@@ -63,8 +64,9 @@ def test_origin_read_write_to_xml(run_in_tmpdir, model):
     np.testing.assert_equal(new_mesh.origin, mesh.origin)
 
 estimators = ('tracklength', 'collision')
-origins = set(permutations((-geom_size, 0, 0)))
-origins |= set(permutations((geom_size, 0, 0)))
+offset = geom_size + 0.001
+origins = set(permutations((-offset , 0, 0)))
+origins |= set(permutations((offset, 0, 0)))
 
 test_cases = product(estimators, origins)
 
@@ -74,8 +76,9 @@ def label(p):
     if isinstance(p, str):
         return f'estimator:{p}'
 
+
 @pytest.mark.parametrize('estimator,origin', test_cases, ids=label)
-def test_offset_mesh(run_in_tmpdir, model, estimator, origin):
+def test_offset_mesh(model, estimator, origin):
     """Tests that the mesh has been moved based on tally results
     """
     mesh = model.tallies[0].filters[0].mesh
@@ -103,6 +106,7 @@ def test_offset_mesh(run_in_tmpdir, model, estimator, origin):
             else:
                 mean[i, j, k] != 0.0
 
+
 @pytest.fixture()
 def void_coincident_geom_model():
     """A model with many geometric boundaries coincident with mesh boundaries
@@ -155,6 +159,7 @@ def _check_void_cylindrical_tally(statepoint_filename):
         d_r = mesh.r_grid[1] - mesh.r_grid[0]
         assert neutron_flux == pytest.approx(d_r)
 
+
 def test_void_geom_pnt_src(run_in_tmpdir, void_coincident_geom_model):
     src = openmc.IndependentSource()
     src.space = openmc.stats.Point()
diff --git a/tests/unit_tests/test_spherical_mesh.py b/tests/unit_tests/test_spherical_mesh.py
index 0b579be35..a95a4151a 100644
--- a/tests/unit_tests/test_spherical_mesh.py
+++ b/tests/unit_tests/test_spherical_mesh.py
@@ -63,8 +63,6 @@ def test_origin_read_write_to_xml(run_in_tmpdir, model):
     np.testing.assert_equal(new_mesh.origin, mesh.origin)
 
 estimators = ('tracklength', 'collision')
-# TODO: determine why this is needed for spherical mesh
-# but not cylindrical mesh
 offset = geom_size + 0.001
 
 origins = set(permutations((-offset, 0, 0)))

From 820648daeee2d3323ce2125f7ad67c4e23a8cd2e Mon Sep 17 00:00:00 2001
From: Jonathan Shimwell <mail@jshimwell.com>
Date: Wed, 23 Apr 2025 08:44:46 +0200
Subject: [PATCH 016/203] using reduce chain level to remove need for reduce
 chain (#3377)

Co-authored-by: Jon Shimwell <jon@proximafusion.com>
Co-authored-by: Paul Romano <paul.k.romano@gmail.com>
---
 openmc/deplete/coupled_operator.py     | 13 +++----------
 openmc/deplete/independent_operator.py | 20 ++++----------------
 openmc/deplete/openmc_operator.py      | 16 +++++++---------
 tests/unit_tests/test_model.py         |  4 ++--
 4 files changed, 16 insertions(+), 37 deletions(-)

diff --git a/openmc/deplete/coupled_operator.py b/openmc/deplete/coupled_operator.py
index 17af935f4..7ecfd5a08 100644
--- a/openmc/deplete/coupled_operator.py
+++ b/openmc/deplete/coupled_operator.py
@@ -154,15 +154,9 @@ class CoupledOperator(OpenMCOperator):
         options.
 
         .. versionadded:: 0.12.1
-    reduce_chain : bool, optional
-        If True, use :meth:`openmc.deplete.Chain.reduce` to reduce the
-        depletion chain up to ``reduce_chain_level``.
-
-        .. versionadded:: 0.12
     reduce_chain_level : int, optional
-        Depth of the search when reducing the depletion chain. Only used
-        if ``reduce_chain`` evaluates to true. The default value of
-        ``None`` implies no limit on the depth.
+        Depth of the search when reducing the depletion chain. The default
+        value of ``None`` implies no limit on the depth.
 
         .. versionadded:: 0.12
     diff_volume_method : str
@@ -214,7 +208,7 @@ class CoupledOperator(OpenMCOperator):
                  normalization_mode="fission-q", fission_q=None,
                  fission_yield_mode="constant", fission_yield_opts=None,
                  reaction_rate_mode="direct", reaction_rate_opts=None,
-                 reduce_chain=False, reduce_chain_level=None):
+                 reduce_chain_level=None):
 
         # check for old call to constructor
         if isinstance(model, openmc.Geometry):
@@ -270,7 +264,6 @@ class CoupledOperator(OpenMCOperator):
             diff_volume_method=diff_volume_method,
             fission_q=fission_q,
             helper_kwargs=helper_kwargs,
-            reduce_chain=reduce_chain,
             reduce_chain_level=reduce_chain_level)
 
     def _differentiate_burnable_mats(self):
diff --git a/openmc/deplete/independent_operator.py b/openmc/deplete/independent_operator.py
index 333ead0f8..b3fe9a78f 100644
--- a/openmc/deplete/independent_operator.py
+++ b/openmc/deplete/independent_operator.py
@@ -66,13 +66,9 @@ class IndependentOperator(OpenMCOperator):
         Dictionary of nuclides and their fission Q values [eV]. If not given,
         values will be pulled from the ``chain_file``. Only applicable if
         ``"normalization_mode" == "fission-q"``.
-    reduce_chain : bool, optional
-        If True, use :meth:`openmc.deplete.Chain.reduce` to reduce the depletion
-        chain up to ``reduce_chain_level``.
     reduce_chain_level : int, optional
-        Depth of the search when reducing the depletion chain. Only used if
-        ``reduce_chain`` evaluates to true. The default value of ``None``
-        implies no limit on the depth.
+        Depth of the search when reducing the depletion chain. The default
+        value of ``None`` implies no limit on the depth.
     fission_yield_opts : dict of str to option, optional
         Optional arguments to pass to the
         :class:`openmc.deplete.helpers.FissionYieldHelper` object. Will be
@@ -119,7 +115,6 @@ class IndependentOperator(OpenMCOperator):
                  normalization_mode='fission-q',
                  fission_q=None,
                  prev_results=None,
-                 reduce_chain=False,
                  reduce_chain_level=None,
                  fission_yield_opts=None):
         # Validate micro-xs parameters
@@ -157,7 +152,6 @@ class IndependentOperator(OpenMCOperator):
             prev_results=prev_results,
             fission_q=fission_q,
             helper_kwargs=helper_kwargs,
-            reduce_chain=reduce_chain,
             reduce_chain_level=reduce_chain_level)
 
     @classmethod
@@ -170,7 +164,6 @@ class IndependentOperator(OpenMCOperator):
                       normalization_mode='fission-q',
                       fission_q=None,
                       prev_results=None,
-                      reduce_chain=False,
                       reduce_chain_level=None,
                       fission_yield_opts=None):
         """
@@ -206,13 +199,9 @@ class IndependentOperator(OpenMCOperator):
             applicable if ``"normalization_mode" == "fission-q"``.
         prev_results : Results, optional
             Results from a previous depletion calculation.
-        reduce_chain : bool, optional
-            If True, use :meth:`openmc.deplete.Chain.reduce` to reduce the
-            depletion chain up to ``reduce_chain_level``. Default is False.
         reduce_chain_level : int, optional
-            Depth of the search when reducing the depletion chain. Only used
-            if ``reduce_chain`` evaluates to true. The default value of
-            ``None`` implies no limit on the depth.
+            Depth of the search when reducing the depletion chain. The default
+            value of ``None`` implies no limit on the depth.
         fission_yield_opts : dict of str to option, optional
             Optional arguments to pass to the
             :class:`openmc.deplete.helpers.FissionYieldHelper` class. Will be
@@ -232,7 +221,6 @@ class IndependentOperator(OpenMCOperator):
                    normalization_mode=normalization_mode,
                    fission_q=fission_q,
                    prev_results=prev_results,
-                   reduce_chain=reduce_chain,
                    reduce_chain_level=reduce_chain_level,
                    fission_yield_opts=fission_yield_opts)
 
diff --git a/openmc/deplete/openmc_operator.py b/openmc/deplete/openmc_operator.py
index 64cb0a7e5..4ef867372 100644
--- a/openmc/deplete/openmc_operator.py
+++ b/openmc/deplete/openmc_operator.py
@@ -11,7 +11,7 @@ from warnings import warn
 import numpy as np
 
 import openmc
-from openmc.checkvalue import check_value
+from openmc.checkvalue import check_value, check_type, check_greater_than
 from openmc.exceptions import DataError
 from openmc.mpi import comm
 from .abc import TransportOperator, OperatorResult
@@ -49,13 +49,9 @@ class OpenMCOperator(TransportOperator):
         Dictionary of nuclides and their fission Q values [eV].
     helper_kwargs : dict
         Keyword arguments for helper classes
-    reduce_chain : bool, optional
-        If True, use :meth:`openmc.deplete.Chain.reduce()` to reduce the
-        depletion chain up to ``reduce_chain_level``.
     reduce_chain_level : int, optional
-        Depth of the search when reducing the depletion chain. Only used
-        if ``reduce_chain`` evaluates to true. The default value of
-        ``None`` implies no limit on the depth.
+        Depth of the search when reducing the depletion chain. The default
+        value of ``None`` implies no limit on the depth.
 
     diff_volume_method : str
         Specifies how the volumes of the new materials should be found. Default
@@ -107,7 +103,6 @@ class OpenMCOperator(TransportOperator):
             diff_volume_method='divide equally',
             fission_q=None,
             helper_kwargs=None,
-            reduce_chain=False,
             reduce_chain_level=None):
 
         # If chain file was not specified, try to get it from global config
@@ -126,10 +121,13 @@ class OpenMCOperator(TransportOperator):
 
         check_value('diff volume method', diff_volume_method,
                     {'divide equally', 'match cell'})
+        if reduce_chain_level:
+            check_type('reduce_chain_level', reduce_chain_level, int)
+            check_greater_than('reduce_chain_level', reduce_chain_level, 0)
         self.diff_volume_method = diff_volume_method
 
         # Reduce the chain to only those nuclides present
-        if reduce_chain:
+        if reduce_chain_level is not None:
             init_nuclides = set()
             for material in self.materials:
                 if not material.depletable:
diff --git a/tests/unit_tests/test_model.py b/tests/unit_tests/test_model.py
index ee5d8895c..aa844e2f2 100644
--- a/tests/unit_tests/test_model.py
+++ b/tests/unit_tests/test_model.py
@@ -448,7 +448,7 @@ def test_deplete(run_in_tmpdir, pin_model_attributes, mpi_intracomm):
     # In this test we first run without pre-initializing the shared library
     # data and then compare. Then we repeat with the C API already initialized
     # and make sure we get the same answer
-    test_model.deplete([1e6], 'predictor', final_step=False,
+    test_model.deplete(timesteps=[1e6], method='predictor', final_step=False,
                        operator_kwargs=op_kwargs,
                        power=1., output=False)
     # Get the new Xe136 and U235 atom densities
@@ -482,7 +482,7 @@ def test_deplete(run_in_tmpdir, pin_model_attributes, mpi_intracomm):
 
     # Now we can re-run with the pre-initialized API
     test_model.init_lib(output=False, intracomm=mpi_intracomm)
-    test_model.deplete([1e6], 'predictor', final_step=False,
+    test_model.deplete(timesteps=[1e6], method='predictor', final_step=False,
                        operator_kwargs=op_kwargs,
                        power=1., output=False)
     # Get the new Xe136 and U235 atom densities

From c17908f24ccc9ae3ae47686cacd8faa78f879d9c Mon Sep 17 00:00:00 2001
From: Paul Romano <paul.k.romano@gmail.com>
Date: Fri, 2 May 2025 18:38:10 -0500
Subject: [PATCH 017/203] Install MCPL using same build type as OpenMC in CI
 (#3388)

---
 CMakeLists.txt               | 7 +++++++
 cmake/OpenMCConfig.cmake.in  | 2 +-
 tools/ci/gha-install-mcpl.sh | 7 -------
 tools/ci/gha-install.sh      | 2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)
 delete mode 100755 tools/ci/gha-install-mcpl.sh

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8cb03a1a1..d79746209 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -194,6 +194,13 @@ endif()
 #===============================================================================
 
 if (OPENMC_USE_MCPL)
+  if (NOT DEFINED MCPL_DIR)
+    execute_process(
+      COMMAND mcpl-config --show cmakedir
+      OUTPUT_VARIABLE MCPL_DIR
+      OUTPUT_STRIP_TRAILING_WHITESPACE
+    )
+  endif()
   find_package(MCPL REQUIRED)
   message(STATUS "Found MCPL: ${MCPL_DIR} (found version \"${MCPL_VERSION}\")")
 endif()
diff --git a/cmake/OpenMCConfig.cmake.in b/cmake/OpenMCConfig.cmake.in
index 5cab4790a..7416013fb 100644
--- a/cmake/OpenMCConfig.cmake.in
+++ b/cmake/OpenMCConfig.cmake.in
@@ -30,7 +30,7 @@ if(@OPENMC_USE_OPENMP@)
 endif()
 
 if(@OPENMC_USE_MCPL@)
-  find_package(MCPL REQUIRED)
+  find_package(MCPL REQUIRED HINTS @MCPL_DIR@)
 endif()
 
 if(@OPENMC_USE_UWUW@ AND NOT ${DAGMC_BUILD_UWUW})
diff --git a/tools/ci/gha-install-mcpl.sh b/tools/ci/gha-install-mcpl.sh
deleted file mode 100755
index 9b8609398..000000000
--- a/tools/ci/gha-install-mcpl.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-set -ex
-cd $HOME
-git clone https://github.com/mctools/mcpl
-cd mcpl
-mkdir build && cd build
-cmake .. && make 2>/dev/null && sudo make install
diff --git a/tools/ci/gha-install.sh b/tools/ci/gha-install.sh
index d8a3a7600..74c3947f1 100755
--- a/tools/ci/gha-install.sh
+++ b/tools/ci/gha-install.sh
@@ -29,7 +29,7 @@ if [[ $LIBMESH = 'y' ]]; then
 fi
 
 # Install MCPL
-./tools/ci/gha-install-mcpl.sh
+pip install mcpl
 
 # For MPI configurations, make sure mpi4py and h5py are built against the
 # correct version of MPI

From 4138bc34e08777d2a0c7c91748c00aacf048e136 Mon Sep 17 00:00:00 2001
From: Paul Romano <paul.k.romano@gmail.com>
Date: Fri, 2 May 2025 19:07:43 -0500
Subject: [PATCH 018/203] Add option to determine waste disposal rating by
 nuclide (#3376)

---
 openmc/material.py                            | 22 ++++++++++------
 openmc/waste.py                               | 25 ++++++++++++-------
 tests/unit_tests/test_waste_classification.py |  4 +++
 3 files changed, 35 insertions(+), 16 deletions(-)

diff --git a/openmc/material.py b/openmc/material.py
index 9677fbba3..770722f74 100644
--- a/openmc/material.py
+++ b/openmc/material.py
@@ -1348,10 +1348,11 @@ class Material(IDManagerMixin):
         return waste._waste_classification(self, metal=metal)
 
     def waste_disposal_rating(
-            self,
-            limits: str | dict[str, float] = 'Fetter',
-            metal: bool = False,
-        ) -> float:
+        self,
+        limits: str | dict[str, float] = 'Fetter',
+        metal: bool = False,
+        by_nuclide: bool = False,
+    ) -> float | dict[str, float]:
         """Return the waste disposal rating for the material.
 
         This method returns a waste disposal rating for the material based on a
@@ -1387,18 +1388,25 @@ class Material(IDManagerMixin):
         metal : bool, optional
             Whether or not the material is in metal form (only applicable for
             NRC based limits)
+        by_nuclide : bool, optional
+            Whether to return the waste disposal rating for each nuclide in the
+            material. If True, a dictionary is returned where the keys are the
+            nuclide names and the values are the waste disposal ratings for each
+            nuclide. If False, a single float value is returned that represents
+            the overall waste disposal rating for the material.
 
         Returns
         -------
-        float
-            The waste disposal rating for the material.
+        float or dict
+            The waste disposal rating for the material or its constituent
+            nuclides.
 
         See also
         --------
         Material.waste_classification()
 
         """
-        return waste._waste_disposal_rating(self, limits, metal)
+        return waste._waste_disposal_rating(self, limits, metal, by_nuclide)
 
     def clone(self, memo: dict | None = None) -> Material:
         """Create a copy of this material with a new unique ID.
diff --git a/openmc/waste.py b/openmc/waste.py
index 7dd45b8e3..80cfc0adc 100644
--- a/openmc/waste.py
+++ b/openmc/waste.py
@@ -77,10 +77,11 @@ def _waste_classification(mat: openmc.Material, metal: bool = True) -> str:
 
 
 def _waste_disposal_rating(
-        mat: openmc.Material,
-        limits: str | dict[str, float] = 'Fetter',
-        metal: bool = False,
-    ) -> float:
+    mat: openmc.Material,
+    limits: str | dict[str, float] = 'Fetter',
+    metal: bool = False,
+    by_nuclide: bool = False,
+) -> float | dict[str, float]:
     """Return the waste disposal rating for a material.
 
     This method returns a waste disposal rating for the material based on a set
@@ -111,11 +112,17 @@ def _waste_disposal_rating(
     metal : bool, optional
         Whether or not the material is in metal form (only applicable for NRC
         based limits)
+    by_nuclide : bool, optional
+        Whether to return the waste disposal rating for each nuclide in the
+        material. If True, a dictionary is returned where the keys are the
+        nuclide names and the values are the waste disposal ratings for each
+        nuclide. If False, a single float value is returned that represents the
+        overall waste disposal rating for the material.
 
     Returns
     -------
-    float
-        The waste disposal rating for the material.
+    float or dict
+        The waste disposal rating for the material or its constituent nuclides.
 
     """
     if limits == 'Fetter':
@@ -272,8 +279,8 @@ def _waste_disposal_rating(
 
     # Calculate the sum of the fractions of the activity of each radionuclide
     # compared to the specified limits
-    ratio = 0.0
+    ratio = {}
     for nuc, ci_m3 in mat.get_activity(units="Ci/m3", by_nuclide=True).items():
         if nuc in limits:
-            ratio += ci_m3 / limits[nuc]
-    return ratio
+            ratio[nuc] = ci_m3 / limits[nuc]
+    return ratio if by_nuclide else sum(ratio.values())
diff --git a/tests/unit_tests/test_waste_classification.py b/tests/unit_tests/test_waste_classification.py
index dd692cc4b..072590df9 100644
--- a/tests/unit_tests/test_waste_classification.py
+++ b/tests/unit_tests/test_waste_classification.py
@@ -96,3 +96,7 @@ def test_waste_disposal_rating():
     ci_m3 = mat.get_activity('Ci/m3')
     assert mat.waste_disposal_rating(limits={'K40': 2*ci_m3}) < 1.0
     assert mat.waste_disposal_rating(limits={'K40': 0.5*ci_m3}) > 1.0
+
+    wdr = mat.waste_disposal_rating(limits={'K40': 4*ci_m3}, by_nuclide=True)
+    assert isinstance(wdr, dict)
+    assert wdr['K40'] == pytest.approx(1/4)

From d0354dbd71531d9c6c88d2c613d571a270453e71 Mon Sep 17 00:00:00 2001
From: Jonathan Shimwell <mail@jshimwell.com>
Date: Sat, 3 May 2025 06:38:23 +0200
Subject: [PATCH 019/203] corrected tally name in D1S example (#3383)

Co-authored-by: Paul Romano <paul.k.romano@gmail.com>
---
 docs/source/usersguide/decay_sources.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/source/usersguide/decay_sources.rst b/docs/source/usersguide/decay_sources.rst
index a228f8e66..d5a078135 100644
--- a/docs/source/usersguide/decay_sources.rst
+++ b/docs/source/usersguide/decay_sources.rst
@@ -88,5 +88,5 @@ relevant tallies. This can be done with the aid of the
         dose_tally = sp.get_tally(name='dose tally')
 
     # Apply time correction factors
-    tally = d1s.apply_time_correction(tally, factors, time_index)
+    tally = d1s.apply_time_correction(dose_tally, factors, time_index)
 

From a921280fa9c3f63eb10132ad37bacd612ab82157 Mon Sep 17 00:00:00 2001
From: Hunter Belanger <hunter.belanger@gmail.com>
Date: Sat, 3 May 2025 05:10:18 +0000
Subject: [PATCH 020/203] Fix extremely large yields from Bremsstrahlung
 (#3386)

Co-authored-by: Paul Romano <paul.k.romano@gmail.com>
---
 src/material.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/material.cpp b/src/material.cpp
index a1937aca4..2bd504e4d 100644
--- a/src/material.cpp
+++ b/src/material.cpp
@@ -640,7 +640,7 @@ void Material::init_bremsstrahlung()
     // Allocate arrays for TTB data
     ttb->pdf = xt::zeros<double>({n_e, n_e});
     ttb->cdf = xt::zeros<double>({n_e, n_e});
-    ttb->yield = xt::empty<double>({n_e});
+    ttb->yield = xt::zeros<double>({n_e});
 
     // Allocate temporary arrays
     xt::xtensor<double, 1> stopping_power_collision({n_e}, 0.0);

From 512df2f4ffb4ad529af2f69b614685ab1ad4d372 Mon Sep 17 00:00:00 2001
From: Amanda Lund <alund@anl.gov>
Date: Sat, 3 May 2025 00:46:14 -0500
Subject: [PATCH 021/203] Skip atomic relaxation if binding energy is larger
 than photon energy (#3391)

Co-authored-by: Paul Romano <paul.k.romano@gmail.com>
---
 src/photon.cpp                                |  5 +-
 .../results_true.dat                          | 58 +++++++++----------
 2 files changed, 32 insertions(+), 31 deletions(-)

diff --git a/src/photon.cpp b/src/photon.cpp
index 4b2fb4197..dae87ea4e 100644
--- a/src/photon.cpp
+++ b/src/photon.cpp
@@ -770,8 +770,9 @@ void PhotonInteraction::pair_production(double alpha, double* E_electron,
 
 void PhotonInteraction::atomic_relaxation(int i_shell, Particle& p) const
 {
-  // Return if no atomic relaxation data is present
-  if (!has_atomic_relaxation_)
+  // Return if no atomic relaxation data is present or if the binding energy is
+  // larger than the incident particle energy
+  if (!has_atomic_relaxation_ || shells_[i_shell].binding_energy > p.E())
     return;
 
   // Stack for unprocessed holes left by transitioning electrons
diff --git a/tests/regression_tests/photon_production_fission/results_true.dat b/tests/regression_tests/photon_production_fission/results_true.dat
index 1aa08b147..7e20342af 100644
--- a/tests/regression_tests/photon_production_fission/results_true.dat
+++ b/tests/regression_tests/photon_production_fission/results_true.dat
@@ -1,12 +1,12 @@
 k-combined:
-2.272421E+00 4.418825E-02
+2.270911E+00 4.568134E-02
 tally 1:
-2.665301E+00
-2.369839E+00
+2.663476E+00
+2.366726E+00
 0.000000E+00
 0.000000E+00
-2.665301E+00
-2.369839E+00
+2.663476E+00
+2.366726E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -18,52 +18,52 @@ tally 1:
 0.000000E+00
 0.000000E+00
 tally 2:
-2.637532E+00
-2.320051E+00
-4.231377E+08
-5.971498E+16
+2.636709E+00
+2.318646E+00
+4.230052E+08
+5.967879E+16
 0.000000E+00
 0.000000E+00
-2.637532E+00
-2.320051E+00
-4.231377E+08
-5.971498E+16
+2.636709E+00
+2.318646E+00
+4.230052E+08
+5.967879E+16
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-2.448745E+06
-2.005297E+12
+2.455009E+06
+2.015314E+12
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-2.448745E+06
-2.005297E+12
+2.455009E+06
+2.015314E+12
 0.000000E+00
 0.000000E+00
 tally 3:
-2.660000E+00
-2.358558E+00
-4.231377E+08
-5.971498E+16
+2.660004E+00
+2.358564E+00
+4.230052E+08
+5.967879E+16
 0.000000E+00
 0.000000E+00
-2.660000E+00
-2.358558E+00
-4.231377E+08
-5.971498E+16
+2.660004E+00
+2.358564E+00
+4.230052E+08
+5.967879E+16
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-2.448745E+06
-2.005297E+12
+2.455009E+06
+2.015314E+12
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-2.448745E+06
-2.005297E+12
+2.455009E+06
+2.015314E+12
 0.000000E+00
 0.000000E+00

From 1e7d8324eefaa6b0995f16a40b99416fdf3cf179 Mon Sep 17 00:00:00 2001
From: Gregoire Biot <grego01@mit.edu>
Date: Sat, 3 May 2025 08:19:10 -0400
Subject: [PATCH 022/203] Figure of Merit implementation (#3363)

Co-authored-by: Paul Romano <paul.k.romano@gmail.com>
---
 docs/source/methods/tallies.rst  | 27 +++++++++++++++++++++++++++
 openmc/tallies.py                | 18 ++++++++++++++++++
 tests/unit_tests/test_tallies.py | 18 +++++++++++++++++-
 3 files changed, 62 insertions(+), 1 deletion(-)

diff --git a/docs/source/methods/tallies.rst b/docs/source/methods/tallies.rst
index 57e05d84f..79a63fbdd 100644
--- a/docs/source/methods/tallies.rst
+++ b/docs/source/methods/tallies.rst
@@ -387,6 +387,33 @@ of this is that the longer you run a simulation, the better you know your
 results. Therefore, by running a simulation long enough, it is possible to
 reduce the stochastic uncertainty to arbitrarily low levels.
 
+Figure of Merit
++++++++++++++++
+
+The figure of merit (FOM) is an indicator that accounts for both the statistical
+uncertainty and the execution time and represents how much information is
+obtained per unit time in the simulation. The FOM is defined as
+
+.. math::
+    :label: figure_of_merit
+
+    FOM = \frac{1}{r^2 t},
+
+where :math:`t` is the total execution time and :math:`r` is the relative error
+defined as
+
+.. math::
+    :label: relative_error
+
+    r = \frac{s_\bar{X}}{\bar{x}}.
+
+Based on this definition, one can see that a higher FOM is desirable. The FOM is
+useful as a comparative tool. For example, if a variance reduction technique is
+being applied to a simulation, the FOM with variance reduction can be compared
+to the FOM without variance reduction to ascertain whether the reduction in
+variance outweighs the potential increase in execution time (e.g., due to
+particle splitting).
+
 Confidence Intervals
 ++++++++++++++++++++
 
diff --git a/openmc/tallies.py b/openmc/tallies.py
index ebb313551..e990a95f7 100644
--- a/openmc/tallies.py
+++ b/openmc/tallies.py
@@ -95,6 +95,10 @@ class Tally(IDManagerMixin):
         An array containing the sample mean for each bin
     std_dev : numpy.ndarray
         An array containing the sample standard deviation for each bin
+    figure_of_merit : numpy.ndarray
+        An array containing the figure of merit for each bin
+
+        .. versionadded:: 0.15.3
     derived : bool
         Whether or not the tally is derived from one or more other tallies
     sparse : bool
@@ -127,6 +131,7 @@ class Tally(IDManagerMixin):
         self._sum_sq = None
         self._mean = None
         self._std_dev = None
+        self._simulation_time = None
         self._with_batch_statistics = False
         self._derived = False
         self._sparse = False
@@ -385,6 +390,9 @@ class Tally(IDManagerMixin):
                 self._sum = sps.lil_matrix(self._sum.flatten(), self._sum.shape)
                 self._sum_sq = sps.lil_matrix(self._sum_sq.flatten(), self._sum_sq.shape)
 
+            # Read simulation time (needed for figure of merit)
+            self._simulation_time = f["runtime"]["simulation"][()]
+
         # Indicate that Tally results have been read
         self._results_read = True
 
@@ -462,6 +470,16 @@ class Tally(IDManagerMixin):
         else:
             return self._std_dev
 
+    @property
+    def figure_of_merit(self):
+        mean = self.mean
+        std_dev = self.std_dev
+        fom = np.zeros_like(mean)
+        nonzero = np.abs(mean) > 0
+        fom[nonzero] = 1.0 / (
+            (std_dev[nonzero] / mean[nonzero])**2 * self._simulation_time)
+        return fom
+
     @property
     def with_batch_statistics(self):
         return self._with_batch_statistics
diff --git a/tests/unit_tests/test_tallies.py b/tests/unit_tests/test_tallies.py
index ccc6ff343..c38f067d5 100644
--- a/tests/unit_tests/test_tallies.py
+++ b/tests/unit_tests/test_tallies.py
@@ -1,5 +1,5 @@
 import numpy as np
-
+import pytest
 import openmc
 
 
@@ -96,6 +96,22 @@ def test_tally_equivalence():
     assert tally_a == tally_b
 
 
+def test_figure_of_merit(sphere_model, run_in_tmpdir):
+    # Run model with a few simple tally scores
+    tally = openmc.Tally()
+    tally.scores = ['total', 'absorption', 'scatter']
+    sphere_model.tallies = [tally]
+    sp_path = sphere_model.run(apply_tally_results=True)
+
+    # Get execution time and relative error
+    with openmc.StatePoint(sp_path) as sp:
+        time = sp.runtime['simulation']
+    rel_err = tally.std_dev / tally.mean
+
+    # Check that figure of merit is calculated correctly
+    assert tally.figure_of_merit == pytest.approx(1 / (rel_err**2 * time))
+
+
 def test_tally_application(sphere_model, run_in_tmpdir):
     # Create a tally with most possible gizmos
     tally = openmc.Tally(name='test tally')

From 57dc71f5303a53fc74794384d2a211b1fab57810 Mon Sep 17 00:00:00 2001
From: Amanda Lund <alund@anl.gov>
Date: Mon, 5 May 2025 13:05:48 -0500
Subject: [PATCH 023/203] Map Compton subshell data to atomic relaxation data
 (#3392)

Co-authored-by: Paul Romano <paul.k.romano@gmail.com>
---
 include/openmc/photon.h                       |  6 ++-
 src/photon.cpp                                | 30 ++++++++---
 src/physics.cpp                               | 10 ++--
 .../photon_production/results_true.dat        | 52 +++++++++----------
 .../weightwindows/results_true.dat            |  2 +-
 5 files changed, 59 insertions(+), 41 deletions(-)

diff --git a/include/openmc/photon.h b/include/openmc/photon.h
index 1fee6c9f5..f6f28a4df 100644
--- a/include/openmc/photon.h
+++ b/include/openmc/photon.h
@@ -33,7 +33,6 @@ public:
 
   int index_subshell; //!< index in SUBSHELLS
   int threshold;
-  double n_electrons;
   double binding_energy;
   vector<Transition> transitions;
 };
@@ -90,6 +89,11 @@ public:
   xt::xtensor<double, 1> binding_energy_;
   xt::xtensor<double, 1> electron_pdf_;
 
+  // Map subshells from Compton profile data obtained from Biggs et al,
+  // "Hartree-Fock Compton profiles for the elements" to ENDF/B atomic
+  // relaxation data
+  xt::xtensor<int, 1> subshell_map_;
+
   // Stopping power data
   double I_; // mean excitation energy
   xt::xtensor<int, 1> n_electrons_;
diff --git a/src/photon.cpp b/src/photon.cpp
index dae87ea4e..4926e3eae 100644
--- a/src/photon.cpp
+++ b/src/photon.cpp
@@ -165,7 +165,6 @@ PhotonInteraction::PhotonInteraction(hid_t group)
     if (attribute_exists(tgroup, "binding_energy")) {
       has_atomic_relaxation_ = true;
       read_attribute(tgroup, "binding_energy", shell.binding_energy);
-      read_attribute(tgroup, "num_electrons", shell.n_electrons);
     }
 
     // Read subshell cross section
@@ -233,6 +232,28 @@ PhotonInteraction::PhotonInteraction(hid_t group)
   }
   close_group(rgroup);
 
+  // Map Compton subshell data to atomic relaxation data by finding the
+  // subshell with the equivalent binding energy
+  if (has_atomic_relaxation_) {
+    auto is_close = [](double a, double b) {
+      return std::abs(a - b) / a < FP_REL_PRECISION;
+    };
+    subshell_map_ = xt::full_like(binding_energy_, -1);
+    for (int i = 0; i < binding_energy_.size(); ++i) {
+      double E_b = binding_energy_[i];
+      if (i < n_shell && is_close(E_b, shells_[i].binding_energy)) {
+        subshell_map_[i] = i;
+      } else {
+        for (int j = 0; j < n_shell; ++j) {
+          if (is_close(E_b, shells_[j].binding_energy)) {
+            subshell_map_[i] = j;
+            break;
+          }
+        }
+      }
+    }
+  }
+
   // Create Compton profile CDF
   auto n_profile = data::compton_profile_pz.size();
   auto n_shell_compton = profile_pdf_.shape(0);
@@ -423,13 +444,6 @@ void PhotonInteraction::compton_scatter(double alpha, bool doppler,
         double E_out;
         this->compton_doppler(alpha, *mu, &E_out, i_shell, seed);
         *alpha_out = E_out / MASS_ELECTRON_EV;
-
-        // It's possible for the Compton profile data to have more shells than
-        // there are in the ENDF data. Make sure the shell index doesn't end up
-        // out of bounds.
-        if (*i_shell >= shells_.size()) {
-          *i_shell = -1;
-        }
       } else {
         *i_shell = -1;
       }
diff --git a/src/physics.cpp b/src/physics.cpp
index a8e5b9e81..3c06e543d 100644
--- a/src/physics.cpp
+++ b/src/physics.cpp
@@ -340,11 +340,11 @@ void sample_photon_reaction(Particle& p)
       p.create_secondary(p.wgt(), u, E_electron, ParticleType::electron);
     }
 
-    // TODO: Compton subshell data does not match atomic relaxation data
-    // Allow electrons to fill orbital and produce auger electrons
-    // and fluorescent photons
-    if (i_shell >= 0) {
-      element.atomic_relaxation(i_shell, p);
+    // Allow electrons to fill orbital and produce Auger electrons and
+    // fluorescent photons. Since Compton subshell data does not match atomic
+    // relaxation data, use the mapping between the data to find the subshell
+    if (i_shell >= 0 && element.subshell_map_[i_shell] >= 0) {
+      element.atomic_relaxation(element.subshell_map_[i_shell], p);
     }
 
     phi += PI;
diff --git a/tests/regression_tests/photon_production/results_true.dat b/tests/regression_tests/photon_production/results_true.dat
index 398deeed8..a911fed3b 100644
--- a/tests/regression_tests/photon_production/results_true.dat
+++ b/tests/regression_tests/photon_production/results_true.dat
@@ -1,8 +1,8 @@
 tally 1:
 8.610000E-01
 7.413210E-01
-9.493000E-01
-9.011705E-01
+9.491000E-01
+9.007908E-01
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -16,12 +16,12 @@ tally 2:
 1.573004E+00
 4.296434E-04
 1.845934E-07
-2.337049E-01
-5.461796E-02
+2.350021E-01
+5.522600E-02
 0.000000E+00
 0.000000E+00
-2.337049E-01
-5.461796E-02
+2.350021E-01
+5.522600E-02
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -53,16 +53,16 @@ tally 3:
 4.104374E+12
 4.296582E-04
 1.846062E-07
-2.286000E-01
-5.225796E-02
-7.054033E+03
-4.975938E+07
+2.297000E-01
+5.276209E-02
+7.055982E+03
+4.978688E+07
 0.000000E+00
 0.000000E+00
-2.286000E-01
-5.225796E-02
-7.054033E+03
-4.975938E+07
+2.297000E-01
+5.276209E-02
+7.055982E+03
+4.978688E+07
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -73,8 +73,8 @@ tally 3:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-1.764573E+05
-3.113718E+10
+1.774451E+05
+3.148675E+10
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -102,16 +102,16 @@ tally 4:
 4.104374E+12
 0.000000E+00
 0.000000E+00
-2.286000E-01
-5.225796E-02
-7.054033E+03
-4.975938E+07
+2.297000E-01
+5.276209E-02
+7.055982E+03
+4.978688E+07
 0.000000E+00
 0.000000E+00
-2.286000E-01
-5.225796E-02
-7.054033E+03
-4.975938E+07
+2.297000E-01
+5.276209E-02
+7.055982E+03
+4.978688E+07
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -122,8 +122,8 @@ tally 4:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-1.764573E+05
-3.113718E+10
+1.774451E+05
+3.148675E+10
 0.000000E+00
 0.000000E+00
 0.000000E+00
diff --git a/tests/regression_tests/weightwindows/results_true.dat b/tests/regression_tests/weightwindows/results_true.dat
index 6c05af31a..6bb992cd4 100644
--- a/tests/regression_tests/weightwindows/results_true.dat
+++ b/tests/regression_tests/weightwindows/results_true.dat
@@ -1 +1 @@
-ebc761815175b25fc95a226174928c226a3ab5dbf3b2a2abf09e079a0b87dee1dee74aa9b9eaec35acd58b8c481d264be7e9b3f052905bcc14ccd76f36b01549
\ No newline at end of file
+952c20fefac374d3b9fd28627fda7d5ae262f8cd7c01a33f0381526204a2287c18e56259a599dc6fdc1b59a2d2866fdfeedea371154c8fa7a69dc5c445b08c2d
\ No newline at end of file

From 9942269a910cf2f02bd028656be9f3744e1bc7dd Mon Sep 17 00:00:00 2001
From: Patrick Shriwise <pshriwise@gmail.com>
Date: Mon, 5 May 2025 12:55:14 -0600
Subject: [PATCH 024/203] Updates to VTK data checks (#3371)

Co-authored-by: Paul Romano <paul.k.romano@gmail.com>
---
 docs/source/_images/sphere-mesh-vtk.png       | Bin 0 -> 73644 bytes
 docs/source/pythonapi/base.rst                |  19 ++-
 docs/source/usersguide/processing.rst         |  79 +++++++++++
 openmc/mesh.py                                | 124 +++++++++++++-----
 tests/unit_tests/mesh_to_vtk/test.py          |   6 +-
 tests/unit_tests/mesh_to_vtk/test_vtk_dims.py |   2 +-
 tests/unit_tests/test_mesh.py                 |   3 +
 7 files changed, 195 insertions(+), 38 deletions(-)
 create mode 100644 docs/source/_images/sphere-mesh-vtk.png

diff --git a/docs/source/_images/sphere-mesh-vtk.png b/docs/source/_images/sphere-mesh-vtk.png
new file mode 100644
index 0000000000000000000000000000000000000000..73b412bdd3779cff6573d81642b91e083fd7c784
GIT binary patch
literal 73644
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
Muc4z}q-q)PUuriayZ`_I

literal 0
HcmV?d00001

diff --git a/docs/source/pythonapi/base.rst b/docs/source/pythonapi/base.rst
index e5b5b17c3..f3eb7ce83 100644
--- a/docs/source/pythonapi/base.rst
+++ b/docs/source/pythonapi/base.rst
@@ -147,17 +147,26 @@ Constructing Tallies
    openmc.ZernikeRadialFilter
    openmc.ParentNuclideFilter
    openmc.ParticleFilter
-   openmc.RegularMesh
-   openmc.RectilinearMesh
-   openmc.CylindricalMesh
-   openmc.SphericalMesh
-   openmc.UnstructuredMesh
    openmc.MeshMaterialVolumes
    openmc.Trigger
    openmc.TallyDerivative
    openmc.Tally
    openmc.Tallies
 
+Meshes
+------
+
+.. autosummary::
+   :toctree: generated
+   :nosignatures:
+   :template: myclassinherit.rst
+
+   openmc.RegularMesh
+   openmc.RectilinearMesh
+   openmc.CylindricalMesh
+   openmc.SphericalMesh
+   openmc.UnstructuredMesh
+
 Geometry Plotting
 -----------------
 
diff --git a/docs/source/usersguide/processing.rst b/docs/source/usersguide/processing.rst
index 10944b5e2..8b5ae53fa 100644
--- a/docs/source/usersguide/processing.rst
+++ b/docs/source/usersguide/processing.rst
@@ -91,3 +91,82 @@ from a statepoint file, the ``openmc.statepoint`` module can be used. An
 `example notebook`_ demontrates how to analyze and plot source information.
 
 .. _example notebook: https://nbviewer.jupyter.org/github/openmc-dev/openmc-notebooks/blob/main/post-processing.ipynb
+
+------------------------
+VTK Mesh File Generation
+------------------------
+
+VTK files of OpenMC meshes can be created using the
+:meth:`openmc.Mesh.write_data_to_vtk`  method. Data can be applied to the
+elements of the resulting mesh from mesh filter objects. This data can be
+provided either as a flat array or, in the case of structured meshes
+(:class:`~openmc.RegularMesh`, :class:`~openmc.RectilinearMesh`,
+:class:`~openmc.CylindricalMesh`, or :class:`SphericalMesh`), the data can be
+shaped with dimensions that match the dimensions of the mesh itself.
+
+
+.. image:: ../_images/sphere-mesh-vtk.png
+   :width: 400px
+   :align: center
+   :alt: OpenMC spherical mesh exported to VTK
+
+
+For all mesh types, if a flat data array is provided to the mesh, it is expected
+that the data is ordered in the same ordering as the :attr:`openmc.Mesh.indices`
+for that mesh object. When providing data directly from a tally, as shown below,
+a flat array for a given dataset can be passed directly to this method.
+
+::
+
+    # create model above
+
+    # create a mesh tally
+    mesh = openmc.RegularMesh()
+    mesh.dimension = [10, 20, 30]
+    mesh.lower_left = [-5, -10, -15]
+    mesh.upper_right = [5, 10, 15]
+    mesh_filter = openmc.MeshFilter(mesh)
+    tally = openmc.Tally()
+    tally.filters = [mesh_filter]
+    tally.scores = ['flux']
+
+    model.tallies = [tally]
+    model.run(apply_tally_results=True)
+
+    # provide the data as-is to the method
+    mesh.write_data_to_vtk('flux.vtk', {'flux-mean': tally.mean})
+
+The :class:`~openmc.Tally` object also provides a way to expand the dimensions
+of the mesh filter into a meaningful form where indexing the mesh filter
+dimensions results in intuitive slicing of structured meshes by setting
+``expand_dims=True`` when using :meth:`openmc.Tally.get_reshaped_data`. This
+reshaping does cause flat indexing of the data to change, however. As noted
+above, provided datasets are allowed to be shaped so long as such datasets have
+shapes that match the mesh dimensions. The ability to pass datasets in this way
+is useful when additional filters are applied to a tally. The example below
+demonstrates such a case for tally with both a :class:`~openmc.MeshFilter` and
+:class:`~openmc.EnergyFilter` applied.
+
+::
+
+    # create model above
+
+    # create a mesh tally with energy filter
+    mesh = openmc.RegularMesh()
+    mesh.dimension = [10, 20, 30]
+    mesh.lower_left = [-5, -10, -15]
+    mesh.upper_right = [5, 10, 15]
+    mesh_filter = openmc.MeshFilter(mesh)
+    energy_filter = openmc.EnergyFilter([0.0, 1.0, 20.0e6])
+    tally = openmc.Tally()
+    tally.filters = [mesh_filter, energy_filter]
+    tally.scores = ['flux']
+
+    model.tallies = [tally]
+    model.run(apply_tally_results=True)
+
+    # get the data with mesh dimensions expanded, squeeze out length-one dimensions (nuclides, scores)
+    flux = tally.get_reshaped_data(expand_dims=True).squeeze() # shape: (10, 20, 30, 2)
+
+    # write the lowest energy group to a VTK file
+    mesh.write_data_to_vtk('flux-group1.vtk', datasets={'flux-mean': flux[..., 0]})
diff --git a/openmc/mesh.py b/openmc/mesh.py
index 08025f374..27187b5dd 100644
--- a/openmc/mesh.py
+++ b/openmc/mesh.py
@@ -576,11 +576,16 @@ class StructuredMesh(MeshBase):
         filename : str
             Name of the VTK file to write.
         datasets : dict
-            Dictionary whose keys are the data labels
-            and values are the data sets.
+            Dictionary whose keys are the data labels and values are the data
+            sets. 1D datasets are expected to be extracted directly from
+            statepoint data without reordering/reshaping. Multidimensional
+            datasets are expected to have the same dimensions as the mesh itself
+            with structured indexing in "C" ordering. See the "expand_dims" flag
+            of :meth:`~openmc.Tally.get_reshaped_data` on reshaping tally data when using
+            :class:`~openmc.MeshFilter`'s.
         volume_normalization : bool, optional
-            Whether or not to normalize the data by
-            the volume of the mesh elements.
+            Whether or not to normalize the data by the volume of the mesh
+            elements.
         curvilinear : bool
             Whether or not to write curvilinear elements. Only applies to
             ``SphericalMesh`` and ``CylindricalMesh``.
@@ -594,14 +599,27 @@ class StructuredMesh(MeshBase):
         -------
         vtk.StructuredGrid or vtk.UnstructuredGrid
             a VTK grid object representing the mesh
+
+        Examples
+        --------
+        1D data from a tally with only a mesh filter and heating score:
+
+            # pass the tally mean property of shape (N, 1, 1) directly to this
+            # method; dimensions of size 1 will automatically removed
+            >>> heating = tally.mean
+            >>> mesh.write_data_to_vtk({'heating': heating})
+
+        Multidimensional data from a tally with only a mesh
+
+           # retrieve a data array with the mesh filter expanded into three
+           # dimensions, ijk; additional dimensions of size one will
+           # automatically be removed
+           >>> heating = tally.get_reshaped_data(expand_dims=True)
+           >>> mesh.write_data_to_vtk({'heating': heating})
         """
         import vtk
         from vtk.util import numpy_support as nps
 
-        # check that the data sets are appropriately sized
-        if datasets is not None:
-            self._check_vtk_datasets(datasets)
-
         # write linear elements using a structured grid
         if not curvilinear or isinstance(self, (RegularMesh, RectilinearMesh)):
             vtk_grid = self._create_vtk_structured_grid()
@@ -612,22 +630,27 @@ class StructuredMesh(MeshBase):
             writer = vtk.vtkUnstructuredGridWriter()
 
         if datasets is not None:
-            # maintain a list of the datasets as added
-            # to the VTK arrays to ensure they persist
-            # in memory until the file is written
+            # maintain a list of the datasets as added to the VTK arrays to
+            # ensure they persist in memory until the file is written
             datasets_out = []
             for label, dataset in datasets.items():
-                dataset = np.asarray(dataset).flatten()
+                dataset = self._reshape_vtk_dataset(dataset)
+                self._check_vtk_dataset(label, dataset)
+                # If the array data is 3D, assume is in C ordering and transpose
+                # before flattening to match the ordering expected by the VTK
+                # array based on the way mesh indices are ordered in the Python
+                # API
+                # TODO: update to "C" ordering throughout
+                if dataset.ndim == 3:
+                    dataset = dataset.T.ravel()
                 datasets_out.append(dataset)
 
                 if volume_normalization:
-                    dataset /= self.volumes.T.flatten()
+                    dataset /= self.volumes.T.ravel()
 
                 dataset_array = vtk.vtkDoubleArray()
                 dataset_array.SetName(label)
-                dataset_array.SetArray(nps.numpy_to_vtk(dataset),
-                                    dataset.size,
-                                    True)
+                dataset_array.SetArray(nps.numpy_to_vtk(dataset), dataset.size, True)
                 vtk_grid.GetCellData().AddArray(dataset_array)
 
         writer.SetFileName(str(filename))
@@ -754,28 +777,69 @@ class StructuredMesh(MeshBase):
 
         return vtk_grid
 
-    def _check_vtk_datasets(self, datasets: dict):
-        """Perform some basic checks that the datasets are valid for this mesh
+    @staticmethod
+    def _reshape_vtk_dataset(dataset):
+        """Reshape a dataset to be compatible with VTK output
+
+        This method performs the following operations on a dataset:
+        1. Convert to numpy array if not already
+        2. Remove any trailing dimensions of size 1
+        3. Squeeze out any extra dimensions of size 1 beyond the first 3
 
         Parameters
         ----------
-        datasets : dict
-            Dictionary whose keys are the data labels
-            and values are the data sets.
+        dataset : array-like
+            The dataset to reshape
+
+        Returns
+        -------
+        numpy.ndarray
+            The reshaped dataset
+        """
+        reshaped_data = np.asarray(dataset)
+
+        # detect flat array with extra dims
+        if all(d == 1 for d in reshaped_data.shape[1:]):
+            reshaped_data = reshaped_data.squeeze()
+
+        # remove any higher dimensions with size 1
+        if reshaped_data.ndim > 3 and all(d == 1 for d in reshaped_data.shape[3:]):
+            reshaped_data = reshaped_data.reshape(reshaped_data.shape[:3])
+
+        if np.shares_memory(reshaped_data, dataset):
+            return np.copy(reshaped_data)
+        else:
+            return reshaped_data
+
+    def _check_vtk_dataset(self, label: str, dataset: np.ndarray):
+        """Perform some basic checks that a dataset is valid for this Mesh
+
+        Parameters
+        ----------
+        label : str
+            The label for the dataset being checked
+        dataset : numpy.ndarray
+            The dataset array to check against this mesh's dimensions
 
         """
-        for label, dataset in datasets.items():
-            errmsg = (
+        cv.check_type('data label', label, str)
+
+        if dataset.size != self.num_mesh_cells:
+            raise ValueError(
                 f"The size of the dataset '{label}' ({dataset.size}) should be"
                 f" equal to the number of mesh cells ({self.num_mesh_cells})"
             )
-            if isinstance(dataset, np.ndarray):
-                if not dataset.size == self.num_mesh_cells:
-                    raise ValueError(errmsg)
-            else:
-                if len(dataset) == self.num_mesh_cells:
-                    raise ValueError(errmsg)
-            cv.check_type('data label', label, str)
+
+        # accept a flat array as-is, assuming it is in the correct order
+        if dataset.ndim == 1:
+            return
+
+        if dataset.shape != self.dimension:
+            raise ValueError(
+                f'Cannot apply multidimensional dataset "{label}" with '
+                f"shape {dataset.shape} to mesh {self.id} "
+                f"with dimensions {self.dimension}"
+            )
 
 
 class RegularMesh(StructuredMesh):
diff --git a/tests/unit_tests/mesh_to_vtk/test.py b/tests/unit_tests/mesh_to_vtk/test.py
index 3ee6c0298..f00aa4626 100644
--- a/tests/unit_tests/mesh_to_vtk/test.py
+++ b/tests/unit_tests/mesh_to_vtk/test.py
@@ -49,7 +49,10 @@ sphere_mesh = openmc.SphericalMesh(
 
 def mesh_data(mesh_dims):
     data = 100 * np.arange(np.prod(mesh_dims), dtype=float)
-    return data.reshape(*mesh_dims)
+    # data is returned reshaped with order 'F' to ensure that
+    # the resulting data is interpreted correctly by the
+    # write_data_to_vtk method
+    return data.reshape(*mesh_dims, order='F')
 
 test_data = ((reg_mesh, False, 'regular'),
              (rect_mesh, False, 'rectilinear'),
@@ -83,7 +86,6 @@ def test_mesh_write_vtk(mesh_params, run_in_tmpdir):
 
 # check data writing
 def test_mesh_write_vtk_data(run_in_tmpdir):
-
     data = {'ascending_data': mesh_data(cyl_mesh.dimension)}
     filename_expected = full_path('cyl-data.vtk')
     filename_actual = full_path('cyl-data-actual.vtk')
diff --git a/tests/unit_tests/mesh_to_vtk/test_vtk_dims.py b/tests/unit_tests/mesh_to_vtk/test_vtk_dims.py
index 0b6acf5aa..8166ba68c 100644
--- a/tests/unit_tests/mesh_to_vtk/test_vtk_dims.py
+++ b/tests/unit_tests/mesh_to_vtk/test_vtk_dims.py
@@ -90,7 +90,7 @@ def test_write_data_to_vtk(mesh, tmpdir):
     # kji (i changing fastest) orering is expected for input data
     # by using the volumes transposed as the data here, we can ensure the
     # normalization is happening correctly
-    data = mesh.volumes.T
+    data = mesh.volumes
 
     # RUN
     mesh.write_data_to_vtk(filename=filename, datasets={"label1": data, "label2": data})
diff --git a/tests/unit_tests/test_mesh.py b/tests/unit_tests/test_mesh.py
index f1f5e9f67..49556fce3 100644
--- a/tests/unit_tests/test_mesh.py
+++ b/tests/unit_tests/test_mesh.py
@@ -480,6 +480,9 @@ def test_umesh(run_in_tmpdir, simple_umesh, export_type):
     mean = np.array([arr.GetTuple1(i) for i in range(ref_data.size)])
     np.testing.assert_almost_equal(mean, ref_data)
 
+    # attempt to apply a dataset with an improper size to a VTK write
+    with pytest.raises(ValueError, match='Cannot apply dataset "mean"') as e:
+        simple_umesh.write_data_to_vtk(datasets={'mean': ref_data[:-2]}, filename=filename)
 
 def test_mesh_get_homogenized_materials():
     """Test the get_homogenized_materials method"""

From dc619eac17d45ae42361c973bd4e643b5bb31684 Mon Sep 17 00:00:00 2001
From: Gregoire Biot <grego01@mit.edu>
Date: Mon, 5 May 2025 16:33:12 -0400
Subject: [PATCH 025/203] Filter weight implementation (#3345)

Co-authored-by: Grego01-biot <grego01@pc-neutronic-06.psfc.mit.edu>
Co-authored-by: Patrick Shriwise <pshriwise@gmail.com>
Co-authored-by: Paul Romano <paul.k.romano@gmail.com>
---
 CMakeLists.txt                         |  1 +
 docs/source/pythonapi/base.rst         |  1 +
 docs/source/pythonapi/capi.rst         |  1 +
 include/openmc/tallies/filter.h        |  1 +
 include/openmc/tallies/filter_weight.h | 51 +++++++++++++++++++++
 openmc/filter.py                       | 25 +++++++++-
 openmc/lib/filter.py                   |  4 ++
 src/hdf5_interface.cpp                 |  2 +-
 src/tallies/filter.cpp                 |  3 ++
 src/tallies/filter_weight.cpp          | 63 ++++++++++++++++++++++++++
 tests/unit_tests/test_filter_weight.py | 44 ++++++++++++++++++
 tests/unit_tests/test_filters.py       | 21 +++++++++
 12 files changed, 215 insertions(+), 2 deletions(-)
 create mode 100644 include/openmc/tallies/filter_weight.h
 create mode 100644 src/tallies/filter_weight.cpp
 create mode 100644 tests/unit_tests/test_filter_weight.py

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d79746209..4dff35418 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -425,6 +425,7 @@ list(APPEND libopenmc_SOURCES
   src/tallies/filter_surface.cpp
   src/tallies/filter_time.cpp
   src/tallies/filter_universe.cpp
+  src/tallies/filter_weight.cpp
   src/tallies/filter_zernike.cpp
   src/tallies/tally.cpp
   src/tallies/tally_scoring.cpp
diff --git a/docs/source/pythonapi/base.rst b/docs/source/pythonapi/base.rst
index f3eb7ce83..1d8a93d47 100644
--- a/docs/source/pythonapi/base.rst
+++ b/docs/source/pythonapi/base.rst
@@ -143,6 +143,7 @@ Constructing Tallies
    openmc.SpatialLegendreFilter
    openmc.SphericalHarmonicsFilter
    openmc.TimeFilter
+   openmc.WeightFilter
    openmc.ZernikeFilter
    openmc.ZernikeRadialFilter
    openmc.ParentNuclideFilter
diff --git a/docs/source/pythonapi/capi.rst b/docs/source/pythonapi/capi.rst
index c8e0e874d..63fc5d11b 100644
--- a/docs/source/pythonapi/capi.rst
+++ b/docs/source/pythonapi/capi.rst
@@ -91,6 +91,7 @@ Classes
    Tally
    UniverseFilter
    UnstructuredMesh
+   WeightFilter
    WeightWindows
    ZernikeFilter
    ZernikeRadialFilter
diff --git a/include/openmc/tallies/filter.h b/include/openmc/tallies/filter.h
index 3e982d0cf..ee635b183 100644
--- a/include/openmc/tallies/filter.h
+++ b/include/openmc/tallies/filter.h
@@ -44,6 +44,7 @@ enum class FilterType {
   SURFACE,
   TIME,
   UNIVERSE,
+  WEIGHT,
   ZERNIKE,
   ZERNIKE_RADIAL
 };
diff --git a/include/openmc/tallies/filter_weight.h b/include/openmc/tallies/filter_weight.h
new file mode 100644
index 000000000..1fe9d75d3
--- /dev/null
+++ b/include/openmc/tallies/filter_weight.h
@@ -0,0 +1,51 @@
+#ifndef OPENMC_TALLIES_FILTER_WEIGHT_H
+#define OPENMC_TALLIES_FILTER_WEIGHT_H
+
+#include <string>
+
+#include "openmc/span.h"
+#include "openmc/tallies/filter.h"
+#include "openmc/vector.h"
+
+namespace openmc {
+
+//==============================================================================
+//! Bins the weights of the particles.
+//==============================================================================
+
+class WeightFilter : public Filter {
+public:
+  //----------------------------------------------------------------------------
+  // Constructors, destructors
+
+  ~WeightFilter() = default;
+
+  //----------------------------------------------------------------------------
+  // Methods
+
+  std::string type_str() const override { return "weight"; }
+  FilterType type() const override { return FilterType::WEIGHT; }
+
+  void from_xml(pugi::xml_node node) override;
+
+  void get_all_bins(const Particle& p, TallyEstimator estimator,
+    FilterMatch& match) const override;
+
+  void to_statepoint(hid_t filter_group) const override;
+
+  std::string text_label(int bin) const override;
+
+  //----------------------------------------------------------------------------
+  // Accessors
+
+  const vector<double>& bins() const { return bins_; }
+  void set_bins(span<const double> bins);
+
+protected:
+  //----------------------------------------------------------------------------
+  // Data members
+  vector<double> bins_;
+};
+
+} // namespace openmc
+#endif // OPENMC_TALLIES_FILTER_WEIGHT_H
diff --git a/openmc/filter.py b/openmc/filter.py
index 755777c5e..4d37f1055 100644
--- a/openmc/filter.py
+++ b/openmc/filter.py
@@ -25,7 +25,7 @@ _FILTER_TYPES = (
     'energyout', 'mu', 'musurface', 'polar', 'azimuthal', 'distribcell', 'delayedgroup',
     'energyfunction', 'cellfrom', 'materialfrom', 'legendre', 'spatiallegendre',
     'sphericalharmonics', 'zernike', 'zernikeradial', 'particle', 'cellinstance',
-    'collision', 'time', 'parentnuclide'
+    'collision', 'time', 'parentnuclide', 'weight'
 )
 
 _CURRENT_NAMES = (
@@ -2328,3 +2328,26 @@ class EnergyFunctionFilter(Filter):
             {self.short_name.lower(): filter_bins})])
 
         return df
+
+
+class WeightFilter(RealFilter):
+    """Bins tally events based on the incoming particle weight.
+
+    Parameters
+    ----------
+    Values : Iterable of float
+        A list or iterable of the weight boundaries, as float values.
+    filter_id : int
+        Unique identifier for the filter
+
+    Attributes
+    ----------
+    id : int
+        Unique identifier for the filter
+    bins : numpy.ndarray
+        An array of integer values representing the weights by which to filter
+    num_bins : int
+        The number of filter bins
+    values : numpy.ndarray
+        Array of weight boundaries
+    """
diff --git a/openmc/lib/filter.py b/openmc/lib/filter.py
index b6086c567..3a76b52a1 100644
--- a/openmc/lib/filter.py
+++ b/openmc/lib/filter.py
@@ -610,6 +610,10 @@ class UniverseFilter(Filter):
     filter_type = 'universe'
 
 
+class WeightFilter(Filter):
+    filter_type = 'weight'
+
+
 class ZernikeFilter(Filter):
     filter_type = 'zernike'
 
diff --git a/src/hdf5_interface.cpp b/src/hdf5_interface.cpp
index 27b750b93..e90aa7490 100644
--- a/src/hdf5_interface.cpp
+++ b/src/hdf5_interface.cpp
@@ -92,7 +92,7 @@ void get_shape_attr(hid_t obj_id, const char* name, hsize_t* dims)
   H5Aclose(attr);
 }
 
-hid_t create_group(hid_t parent_id, char const* name)
+hid_t create_group(hid_t parent_id, const char* name)
 {
   hid_t out = H5Gcreate(parent_id, name, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
   if (out < 0) {
diff --git a/src/tallies/filter.cpp b/src/tallies/filter.cpp
index 6430d9ae1..17e57a987 100644
--- a/src/tallies/filter.cpp
+++ b/src/tallies/filter.cpp
@@ -36,6 +36,7 @@
 #include "openmc/tallies/filter_surface.h"
 #include "openmc/tallies/filter_time.h"
 #include "openmc/tallies/filter_universe.h"
+#include "openmc/tallies/filter_weight.h"
 #include "openmc/tallies/filter_zernike.h"
 #include "openmc/xml_interface.h"
 
@@ -154,6 +155,8 @@ Filter* Filter::create(const std::string& type, int32_t id)
     return Filter::create<TimeFilter>(id);
   } else if (type == "universe") {
     return Filter::create<UniverseFilter>(id);
+  } else if (type == "weight") {
+    return Filter::create<WeightFilter>(id);
   } else if (type == "zernike") {
     return Filter::create<ZernikeFilter>(id);
   } else if (type == "zernikeradial") {
diff --git a/src/tallies/filter_weight.cpp b/src/tallies/filter_weight.cpp
new file mode 100644
index 000000000..31f4bd1bf
--- /dev/null
+++ b/src/tallies/filter_weight.cpp
@@ -0,0 +1,63 @@
+#include "openmc/tallies/filter_weight.h"
+
+#include <algorithm> // for is_sorted
+#include <stdexcept> // for runtime_error
+
+#include <fmt/core.h>
+
+#include "openmc/search.h"
+#include "openmc/xml_interface.h"
+
+namespace openmc {
+
+//==============================================================================
+// WeightFilter implementation
+//==============================================================================
+
+void WeightFilter::from_xml(pugi::xml_node node)
+{
+  auto bins = get_node_array<double>(node, "bins");
+  this->set_bins(bins);
+}
+
+void WeightFilter::set_bins(span<const double> bins)
+{
+  if (!std::is_sorted(bins.begin(), bins.end())) {
+    throw std::runtime_error {"Weight bins must be monotonically increasing."};
+  }
+
+  // Clear existing bins
+  bins_.clear();
+  bins_.reserve(bins.size());
+
+  // Copy bins
+  bins_.insert(bins_.end(), bins.begin(), bins.end());
+  n_bins_ = bins_.size() - 1;
+}
+
+void WeightFilter::get_all_bins(
+  const Particle& p, TallyEstimator estimator, FilterMatch& match) const
+{
+  // Get particle weight
+  double wgt = p.wgt_last();
+
+  // Bin the weight
+  if (wgt >= bins_.front() && wgt <= bins_.back()) {
+    auto bin = lower_bound_index(bins_.begin(), bins_.end(), wgt);
+    match.bins_.push_back(bin);
+    match.weights_.push_back(1.0);
+  }
+}
+
+void WeightFilter::to_statepoint(hid_t filter_group) const
+{
+  Filter::to_statepoint(filter_group);
+  write_dataset(filter_group, "bins", bins_);
+}
+
+std::string WeightFilter::text_label(int bin) const
+{
+  return fmt::format("Weight [{}, {}]", bins_[bin], bins_[bin + 1]);
+}
+
+} // namespace openmc
diff --git a/tests/unit_tests/test_filter_weight.py b/tests/unit_tests/test_filter_weight.py
new file mode 100644
index 000000000..878929ee0
--- /dev/null
+++ b/tests/unit_tests/test_filter_weight.py
@@ -0,0 +1,44 @@
+import openmc
+import numpy as np
+
+
+def test_weightfilter(run_in_tmpdir):
+    steel = openmc.Material(name='Stainless Steel')
+    steel.set_density('g/cm3', 8.00)
+    steel.add_nuclide('Fe56', 1.0)
+
+    sphere = openmc.Sphere(r=50.0, boundary_type='vacuum')
+    cell = openmc.Cell(region=-sphere, fill=steel)
+    model = openmc.Model()
+    model.geometry = openmc.Geometry([cell])
+    model.settings.particles = 100
+    model.settings.batches = 10
+
+    model.settings.source = openmc.IndependentSource(
+        energy=openmc.stats.delta_function(14e6),
+    )
+    model.settings.run_mode = "fixed source"
+
+    radius = list(range(1, 50))
+    sphere_mesh = openmc.SphericalMesh(radius)
+    mesh_filter = openmc.MeshFilter(sphere_mesh)
+    weight_filter = openmc.WeightFilter(
+        [0.999, 0.9999, 0.99999, 0.999999, 1.0, 1.000001 ,1.00001, 1.0001, 1.001]
+    )
+
+    tally = openmc.Tally()
+    tally.filters = [mesh_filter, weight_filter]
+    tally.estimator = 'analog'
+    tally.scores = ['flux']
+    model.tallies = openmc.Tallies([tally])
+
+    # Run OpenMC
+    model.run(apply_tally_results=True)
+
+    # Get current binned by mu
+    neutron_flux = tally.mean.reshape(48, 8)
+
+    # All contributions should show up in the fourth bin
+    assert np.all(neutron_flux[:, 3] != 0.0)
+    neutron_flux[:, 3] = 0.0
+    assert np.all(neutron_flux == 0.0)
diff --git a/tests/unit_tests/test_filters.py b/tests/unit_tests/test_filters.py
index c3b737192..60a60e3f5 100644
--- a/tests/unit_tests/test_filters.py
+++ b/tests/unit_tests/test_filters.py
@@ -312,3 +312,24 @@ def test_energy_filter():
     msg = 'Unable to set "filter value" to "-1.2" since it is less than "0.0"'
     with raises(ValueError, match=msg):
         openmc.EnergyFilter([-1.2, 0.25, 0.5])
+
+
+def test_weight():
+    f = openmc.WeightFilter([0.01, 0.1, 1.0, 10.0])
+    expected_bins = [[0.01, 0.1], [0.1, 1.0], [1.0, 10.0]]
+
+    assert np.allclose(f.bins, expected_bins)
+    assert len(f.bins) == 3
+
+    # Make sure __repr__ works
+    repr(f)
+
+    # to_xml_element()
+    elem = f.to_xml_element()
+    assert elem.tag == 'filter'
+    assert elem.attrib['type'] == 'weight'
+
+    # from_xml_element()
+    new_f = openmc.Filter.from_xml_element(elem)
+    assert new_f.id == f.id
+    assert np.allclose(new_f.bins, f.bins)

From e4f55a57b69c87f16e73710bcf51f7427b2cb6a7 Mon Sep 17 00:00:00 2001
From: Paul Romano <paul.k.romano@gmail.com>
Date: Mon, 5 May 2025 15:59:11 -0500
Subject: [PATCH 026/203] Fix weight modification for uniform source sampling
 (#3395)

Co-authored-by: Patrick Shriwise <pshriwise@gmail.com>
---
 openmc/deplete/d1s.py                            |  4 +++-
 openmc/source.py                                 |  2 +-
 src/settings.cpp                                 | 14 +++++++-------
 src/source.cpp                                   | 15 ++++++++++-----
 src/tallies/tally.cpp                            |  7 ++-----
 tests/unit_tests/test_uniform_source_sampling.py | 15 +++++++++++----
 6 files changed, 34 insertions(+), 23 deletions(-)

diff --git a/openmc/deplete/d1s.py b/openmc/deplete/d1s.py
index 8f6bffa86..0a1ed74b1 100644
--- a/openmc/deplete/d1s.py
+++ b/openmc/deplete/d1s.py
@@ -141,7 +141,9 @@ def apply_time_correction(
     time_correction_factors : dict
         Time correction factors as returned by :func:`time_correction_factors`
     index : int, optional
-        Index to use for the correction factors
+        Index of the time of interest. If N timesteps are provided in
+        :func:`time_correction_factors`, there are N + 1 times to select from.
+        The default is -1 which corresponds to the final time.
     sum_nuclides : bool
         Whether to sum over the parent nuclides
 
diff --git a/openmc/source.py b/openmc/source.py
index 878f52c3b..87e734e9a 100644
--- a/openmc/source.py
+++ b/openmc/source.py
@@ -110,7 +110,7 @@ class SourceBase(ABC):
                 cv.check_value('rejection strategy', value, ('resample', 'kill'))
                 self._constraints['rejection_strategy'] = value
             else:
-                raise ValueError('Unknown key in constraints dictionary: {key}')
+                raise ValueError(f'Unknown key in constraints dictionary: {key}')
 
     @abstractmethod
     def populate_xml_element(self, element):
diff --git a/src/settings.cpp b/src/settings.cpp
index c135fa339..c8230a10f 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -620,13 +620,6 @@ void read_settings_xml(pugi::xml_node root)
     model::external_sources.push_back(make_unique<FileSource>(path));
   }
 
-  // Build probability mass function for sampling external sources
-  vector<double> source_strengths;
-  for (auto& s : model::external_sources) {
-    source_strengths.push_back(s->strength());
-  }
-  model::external_sources_probability.assign(source_strengths);
-
   // If no source specified, default to isotropic point source at origin with
   // Watt spectrum. No default source is needed in random ray mode.
   if (model::external_sources.empty() &&
@@ -639,6 +632,13 @@ void read_settings_xml(pugi::xml_node root)
       UPtrDist {new Discrete(T, p, 1)}));
   }
 
+  // Build probability mass function for sampling external sources
+  vector<double> source_strengths;
+  for (auto& s : model::external_sources) {
+    source_strengths.push_back(s->strength());
+  }
+  model::external_sources_probability.assign(source_strengths);
+
   // Check if we want to write out source
   if (check_for_node(root, "write_initial_source")) {
     write_initial_source = get_node_value_bool(root, "write_initial_source");
diff --git a/src/source.cpp b/src/source.cpp
index c1b4ce260..8e6eb4f11 100644
--- a/src/source.cpp
+++ b/src/source.cpp
@@ -613,9 +613,10 @@ SourceSite sample_external_source(uint64_t* seed)
 {
   // Sample from among multiple source distributions
   int i = 0;
-  if (model::external_sources.size() > 1) {
+  int n_sources = model::external_sources.size();
+  if (n_sources > 1) {
     if (settings::uniform_source_sampling) {
-      i = prn(seed) * model::external_sources.size();
+      i = prn(seed) * n_sources;
     } else {
       i = model::external_sources_probability.sample(seed);
     }
@@ -624,9 +625,13 @@ SourceSite sample_external_source(uint64_t* seed)
   // Sample source site from i-th source distribution
   SourceSite site {model::external_sources[i]->sample_with_constraints(seed)};
 
-  // Set particle creation weight
-  if (settings::uniform_source_sampling) {
-    site.wgt *= model::external_sources[i]->strength();
+  // For uniform source sampling, multiply the weight by the ratio of the actual
+  // probability of sampling source i to the biased probability of sampling
+  // source i, which is (strength_i / total_strength) / (1 / n)
+  if (n_sources > 1 && settings::uniform_source_sampling) {
+    double total_strength = model::external_sources_probability.integral();
+    site.wgt *=
+      model::external_sources[i]->strength() * n_sources / total_strength;
   }
 
   // If running in MG, convert site.E to group
diff --git a/src/tallies/tally.cpp b/src/tallies/tally.cpp
index 35805b20d..54840b518 100644
--- a/src/tallies/tally.cpp
+++ b/src/tallies/tally.cpp
@@ -815,11 +815,8 @@ void Tally::accumulate()
   if (mpi::master || !settings::reduce_tallies) {
     // Calculate total source strength for normalization
     double total_source = 0.0;
-    if (settings::run_mode == RunMode::FIXED_SOURCE &&
-        !settings::uniform_source_sampling) {
-      for (const auto& s : model::external_sources) {
-        total_source += s->strength();
-      }
+    if (settings::run_mode == RunMode::FIXED_SOURCE) {
+      total_source = model::external_sources_probability.integral();
     } else {
       total_source = 1.0;
     }
diff --git a/tests/unit_tests/test_uniform_source_sampling.py b/tests/unit_tests/test_uniform_source_sampling.py
index 7f805e37d..0d1930328 100644
--- a/tests/unit_tests/test_uniform_source_sampling.py
+++ b/tests/unit_tests/test_uniform_source_sampling.py
@@ -14,10 +14,15 @@ def sphere_model():
 
     model.settings.particles = 100
     model.settings.batches = 1
-    model.settings.source = openmc.IndependentSource(
+    src1 = openmc.IndependentSource(
         energy=openmc.stats.delta_function(1.0e3),
-        strength=100.0
+        strength=75.0
     )
+    src2 = openmc.IndependentSource(
+        energy=openmc.stats.delta_function(1.0e3),
+        strength=25.0
+    )
+    model.settings.source = [src1, src2]
     model.settings.run_mode = "fixed source"
     model.settings.surf_source_write = {
         "max_particles": 100,
@@ -42,11 +47,13 @@ def test_source_weight(run_in_tmpdir, sphere_model):
     sphere_model.settings.uniform_source_sampling = True
     sphere_model.run()
     particles = openmc.ParticleList.from_hdf5('surface_source.h5')
-    strength = sphere_model.settings.source[0].strength
-    assert set(p.wgt for p in particles) == {strength}
+    assert set(p.wgt for p in particles) == {0.5, 1.5}
 
 
 def test_tally_mean(run_in_tmpdir, sphere_model):
+    # Use only one source
+    sphere_model.settings.source.pop()
+
     # Run without uniform source sampling
     sphere_model.settings.uniform_source_sampling = False
     sp_file = sphere_model.run()

From f9dca9a458fec7ec8384b88d349170ddf581ce3d Mon Sep 17 00:00:00 2001
From: GuySten <62616591+GuySten@users.noreply.github.com>
Date: Tue, 6 May 2025 03:04:47 +0300
Subject: [PATCH 027/203] Fixing an incorrect computation of CDF of
 bremsstrahlung photons (#3396)

Co-authored-by: Paul Romano <paul.k.romano@gmail.com>
---
 src/material.cpp                              |  9 +--
 .../photon_production/results_true.dat        | 24 ++++----
 .../results_true.dat                          | 58 +++++++++----------
 .../photon_source/results_true.dat            |  4 +-
 .../weightwindows/results_true.dat            |  2 +-
 5 files changed, 49 insertions(+), 48 deletions(-)

diff --git a/src/material.cpp b/src/material.cpp
index 2bd504e4d..b8846d7cb 100644
--- a/src/material.cpp
+++ b/src/material.cpp
@@ -777,14 +777,15 @@ void Material::init_bremsstrahlung()
       // Loop over photon energies
       double c = 0.0;
       for (int i = 0; i < j; ++i) {
-        // Integrate the CDF from the PDF using the trapezoidal rule in log-log
-        // space
+        // Integrate the CDF from the PDF using the fact that the PDF is linear
+        // in log-log space
         double w_l = std::log(data::ttb_e_grid(i));
         double w_r = std::log(data::ttb_e_grid(i + 1));
         double x_l = std::log(ttb->pdf(j, i));
         double x_r = std::log(ttb->pdf(j, i + 1));
-
-        c += 0.5 * (w_r - w_l) * (std::exp(w_l + x_l) + std::exp(w_r + x_r));
+        double beta = (x_r - x_l) / (w_r - w_l);
+        double a = beta + 1.0;
+        c += std::exp(w_l + x_l) / a * std::expm1(a * (w_r - w_l));
         ttb->cdf(j, i + 1) = c;
       }
 
diff --git a/tests/regression_tests/photon_production/results_true.dat b/tests/regression_tests/photon_production/results_true.dat
index a911fed3b..874e32b85 100644
--- a/tests/regression_tests/photon_production/results_true.dat
+++ b/tests/regression_tests/photon_production/results_true.dat
@@ -16,12 +16,12 @@ tally 2:
 1.573004E+00
 4.296434E-04
 1.845934E-07
-2.350021E-01
-5.522600E-02
+2.350047E-01
+5.522722E-02
 0.000000E+00
 0.000000E+00
-2.350021E-01
-5.522600E-02
+2.350047E-01
+5.522722E-02
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -73,8 +73,8 @@ tally 3:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-1.774451E+05
-3.148675E+10
+1.774484E+05
+3.148794E+10
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -85,8 +85,8 @@ tally 3:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-7.691658E+03
-5.916160E+07
+7.692488E+03
+5.917437E+07
 0.000000E+00
 0.000000E+00
 tally 4:
@@ -122,8 +122,8 @@ tally 4:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-1.774451E+05
-3.148675E+10
+1.774484E+05
+3.148794E+10
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -134,7 +134,7 @@ tally 4:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-7.691658E+03
-5.916160E+07
+7.692488E+03
+5.917437E+07
 0.000000E+00
 0.000000E+00
diff --git a/tests/regression_tests/photon_production_fission/results_true.dat b/tests/regression_tests/photon_production_fission/results_true.dat
index 7e20342af..cdbb1255c 100644
--- a/tests/regression_tests/photon_production_fission/results_true.dat
+++ b/tests/regression_tests/photon_production_fission/results_true.dat
@@ -1,12 +1,12 @@
 k-combined:
-2.270911E+00 4.568134E-02
+2.278476E+00 6.220292E-02
 tally 1:
-2.663476E+00
-2.366726E+00
+2.664071E+00
+2.369250E+00
 0.000000E+00
 0.000000E+00
-2.663476E+00
-2.366726E+00
+2.664071E+00
+2.369250E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -18,52 +18,52 @@ tally 1:
 0.000000E+00
 0.000000E+00
 tally 2:
-2.636709E+00
-2.318646E+00
-4.230052E+08
-5.967879E+16
+2.640755E+00
+2.326201E+00
+4.245217E+08
+6.012128E+16
 0.000000E+00
 0.000000E+00
-2.636709E+00
-2.318646E+00
-4.230052E+08
-5.967879E+16
+2.640755E+00
+2.326201E+00
+4.245217E+08
+6.012128E+16
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-2.455009E+06
-2.015314E+12
+2.479234E+06
+2.052367E+12
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-2.455009E+06
-2.015314E+12
+2.479234E+06
+2.052367E+12
 0.000000E+00
 0.000000E+00
 tally 3:
-2.660004E+00
-2.358564E+00
-4.230052E+08
-5.967879E+16
+2.657846E+00
+2.354717E+00
+4.245217E+08
+6.012128E+16
 0.000000E+00
 0.000000E+00
-2.660004E+00
-2.358564E+00
-4.230052E+08
-5.967879E+16
+2.657846E+00
+2.354717E+00
+4.245217E+08
+6.012128E+16
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-2.455009E+06
-2.015314E+12
+2.479234E+06
+2.052367E+12
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-2.455009E+06
-2.015314E+12
+2.479234E+06
+2.052367E+12
 0.000000E+00
 0.000000E+00
diff --git a/tests/regression_tests/photon_source/results_true.dat b/tests/regression_tests/photon_source/results_true.dat
index fcc75cbca..8d934afc6 100644
--- a/tests/regression_tests/photon_source/results_true.dat
+++ b/tests/regression_tests/photon_source/results_true.dat
@@ -1,5 +1,5 @@
 tally 1:
-2.263938E+02
-5.125417E+04
+2.263761E+02
+5.124615E+04
 0.000000E+00
 0.000000E+00
diff --git a/tests/regression_tests/weightwindows/results_true.dat b/tests/regression_tests/weightwindows/results_true.dat
index 6bb992cd4..671be1d7b 100644
--- a/tests/regression_tests/weightwindows/results_true.dat
+++ b/tests/regression_tests/weightwindows/results_true.dat
@@ -1 +1 @@
-952c20fefac374d3b9fd28627fda7d5ae262f8cd7c01a33f0381526204a2287c18e56259a599dc6fdc1b59a2d2866fdfeedea371154c8fa7a69dc5c445b08c2d
\ No newline at end of file
+a5880ad9262e8aba90801783891ee74618144101401f06fb46e954e851a3c517ab28d5f0d6e1b2b364844f08d363cba35ab23b63fc81012ea8a6a328755d56c4
\ No newline at end of file

From c1c5c0b93ecc93815afb3554a2812fb22b50d9c4 Mon Sep 17 00:00:00 2001
From: Patrick Shriwise <pshriwise@gmail.com>
Date: Wed, 7 May 2025 18:51:40 -0600
Subject: [PATCH 028/203] Apply resolve paths to path values in `config`
 (#3400)

---
 docs/source/usersguide/data.rst | 3 ++-
 openmc/config.py                | 2 +-
 tests/unit_tests/test_config.py | 7 +++++++
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/docs/source/usersguide/data.rst b/docs/source/usersguide/data.rst
index 2a9cd36db..8b2938556 100644
--- a/docs/source/usersguide/data.rst
+++ b/docs/source/usersguide/data.rst
@@ -30,7 +30,8 @@ responsible for specifying one or more of the following:
 Each of the above files can specified in several ways. In the Python API, a
 :ref:`runtime configuration variable <usersguide_data_runtime>`
 :data:`openmc.config` can be used to specify any of the above and is initialized
-using a set of environment variables.
+using a set of environment variables. Data configuration paths set in
+:data:`openmc.config` will be expanded to absolute paths.
 
 .. _usersguide_data_runtime:
 
diff --git a/openmc/config.py b/openmc/config.py
index ab53ab61b..56d8a4072 100644
--- a/openmc/config.py
+++ b/openmc/config.py
@@ -60,7 +60,7 @@ class _Config(MutableMapping):
         return repr(self._mapping)
 
     def _set_path(self, key, value):
-        self._mapping[key] = p = Path(value)
+        self._mapping[key] = p = Path(value).resolve()
         if not p.exists():
             warnings.warn(f"'{value}' does not exist.")
 
diff --git a/tests/unit_tests/test_config.py b/tests/unit_tests/test_config.py
index 9d3f53a74..4e87de4b7 100644
--- a/tests/unit_tests/test_config.py
+++ b/tests/unit_tests/test_config.py
@@ -1,5 +1,6 @@
 from collections.abc import Mapping
 import os
+from pathlib import Path
 
 import openmc
 import pytest
@@ -34,6 +35,12 @@ def test_config_basics():
     with pytest.raises(KeyError):
         openmc.config['🐖'] = '/like/to/eat/bacon'
 
+    # ensure relative paths are expanded into absolute
+    # paths
+    chain_path = Path('./chain.xml')
+    openmc.config['chain_file'] = chain_path
+    assert openmc.config['chain_file'] == chain_path.resolve()
+
 
 def test_config_patch():
     openmc.config['cross_sections'] = '/path/to/cross_sections.xml'

From ba834be5c29f4e2a5218cf6377bf536b0358a12c Mon Sep 17 00:00:00 2001
From: Jonathan Shimwell <mail@jshimwell.com>
Date: Thu, 8 May 2025 08:10:33 +0200
Subject: [PATCH 029/203] added type hints to model file (#3399)

Co-authored-by: Paul Romano <paul.k.romano@gmail.com>
---
 openmc/model/model.py | 223 ++++++++++++++++++++++++++++++------------
 1 file changed, 162 insertions(+), 61 deletions(-)

diff --git a/openmc/model/model.py b/openmc/model/model.py
index 9ff574ec6..c19c8ac9f 100644
--- a/openmc/model/model.py
+++ b/openmc/model/model.py
@@ -67,8 +67,14 @@ class Model:
 
     """
 
-    def __init__(self, geometry=None, materials=None, settings=None,
-                 tallies=None, plots=None):
+    def __init__(
+        self,
+        geometry: openmc.Geometry | None = None,
+        materials: openmc.Materials = None,
+        settings: openmc.Settings | None = None,
+        tallies: openmc.Tallies | None = None,
+        plots: openmc.Plots | None = None,
+    ):
         self.geometry = openmc.Geometry() if geometry is None else geometry
         self.materials = openmc.Materials() if materials is None else materials
         self.settings = openmc.Settings() if settings is None else settings
@@ -192,24 +198,29 @@ class Model:
         return result
 
     @classmethod
-    def from_xml(cls, geometry='geometry.xml', materials='materials.xml',
-                 settings='settings.xml', tallies='tallies.xml',
-                 plots='plots.xml') -> Model:
+    def from_xml(
+        cls,
+        geometry: PathLike = "geometry.xml",
+        materials: PathLike = "materials.xml",
+        settings: PathLike = "settings.xml",
+        tallies: PathLike = "tallies.xml",
+        plots: PathLike = "plots.xml",
+    ) -> Model:
         """Create model from existing XML files
 
         Parameters
         ----------
-        geometry : str
+        geometry : PathLike
             Path to geometry.xml file
-        materials : str
+        materials : PathLike
             Path to materials.xml file
-        settings : str
+        settings : PathLike
             Path to settings.xml file
-        tallies : str
+        tallies : PathLike
             Path to tallies.xml file
 
             .. versionadded:: 0.13.0
-        plots : str
+        plots : PathLike
             Path to plots.xml file
 
             .. versionadded:: 0.13.0
@@ -229,14 +240,14 @@ class Model:
         return cls(geometry, materials, settings, tallies, plots)
 
     @classmethod
-    def from_model_xml(cls, path='model.xml'):
+    def from_model_xml(cls, path: PathLike = "model.xml") -> Model:
         """Create model from single XML file
 
         .. versionadded:: 0.13.3
 
         Parameters
         ----------
-        path : str or PathLike
+        path : PathLike
             Path to model.xml file
         """
         parser = ET.XMLParser(huge_tree=True)
@@ -262,8 +273,17 @@ class Model:
 
         return model
 
-    def init_lib(self, threads=None, geometry_debug=False, restart_file=None,
-                 tracks=False, output=True, event_based=None, intracomm=None, directory=None):
+    def init_lib(
+        self,
+        threads: int | None = None,
+        geometry_debug: bool = False,
+        restart_file: PathLike | None = None,
+        tracks: bool = False,
+        output: bool = True,
+        event_based: bool | None = None,
+        intracomm=None,
+        directory: PathLike | None = None,
+    ):
         """Initializes the model in memory via the C API
 
         .. versionadded:: 0.13.0
@@ -278,7 +298,7 @@ class Model:
             variable).
         geometry_debug : bool, optional
             Turn on geometry debugging during simulation. Defaults to False.
-        restart_file : str, optional
+        restart_file : PathLike, optional
             Path to restart file to use
         tracks : bool, optional
             Enables the writing of particles tracks. The number of particle
@@ -291,7 +311,7 @@ class Model:
             the Settings will be used.
         intracomm : mpi4py.MPI.Intracomm or None, optional
             MPI intracommunicator
-        directory : str or None, optional
+        directory : PathLike or None, optional
             Directory to write XML files to. Defaults to None.
         """
 
@@ -365,9 +385,15 @@ class Model:
 
         openmc.lib.finalize()
 
-    def deplete(self, timesteps, method='cecm', final_step=True,
-                operator_kwargs=None, directory='.', output=True,
-                **integrator_kwargs):
+    def deplete(
+        self,
+        method: str = "cecm",
+        final_step: bool = True,
+        operator_kwargs: dict | None = None,
+        directory: PathLike = ".",
+        output: bool = True,
+        **integrator_kwargs,
+    ):
         """Deplete model using specified timesteps/power
 
         .. versionchanged:: 0.13.0
@@ -376,10 +402,12 @@ class Model:
 
         Parameters
         ----------
-        timesteps : iterable of float
-            Array of timesteps in units of [s]. Note that values are not
-            cumulative.
-        method : str, optional
+        timesteps : iterable of float or iterable of tuple
+            Array of timesteps. Note that values are not cumulative. The units are
+            specified by the `timestep_units` argument when `timesteps` is an
+            iterable of float. Alternatively, units can be specified for each step
+            by passing an iterable of (value, unit) tuples.
+        method : str
              Integration method used for depletion (e.g., 'cecm', 'predictor').
              Defaults to 'cecm'.
         final_step : bool, optional
@@ -388,14 +416,14 @@ class Model:
         operator_kwargs : dict
             Keyword arguments passed to the depletion operator initializer
             (e.g., :func:`openmc.deplete.Operator`)
-        directory : str, optional
+        directory : PathLike, optional
             Directory to write XML files to. If it doesn't exist already, it
             will be created. Defaults to the current working directory
         output : bool
             Capture OpenMC output from standard out
         integrator_kwargs : dict
-            Remaining keyword arguments passed to the depletion Integrator
-            initializer (e.g., :func:`openmc.deplete.integrator.cecm`).
+            Remaining keyword arguments passed to the depletion integrator
+            (e.g., :class:`openmc.deplete.CECMIntegrator`).
 
         """
 
@@ -426,8 +454,7 @@ class Model:
             check_value('method', method,
                         dep.integrators.integrator_by_name.keys())
             integrator_class = dep.integrators.integrator_by_name[method]
-            integrator = integrator_class(depletion_operator, timesteps,
-                                          **integrator_kwargs)
+            integrator = integrator_class(depletion_operator, **integrator_kwargs)
 
             # Now perform the depletion
             with openmc.lib.quiet_dll(output):
@@ -456,7 +483,7 @@ class Model:
 
         Parameters
         ----------
-        directory : str
+        directory : PathLike
             Directory to write XML files to. If it doesn't exist already, it
             will be created.
         remove_surfs : bool
@@ -570,7 +597,7 @@ class Model:
                 fh.write(ET.tostring(plots_element, encoding="unicode"))
             fh.write("</model>\n")
 
-    def import_properties(self, filename):
+    def import_properties(self, filename: PathLike):
         """Import physical properties
 
         .. versionchanged:: 0.13.0
@@ -578,7 +605,7 @@ class Model:
 
         Parameters
         ----------
-        filename : str
+        filename : PathLike
             Path to properties HDF5 file
 
         See Also
@@ -631,11 +658,22 @@ class Model:
                     C_mat = openmc.lib.materials[mat_id]
                     C_mat.set_density(atom_density, 'atom/b-cm')
 
-    def run(self, particles=None, threads=None, geometry_debug=False,
-            restart_file=None, tracks=False, output=True, cwd='.',
-            openmc_exec='openmc', mpi_args=None, event_based=None,
-            export_model_xml=True, apply_tally_results=False,
-            **export_kwargs):
+    def run(
+        self,
+        particles: int | None = None,
+        threads: int | None = None,
+        geometry_debug: bool = False,
+        restart_file: PathLike | None = None,
+        tracks: bool = False,
+        output: bool = True,
+        cwd: PathLike = ".",
+        openmc_exec: PathLike = "openmc",
+        mpi_args: Iterable[str] = None,
+        event_based: bool | None = None,
+        export_model_xml: bool = True,
+        apply_tally_results: bool = False,
+        **export_kwargs,
+    ) -> Path:
         """Run OpenMC
 
         If the C API has been initialized, then the C API is used, otherwise,
@@ -767,10 +805,17 @@ class Model:
 
         return last_statepoint
 
-    def calculate_volumes(self, threads=None, output=True, cwd='.',
-                          openmc_exec='openmc', mpi_args=None,
-                          apply_volumes=True, export_model_xml=True,
-                          **export_kwargs):
+    def calculate_volumes(
+        self,
+        threads: int | None = None,
+        output: bool = True,
+        cwd: PathLike = ".",
+        openmc_exec: PathLike = "openmc",
+        mpi_args: list[str] | None = None,
+        apply_volumes: bool = True,
+        export_model_xml: bool = True,
+        **export_kwargs,
+    ):
         """Runs an OpenMC stochastic volume calculation and, if requested,
         applies volumes to the model
 
@@ -1116,8 +1161,14 @@ class Model:
         """
         self.tallies.add_results(statepoint)
 
-    def plot_geometry(self, output=True, cwd='.', openmc_exec='openmc',
-                      export_model_xml=True, **export_kwargs):
+    def plot_geometry(
+        self,
+        output: bool = True,
+        cwd: PathLike = ".",
+        openmc_exec: PathLike = "openmc",
+        export_model_xml: bool = True,
+        **export_kwargs,
+    ):
         """Creates plot images as specified by the Model.plots attribute
 
         .. versionadded:: 0.13.0
@@ -1126,10 +1177,10 @@ class Model:
         ----------
         output : bool, optional
             Capture OpenMC output from standard out
-        cwd : str, optional
+        cwd : PathLike, optional
             Path to working directory to run in. Defaults to the current
             working directory.
-        openmc_exec : str, optional
+        openmc_exec : PathLike, optional
             Path to OpenMC executable. Defaults to 'openmc'.
             This only applies to the case when not using the C API.
         export_model_xml : bool, optional
@@ -1159,8 +1210,14 @@ class Model:
                 openmc.plot_geometry(output=output, openmc_exec=openmc_exec,
                                      path_input=path_input)
 
-    def _change_py_lib_attribs(self, names_or_ids, value, obj_type,
-                               attrib_name, density_units='atom/b-cm'):
+    def _change_py_lib_attribs(
+        self,
+        names_or_ids: Iterable[str] | Iterable[int],
+        value: float | Iterable[float],
+        obj_type: str,
+        attrib_name: str,
+        density_units: str = "atom/b-cm",
+    ):
         # Method to do the same work whether it is a cell or material and
         # a temperature or volume
         check_type('names_or_ids', names_or_ids, Iterable, (Integral, str))
@@ -1239,7 +1296,9 @@ class Model:
                 else:
                     setattr(lib_obj, attrib_name, value)
 
-    def rotate_cells(self, names_or_ids, vector):
+    def rotate_cells(
+        self, names_or_ids: Iterable[str] | Iterable[int], vector: Iterable[float]
+    ):
         """Rotate the identified cell(s) by the specified rotation vector.
         The rotation is only applied to cells filled with a universe.
 
@@ -1261,7 +1320,9 @@ class Model:
 
         self._change_py_lib_attribs(names_or_ids, vector, 'cell', 'rotation')
 
-    def translate_cells(self, names_or_ids, vector):
+    def translate_cells(
+        self, names_or_ids: Iterable[str] | Iterable[int], vector: Iterable[float]
+    ):
         """Translate the identified cell(s) by the specified translation vector.
         The translation is only applied to cells filled with a universe.
 
@@ -1284,7 +1345,12 @@ class Model:
         self._change_py_lib_attribs(names_or_ids, vector, 'cell',
                                     'translation')
 
-    def update_densities(self, names_or_ids, density, density_units='atom/b-cm'):
+    def update_densities(
+        self,
+        names_or_ids: Iterable[str] | Iterable[int],
+        density: float,
+        density_units: str = "atom/b-cm",
+    ):
         """Update the density of a given set of materials to a new value
 
         .. note:: If applying this change to a name that is not unique, then
@@ -1307,7 +1373,9 @@ class Model:
         self._change_py_lib_attribs(names_or_ids, density, 'material',
                                     'density', density_units)
 
-    def update_cell_temperatures(self, names_or_ids, temperature):
+    def update_cell_temperatures(
+        self, names_or_ids: Iterable[str] | Iterable[int], temperature: float
+    ):
         """Update the temperature of a set of cells to the given value
 
         .. note:: If applying this change to a name that is not unique, then
@@ -1328,7 +1396,9 @@ class Model:
         self._change_py_lib_attribs(names_or_ids, temperature, 'cell',
                                     'temperature')
 
-    def update_material_volumes(self, names_or_ids, volume):
+    def update_material_volumes(
+        self, names_or_ids: Iterable[str] | Iterable[int], volume: float
+    ):
         """Update the volume of a set of materials to the given value
 
         .. note:: If applying this change to a name that is not unique, then
@@ -1449,7 +1519,14 @@ class Model:
                 self.geometry.get_all_materials().values()
             )
 
-    def _generate_infinite_medium_mgxs(self, groups, nparticles, mgxs_path, correction, directory):
+    def _generate_infinite_medium_mgxs(
+        self,
+        groups: openmc.mgxs.EnergyGroups,
+        nparticles: int,
+        mgxs_path: PathLike,
+        correction: str | None,
+        directory: PathLike,
+    ):
         """Generate a MGXS library by running multiple OpenMC simulations, each
         representing an infinite medium simulation of a single isolated
         material. A discrete source is used to sample particles, with an equal
@@ -1567,7 +1644,11 @@ class Model:
         mgxs_file.export_to_hdf5(mgxs_path)
 
     @staticmethod
-    def _create_stochastic_slab_geometry(materials, cell_thickness=1.0, num_repeats=100):
+    def _create_stochastic_slab_geometry(
+        materials: Sequence[openmc.Material],
+        cell_thickness: float = 1.0,
+        num_repeats: int = 100,
+    ) -> tuple[openmc.Geometry, openmc.stats.Box]:
         """Create a geometry representing a stochastic "sandwich" of materials in a
         layered slab geometry. To reduce the impact of the order of materials in
         the slab, the materials are applied to 'num_repeats' different randomly
@@ -1636,7 +1717,14 @@ class Model:
 
         return geometry, box
 
-    def _generate_stochastic_slab_mgxs(self, groups, nparticles, mgxs_path, correction, directory) -> None:
+    def _generate_stochastic_slab_mgxs(
+        self,
+        groups: openmc.mgxs.EnergyGroups,
+        nparticles: int,
+        mgxs_path: PathLike,
+        correction: str | None,
+        directory: PathLike,
+    ) -> None:
         """Generate MGXS assuming a stochastic "sandwich" of materials in a layered
         slab geometry. While geometry-specific spatial shielding effects are not
         captured, this method can be useful when the geometry has materials only
@@ -1741,7 +1829,14 @@ class Model:
         mgxs_file = mgxs_lib.create_mg_library(xs_type='macro', xsdata_names=names)
         mgxs_file.export_to_hdf5(mgxs_path)
 
-    def _generate_material_wise_mgxs(self, groups, nparticles, mgxs_path, correction, directory) -> None:
+    def _generate_material_wise_mgxs(
+        self,
+        groups: openmc.mgxs.EnergyGroups,
+        nparticles: int,
+        mgxs_path: PathLike,
+        correction: str | None,
+        directory: PathLike,
+    ) -> None:
         """Generate a material-wise MGXS library for the model by running the
         original continuous energy OpenMC simulation of the full material
         geometry and source, and tally MGXS data for each material. This method
@@ -1758,12 +1853,12 @@ class Model:
             Energy group structure for the MGXS.
         nparticles : int
             Number of particles to simulate per batch when generating MGXS.
-        mgxs_path : str
+        mgxs_path : PathLike
             Filename for the MGXS HDF5 file.
         correction : str
             Transport correction to apply to the MGXS. Options are None and
             "P0".
-        directory : str
+        directory : PathLike
             Directory to run the simulation in, so as to contain XML files.
         """
         openmc.reset_auto_ids()
@@ -1831,9 +1926,15 @@ class Model:
             xs_type='macro', xsdata_names=names)
         mgxs_file.export_to_hdf5(mgxs_path)
 
-    def convert_to_multigroup(self, method="material_wise", groups='CASMO-2',
-                              nparticles=2000, overwrite_mgxs_library=False,
-                              mgxs_path: PathLike = "mgxs.h5", correction=None):
+    def convert_to_multigroup(
+        self,
+        method: str = "material_wise",
+        groups: str = "CASMO-2",
+        nparticles: int = 2000,
+        overwrite_mgxs_library: bool = False,
+        mgxs_path: PathLike = "mgxs.h5",
+        correction: str | None = None,
+    ):
         """Convert all materials from continuous energy to multigroup.
 
         If no MGXS data library file is found, generate one using one or more
@@ -1868,7 +1969,7 @@ class Model:
                     self.sync_dagmc_universes()
                     self.finalize_lib()
                     break
-            
+
             # Make sure all materials have a name, and that the name is a valid HDF5
             # dataset name
             for material in self.materials:

From f615441f069cea5a835c1302fa84f7f5a9bdf538 Mon Sep 17 00:00:00 2001
From: John Tramm <john.tramm@gmail.com>
Date: Fri, 9 May 2025 22:10:25 -0500
Subject: [PATCH 030/203] Random Ray Misc Memory Error Fixes (#3405)

Co-authored-by: Hunter Belanger <hunter.belanger@gmail.com>
---
 src/random_ray/flat_source_domain.cpp |  8 +++++---
 src/random_ray/random_ray.cpp         | 21 +++++++++++++--------
 src/random_ray/source_region.cpp      |  6 +++++-
 3 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/src/random_ray/flat_source_domain.cpp b/src/random_ray/flat_source_domain.cpp
index 8ab30abf2..cd073f350 100644
--- a/src/random_ray/flat_source_domain.cpp
+++ b/src/random_ray/flat_source_domain.cpp
@@ -206,9 +206,11 @@ void FlatSourceDomain::set_flux_to_flux_plus_source(
   int material = source_regions_.material(sr);
   if (material == MATERIAL_VOID) {
     source_regions_.scalar_flux_new(sr, g) /= volume;
-    source_regions_.scalar_flux_new(sr, g) +=
-      0.5f * source_regions_.external_source(sr, g) *
-      source_regions_.volume_sq(sr);
+    if (settings::run_mode == RunMode::FIXED_SOURCE) {
+      source_regions_.scalar_flux_new(sr, g) +=
+        0.5f * source_regions_.external_source(sr, g) *
+        source_regions_.volume_sq(sr);
+    }
   } else {
     double sigma_t = sigma_t_[source_regions_.material(sr) * negroups_ + g];
     source_regions_.scalar_flux_new(sr, g) /= (sigma_t * volume);
diff --git a/src/random_ray/random_ray.cpp b/src/random_ray/random_ray.cpp
index 532840f1f..27819591c 100644
--- a/src/random_ray/random_ray.cpp
+++ b/src/random_ray/random_ray.cpp
@@ -518,8 +518,10 @@ void RandomRay::attenuate_flux_flat_source_void(
   }
 
   // Add source to incoming angular flux, assuming void region
-  for (int g = 0; g < negroups_; g++) {
-    angular_flux_[g] += srh.external_source(g) * distance;
+  if (settings::run_mode == RunMode::FIXED_SOURCE) {
+    for (int g = 0; g < negroups_; g++) {
+      angular_flux_[g] += srh.external_source(g) * distance;
+    }
   }
 }
 
@@ -688,7 +690,10 @@ void RandomRay::attenuate_flux_linear_source_void(
   // transport through a void region is greatly simplified. Here we
   // compute the updated flux moments.
   for (int g = 0; g < negroups_; g++) {
-    float spatial_source = srh.external_source(g);
+    float spatial_source = 0.f;
+    if (settings::run_mode == RunMode::FIXED_SOURCE) {
+      spatial_source = srh.external_source(g);
+    }
     float new_delta_psi = (angular_flux_[g] - spatial_source) * distance;
     float h1 = 0.5f;
     h1 = h1 * angular_flux_[g];
@@ -750,8 +755,10 @@ void RandomRay::attenuate_flux_linear_source_void(
   }
 
   // Add source to incoming angular flux, assuming void region
-  for (int g = 0; g < negroups_; g++) {
-    angular_flux_[g] += srh.external_source(g) * distance;
+  if (settings::run_mode == RunMode::FIXED_SOURCE) {
+    for (int g = 0; g < negroups_; g++) {
+      angular_flux_[g] += srh.external_source(g) * distance;
+    }
   }
 }
 
@@ -782,9 +789,7 @@ void RandomRay::initialize_ray(uint64_t ray_id, FlatSourceDomain* domain)
     fatal_error("Unknown sample method for random ray transport.");
   }
 
-  site.E = lower_bound_index(
-    data::mg.rev_energy_bins_.begin(), data::mg.rev_energy_bins_.end(), site.E);
-  site.E = negroups_ - site.E - 1.;
+  site.E = 0.0;
   this->from_source(&site);
 
   // Locate ray
diff --git a/src/random_ray/source_region.cpp b/src/random_ray/source_region.cpp
index 6c0df0157..69541f7f8 100644
--- a/src/random_ray/source_region.cpp
+++ b/src/random_ray/source_region.cpp
@@ -217,7 +217,11 @@ SourceRegionHandle SourceRegionContainer::get_source_region_handle(int64_t sr)
   handle.scalar_flux_old_ = &scalar_flux_old(sr, 0);
   handle.scalar_flux_new_ = &scalar_flux_new(sr, 0);
   handle.source_ = &source(sr, 0);
-  handle.external_source_ = &external_source(sr, 0);
+  if (settings::run_mode == RunMode::FIXED_SOURCE) {
+    handle.external_source_ = &external_source(sr, 0);
+  } else {
+    handle.external_source_ = nullptr;
+  }
   handle.scalar_flux_final_ = &scalar_flux_final(sr, 0);
   handle.tally_task_ = &tally_task(sr, 0);
 

From 7382b5d1c8b00342335b39159a00667ca8768b05 Mon Sep 17 00:00:00 2001
From: Lorenzo Chierici <l.chierici89@gmail.com>
Date: Mon, 12 May 2025 22:48:21 +0200
Subject: [PATCH 031/203] External transfer rates source term (#3088)

Co-authored-by: Paul Romano <paul.k.romano@gmail.com>
---
 docs/source/pythonapi/deplete.rst             |   5 +-
 openmc/deplete/abc.py                         | 110 ++++--
 openmc/deplete/chain.py                       |  70 +++-
 openmc/deplete/integrators.py                 |  56 +--
 openmc/deplete/pool.py                        |  59 ++-
 openmc/deplete/transfer_rates.py              | 355 ++++++++++++++----
 .../ref_depletion_with_ext_source.h5          | Bin 0 -> 37328 bytes
 .../ref_depletion_with_feed.h5                | Bin 37328 -> 37328 bytes
 .../ref_depletion_with_removal.h5             | Bin 37328 -> 37328 bytes
 .../ref_depletion_with_transfer.h5            | Bin 37328 -> 37328 bytes
 .../ref_no_depletion_only_feed.h5             | Bin 37328 -> 37328 bytes
 .../ref_no_depletion_only_removal.h5          | Bin 37328 -> 37328 bytes
 .../ref_no_depletion_with_ext_source.h5       | Bin 0 -> 37328 bytes
 .../ref_no_depletion_with_transfer.h5         | Bin 37328 -> 37328 bytes
 .../deplete_with_transfer_rates/test.py       |  45 ++-
 .../test_deplete_external_source_rates.py     | 170 +++++++++
 .../unit_tests/test_deplete_transfer_rates.py |  65 ++--
 17 files changed, 751 insertions(+), 184 deletions(-)
 create mode 100644 tests/regression_tests/deplete_with_transfer_rates/ref_depletion_with_ext_source.h5
 create mode 100644 tests/regression_tests/deplete_with_transfer_rates/ref_no_depletion_with_ext_source.h5
 create mode 100644 tests/unit_tests/test_deplete_external_source_rates.py

diff --git a/docs/source/pythonapi/deplete.rst b/docs/source/pythonapi/deplete.rst
index 3967f1a18..f112cf8cc 100644
--- a/docs/source/pythonapi/deplete.rst
+++ b/docs/source/pythonapi/deplete.rst
@@ -206,14 +206,15 @@ total system energy.
 The :class:`openmc.deplete.IndependentOperator` uses inner classes subclassed
 from those listed above to perform similar calculations.
 
-The following classes are used to define transfer rates to model continuous
-removal or feed of nuclides during depletion.
+The following classes are used to define external source rates or transfer rates
+to model continuous removal or feed of nuclides during depletion.
 
 .. autosummary::
    :toctree: generated
    :nosignatures:
    :template: myclass.rst
 
+   transfer_rates.ExternalSourceRates
    transfer_rates.TransferRates
 
 Intermediate Classes
diff --git a/openmc/deplete/abc.py b/openmc/deplete/abc.py
index ab087b98e..c304b8dc6 100644
--- a/openmc/deplete/abc.py
+++ b/openmc/deplete/abc.py
@@ -29,7 +29,7 @@ from .results import Results, _SECONDS_PER_MINUTE, _SECONDS_PER_HOUR, \
     _SECONDS_PER_DAY, _SECONDS_PER_JULIAN_YEAR
 from .pool import deplete
 from .reaction_rates import ReactionRates
-from .transfer_rates import TransferRates
+from .transfer_rates import TransferRates, ExternalSourceRates
 
 
 __all__ = [
@@ -607,9 +607,14 @@ class Integrator(ABC):
               next time step. Expected to be of the same shape as ``n0``
 
     transfer_rates : openmc.deplete.TransferRates
-        Instance of TransferRates class to perform continuous transfer during depletion
+        Transfer rates for the depletion system used to model continuous
+        removal/feed between materials.
 
         .. versionadded:: 0.14.0
+    external_source_rates : openmc.deplete.ExternalSourceRates
+        External source rates for the depletion system.
+
+        .. versionadded:: 0.15.3
 
     """
 
@@ -686,6 +691,7 @@ class Integrator(ABC):
         self.source_rates = np.asarray(source_rates)
 
         self.transfer_rates = None
+        self.external_source_rates = None
 
         if isinstance(solver, str):
             # Delay importing of cram module, which requires this file
@@ -731,11 +737,11 @@ class Integrator(ABC):
 
         self._solver = func
 
-    def _timed_deplete(self, n, rates, dt, matrix_func=None):
+    def _timed_deplete(self, n, rates, dt, i=None, matrix_func=None):
         start = time.time()
         results = deplete(
-            self._solver, self.chain, n, rates, dt, matrix_func,
-            self.transfer_rates)
+            self._solver, self.chain, n, rates, dt, i, matrix_func,
+            self.transfer_rates, self.external_source_rates)
         return time.time() - start, results
 
     @abstractmethod
@@ -885,13 +891,14 @@ class Integrator(ABC):
         self.operator.finalize()
 
     def add_transfer_rate(
-            self,
-            material: Union[str, int, Material],
-            components: Sequence[str],
-            transfer_rate: float,
-            transfer_rate_units: str = '1/s',
-            destination_material: Optional[Union[str, int, Material]] = None
-        ):
+        self,
+        material: str | int | Material,
+        components: Sequence[str],
+        transfer_rate: float,
+        transfer_rate_units: str = '1/s',
+        timesteps: Sequence[int] | None = None,
+        destination_material: str | int | Material | None = None
+    ):
         """Add transfer rates to depletable material.
 
         Parameters
@@ -905,18 +912,79 @@ class Integrator(ABC):
         transfer_rate : float
             Rate at which elements are transferred. A positive or negative values
             set removal of feed rates, respectively.
-        destination_material : openmc.Material or str or int, Optional
-            Destination material to where nuclides get fed.
         transfer_rate_units : {'1/s', '1/min', '1/h', '1/d', '1/a'}
             Units for values specified in the transfer_rate argument. 's' means
             seconds, 'min' means minutes, 'h' means hours, 'a' means Julian years.
+        timesteps : list of int, optional
+            List of timestep indices where to set external source rates.
+            Defaults to None, which means the external source rate is set for
+            all timesteps.
+        destination_material : openmc.Material or str or int, Optional
+            Destination material to where nuclides get fed.
 
         """
         if self.transfer_rates is None:
-            self.transfer_rates = TransferRates(self.operator, self.operator.model)
+            if hasattr(self.operator, 'model'):
+                materials = self.operator.model.materials
+            elif hasattr(self.operator, 'materials'):
+                materials = self.operator.materials
+            self.transfer_rates = TransferRates(
+                self.operator, materials, len(self.timesteps))
+
+        if self.external_source_rates is not None and destination_material:
+            raise ValueError('Currently is not possible to set a transfer rate '
+                             'with destination matrial in combination with '
+                             'external source rates.')
+
+        self.transfer_rates.set_transfer_rate(
+            material, components, transfer_rate, transfer_rate_units,
+            timesteps, destination_material)
+
+    def add_external_source_rate(
+        self,
+        material: str | int | Material,
+        composition: dict[str, float],
+        rate: float,
+        rate_units: str = 'g/s',
+        timesteps: Sequence[int] | None = None
+    ):
+        """Add external source rates to depletable material.
+
+        Parameters
+        ----------
+        material : openmc.Material or str or int
+            Depletable material
+        composition : dict of str to float
+            External source rate composition vector, where key can be an element
+            or a nuclide and value the corresponding weight percent.
+        rate : float
+            External source rate in units of mass per time. A positive or
+            negative value corresponds to a feed or removal rate, respectively.
+        units : {'g/s', 'g/min', 'g/h', 'g/d', 'g/a'}
+            Units for values specified in the `rate` argument. 's' for seconds,
+            'min' for minutes, 'h' for hours, 'a' for Julian years.
+        timesteps : list of int, optional
+            List of timestep indices where to set external source rates.
+            Defaults to None, which means the external source rate is set for
+            all timesteps.
+
+        """
+        if self.external_source_rates is None:
+            if hasattr(self.operator, 'model'):
+                materials = self.operator.model.materials
+            elif hasattr(self.operator, 'materials'):
+                materials = self.operator.materials
+            self.external_source_rates = ExternalSourceRates(
+                self.operator, materials, len(self.timesteps))
+
+        if self.transfer_rates is not None and self.transfer_rates.index_transfer:
+            raise ValueError('Currently is not possible to set an external '
+                             'source rate in combination with transfer rates '
+                             'with destination matrial.')
+
+        self.external_source_rates.set_external_source_rate(
+            material, composition, rate, rate_units, timesteps)
 
-        self.transfer_rates.set_transfer_rate(material, components, transfer_rate,
-                                      transfer_rate_units, destination_material)
 
 @add_params
 class SIIntegrator(Integrator):
@@ -1047,10 +1115,10 @@ class SIIntegrator(Integrator):
         return inherited
 
     def integrate(
-            self,
-            output: bool = True,
-            path: PathLike = "depletion_results.h5"
-        ):
+        self,
+        output: bool = True,
+        path: PathLike = "depletion_results.h5"
+    ):
         """Perform the entire depletion process across all steps
 
         Parameters
diff --git a/openmc/deplete/chain.py b/openmc/deplete/chain.py
index 4998a2c3d..9f234683a 100644
--- a/openmc/deplete/chain.py
+++ b/openmc/deplete/chain.py
@@ -703,7 +703,7 @@ class Chain:
         # Return CSC representation instead of DOK
         return matrix.tocsc()
 
-    def form_rr_term(self, tr_rates, mats):
+    def form_rr_term(self, tr_rates, current_timestep, mats):
         """Function to form the transfer rate term matrices.
 
         .. versionadded:: 0.14.0
@@ -712,6 +712,8 @@ class Chain:
         ----------
         tr_rates : openmc.deplete.TransferRates
             Instance of openmc.deplete.TransferRates
+        current_timestep : int
+            Current timestep index
         mats : string or two-tuple of strings
             Two cases are possible:
 
@@ -740,32 +742,74 @@ class Chain:
 
         for i, nuc in enumerate(self.nuclides):
             elm = re.split(r'\d+', nuc.name)[0]
-            # Build transfer terms matrices
+            # Build transfer terms (nuclide transfer only)
             if isinstance(mats, str):
                 mat = mats
-                components = tr_rates.get_components(mat)
+                components = tr_rates.get_components(mat, current_timestep)
+                if not components:
+                    break
                 if elm in components:
-                    matrix[i, i] = sum(tr_rates.get_transfer_rate(mat, elm))
+                    matrix[i, i] = sum(
+                        tr_rates.get_external_rate(mat, elm, current_timestep))
                 elif nuc.name in components:
-                    matrix[i, i] = sum(tr_rates.get_transfer_rate(mat, nuc.name))
+                    matrix[i, i] = sum(
+                        tr_rates.get_external_rate(mat, nuc.name, current_timestep))
                 else:
                     matrix[i, i] = 0.0
-            #Build transfer terms matrices
+
+            # Build transfer terms (transfer from one material into another)
             elif isinstance(mats, tuple):
                 dest_mat, mat = mats
-                if dest_mat in tr_rates.get_destination_material(mat, elm):
-                    dest_mat_idx = tr_rates.get_destination_material(mat, elm).index(dest_mat)
-                    matrix[i, i] = tr_rates.get_transfer_rate(mat, elm)[dest_mat_idx]
-                elif dest_mat in tr_rates.get_destination_material(mat, nuc.name):
-                    dest_mat_idx = tr_rates.get_destination_material(mat, nuc.name).index(dest_mat)
-                    matrix[i, i] = tr_rates.get_transfer_rate(mat, nuc.name)[dest_mat_idx]
+                components = tr_rates.get_components(mat, current_timestep, dest_mat)
+                if elm in components:
+                    matrix[i, i] = tr_rates.get_external_rate(
+                        mat, elm, current_timestep, dest_mat)[0]
+                elif nuc.name in components:
+                    matrix[i, i] = tr_rates.get_external_rate(
+                        mat, nuc.name, current_timestep, dest_mat)[0]
                 else:
                     matrix[i, i] = 0.0
-            #Nothing else is allowed
 
         # Return CSC instead of DOK
         return matrix.tocsc()
 
+    def form_ext_source_term(self, ext_source_rates, current_timestep, mat):
+        """Function to form the external source rate term vectors.
+
+        .. versionadded:: 0.15.3
+
+        Parameters
+        ----------
+        ext_source_rates : openmc.deplete.ExternalSourceRates
+            Instance of openmc.deplete.ExternalSourceRates
+        current_timestep : int
+            Current timestep index
+        mat : string
+            Material id
+
+        Returns
+        -------
+        scipy.sparse.csc_matrix
+            Sparse vector representing external source term.
+
+        """
+        if not ext_source_rates.get_components(mat, current_timestep):
+            return
+        # Use DOK as intermediate representation
+        n = len(self)
+        vector = sp.dok_matrix((n, 1))
+
+        for i, nuc in enumerate(self.nuclides):
+            # Build source term vector
+            if nuc.name in ext_source_rates.get_components(mat, current_timestep):
+                vector[i] = sum(ext_source_rates.get_external_rate(
+                    mat, nuc.name, current_timestep))
+            else:
+                vector[i] = 0.0
+
+        # Return CSC instead of DOK
+        return vector.tocsc()
+
     def get_branch_ratios(self, reaction="(n,gamma)"):
         """Return a dictionary with reaction branching ratios
 
diff --git a/openmc/deplete/integrators.py b/openmc/deplete/integrators.py
index 50810c88a..000cb2c41 100644
--- a/openmc/deplete/integrators.py
+++ b/openmc/deplete/integrators.py
@@ -40,8 +40,8 @@ class PredictorIntegrator(Integrator):
             Time in [s] for the entire depletion interval
         source_rate : float
             Power in [W] or source rate in [neutron/sec]
-        _i : int or None
-            Iteration index. Not used
+        _i : int, optional
+            Current iteration count. Not used
 
         Returns
         -------
@@ -54,7 +54,7 @@ class PredictorIntegrator(Integrator):
             with predictor
 
         """
-        proc_time, n_end = self._timed_deplete(n, rates, dt)
+        proc_time, n_end = self._timed_deplete(n, rates, dt, _i)
         return proc_time, [n_end], []
 
 
@@ -106,12 +106,12 @@ class CECMIntegrator(Integrator):
             Eigenvalue and reaction rates from transport simulations
         """
         # deplete across first half of interval
-        time0, n_middle = self._timed_deplete(n, rates, dt / 2)
+        time0, n_middle = self._timed_deplete(n, rates, dt / 2, _i)
         res_middle = self.operator(n_middle, source_rate)
 
         # deplete across entire interval with BOS concentrations,
         # MOS reaction rates
-        time1, n_end = self._timed_deplete(n, res_middle.rates, dt)
+        time1, n_end = self._timed_deplete(n, res_middle.rates, dt, _i)
 
         return time0 + time1, [n_middle, n_end], [res_middle]
 
@@ -172,26 +172,26 @@ class CF4Integrator(Integrator):
         """
         # Step 1: deplete with matrix 1/2*A(y0)
         time1, n_eos1 = self._timed_deplete(
-            n_bos, bos_rates, dt, matrix_func=cf4_f1)
+            n_bos, bos_rates, dt, _i, matrix_func=cf4_f1)
         res1 = self.operator(n_eos1, source_rate)
 
         # Step 2: deplete with matrix 1/2*A(y1)
         time2, n_eos2 = self._timed_deplete(
-            n_bos, res1.rates, dt, matrix_func=cf4_f1)
+            n_bos, res1.rates, dt, _i, matrix_func=cf4_f1)
         res2 = self.operator(n_eos2, source_rate)
 
         # Step 3: deplete with matrix -1/2*A(y0)+A(y2)
         list_rates = list(zip(bos_rates, res2.rates))
         time3, n_eos3 = self._timed_deplete(
-            n_eos1, list_rates, dt, matrix_func=cf4_f2)
+            n_eos1, list_rates, dt, _i, matrix_func=cf4_f2)
         res3 = self.operator(n_eos3, source_rate)
 
         # Step 4: deplete with two matrix exponentials
         list_rates = list(zip(bos_rates, res1.rates, res2.rates, res3.rates))
         time4, n_inter = self._timed_deplete(
-            n_bos, list_rates, dt, matrix_func=cf4_f3)
+            n_bos, list_rates, dt, _i, matrix_func=cf4_f3)
         time5, n_eos5 = self._timed_deplete(
-            n_inter, list_rates, dt, matrix_func=cf4_f4)
+            n_inter, list_rates, dt, _i, matrix_func=cf4_f4)
 
         return (time1 + time2 + time3 + time4 + time5,
                 [n_eos1, n_eos2, n_eos3, n_eos5],
@@ -249,17 +249,17 @@ class CELIIntegrator(Integrator):
             simulation
         """
         # deplete to end using BOS rates
-        proc_time, n_ce = self._timed_deplete(n_bos, rates, dt)
+        proc_time, n_ce = self._timed_deplete(n_bos, rates, dt, _i)
         res_ce = self.operator(n_ce, source_rate)
 
         # deplete using two matrix exponentials
         list_rates = list(zip(rates, res_ce.rates))
 
         time_le1, n_inter = self._timed_deplete(
-            n_bos, list_rates, dt, matrix_func=celi_f1)
+            n_bos, list_rates, dt, _i, matrix_func=celi_f1)
 
         time_le2, n_end = self._timed_deplete(
-            n_inter, list_rates, dt, matrix_func=celi_f2)
+            n_inter, list_rates, dt, _i, matrix_func=celi_f2)
 
         return proc_time + time_le1 + time_le1, [n_ce, n_end], [res_ce]
 
@@ -316,20 +316,20 @@ class EPCRK4Integrator(Integrator):
         """
 
         # Step 1: deplete with matrix A(y0) / 2
-        time1, n1 = self._timed_deplete(n, rates, dt, matrix_func=rk4_f1)
+        time1, n1 = self._timed_deplete(n, rates, dt, _i, matrix_func=rk4_f1)
         res1 = self.operator(n1, source_rate)
 
         # Step 2: deplete with matrix A(y1) / 2
-        time2, n2 = self._timed_deplete(n, res1.rates, dt, matrix_func=rk4_f1)
+        time2, n2 = self._timed_deplete(n, res1.rates, dt, _i, matrix_func=rk4_f1)
         res2 = self.operator(n2, source_rate)
 
         # Step 3: deplete with matrix A(y2)
-        time3, n3 = self._timed_deplete(n, res2.rates, dt)
+        time3, n3 = self._timed_deplete(n, res2.rates, dt, _i)
         res3 = self.operator(n3, source_rate)
 
         # Step 4: deplete with matrix built from weighted rates
         list_rates = list(zip(rates, res1.rates, res2.rates, res3.rates))
-        time4, n4 = self._timed_deplete(n, list_rates, dt, matrix_func=rk4_f4)
+        time4, n4 = self._timed_deplete(n, list_rates, dt, _i, matrix_func=rk4_f4)
 
         return (time1 + time2 + time3 + time4, [n1, n2, n3, n4], [res1, res2, res3])
 
@@ -414,9 +414,9 @@ class LEQIIntegrator(Integrator):
             self._prev_rates, bos_res.rates, repeat(prev_dt), repeat(dt)))
 
         time1, n_inter = self._timed_deplete(
-            n_bos, le_inputs, dt, matrix_func=leqi_f1)
+            n_bos, le_inputs, dt, i, matrix_func=leqi_f1)
         time2, n_eos0 = self._timed_deplete(
-            n_inter, le_inputs, dt, matrix_func=leqi_f2)
+            n_inter, le_inputs, dt, i, matrix_func=leqi_f2)
 
         res_inter = self.operator(n_eos0, source_rate)
 
@@ -425,9 +425,9 @@ class LEQIIntegrator(Integrator):
             repeat(prev_dt), repeat(dt)))
 
         time3, n_inter = self._timed_deplete(
-            n_bos, qi_inputs, dt, matrix_func=leqi_f3)
+            n_bos, qi_inputs, dt, i, matrix_func=leqi_f3)
         time4, n_eos1 = self._timed_deplete(
-            n_inter, qi_inputs, dt, matrix_func=leqi_f4)
+            n_inter, qi_inputs, dt, i, matrix_func=leqi_f4)
 
         # store updated rates
         self._prev_rates = copy.deepcopy(bos_res.rates)
@@ -478,7 +478,7 @@ class SICELIIntegrator(SIIntegrator):
             Eigenvalue and reaction rates from intermediate transport
             simulations
         """
-        proc_time, n_eos = self._timed_deplete(n_bos, bos_rates, dt)
+        proc_time, n_eos = self._timed_deplete(n_bos, bos_rates, dt, _i)
         n_inter = copy.deepcopy(n_eos)
 
         # Begin iteration
@@ -494,9 +494,9 @@ class SICELIIntegrator(SIIntegrator):
 
             list_rates = list(zip(bos_rates, res_bar.rates))
             time1, n_inter = self._timed_deplete(
-                n_bos, list_rates, dt, matrix_func=celi_f1)
+                n_bos, list_rates, dt, _i, matrix_func=celi_f1)
             time2, n_inter = self._timed_deplete(
-                n_inter, list_rates, dt, matrix_func=celi_f2)
+                n_inter, list_rates, dt, _i, matrix_func=celi_f2)
             proc_time += time1 + time2
 
         # end iteration
@@ -560,9 +560,9 @@ class SILEQIIntegrator(SIIntegrator):
         inputs = list(zip(self._prev_rates, bos_rates,
                           repeat(prev_dt), repeat(dt)))
         proc_time, n_inter = self._timed_deplete(
-            n_bos, inputs, dt, matrix_func=leqi_f1)
+            n_bos, inputs, dt, i, matrix_func=leqi_f1)
         time1, n_eos = self._timed_deplete(
-            n_inter, inputs, dt, matrix_func=leqi_f2)
+            n_inter, inputs, dt, i, matrix_func=leqi_f2)
 
         proc_time += time1
         n_inter = copy.deepcopy(n_eos)
@@ -580,9 +580,9 @@ class SILEQIIntegrator(SIIntegrator):
             inputs = list(zip(self._prev_rates, bos_rates, res_bar.rates,
                               repeat(prev_dt), repeat(dt)))
             time1, n_inter = self._timed_deplete(
-                n_bos, inputs, dt, matrix_func=leqi_f3)
+                n_bos, inputs, dt, i, matrix_func=leqi_f3)
             time2, n_inter = self._timed_deplete(
-                n_inter, inputs, dt, matrix_func=leqi_f4)
+                n_inter, inputs, dt, i, matrix_func=leqi_f4)
             proc_time += time1 + time2
 
         return proc_time, [n_eos, n_inter], [res_bar]
diff --git a/openmc/deplete/pool.py b/openmc/deplete/pool.py
index 27ecaa4dd..03b050af3 100644
--- a/openmc/deplete/pool.py
+++ b/openmc/deplete/pool.py
@@ -5,7 +5,7 @@ Provided to avoid some circular imports
 from itertools import repeat, starmap
 from multiprocessing import Pool
 
-from scipy.sparse import bmat
+from scipy.sparse import bmat, hstack, vstack, csc_matrix
 import numpy as np
 
 from openmc.mpi import comm
@@ -40,8 +40,8 @@ def _distribute(items):
             return items[j:j + chunk_size]
         j += chunk_size
 
-def deplete(func, chain, n, rates, dt, matrix_func=None, transfer_rates=None,
-            *matrix_args):
+def deplete(func, chain, n, rates, dt, current_timestep=None, matrix_func=None,
+            transfer_rates=None, external_source_rates=None, *matrix_args):
     """Deplete materials using given reaction rates for a specified time
 
     Parameters
@@ -58,15 +58,21 @@ def deplete(func, chain, n, rates, dt, matrix_func=None, transfer_rates=None,
         Reaction rates (from transport operator)
     dt : float
         Time in [s] to deplete for
+    current_timestep : int
+        Current timestep index
     maxtrix_func : callable, optional
         Function to form the depletion matrix after calling ``matrix_func(chain,
         rates, fission_yields)``, where ``fission_yields = {parent: {product:
         yield_frac}}`` Expected to return the depletion matrix required by
         ``func``
     transfer_rates : openmc.deplete.TransferRates, Optional
-        Object to perform continuous reprocessing.
+        Transfer rates for continuous removal/feed.
 
         .. versionadded:: 0.14.0
+    external_source_rates : openmc.deplete.ExternalSourceRates, Optional
+        External source rates for continuous removal/feed.
+
+        .. versionadded:: 0.15.3
     matrix_args: Any, optional
         Additional arguments passed to matrix_func
 
@@ -93,15 +99,17 @@ def deplete(func, chain, n, rates, dt, matrix_func=None, transfer_rates=None,
         matrices = map(matrix_func, repeat(chain), rates, fission_yields,
                        *matrix_args)
 
-    if transfer_rates is not None:
+    if (transfer_rates is not None and
+        current_timestep in transfer_rates.external_timesteps):
         # Calculate transfer rate terms as diagonal matrices
         transfers = map(chain.form_rr_term, repeat(transfer_rates),
-                        transfer_rates.local_mats)
+                        repeat(current_timestep), transfer_rates.local_mats)
+
         # Subtract transfer rate terms from Bateman matrices
         matrices = [matrix - transfer for (matrix, transfer) in zip(matrices,
                                                                     transfers)]
 
-        if len(transfer_rates.index_transfer) > 0:
+        if current_timestep in transfer_rates.index_transfer:
             # Gather all on comm.rank 0
             matrices = comm.gather(matrices)
             n = comm.gather(n)
@@ -112,10 +120,12 @@ def deplete(func, chain, n, rates, dt, matrix_func=None, transfer_rates=None,
                 n = [n_elm for n_mat in n for  n_elm in n_mat]
 
                 # Calculate transfer rate terms as diagonal matrices
-                transfer_pair = {
-                    mat_pair: chain.form_rr_term(transfer_rates, mat_pair)
-                    for mat_pair in transfer_rates.index_transfer
-                }
+                transfer_pair = {}
+                for mat_pair in transfer_rates.index_transfer[current_timestep]:
+                    transfer_matrix = chain.form_rr_term(transfer_rates,
+                                                         current_timestep,
+                                                         mat_pair)
+                    transfer_pair[mat_pair] = transfer_matrix
 
                 # Combine all matrices together in a single matrix of matrices
                 # to be solved in one go
@@ -129,7 +139,7 @@ def deplete(func, chain, n, rates, dt, matrix_func=None, transfer_rates=None,
                         if row == col:
                             # Fill the diagonals with the Bateman matrices
                             cols.append(matrices[row])
-                        elif mat_pair in transfer_rates.index_transfer:
+                        elif mat_pair in transfer_rates.index_transfer[current_timestep]:
                             # Fill the off-diagonals with the transfer pair matrices
                             cols.append(transfer_pair[mat_pair])
                         else:
@@ -155,6 +165,25 @@ def deplete(func, chain, n, rates, dt, matrix_func=None, transfer_rates=None,
 
             return n_result
 
+    if (external_source_rates is not None and
+        current_timestep in external_source_rates.external_timesteps):
+        # Calculate external source term vectors
+        sources = map(chain.form_ext_source_term, repeat(external_source_rates),
+                      repeat(current_timestep), external_source_rates.local_mats)
+
+        # stack vector column at the end of the matrix
+        matrices = [
+            hstack([matrix, source])
+            for matrix, source in zip(matrices, sources)
+        ]
+
+        # Add a last row of zeroes to the matrices and append 1 to the last row
+        # of the nuclide vectors
+        for i, matrix in enumerate(matrices):
+            if not np.equal(*matrix.shape):
+                matrices[i] = vstack([matrix, csc_matrix([0]*matrix.shape[1])])
+                n[i] = np.append(n[i], 1.0)
+
     inputs = zip(matrices, n, repeat(dt))
 
     if USE_MULTIPROCESSING:
@@ -163,4 +192,10 @@ def deplete(func, chain, n, rates, dt, matrix_func=None, transfer_rates=None,
     else:
         n_result = list(starmap(func, inputs))
 
+    # Remove extra value at the end of the nuclide vectors
+    if (external_source_rates is not None and
+        current_timestep in external_source_rates.external_timesteps):
+        external_source_rates.reformat_nuclide_vectors(n)
+        external_source_rates.reformat_nuclide_vectors(n_result)
+
     return n_result
diff --git a/openmc/deplete/transfer_rates.py b/openmc/deplete/transfer_rates.py
index 01c9b2e35..4c28c7d15 100644
--- a/openmc/deplete/transfer_rates.py
+++ b/openmc/deplete/transfer_rates.py
@@ -1,31 +1,31 @@
+from collections import defaultdict
 from numbers import Real
 import re
+from typing import Sequence
+
+import numpy as np
 
 from openmc.checkvalue import check_type, check_value
 from openmc import Material
-from openmc.data import ELEMENT_SYMBOL
+from openmc.data import ELEMENT_SYMBOL, isotopes, AVOGADRO, atomic_mass
+from .results import _SECONDS_PER_MINUTE, _SECONDS_PER_HOUR, \
+    _SECONDS_PER_DAY, _SECONDS_PER_JULIAN_YEAR
 
 
-class TransferRates:
-    """Class for defining continuous removals and feeds.
 
-    Molten Salt Reactors (MSRs) benefit from continuous reprocessing,
-    which removes fission products and feeds fresh fuel into the system. MSRs
-    inspired the development of this class.
+class ExternalRates:
+    """External rates class for defining addition terms of depletion equation.
 
-    An instance of this class can be passed directly to an instance of one of
-    the :class:`openmc.deplete.Integrator` classes.
-
-    .. versionadded:: 0.14.0
+    .. versionadded:: 0.15.3
 
     Parameters
     ----------
     operator : openmc.TransportOperator
         Depletion operator
-    model : openmc.Model
-        OpenMC model containing materials and geometry. If using
-        :class:`openmc.deplete.CoupledOperator`, the model must also contain
-        a :class:`opnemc.Settings` object.
+    materials : openmc.Materials
+        OpenMC materials.
+    number_of_timesteps : int
+        Total number of depletion timesteps
 
     Attributes
     ----------
@@ -33,22 +33,25 @@ class TransferRates:
         All burnable material IDs.
     local_mats : list of str
         All burnable material IDs being managed by a single process
-    transfer_rates : dict of str to dict
-        Container of transfer rates, components (elements and/or nuclides) and
-        destination material
-    index_transfer : Set of pair of str
-        Pair of strings needed to build final matrix (destination_material, mat)
+    number_of_timesteps : int
+        Total number of depletion timesteps
+    external_rates : dict of str to dict
+        Container of timesteps, external rates, components (elements and/or
+        nuclides) and optionally destination material
+    external_timesteps : list of int
+        Container of all timesteps indeces with an external rate defined.
     """
 
-    def __init__(self, operator, model):
+    def __init__(self, operator, materials, number_of_timesteps):
 
-        self.materials = model.materials
+        self.materials = materials
         self.burnable_mats = operator.burnable_mats
         self.local_mats = operator.local_mats
+        self.number_of_timesteps = number_of_timesteps
 
-        #initialize transfer rates container dict
-        self.transfer_rates = {mat: {} for mat in self.burnable_mats}
-        self.index_transfer = set()
+        # initialize transfer rates container dict
+        self.external_rates = {mat: defaultdict(list) for mat in self.burnable_mats}
+        self.external_timesteps = []
 
     def _get_material_id(self, val):
         """Helper method for getting material id from Material obj or name.
@@ -71,7 +74,7 @@ class TransferRates:
                 check_value('Material ID', str(val), self.burnable_mats)
             else:
                 check_value('Material name', val,
-                        [mat.name for mat in self.materials if mat.depletable])
+                            [mat.name for mat in self.materials if mat.depletable])
                 val = [mat.id for mat in self.materials if mat.name == val][0]
 
         elif isinstance(val, int):
@@ -79,7 +82,13 @@ class TransferRates:
 
         return str(val)
 
-    def get_transfer_rate(self, material, component):
+    def get_external_rate(
+        self,
+        material: str | int | Material,
+        component: str,
+        timestep: int,
+        destination_material: str | int | Material | None = None
+    ):
         """Return transfer rate for given material and element.
 
         Parameters
@@ -88,62 +97,114 @@ class TransferRates:
             Depletable material
         component : str
             Element or nuclide to get transfer rate value
+        timestep : int
+            Current timestep index
+        destination_material : openmc.Material or str or int, Optional
+            Destination material to where nuclides get fed
 
         Returns
         -------
-        transfer_rate : list of floats
-            Transfer rate values
+        external_rate : list of floats
+            External rate values
 
         """
         material_id = self._get_material_id(material)
         check_type('component', component, str)
-        return [i[0] for i in self.transfer_rates[material_id][component]]
-
-    def get_destination_material(self, material, component):
-        """Return destination material for given material and
-        component, if defined.
-
-        Parameters
-        ----------
-        material : openmc.Material or str or int
-            Depletable material
-        component : str
-            Element or nuclide that gets transferred to another material.
-
-        Returns
-        -------
-        destination_material_id : list of str
-            Depletable material ID to where the element or nuclide gets
-            transferred
-
-        """
-        material_id = self._get_material_id(material)
-        check_type('component', component, str)
-        if component in self.transfer_rates[material_id]:
-            return [i[1] for i in self.transfer_rates[material_id][component]]
+        if destination_material is not None:
+            dest_mat_id = self._get_material_id(destination_material)
+            return [i[1] for i in self.external_rates[material_id][component]
+                    if timestep in i[0] and dest_mat_id == i[2]]
         else:
-            return []
+            return [i[1] for i in self.external_rates[material_id][component]
+                    if timestep in i[0]]
 
-    def get_components(self, material):
-        """Extract removing elements and/or nuclides for a given material
+    def get_components(self, material, timestep, destination_material=None):
+        """Extract removing elements and/or nuclides for a given material at a
+        given timestep
 
         Parameters
         ----------
         material : openmc.Material or str or int
             Depletable material
+        timestep : int
+            Current timestep index
+        destination_material : openmc.Material or str or int, Optional
+            Destination material to where nuclides get fed
 
         Returns
         -------
-        elements : list
-            List of elements and nuclides where transfer rates exist
+        components : list
+            List of elements or nuclides with external rates set at a given
+            timestep
 
         """
         material_id = self._get_material_id(material)
-        if material_id in self.transfer_rates:
-            return self.transfer_rates[material_id].keys()
+        if destination_material is not None:
+            dest_mat_id = self._get_material_id(destination_material)
+        else:
+            dest_mat_id = None
+
+        all_components = []
+        if material_id in self.external_rates:
+            mat_components = self.external_rates[material_id]
+
+            for component in mat_components:
+                if dest_mat_id:
+                    # check for both timestep and destination material ids
+                    if np.isin(timestep, [val[0] for val in mat_components[component]]) and \
+                       np.isin(dest_mat_id, [val[2] for val in mat_components[component]]):
+                        all_components.append(component)
+                else:
+                    # check only for timesteps
+                    if np.isin(timestep, [val[0] for val in mat_components[component]]):
+                        all_components.append(component)
+        return all_components
+
+
+class TransferRates(ExternalRates):
+    """Class for defining continuous removals and feeds.
+
+    Molten Salt Reactors (MSRs) benefit from continuous reprocessing,
+    which removes fission products and feeds fresh fuel into the system. MSRs
+    inspired the development of this class.
+
+    An instance of this class can be passed directly to an instance of one of
+    the :class:`openmc.deplete.Integrator` classes.
+
+    .. versionadded:: 0.14.0
+
+    Parameters
+    ----------
+    operator : openmc.TransportOperator
+        Depletion operator
+    materials : openmc.Materials
+        OpenMC materials.
+    number_of_timesteps : int
+        Total number of depletion timesteps
+
+    Attributes
+    ----------
+    burnable_mats : list of str
+        All burnable material IDs.
+    local_mats : list of str
+        All burnable material IDs being managed by a single process
+    external_rates : dict of str to dict
+        Container of timesteps, transfer rates, components (elements and/or
+        nuclides) and destination material
+    external_timesteps : list of int
+        Container of all timesteps indeces with an external rate defined.
+    index_transfer : Set of pair of str
+        Pair of strings needed to build final matrix (destination_material, mat)
+    """
+
+    def __init__(self, operator, materials, number_of_timesteps):
+        super().__init__(operator, materials, number_of_timesteps)
+        self.index_transfer = defaultdict(list)
+        self.chain_nuclides = [nuc.name for nuc in operator.chain.nuclides]
 
     def set_transfer_rate(self, material, components, transfer_rate,
-                          transfer_rate_units='1/s', destination_material=None):
+                          transfer_rate_units='1/s', timesteps=None,
+                          destination_material=None):
         """Set element and/or nuclide transfer rates in a depletable material.
 
         Parameters
@@ -157,11 +218,14 @@ class TransferRates:
         transfer_rate : float
             Rate at which elements and/or nuclides are transferred. A positive or
             negative value corresponds to a removal or feed rate, respectively.
-        destination_material : openmc.Material or str or int, Optional
-            Destination material to where nuclides get fed.
         transfer_rate_units : {'1/s', '1/min', '1/h', '1/d', '1/a'}
             Units for values specified in the transfer_rate argument. 's' for
             seconds, 'min' for minutes, 'h' for hours, 'a' for Julian years.
+        timesteps : list of int, Optional
+            List of timestep indeces where to set transfer rates.
+            Default to None means the transfer rate is set for all timesteps.
+        destination_material : openmc.Material or str or int, Optional
+            Destination material to where nuclides get fed.
 
         """
         material_id = self._get_material_id(material)
@@ -183,19 +247,25 @@ class TransferRates:
         if transfer_rate_units in ('1/s', '1/sec'):
             unit_conv = 1
         elif transfer_rate_units in ('1/min', '1/minute'):
-            unit_conv = 60
+            unit_conv = _SECONDS_PER_MINUTE
         elif transfer_rate_units in ('1/h', '1/hr', '1/hour'):
-            unit_conv = 60*60
+            unit_conv = _SECONDS_PER_HOUR
         elif transfer_rate_units in ('1/d', '1/day'):
-            unit_conv = 24*60*60
+            unit_conv = _SECONDS_PER_DAY
         elif transfer_rate_units in ('1/a', '1/year'):
-            unit_conv = 365.25*24*60*60
+            unit_conv = _SECONDS_PER_JULIAN_YEAR
         else:
-            raise ValueError('Invalid transfer rate unit '
-                             f'"{transfer_rate_units}"')
+            raise ValueError(f'Invalid transfer rate unit "{transfer_rate_units}"')
+
+        if timesteps is not None:
+            for timestep in timesteps:
+                check_value('timestep', timestep, range(self.number_of_timesteps))
+            timesteps = np.array(timesteps)
+        else:
+            timesteps = np.arange(self.number_of_timesteps)
 
         for component in components:
-            current_components = self.transfer_rates[material_id].keys()
+            current_components = self.external_rates[material_id].keys()
             split_component = re.split(r'\d+', component)
             element = split_component[0]
             if element not in ELEMENT_SYMBOL.values():
@@ -219,11 +289,144 @@ class TransferRates:
                                          f'where element {element} already has '
                                          'a transfer rate.')
 
-            if component in self.transfer_rates[material_id]:
-                self.transfer_rates[material_id][component].append(
-                    (transfer_rate / unit_conv, destination_material_id))
-            else:
-                self.transfer_rates[material_id][component] = [
-                    (transfer_rate / unit_conv, destination_material_id)]
+            self.external_rates[material_id][component].append(
+                (timesteps, transfer_rate/unit_conv, destination_material_id))
+
             if destination_material_id is not None:
-                self.index_transfer.add((destination_material_id, material_id))
+                for timestep in timesteps:
+                    self.index_transfer[timestep].append(
+                        (destination_material_id, material_id))
+
+            self.external_timesteps = np.unique(np.concatenate(
+                    [self.external_timesteps, timesteps]))
+
+
+class ExternalSourceRates(ExternalRates):
+    """Class for defining external source rates.
+
+    An instance of this class can be passed directly to an instance of one of
+    the :class:`openmc.deplete.Integrator` classes.
+
+    .. versionadded:: 0.15.3
+
+    Parameters
+    ----------
+    operator : openmc.TransportOperator
+        Depletion operator
+    materials : openmc.Materials
+        OpenMC materials.
+    number_of_timesteps : int
+        Total number of depletion timesteps
+
+    Attributes
+    ----------
+    burnable_mats : list of str
+        All burnable material IDs.
+    local_mats : list of str
+        All burnable material IDs being managed by a single process
+    external_timesteps : list of int
+        Container of all timesteps indeces with an external rate defined.
+    external_rates : dict of str to dict
+        Container of timesteps external source rates, and components
+        (elements and/or nuclides)
+    """
+
+    def reformat_nuclide_vectors(self, vectors):
+        """Remove last element of nuclide vector that was added for handling
+        external source rates by the depletion solver.
+
+        Parameters
+        ----------
+        vectors : list of array
+            List of nuclides vector to reformat
+
+        """
+        for mat_index, i in enumerate(self.local_mats):
+            if self.external_rates[i]:
+                vectors[mat_index] = vectors[mat_index][:-1]
+
+    def set_external_source_rate(
+        self,
+        material: str | int | Material,
+        composition: dict[str, float],
+        rate: float,
+        rate_units: str = 'g/s',
+        timesteps: Sequence[int] | None = None
+    ):
+        """Set element and/or nuclide composition vector external source rates
+        to a depletable material.
+
+        Parameters
+        ----------
+        material : openmc.Material or str or int
+            Depletable material
+        composition : dict of str to float
+            External source rate composition vector, where key can be an element
+            or a nuclide and value the corresponding weight percent.
+        rate : float
+            External source rate in units of mass per time. A positive or
+            negative value corresponds to a feed or removal rate, respectively.
+        units : {'g/s', 'g/min', 'g/h', 'g/d', 'g/a'}
+            Units for values specified in the `rate` argument. 's' for seconds,
+            'min' for minutes, 'h' for hours, 'a' for Julian years.
+        timesteps : list of int, optional
+            List of timestep indices where to set external source rates. Default
+            to None, which means the external source rate is set for all
+            timesteps.
+
+        """
+
+        material_id = self._get_material_id(material)
+        check_type('rate', rate, Real)
+        check_type('composition', composition, dict, str)
+
+        if rate_units in ('g/s', 'g/sec'):
+            unit_conv = 1
+        elif rate_units in ('g/min', 'g/minute'):
+            unit_conv = _SECONDS_PER_MINUTE
+        elif rate_units in ('g/h', 'g/hr', 'g/hour'):
+            unit_conv = _SECONDS_PER_HOUR
+        elif rate_units in ('g/d', 'g/day'):
+            unit_conv = _SECONDS_PER_DAY
+        elif rate_units in ('g/a', 'g/year'):
+            unit_conv = _SECONDS_PER_JULIAN_YEAR
+        else:
+            raise ValueError(f'Invalid external source rate unit "{rate_units}"')
+
+        if timesteps is not None:
+            for timestep in timesteps:
+                check_value('timestep', timestep, range(self.number_of_timesteps))
+            timesteps = np.asarray(timesteps)
+        else:
+            timesteps = np.arange(self.number_of_timesteps)
+
+        components = composition.keys()
+        percents = composition.values()
+        norm_percents = [float(i) / sum(percents) for i in percents]
+
+        atoms_per_nuc = {}
+        for component, percent in zip(components, norm_percents):
+            split_component = re.split(r'\d+', component)
+            element = split_component[0]
+            if element not in ELEMENT_SYMBOL.values():
+                raise ValueError(f'{component} is not a valid nuclide or element.')
+
+            if len(split_component) == 1:
+                if not isotopes(component):
+                    raise ValueError(f'Cannot add element {component} '
+                                     'as it is not naturally abundant. '
+                                     'Specify a nuclide vector instead.')
+                for nuc, frac in isotopes(component):
+                    atoms_per_nuc[nuc] = (rate / atomic_mass(nuc) * AVOGADRO *
+                                          frac * percent / unit_conv)
+
+            else:
+                atoms_per_nuc[component] = (rate / atomic_mass(component) *
+                                            AVOGADRO * percent / unit_conv)
+
+        for nuc, val in atoms_per_nuc.items():
+            self.external_rates[material_id][nuc].append((timesteps, val, None))
+
+        self.external_timesteps = np.unique(np.concatenate(
+            [self.external_timesteps, timesteps]
+        ))
diff --git a/tests/regression_tests/deplete_with_transfer_rates/ref_depletion_with_ext_source.h5 b/tests/regression_tests/deplete_with_transfer_rates/ref_depletion_with_ext_source.h5
new file mode 100644
index 0000000000000000000000000000000000000000..aa09e1bcf4e352f94798f2cc266718b5f77fcec1
GIT binary patch
literal 37328
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
Ucl%fGx&FKI{NlW#oOXWy2Me7t<p2Nx

literal 0
HcmV?d00001

diff --git a/tests/regression_tests/deplete_with_transfer_rates/ref_depletion_with_feed.h5 b/tests/regression_tests/deplete_with_transfer_rates/ref_depletion_with_feed.h5
index b9be7634513373af572ead9d97e1b705ad454e83..284d5cbe4ed05d7404222e70200aa0e0318cf2ad 100644
GIT binary patch
delta 693
zcmcbxnCZe|rVXd;7@0Powv%TBQm^gj1F6Z~j{kw2ZYO>aXSOqlGuvgUC!_3S$G-Ub
z>PcrL;#Tt8F+hPS-`|d^MQ`AIlLrRv;c*jeVe(3^wOIarkbukYSUJnf{M1r7f93Lp
z55gWQ!ujSi3S71r8`|-%_xWe{^^fg=bB6cV>8RWNTqwCp`-5Y>-QuzXv9b^U*fLur
zwLe^U)i(71y?BKl1-Jn_UruH@P{wQzbHF;c6>c%v3*Zj&=RdOU=w%hS`j!62H(v_c
z59fRRdEWA&!Vu0seo0GkdYLnnufxF5`hx9XGmiyaL8w?vzkQP~oWD(Ay|!=bM|;mD
zlTY<4>ArS3Vt@IQOj&ZjfpgqqU4doi^qr^FGp>wm^mo?h>M_q;tK+PwX{*|1a>{A?
zWXTEXhIW5`ZSN}QgBuvGerM^9V~8N0el6erozFzLk2)rAoFHGnY}V?<#(Q+&x*n#u
zN`E_LVz)JC)|5kx|7>sGX$`Os*Rb1@__2D{KS#SI+>dqI&iuEn;8^<bbN*G^JD>OO
zt(QTB<IlCbY82Np!Nc*rh~w-pQxM_EdHtfnwKd8x`=S|gKB>0wr0;_XFx>R|lfGn&
z5uCsMY-cgY88<lJMn^N>J>MM8&(C#?Xa9#tDeQIn<|Z#b*n3A$UNupP1r&||h;P(U

delta 693
zcmcbxnCZe|rVXd;7#TL7wv%TBQm^gj1F6Z~j{kw2ZYO>aXSOqlGuvgUC!@?{$G-Ub
zZIjMO#I5AFV}JsCzP}w+i{8Nbjt>ml!{a8{!sIPqYq9+MAOV+uv2vD|`KhIF{_f=q
zAA~(rg!4UT6u4|LHndY)@AJ>@>mS>D=M3+!(^0qku~2fA_6Ns$yNhK9Vr3uxu@$sP
zYJa%ys;$ZYd+`cA3UC8Xy`0Q)pp4lb=73vnE8JqT7r-4<#(!kp(aS1u^%MP%Z@v_?
zAI{JI^StFlg&~~3<C2!(^fG5CUx$IA<ptZpW*!T;f^%Xq{q{||aQ=FM_1eCzAMF#C
zPCnJIr0b)y#QyRpnX=@51Lx4ix&q72={wJ;XIvTC=<lq>)nlHyR>xUO(^j?3<doB*
z$&wS&4Q2lP+TK;p2RATA{m#-I#}Gl>eJ$VqozFzLkET!FI6=OC`mEK9jrZulbv;gT
zmHu|h#BN^BtSN^W|Jk0o(;8qOu3@()@niL@e~xzT+>dqI&iuD6=2-ghbN*G^DWCW6
zt(QTB<BPSsY82Np!Nc*ah~w-pQxM_!;MzrlYipEY_C+&TeNt`VN#6$(V0h*ACw<8l
zBRIeRY-cgY88<jzLq{{;J>MM8Z_Ra#Xa9#tDI9hB<|Z#b*vCdpUNupP1r&||wBXb{

diff --git a/tests/regression_tests/deplete_with_transfer_rates/ref_depletion_with_removal.h5 b/tests/regression_tests/deplete_with_transfer_rates/ref_depletion_with_removal.h5
index 4b24bed52ad30a270df65704cecf8aef59078557..271af24103cda8f8c4886da551422a824dcde360 100644
GIT binary patch
delta 720
zcmcbxnCZe|rVXd;7@0Powv%TBQm^gj1F6Z~j{kw2ZYO>aXSOqlGuvgUC!_3S$G-Ub
z`blRb;#Tt8F+hO|-`|d^MQ`AI!v_ZK;c*jeVe-PSwOIarkbukYUOCIl{M1r7fAR8#
z55gWQ!ue)13S71r8`}L}=kw3*>mS=a=M3+!(^0qky-;$M_6Ns$yBTE%Vr3uxvHfSB
z)c$bYRok%t_u>_L6yOFdcsZHnKpC?=%mF*xR=CAvFMvD9ng7VTqnB0S>QDF|-+U=(
zKb-IX=XuMA3PU*m?j<e3>1EDPz77M!#20J_n|UnY3QEOd`t6%^;ry)v>$QDbKiW@R
zHu+S)l5Tw95&LVOWXh8J4V)i-%?pV7q2jzS|7oOSos~0-Rkiu-Zz|4;nzpKKCa0XH
zPnMjJUa#TK<#D4A5yZl)U3P48L<I5tmDxS%ix5F96ZU$E@^5jt11x6wuT4I)9L_h$
zPj_NBQ-$*<To9O;5oc?6)wiQ><Ap!Ai+(*&e{8H_ryAfSb5z`^-Y%$S{r>fz{@F?$
zH(<a1=!)(C<FiaNKPkZth~lbhug_+K2k{A?OqW?&OW{Fmd}E&3yZMMHS@EO3Xw{)3
zaQ$uhUXIf%jNtt4ITbwGu>nv%Fo^RFe%OS1TEZ2iO+31{_^BzJzm#RxO@U1x?VT4*
LUNupP1r)>p<V4n<

delta 720
zcmcbxnCZe|rVXd;7#TL7wv%TBQm^gj1F6Z~j{kw2ZYO>aXSOqlGuvgUC!@?{$G-Ub
zU6am8#I5AFV}JrDzP}w+i{8NbE)NXa!{a8{!sM-AYq9+MAOV+uy>gb9`KhIF{=Vf4
zAA~(rg!8>-6u4|LHnh`P@AJ>@>mS?u=M3+!(^0qku~2fA_6Ns$yDMb}Vr3uxu@$jM
zYJa%ys;$}od+`cA3UC9?yqwH(pp4lb=74){E8JqT7r-4<#eZbo(aS1u_0#;1Z@v_?
zAI{JE^StFlg&~~3>ynn>^fG5CUx$IA>jm4vW*!T;f^%Xq{q{||aQ=FM_1eCzAMF#C
zPCnJIq<cqViT&kIGG)pA2F|y><^@FkP;p+E|1{FE&dT|ZWwrV2Zz|5pnzpKKCa0WM
zOqQIGUT^5m<#D4A5yXP4U3P48L<I5NmDxS%ix5F981{OJ@^5jt19WEjuT4I)9L~4P
zPj_NBQ-$-FUJ#g=5oc?+&9|d(<Ap!A`+q%9e{8H_rxoBNb5z`^-Y%eK{r>fz{@Jn|
zH(<a1=!&i3iCLzZpOoMRcym>?*JrcAgLsoqrpqj?rSKpQy)n=1-F!rp9Q#pUwCd0i
zxc=&VFURQ>MsWVhITbwGu>nv%Fo;VGe%OS1TEZ2yO+31{_^BzJ-^nuTrog6;_FYRR
LubQaD0t#XPxH8vc

diff --git a/tests/regression_tests/deplete_with_transfer_rates/ref_depletion_with_transfer.h5 b/tests/regression_tests/deplete_with_transfer_rates/ref_depletion_with_transfer.h5
index 51173f778b945f5c666bd9a8ed9ace75f47eb0ec..25365f6f3a486e7cc6ffa3ce844d4ed3fa17a95c 100644
GIT binary patch
delta 747
zcmcbxnCZe|rVXd;7@0Powv%TBQm^gj1F6Z~j{kw2ZYO>aXSOqlGuvgUC!_3S$G-Ub
znn`CQ;#Tt8F+hPC-`|d^MQ`AIod*W(;c*jeVe)dXwOIarkbujtT{+9k{M1r7fA#W(
z55gWQ!ubv}3S71r8``n1_xWe{^^fg=bB6cV>8RWNS}3_n`-5Y>-Q2PRv9b^U*#0+9
zYJa%ys%^^ud+`cA3UCAVznsi+pp4lb=72SBE8JqT7r-54$A4tq(aS1u^=ti)Z@v_?
zAI?ws^StFlg&~}O?UI(@^fG5CUx$HV!V9*8%{&%x1(U>L`t6%^;ruNE>$QDbKiW$y
zn|!KYIYqL_{>mqrvgCdP=lfst0-}DXI4{V58tGVP<^0dG+I;pm6=y|FTh%s`Q%=*?
zFN}Km^|q7b<V(9+)h{}`c$tN+{ch`W>6BRc^s6l{FfSF{d#K&8>4(#Mfvfj7Ezoh^
zJvnfKzTxvU{%g7!d~kQHYY!LjzWo}`UoVu~79}td9uV%6H%^eRSKe)LTyU`-TvY;-
zPRfT!JG-#7kbTw*|JmB}?}#v$(6rkf@axu!eU5h5#G9{8-1^UU!k!BcORitDz1ih?
zCPfMne=<iu#D?!f1phUu<V^Kh3*olvt0ip>FouU#G=p=3n$G%*2jC9K&N)0GkkJIr
z-*Q~&^`-5uaQ?N71A)5=Ea7~~OTuLjZomy>@MwKGX-dW?`+qu<S4~uA1_nO>QC{jF

delta 747
zcmcbxnCZe|rVXd;7#TL7wv%TBQm^gj1F6Z~j{kw2ZYO>aXSOqlGuvgUC!@?{$G-Ub
zZIjMO#I5AFV}JsCzP}w+i{8NbP7e&)!{a8{!sLx#Yq9+MAOV+uwsMx2`KhIF{@&#a
zAA~(rg!A2J6u4|LHndY;@AJ>@>mS>D=M3+!(^0qku~2fA_6Ns$yGvyUVr3uxu@$sP
zYJa%ys;%+=d+`cA3UC8Xy`0Q)pp4lb=75`SE8JqT7r-4<#(!kp(aS1u_5J?GH(v_c
z59eq8dEWA&!Vu2ia!E^YdYLnnufxF5@`CMPGmiya!DX?Se)}d}IDfssdTrm<kM;>m
zC!gw9PMKS1f8~=*S#rOD^WCp`0Z~6xoR{Z6jdZNDa%QrsHlO`X#aT<!R<+IKl+%*+
z3!`3sz3n79`O>ad^^4A~US^?dzuUT8Iwe*<{c4K~%u6}<9%?si`r-6R;OhNN3v`^f
zP7a))Z}=*W|C(+FAKV>V+QS9BZ@-4~4+-VAMF~uV2ZYt+jT7YS6?a=47hJ3dS5?fU
zlky?b&Mqb`WS{lIf41iQJ0i>_H0`zq{JOPbpQGJ#@#bq2xBjzTwCBRZlIz!OuXK5y
zNs&UtpTN-%vElm=!GBgNIa7VsLb$D*YDrrIjNzdb&5)j;rnCOy0k{KVat==jWHf>E
zR~;96eQCQZoPRLmK;W(dOE~}SMd7jsH{b>`c(uNqG$rGc{af|Pt0pQl1A`v`ms{(o

diff --git a/tests/regression_tests/deplete_with_transfer_rates/ref_no_depletion_only_feed.h5 b/tests/regression_tests/deplete_with_transfer_rates/ref_no_depletion_only_feed.h5
index d53adc7d8413c904289119fcb922be662b396f96..d080b447093018f62b3eced413db81fa606d3338 100644
GIT binary patch
delta 77
zcmcbxnCZe|rVXd;7@0Powv%TBQm^gj1F6Z~j{kw2ZYO>aXSOqlGuvgUC!_3U$G+8!
Z%msdjCnvhfPrM+sSz*E&MiwC79spTR99sYY

delta 77
zcmcbxnCZe|rVXd;7#TL7wv%TBQm^gj1F6Z~j{kw2ZYO>aXSOqlGuvgUC!@?}$G+8!
Z%zKV6nw;n=Kk<UlW`zlB7+HXPdjMt29hLw9

diff --git a/tests/regression_tests/deplete_with_transfer_rates/ref_no_depletion_only_removal.h5 b/tests/regression_tests/deplete_with_transfer_rates/ref_no_depletion_only_removal.h5
index 921755e155991adb4b9bd0ecc7f54ee1fd74b924..36f89e0090b147be206c995014745f3e9cb6c884 100644
GIT binary patch
delta 77
zcmcbxnCZe|rVXd;7@0Powv%TBQm^gj1F6Z~j{kw2ZYO>aXSOqlGuvgUC!_3U$G+8!
Z%!S%VCnvhfPrM+sSz*E&MiwC79spL192)=t

delta 77
zcmcbxnCZe|rVXd;7#TL7wv%TBQm^gj1F6Z~j{kw2ZYO>aXSOqlGuvgUC!@?}$G+8!
Z%u{q0O-^)`pLjuNv%-Wmj4VLDJpfd>91s8i

diff --git a/tests/regression_tests/deplete_with_transfer_rates/ref_no_depletion_with_ext_source.h5 b/tests/regression_tests/deplete_with_transfer_rates/ref_no_depletion_with_ext_source.h5
new file mode 100644
index 0000000000000000000000000000000000000000..f3b1b171ebcab9d99fb7b73f5b8273ac72187971
GIT binary patch
literal 37328
zcmeHPO>7%Q6rQz{)@=i%rIb)nv=vA-|4y5>0o2x|PDw8`f`WWN;56Abmhwk_N)Q~X
z3Q*tx=`AM|2_dBiP!2sHaq$7998)Bu9>Xoia;TI`Rc80SFB?xhcD#vG(>@<OJ2P+I
zy!rNhZ{MtU{cUIF>|;Ck?^OOLkx&h)IXJ}Eef}(5rxw)FpW_3E%SkS0V|3tXjecJX
zw>PtXH%<+6+<xJ`jt-?_3i?rUx0>2UNA29urKSB(F8G$OhaG{=j?-QK8sRVSvs}8i
zE8orjiuvHzO{z1P*ii}9q`mu!H!_+Z8dS{*O{1WP409Y}2Gc=%IDNnulue4|)eb#A
zp)Te7y|K@SJr-9_YQf#Q0{LEVSPSSG-4Sneynk$z1syHn%YbjNf0_B#!aO3rIaa<+
zQ$#SL0j!boVMhRb%ko0uPwnhKSbr-Y9Oe@KnT9}><@@iR&p4`4P4KvMro4h6C}@%9
z)8*xelS(Zx4`8Rs3#_y71nGm^64w)ZsJ)%1OP?%1?}O^KU3V9EkwsH%7{vi)jROzL
zewnvE5HRBac$DVr1FQs3z(=%4Eh!Gf_*$ye?d_xq^Ps~uu2aKJ#d6bJ|LyUpmi)iR
z;regl)ud9v!W^|t=PwDBAMEw~n7bx_F_zz?DDpXKyV|SAT^Z^hAJAFKZub;VkydTH
zRNH+c&h~tH@!YN7|2bugODT@85|<3XrCJgJTU@$r@Eq}Cv*Hr?WX6?h`2@S7^69V1
zeIMPpcT@AJbiQxqE0y-w>8A*0m(iZ!gs!tB`qKEYApkzj@xs8Dc~0<ce%9AU1167A
z>8N<o{uB3m7T=_P=;dj&Z0Y+$llw?wmIWnG1!7W`LID1o<xb?OOM8o@5qC{LES6e-
zjq=n6q*v-H?+-E0EZ67Rj%HS!dYTR(m*x7zGt}O~a?|^Z<qBM1e3sf>mQ&9a%O$zq
zxgr3;`Ydr>HSr4Xi|q;W)b6pN0e5hG;G#F;B4_niWXoGQ4b@}Q!NMJ#wfgz)h}Ydi
zx6iuAyj7Yi>9NJDJAB?GUIj4AR|N!Y@oJj=2*VK{HY;9%XJ)(!`4Nq0jcjnJCmPS7
z$Huel0h&m71`m<490E3;DfT0btrgGA>vhPFXgq6RgF`*hcm_Q-o)ui0NO%Shk+K{D
zHlFpl#iMG)Gc(@}`4Nq0usYNejc3qf<5}_rk`SH&DJjb#VB^`s^TnfT#j~k{G|wE*
z7xE(-&+v0{s3#iFpvT6usY7J9@T}NRq*fXM8_(L=k1(oMJX_}LLJQ9q@*^70_~+9N
z-v@yn8_$+sB4mVT@DM4>Az<U#4Eqtr){1AjB+YP@=i4aH5^Qj&C))K4dTcz)y+#uW
z&)^|amP5eCvjqDQ#@32w^Dom3ORrKH@*~>y40eWkqVWuRY&<I*A$x^q@DM4>Az<U#
zFdmfU!SK7yx~~tL&WyGmIjSq~^tK-Lf0Fmh<GMUY&FX{0M}lAMb?J-w_27Z7tVaTV
z>5qebIbWy-A3W!qWZiuS=>YSZ`^*%}EpT28IWteDr_+>bXT^{+uk&fvH^XrWa%P<B
zWVyuabO5;&*Sn1K%HmsA;P)KUo-i&(i?4W3A=DEszCusM_YK}4$nd-OmH{Xe)dd1(
z+;rKhS$?hvMkWVex!gT4(ETDeT*{9I@7;ix;6LOmmGWFsC4?UBe$y`#3`d&d70`kI
zZPxYNeEz-5c&<qK7j^w{jkuY5i`rpNmg^HIsQpp<#`V#}tJ>#vft&65#ygBJ&cDPJ
zASPug1Z;6-+Tba848JO+tC}|O!Hf&l@&R`F@9G7|+~DB7*am7q{s(!~cd*fT&)e1?
z*Ke}=eYW>Y8uhb$et#?;3sfYO8)%Nl8mG?&M?rTWqO1P29KtsXQJMtbYw^eiT~1?Q
z-kSG+O*~MqgbU=V$A>mX@z}P-3uLr!*lK)y)ws;*!)h}sQfht==*KKa^4<M-PkC^>
zr$688p}O)sCK~7wPqotSj%WqC)5~A>2CsDYkMq#6y#Mx*QlmrTBR$?HzEm)E_<l4=
z5c*2d>P_py`r7kH>v!Vi&!6plReyfmz?gWfAw?@G^50eGB^Mf9!=tr$5P}ZTZN;DA
zkH7)->et`G>yHnAO6!7e^4ceAxZ299*NX@I4S1lw0X$~E2=VaM)hQly{>=Y901naD
zA6xu7T>mN_OjbT=TPT6|0n$8Y*QxT8C%HRm<oD)#HGM3XI#XU>j=SBr%gfb!ub)3V
zCH@a)s!GF~zo!8h2Od^ZbLWR*35-LD_=Y@Yl|vQ}l$szQ2nYg#fFK|U2m*qDARq_`
z0)oJnAYj`^y4c87X~hihCo#TSHCM3_<#{n4rMa&}UG|q%o+uF)1Ox#=KoAfF1OY)n
z5D)|e0YN|z5Ck@WfbD)l^E!1F_;+Q<W8ZHZK6Aae2l6Q8{y;H4QWFFO0YN|z5CjAP
zK|l}?1nLQasQZV7b?zJHEc*r7C)AS{h%JJEARq_`0)l`bAP7`Oz?L^wdM<2{^G3+w
zzOgxD!IC#Z9^=h%QWpdS0YN|z5CjAPK|m0wF9fR18<#5Ni}RK|QS!t3I`3kQARq_`
z0)l`bP)h_3{4#Ol*F(3?+-&PTdHmjq%)QIKf6n~<Ri>76itcqH&~i7uS~C6P9~J(M
xYPB>SfAiT-KW9Gd%3SL^aQ?f03z=)javzW1ZS7bqDJ@%u0M08)p4dOX{{cmRix2<+

literal 0
HcmV?d00001

diff --git a/tests/regression_tests/deplete_with_transfer_rates/ref_no_depletion_with_transfer.h5 b/tests/regression_tests/deplete_with_transfer_rates/ref_no_depletion_with_transfer.h5
index 469149f6742736085bebd22499c4eb2a45f519ed..b0ba997407f2471adcb32897dd08378bfe312814 100644
GIT binary patch
delta 77
zcmcbxnCZe|rVXd;7@0Powv%TBQm^gj1F6Z~j{kw2ZYO>aXSOqlGuvgUC!_3U$G+8!
Z%nw!-O-^)`pLjuNv%-Wmj4VLDJpg559Z>)P

delta 77
zcmcbxnCZe|rVXd;7#TL7wv%TBQm^gj1F6Z~j{kw2ZYO>aXSOqlGuvgUC!@?}$G+8!
Z%nfS`CnvhfPrM+sSz*E&MiwC79spV!9Ebn_

diff --git a/tests/regression_tests/deplete_with_transfer_rates/test.py b/tests/regression_tests/deplete_with_transfer_rates/test.py
index 10d60866a..4ad009d22 100644
--- a/tests/regression_tests/deplete_with_transfer_rates/test.py
+++ b/tests/regression_tests/deplete_with_transfer_rates/test.py
@@ -1,8 +1,7 @@
-""" TransferRates depletion test suite """
+""" ExternalRates depletion test suite """
 
 from pathlib import Path
 import shutil
-import sys
 
 import numpy as np
 import pytest
@@ -11,7 +10,7 @@ import openmc.deplete
 from openmc.deplete import CoupledOperator
 
 from tests.regression_tests import config, assert_reaction_rates_equal, \
-    assert_atoms_equal, assert_same_mats
+    assert_atoms_equal
 
 
 @pytest.fixture
@@ -44,9 +43,11 @@ def model():
     settings.particles = 100
     settings.inactive = 0
     settings.batches = 10
+    settings.seed = 1
 
     return openmc.Model(geometry, materials, settings)
 
+
 @pytest.mark.parametrize("rate, dest_mat, power, ref_result", [
     (1e-5, None, 0.0, 'no_depletion_only_removal'),
     (-1e-5, None, 0.0, 'no_depletion_only_feed'),
@@ -83,6 +84,40 @@ def test_transfer_rates(run_in_tmpdir, model, rate, dest_mat, power, ref_result)
     res_ref = openmc.deplete.Results(path_reference)
     res_test = openmc.deplete.Results(path_test)
 
-    assert_same_mats(res_ref, res_test)
-    assert_atoms_equal(res_ref, res_test, 1e-6)
+    assert_atoms_equal(res_ref, res_test)
+    assert_reaction_rates_equal(res_ref, res_test)
+
+
+@pytest.mark.parametrize("rate, power, ref_result", [
+    (1e-1, 0.0, 'no_depletion_with_ext_source'),
+    (1e-1, 174., 'depletion_with_ext_source'),
+])
+def test_external_source_rates(run_in_tmpdir, model, rate, power, ref_result):
+    """Tests external_rates depletion class with external source rates"""
+
+    chain_file = Path(__file__).parents[2] / 'chain_simple.xml'
+
+    external_source_vector = {'U': 1}
+
+    op = CoupledOperator(model, chain_file)
+    op.round_number = True
+    integrator = openmc.deplete.PredictorIntegrator(
+        op, [1], power, timestep_units='d')
+    integrator.add_external_source_rate('f', external_source_vector, rate)
+    integrator.integrate()
+
+    # Get path to test and reference results
+    path_test = op.output_dir / 'depletion_results.h5'
+    path_reference = Path(__file__).with_name(f'ref_{ref_result}.h5')
+
+    # If updating results, do so and return
+    if config['update']:
+        shutil.copyfile(str(path_test), str(path_reference))
+        return
+
+    # Load the reference/test results
+    res_ref = openmc.deplete.Results(path_reference)
+    res_test = openmc.deplete.Results(path_test)
+
+    assert_atoms_equal(res_ref, res_test)
     assert_reaction_rates_equal(res_ref, res_test)
diff --git a/tests/unit_tests/test_deplete_external_source_rates.py b/tests/unit_tests/test_deplete_external_source_rates.py
new file mode 100644
index 000000000..a8cf9dde5
--- /dev/null
+++ b/tests/unit_tests/test_deplete_external_source_rates.py
@@ -0,0 +1,170 @@
+""" Tests for ExternalSourceRates class """
+
+from pathlib import Path
+
+import pytest
+import numpy as np
+import re
+
+import openmc
+from openmc.data import AVOGADRO, atomic_mass
+from openmc.deplete import CoupledOperator
+from openmc.deplete.transfer_rates import ExternalSourceRates
+from openmc.deplete.abc import (_SECONDS_PER_MINUTE, _SECONDS_PER_HOUR,
+                                _SECONDS_PER_DAY, _SECONDS_PER_JULIAN_YEAR)
+
+CHAIN_PATH = Path(__file__).parents[1] / "chain_simple.xml"
+
+@pytest.fixture
+def model():
+    openmc.reset_auto_ids()
+    f = openmc.Material(name="f")
+    f.add_element("U", 1, enrichment=4.25)
+    f.add_element("O", 2)
+    f.set_density("g/cm3", 10.4)
+
+    w = openmc.Material(name="w")
+    w.add_element("O", 1)
+    w.add_element("H", 2)
+    w.set_density("g/cm3", 1.0)
+    w.depletable = True
+
+    # material just to test multiple destination material
+    h = openmc.Material(name="h")
+    h.add_element("He", 1)
+    h.set_density("g/cm3", 1.78e-4)
+
+    radii = [0.42, 0.45]
+    f.volume = np.pi * radii[0] ** 2
+    w.volume = np.pi * (radii[1]**2 - radii[0]**2)
+    h.volume = 1
+    materials = openmc.Materials([f, w, h])
+
+    surf_f = openmc.Sphere(r=radii[0])
+    surf_w = openmc.Sphere(r=radii[1], boundary_type='vacuum')
+    surf_h = openmc.Sphere(x0=10, r=1, boundary_type='vacuum')
+    cell_f = openmc.Cell(fill=f, region=-surf_f)
+    cell_w = openmc.Cell(fill=w, region=+surf_f & -surf_w)
+    cell_h = openmc.Cell(fill=h, region=-surf_h)
+    geometry = openmc.Geometry([cell_f, cell_w, cell_h])
+
+    settings = openmc.Settings()
+    settings.particles = 1000
+    settings.inactive = 10
+    settings.batches = 50
+
+    return openmc.Model(geometry, materials, settings)
+
+
+@pytest.mark.parametrize(
+"case_name, external_source_vectors, external_source_rate, timesteps", [
+    ('elements', [{'U': 0.9, 'Xe': 0.1}], 1, None),
+    ('nuclides', [{'I135': 0.1, 'Gd156': 0.3, 'Gd157': 0.6}], 1, None),
+    ('nuclides_elements', [{'I135': 0.01, 'Gd156': 0.1, 'Gd157': 0.01, 'U': 0.8,
+                           'Xe': 0.08}], 1, None),
+    ('elements_nuclides', [{'U': 0.78, 'Xe': 0.1, 'I135': 0.01, 'Gd156': 0.1,
+                           'Gd157': 0.01}], 1, None),
+    ('multiple_vectors', [{'U': 1.}, {'Xe': 1}], 1, None),
+    ('timesteps', [{'U': 0.9, 'Xe': 0.1}], 1, [1]),
+    ('rates_invalid_1', [{'Gb': 1.}], 1, None),
+    ('rates_invalid_2', [{'Pu': 1.}], 1, None)
+    ])
+def test_get_set(model, case_name, external_source_vectors, external_source_rate,
+                 timesteps):
+    """Tests the get/set methods"""
+
+    op = CoupledOperator(model, CHAIN_PATH)
+    number_of_timesteps = 2
+    transfer = ExternalSourceRates(op, model.materials, number_of_timesteps)
+
+    if timesteps is None:
+        timesteps = np.arange(number_of_timesteps)
+
+    # Test by Openmc material, material name and material id
+    material= [m for m in model.materials if m.depletable][0]
+
+    for material_input in [material, material.name, material.id]:
+        for external_source_vector in external_source_vectors:
+            if case_name == 'rates_invalid_1':
+                with pytest.raises(ValueError, match='Gb is not a valid '
+                                   'nuclide or element.'):
+                    transfer.set_external_source_rate(material_input,
+                                               external_source_vector,
+                                               external_source_rate)
+            elif case_name == 'rates_invalid_2':
+                with pytest.raises(ValueError, match='Cannot add element Pu'):
+                    transfer.set_external_source_rate(material_input,
+                                               external_source_vector,
+                                               external_source_rate)
+            else:
+                transfer.set_external_source_rate(material_input,
+                                               external_source_vector,
+                                               external_source_rate,
+                                               timesteps=timesteps)
+                for component, percent in external_source_vector.items():
+                    split_component = re.split(r'\d+', component)
+                    if len(split_component) == 1:
+                        for nuc, frac in openmc.data.isotopes(component):
+                            val = external_source_rate * percent * frac * \
+                                AVOGADRO / atomic_mass(nuc)
+                            assert transfer.get_external_rate(
+                                material_input, nuc, timesteps)[0] == pytest.approx(val)
+                    else:
+                        val = external_source_rate * percent * AVOGADRO / atomic_mass(component)
+                        assert transfer.get_external_rate(
+                            material_input, component, timesteps)[0] == pytest.approx(val)
+
+                assert np.all(transfer.external_timesteps == timesteps)
+
+
+@pytest.mark.parametrize("units, unit_conv", [
+    ('g/s', 1),
+    ('g/sec', 1),
+    ('g/min', _SECONDS_PER_MINUTE),
+    ('g/minute', _SECONDS_PER_MINUTE),
+    ('g/h', _SECONDS_PER_HOUR),
+    ('g/hr', _SECONDS_PER_HOUR),
+    ('g/hour', _SECONDS_PER_HOUR),
+    ('g/d', _SECONDS_PER_DAY),
+    ('g/day', _SECONDS_PER_DAY),
+    ('g/a', _SECONDS_PER_JULIAN_YEAR),
+    ('g/year', _SECONDS_PER_JULIAN_YEAR),
+    ])
+def test_units(units, unit_conv, model):
+    """ Units testing"""
+    # create external rate Xe
+    components = ['Xe135', 'U235']
+    external_source_rate = 1.0
+    number_of_timesteps = 2
+    op = CoupledOperator(model, CHAIN_PATH)
+    transfer = ExternalSourceRates(op, model.materials, number_of_timesteps)
+    timesteps = np.arange(number_of_timesteps)
+
+    for component in components:
+        rate = external_source_rate * unit_conv * atomic_mass(component) / AVOGADRO
+        transfer.set_external_source_rate('f', {component: 1}, rate, rate_units=units)
+        assert transfer.get_external_rate(
+            'f', component, timesteps)[0] == pytest.approx(external_source_rate)
+
+
+def test_external_source(run_in_tmpdir, model):
+    """Tests external source depletion class without neither reaction rates nor
+    decay but only external source rates"""
+    # create transfer rate for U
+    vector = {'U235': 1}
+    external_source = 10  # grams
+    op = CoupledOperator(model, CHAIN_PATH)
+    integrator = openmc.deplete.PredictorIntegrator(
+        op, [1, 1], 0.0, timestep_units = 'd')
+    integrator.add_external_source_rate('f', vector, external_source/(24*3600))
+    integrator.integrate()
+
+    # Get number of U238 atoms from results
+    results = openmc.deplete.Results('depletion_results.h5')
+    _, atoms = results.get_atoms(model.materials[0], "U235")
+
+    # Ensure number of atoms equal external source
+    assert atoms[1] - atoms[0] == pytest.approx(
+        external_source * AVOGADRO / atomic_mass('U235'))
+    assert atoms[2] - atoms[1] == pytest.approx(
+        external_source * AVOGADRO / atomic_mass('U235'))
diff --git a/tests/unit_tests/test_deplete_transfer_rates.py b/tests/unit_tests/test_deplete_transfer_rates.py
index 140777cd6..a3228e9fb 100644
--- a/tests/unit_tests/test_deplete_transfer_rates.py
+++ b/tests/unit_tests/test_deplete_transfer_rates.py
@@ -16,6 +16,7 @@ CHAIN_PATH = Path(__file__).parents[1] / "chain_simple.xml"
 
 @pytest.fixture
 def model():
+    openmc.reset_auto_ids()
     f = openmc.Material(name="f")
     f.add_element("U", 1, percent_type="ao", enrichment=4.25)
     f.add_element("O", 2)
@@ -54,32 +55,35 @@ def model():
 
     return openmc.Model(geometry, materials, settings)
 
-@pytest.mark.parametrize("case_name, transfer_rates", [
-    ('elements', {'U': 0.01, 'Xe': 0.1}),
-    ('nuclides', {'I135': 0.01, 'Gd156': 0.1, 'Gd157': 0.01}),
+@pytest.mark.parametrize("case_name, transfer_rates, timesteps", [
+    ('elements', {'U': 0.01, 'Xe': 0.1}, None),
+    ('nuclides', {'I135': 0.01, 'Gd156': 0.1, 'Gd157': 0.01}, None),
     ('nuclides_elements', {'I135': 0.01, 'Gd156': 0.1, 'Gd157': 0.01, 'U': 0.01,
-                           'Xe': 0.1}),
+                           'Xe': 0.1}, None),
     ('elements_nuclides', {'U': 0.01, 'Xe': 0.1, 'I135': 0.01, 'Gd156': 0.1,
-                           'Gd157': 0.01}),
+                           'Gd157': 0.01}, None),
     ('multiple_transfer', {'U': 0.01, 'Xe': 0.1, 'I135': 0.01, 'Gd156': 0.1,
-                           'Gd157': 0.01}),
-    ('rates_invalid_1', {'Gd': 0.01, 'Gd157': 0.01, 'Gd156': 0.01}),
-    ('rates_invalid_2', {'Gd156': 0.01, 'Gd157': 0.01, 'Gd': 0.01}),
-    ('rates_invalid_3', {'Gb156': 0.01}),
-    ('rates_invalid_4', {'Gb': 0.01})
+                           'Gd157': 0.01}, None),
+    ('timesteps', {'U': 0.01, 'Xe': 0.1}, [1]),
+    ('rates_invalid_1', {'Gd': 0.01, 'Gd157': 0.01, 'Gd156': 0.01}, None),
+    ('rates_invalid_2', {'Gd156': 0.01, 'Gd157': 0.01, 'Gd': 0.01}, None),
+    ('rates_invalid_3', {'Gb156': 0.01}, None),
+    ('rates_invalid_4', {'Gb': 0.01}, None)
     ])
-def test_get_set(model, case_name, transfer_rates):
+def test_get_set(model, case_name, transfer_rates, timesteps):
     """Tests the get/set methods"""
-
-    openmc.reset_auto_ids()
     op = CoupledOperator(model, CHAIN_PATH)
-    transfer = TransferRates(op, model)
+    number_of_timesteps = 2
+    transfer = TransferRates(op, model.materials, number_of_timesteps)
+
+    if timesteps is None:
+        timesteps = np.arange(number_of_timesteps)
 
     # Test by Openmc material, material name and material id
     material, dest_material, dest_material2 = [m for m in model.materials
                                                if m.depletable]
     for material_input in [material, material.name, material.id]:
-        for dest_material_input in [dest_material, dest_material.name,
+        for dest_material_input in [None, dest_material, dest_material.name,
                                     dest_material.id]:
             if case_name == 'rates_invalid_1':
                 with pytest.raises(ValueError, match='Cannot add transfer '
@@ -117,14 +121,21 @@ def test_get_set(model, case_name, transfer_rates):
                 for component, transfer_rate in transfer_rates.items():
                     transfer.set_transfer_rate(material_input, [component],
                                                transfer_rate,
+                                               timesteps=timesteps,
                                                destination_material=\
                                                dest_material_input)
-                    assert transfer.get_transfer_rate(
-                        material_input, component)[0] == transfer_rate
-                    assert transfer.get_destination_material(
-                        material_input, component)[0] == str(dest_material.id)
-                assert transfer.get_components(material_input) == \
-                    transfer_rates.keys()
+                    assert transfer.get_external_rate(
+                        material_input, component, timesteps,
+                        dest_material_input)[0] == transfer_rate
+                    assert np.all(transfer.external_timesteps == timesteps)
+
+                if timesteps is not None:
+                    for timestep in timesteps:
+                        assert transfer.get_components(material_input, timestep,
+                            dest_material_input) == list(transfer_rates.keys())
+                else:
+                    assert transfer.get_components(material_input, timesteps,
+                            dest_material_input) == list(transfer_rates.keys())
 
             if case_name == 'multiple_transfer':
                 for dest2_material_input in [dest_material2, dest_material2.name,
@@ -135,10 +146,8 @@ def test_get_set(model, case_name, transfer_rates):
                                                destination_material=\
                                                dest2_material_input)
                         for id, dest_mat in zip([0,1],[dest_material,dest_material2]):
-                            assert transfer.get_transfer_rate(
-                                material_input, component)[id] == transfer_rate
-                            assert transfer.get_destination_material(
-                                material_input, component)[id] == str(dest_mat.id)
+                            assert transfer.get_external_rate(
+                                material_input, component, timesteps)[0] == transfer_rate
 
 @pytest.mark.parametrize("transfer_rate_units, unit_conv", [
     ('1/s', 1),
@@ -158,13 +167,15 @@ def test_units(transfer_rate_units, unit_conv, model):
     # create transfer rate Xe
     components = ['Xe', 'U235']
     transfer_rate = 1e-5
+    number_of_timesteps = 2
     op = CoupledOperator(model, CHAIN_PATH)
-    transfer = TransferRates(op, model)
+    transfer = TransferRates(op, model.materials, number_of_timesteps)
 
     for component in components:
         transfer.set_transfer_rate('f', [component], transfer_rate * unit_conv,
                                    transfer_rate_units=transfer_rate_units)
-        assert transfer.get_transfer_rate('f', component)[0] == transfer_rate
+        for timestep in range(transfer.number_of_timesteps):
+            assert transfer.get_external_rate('f', component, timestep)[0] == transfer_rate
 
 
 def test_transfer(run_in_tmpdir, model):

From 757617be50acb2a92120fb06991b5491b79bf4d4 Mon Sep 17 00:00:00 2001
From: Jonathan Shimwell <mail@jshimwell.com>
Date: Fri, 16 May 2025 16:55:41 +0300
Subject: [PATCH 032/203] added test for dagmc geometry plot (#3375)

Co-authored-by: Paul Romano <paul.k.romano@gmail.com>
---
 tests/unit_tests/dagmc/test_model.py |  1 +
 tests/unit_tests/dagmc/test_plot.py  | 32 ++++++++++++++++++++++++++++
 2 files changed, 33 insertions(+)
 create mode 100644 tests/unit_tests/dagmc/test_plot.py

diff --git a/tests/unit_tests/dagmc/test_model.py b/tests/unit_tests/dagmc/test_model.py
index 9fdfbcebc..0de4f6092 100644
--- a/tests/unit_tests/dagmc/test_model.py
+++ b/tests/unit_tests/dagmc/test_model.py
@@ -4,6 +4,7 @@ import lxml.etree as ET
 import numpy as np
 import pytest
 import openmc
+import openmc.lib
 from openmc.utility_funcs import change_directory
 
 pytestmark = pytest.mark.skipif(
diff --git a/tests/unit_tests/dagmc/test_plot.py b/tests/unit_tests/dagmc/test_plot.py
new file mode 100644
index 000000000..83f6df767
--- /dev/null
+++ b/tests/unit_tests/dagmc/test_plot.py
@@ -0,0 +1,32 @@
+import pytest
+import openmc
+import openmc.lib
+
+
+pytestmark = pytest.mark.skipif(
+    not openmc.lib._dagmc_enabled(), reason="DAGMC CAD geometry is not enabled."
+)
+
+def test_plotting_dagmc_geometry(request):
+    """Test plotting a DAGMC geometry with OpenMC. This is different to CSG
+    geometry plotting as the path to the DAGMC file needs handling."""
+
+    dag_universe = openmc.DAGMCUniverse(request.path.parent / 'dagmc.h5m')
+    csg_with_dag_inside = dag_universe.bounded_universe()
+    model = openmc.Model()
+    model.geometry = openmc.Geometry(csg_with_dag_inside)
+
+    for mat_name in dag_universe.material_names:
+        material = openmc.Material(name=mat_name)
+        material.add_nuclide("Fe56", 1.0)
+        material.set_density("g/cm3", 7.0)
+        model.materials.append(material)
+
+    # putting the source at the center of the bounding box of the DAGMC
+    model.settings.source = openmc.IndependentSource(
+        space=openmc.stats.Point(dag_universe.bounding_box.center)
+    )
+    model.settings.batches = 10
+    model.settings.particles = 50
+
+    model.plot()

From a7d1ceba3f9fe5e394a49cdf10b724094f39af11 Mon Sep 17 00:00:00 2001
From: Alberto P <4104972+alberto743@users.noreply.github.com>
Date: Sun, 18 May 2025 19:28:00 +0200
Subject: [PATCH 033/203] small typo - spelling of Debian (#3411)

---
 docs/source/usersguide/install.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/source/usersguide/install.rst b/docs/source/usersguide/install.rst
index d294770e0..7a8cb8020 100644
--- a/docs/source/usersguide/install.rst
+++ b/docs/source/usersguide/install.rst
@@ -221,7 +221,7 @@ Prerequisites
       OpenMC's built-in plotting capabilities use the libpng library to produce
       compressed PNG files. In the absence of this library, OpenMC will fallback
       to writing PPM files, which are uncompressed and only supported by select
-      image viewers. libpng can be installed on Ddebian derivates with::
+      image viewers. libpng can be installed on Debian derivates with::
 
           sudo apt install libpng-dev
 

From cb95c784b755719d9e5897bb550611eb0a8e542a Mon Sep 17 00:00:00 2001
From: GuySten <62616591+GuySten@users.noreply.github.com>
Date: Tue, 27 May 2025 19:04:16 +0300
Subject: [PATCH 034/203] Fix bug where the same mesh is written multiple times
 to settings.xml (#3418)

---
 openmc/settings.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/openmc/settings.py b/openmc/settings.py
index 6fb36f3fc..4cacefbed 100644
--- a/openmc/settings.py
+++ b/openmc/settings.py
@@ -1626,9 +1626,12 @@ class Settings:
             if mesh_memo is not None and wwg.mesh.id in mesh_memo:
                 continue
 
-            root.append(wwg.mesh.to_xml_element())
-            if mesh_memo is not None:
-                mesh_memo.add(wwg.mesh.id)
+            # See if a <mesh> element already exists -- if not, add it
+            path = f"./mesh[@id='{wwg.mesh.id}']"
+            if root.find(path) is None:
+                root.append(wwg.mesh.to_xml_element())
+                if mesh_memo is not None:
+                    mesh_memo.add(wwg.mesh.id)
 
     def _create_weight_windows_file_element(self, root):
         if self.weight_windows_file is not None:

From ace73ab5de619d33241fcc778551c843b682ced1 Mon Sep 17 00:00:00 2001
From: GuySten <62616591+GuySten@users.noreply.github.com>
Date: Tue, 3 Jun 2025 21:02:20 +0300
Subject: [PATCH 035/203] Fixed a bug in charged particle energy deposition.
 (#3416)

Co-authored-by: Jonathan Shimwell <drshimwell@gmail.com>
Co-authored-by: Paul Romano <paul.k.romano@gmail.com>
---
 docs/source/methods/energy_deposition.rst     | 79 ++++++++++++++++---
 include/openmc/material.h                     |  5 ++
 src/material.cpp                              | 11 ++-
 src/tallies/tally_scoring.cpp                 | 67 +++++++++-------
 .../photon_production/results_true.dat        |  8 +-
 tests/unit_tests/test_data_multipole.py       |  4 +-
 tests/unit_tests/test_nuclide_heating.py      | 39 +++++++++
 7 files changed, 166 insertions(+), 47 deletions(-)
 create mode 100644 tests/unit_tests/test_nuclide_heating.py

diff --git a/docs/source/methods/energy_deposition.rst b/docs/source/methods/energy_deposition.rst
index 4675aee3f..0babd7124 100644
--- a/docs/source/methods/energy_deposition.rst
+++ b/docs/source/methods/energy_deposition.rst
@@ -25,19 +25,36 @@ KERMA (Kinetic Energy Release in Materials) [Mack97]_ coefficients for reaction
 :math:`\times` cross-section (e.g., eV-barn) and can be used much like a reaction
 cross section for the purpose of tallying energy deposition.
 
-KERMA coefficients can be computed using the energy-balance method with
-a nuclear data processing code like NJOY, which performs the following
-iteration over all reactions :math:`r` for all isotopes :math:`i`
-requested
+KERMA coefficients can be computed using the energy-balance method with a
+nuclear data processing code like NJOY, which estimates the KERMA coefficients
+using the following equation:
 
 .. math::
 
-    k_{i, r}(E) = \left(E + Q_{i, r} - \bar{E}_{i, r, n}
+    k_{i, r}(E) = \left(E + Q_{i, r} - \sum\limits_x \bar{E}_{i, r, x}
+    \right)\sigma_{i, r}(E),
+
+where the summation is over each secondary particle type :math:`x`. This
+equation states that the energy deposited is equal to the energy of the incident
+particle plus the reaction :math:`Q` value less the energy of secondary
+particles that are transported away from the reaction site. For neutron
+interactions, the energy-balance KERMA coefficient is
+
+.. math::
+
+    k_{i, r}(E) = \left(E + Q_{i, r} - \sum\limits_x \bar{E}_{i, r, n}
     - \bar{E}_{i, r, \gamma}\right)\sigma_{i, r}(E),
 
-removing the energy of neutral particles (neutrons and photons) that are
-transported away from the reaction site :math:`\bar{E}`, and the reaction
-:math:`Q` value.
+where :math:`\bar{E}_{i, r, n}` is the average energy of secondary neutrons and
+:math:`\bar{E}_{i, r, \gamma}` is the average energy of secondary photons. For
+photon and charged particle interactions, the :math:`Q` value is zero and thus
+the KERMA coefficient is
+
+.. math::
+    :label: energy-balance-photon
+
+    k_{i, r}(E) = \left(E - \sum\limits_x \bar{E}_{i, r, x}
+    \right)\sigma_{i, r}(E).
 
 -------
 Fission
@@ -120,7 +137,7 @@ run with :math:`N918` reflecting fission heating computed from NJOY.
 This modified heating data is stored as the MT=901 reaction and will be scored
 if ``heating-local`` is included in :attr:`openmc.Tally.scores`.
 
-Coupled neutron-photon transport
+Coupled Neutron-Photon Transport
 --------------------------------
 
 Here, OpenMC instructs ``heatr`` to assume that energy from photons is not
@@ -138,6 +155,50 @@ Let :math:`N301` represent the total heating number returned from this
 This modified heating data is stored as the MT=301 reaction and will be scored
 if ``heating`` is included in :attr:`openmc.Tally.scores`.
 
+Photons and Charged Particles
+-----------------------------
+
+In OpenMC, energy deposition from photons or charged particles is scored using
+the energy balance method based on Equation :eq:`energy-balance-photon`. Special
+consideration is given to electrons and positrons as described below.
+
++++++++++++++++++
+Charged Particles
++++++++++++++++++
+
+OpenMC tracks photons interaction by interaction so the energy deposited in each
+collision is easily attributed back to the nuclide and reaction for which the
+photon interacted with. Charged particles (electrons and photons) aren't tracked
+in the same way. For charged particles, OpenMC assumes that all their energy
+(less the energy of bremsstrahlung radiation) is deposited in the material in
+which they were born. In this way it is harder to trace how much energy should
+be attributed in each nuclide.
+
+According to the CSDA approximation (see :ref:`ttb`) the energy deposited by a
+charged particle with kinetic energy :math:`T` in the :math:`i`-th element can
+be calculated as:
+
+.. math::
+
+    E_{i} = \int_{0}^{R(T)} w_{i}S_{\text{col,i}} dx
+
+where :math:`R(T)` is the CSDA range of the charged particle,
+:math:`S_{\text{col},i}` is the collision stopping power of the charged particle
+in the :math:`i`-th element and :math:`w_i` is the mass fraction of the
+:math:`i`-th element. According to the Bethe formula the collision stopping
+power of the :math:`i`-th element is proportional to :math:`Z_i/A_i`, so the
+fractional collision stopping power from the :math:`i`-th element is:
+
+.. math::
+
+    \frac{w_{i}S_{\text{col},i}(T)}{S_{\text{col}}(T)} =
+    \frac{\frac{w_{i}Z_{i}}{A_{i}}}{\sum_{i}\frac{w_{i}Z_{i}}{A_{i}}} =
+    \frac{\gamma_i Z_{i}}{\sum_{i}\gamma_i Z_{i}}.
+
+where :math:`\gamma_i` is the atomic fraction of the :math:`i`-th element.
+Therefore, the energy deposited by charged particles should be attributed to
+a given element according to its fractional charge density.
+
 ----------
 References
 ----------
diff --git a/include/openmc/material.h b/include/openmc/material.h
index 31fab2ae2..fe587a86f 100644
--- a/include/openmc/material.h
+++ b/include/openmc/material.h
@@ -107,6 +107,10 @@ public:
   //! \return Density in [g/cm^3]
   double density_gpcc() const { return density_gpcc_; }
 
+  //! Get charge density in [e/b-cm]
+  //! \return Charge density in [e/b-cm]
+  double charge_density() const { return charge_density_; };
+
   //! Get name
   //! \return Material name
   const std::string& name() const { return name_; }
@@ -177,6 +181,7 @@ public:
   xt::xtensor<double, 1> atom_density_; //!< Nuclide atom density in [atom/b-cm]
   double density_;                      //!< Total atom density in [atom/b-cm]
   double density_gpcc_;                 //!< Total atom density in [g/cm^3]
+  double charge_density_;               //!< Total charge density in [e/b-cm]
   double volume_ {-1.0};                //!< Volume in [cm^3]
   vector<bool> p0_; //!< Indicate which nuclides are to be treated with
                     //!< iso-in-lab scattering
diff --git a/src/material.cpp b/src/material.cpp
index b8846d7cb..32384ddf1 100644
--- a/src/material.cpp
+++ b/src/material.cpp
@@ -454,12 +454,15 @@ void Material::normalize_density()
   // Calculate nuclide atom densities
   atom_density_ *= density_;
 
-  // Calculate density in g/cm^3.
+  // Calculate density in [g/cm^3] and charge density in [e/b-cm]
   density_gpcc_ = 0.0;
+  charge_density_ = 0.0;
   for (int i = 0; i < nuclide_.size(); ++i) {
     int i_nuc = nuclide_[i];
     double awr = settings::run_CE ? data::nuclides[i_nuc]->awr_ : 1.0;
+    int z = settings::run_CE ? data::nuclides[i_nuc]->Z_ : 0.0;
     density_gpcc_ += atom_density_(i) * awr * MASS_NEUTRON / N_AVOGADRO;
+    charge_density_ += atom_density_(i) * z;
   }
 }
 
@@ -982,12 +985,15 @@ void Material::set_density(double density, const std::string& units)
     // Recalculate nuclide atom densities based on given density
     atom_density_ *= density;
 
-    // Calculate density in g/cm^3.
+    // Calculate density in g/cm^3 and charge density in [e/b-cm]
     density_gpcc_ = 0.0;
+    charge_density_ = 0.0;
     for (int i = 0; i < nuclide_.size(); ++i) {
       int i_nuc = nuclide_[i];
       double awr = data::nuclides[i_nuc]->awr_;
+      int z = settings::run_CE ? data::nuclides[i_nuc]->Z_ : 0.0;
       density_gpcc_ += atom_density_(i) * awr * MASS_NEUTRON / N_AVOGADRO;
+      charge_density_ += atom_density_(i) * z;
     }
   } else if (units == "g/cm3" || units == "g/cc") {
     // Determine factor by which to change densities
@@ -998,6 +1004,7 @@ void Material::set_density(double density, const std::string& units)
     density_gpcc_ = density;
     density_ *= f;
     atom_density_ *= f;
+    charge_density_ *= f;
   } else {
     throw std::invalid_argument {
       "Invalid units '" + std::string(units.data()) + "' specified."};
diff --git a/src/tallies/tally_scoring.cpp b/src/tallies/tally_scoring.cpp
index 5c6386fb4..62b002907 100644
--- a/src/tallies/tally_scoring.cpp
+++ b/src/tallies/tally_scoring.cpp
@@ -325,6 +325,39 @@ double score_neutron_heating(const Particle& p, const Tally& tally, double flux,
   return score;
 }
 
+//! Helper function to obtain particle heating [eV]
+
+double score_particle_heating(const Particle& p, const Tally& tally,
+  double flux, int rxn_bin, int i_nuclide, double atom_density)
+{
+  if (p.type() == ParticleType::neutron)
+    return score_neutron_heating(
+      p, tally, flux, rxn_bin, i_nuclide, atom_density);
+  if (i_nuclide == -1 || i_nuclide == p.event_nuclide() ||
+      p.event_nuclide() == -1) {
+    // Get the pre-collision energy of the particle.
+    auto E = p.E_last();
+    // The energy deposited is the difference between the pre-collision
+    // and post-collision energy...
+    double score = E - p.E();
+    // ...less the energy of any secondary particles since they will be
+    // transported individually later
+    score -= p.bank_second_E();
+    score *= p.wgt_last();
+
+    // if no event_nuclide (charged particle) scale energy deposition by
+    // fractional charge density
+    if (i_nuclide != -1 && p.event_nuclide() == -1) {
+      const auto& mat {model::materials[p.material()]};
+      int z = data::nuclides[i_nuclide]->Z_;
+      auto i = mat->mat_nuclide_index_[i_nuclide];
+      score *= (z * mat->atom_density_[i] / mat->charge_density());
+    }
+    return score;
+  }
+  return 0.0;
+}
+
 //! Helper function for nu-fission tallies with energyout filters.
 //
 //! In this case, we may need to score to multiple bins if there were multiple
@@ -1007,23 +1040,8 @@ void score_general_ce_nonanalog(Particle& p, int i_tally, int start_index,
       break;
 
     case HEATING:
-      if (p.type() == Type::neutron) {
-        score = score_neutron_heating(
-          p, tally, flux, HEATING, i_nuclide, atom_density);
-      } else {
-        if (i_nuclide == -1 || i_nuclide == p.event_nuclide()) {
-          // The energy deposited is the difference between the pre-collision
-          // and post-collision energy...
-          score = E - p.E();
-          // ...less the energy of any secondary particles since they will be
-          // transported individually later
-          score -= p.bank_second_E();
-
-          score *= p.wgt_last();
-        } else {
-          score = 0.0;
-        }
-      }
+      score = score_particle_heating(
+        p, tally, flux, HEATING, i_nuclide, atom_density);
       break;
 
     default:
@@ -1539,19 +1557,8 @@ void score_general_ce_analog(Particle& p, int i_tally, int start_index,
       break;
 
     case HEATING:
-      if (p.type() == Type::neutron) {
-        score = score_neutron_heating(
-          p, tally, flux, HEATING, i_nuclide, atom_density);
-      } else {
-        // The energy deposited is the difference between the pre-collision and
-        // post-collision energy...
-        score = E - p.E();
-        // ...less the energy of any secondary particles since they will be
-        // transported individually later
-        score -= p.bank_second_E();
-
-        score *= p.wgt_last();
-      }
+      score = score_particle_heating(
+        p, tally, flux, HEATING, i_nuclide, atom_density);
       break;
 
     default:
diff --git a/tests/regression_tests/photon_production/results_true.dat b/tests/regression_tests/photon_production/results_true.dat
index 874e32b85..c16524689 100644
--- a/tests/regression_tests/photon_production/results_true.dat
+++ b/tests/regression_tests/photon_production/results_true.dat
@@ -67,8 +67,8 @@ tally 3:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-0.000000E+00
-0.000000E+00
+1.774484E+05
+3.148794E+10
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -79,8 +79,8 @@ tally 3:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-0.000000E+00
-0.000000E+00
+7.692488E+03
+5.917437E+07
 0.000000E+00
 0.000000E+00
 0.000000E+00
diff --git a/tests/unit_tests/test_data_multipole.py b/tests/unit_tests/test_data_multipole.py
index 4c2ba96d6..bc7136a97 100644
--- a/tests/unit_tests/test_data_multipole.py
+++ b/tests/unit_tests/test_data_multipole.py
@@ -52,7 +52,7 @@ def test_from_endf():
     pytest.importorskip('vectfit')
     endf_data = os.environ['OPENMC_ENDF_DATA']
     endf_file = os.path.join(endf_data, 'neutrons', 'n-001_H_001.endf')
-    return openmc.data.WindowedMultipole.from_endf(
+    assert openmc.data.WindowedMultipole.from_endf(
             endf_file, log=True, wmp_options={"n_win": 400, "n_cf": 3})
 
 
@@ -60,5 +60,5 @@ def test_from_endf_search():
     pytest.importorskip('vectfit')
     endf_data = os.environ['OPENMC_ENDF_DATA']
     endf_file = os.path.join(endf_data, 'neutrons', 'n-095_Am_244.endf')
-    return openmc.data.WindowedMultipole.from_endf(
+    assert openmc.data.WindowedMultipole.from_endf(
             endf_file, log=True, wmp_options={"search": True, 'rtol':1e-2})
diff --git a/tests/unit_tests/test_nuclide_heating.py b/tests/unit_tests/test_nuclide_heating.py
new file mode 100644
index 000000000..e00d57b4f
--- /dev/null
+++ b/tests/unit_tests/test_nuclide_heating.py
@@ -0,0 +1,39 @@
+import openmc
+from pytest import approx
+
+
+def test_nuclide_heating(run_in_tmpdir):
+    mat = openmc.Material()
+    mat.add_nuclide("Li6", 0.5)
+    mat.add_nuclide("Li7", 0.5)
+    mat.set_density("g/cm3", 1.0)
+
+    sphere = openmc.Sphere(r=20, boundary_type="reflective")
+    inside_sphere = openmc.Cell(fill=mat, region=-sphere)
+    model = openmc.Model()
+    model.geometry = openmc.Geometry([inside_sphere])
+
+    model.settings.particles = 1000
+    model.settings.batches = 1
+    model.settings.photon_transport = True
+    model.settings.electron_treatment = "ttb"
+    model.settings.cutoff = {"energy_photon": 1000}
+    model.settings.run_mode = "fixed source"
+    model.settings.source = openmc.IndependentSource(
+        energy=openmc.stats.delta_function(10.0e6),
+        particle="photon"
+    )
+
+    # Create two tallies, one with heating by nuclide and one with total heating
+    tally1 = openmc.Tally()
+    tally1.scores = ["heating"]
+    tally1.nuclides = mat.get_nuclides()
+    tally2 = openmc.Tally()
+    tally2.scores = ["heating"]
+    model.tallies = [tally1, tally2]
+
+    # Run the model
+    model.run(apply_tally_results=True)
+
+    # Make sure the heating results are consistent
+    assert tally1.mean.sum() == approx(tally2.mean.sum())

From e14bb884eb97f80fecaa3c509dce10964c10247a Mon Sep 17 00:00:00 2001
From: Lewis Gross <43077972+lewisgross1296@users.noreply.github.com>
Date: Wed, 4 Jun 2025 18:40:55 -0500
Subject: [PATCH 036/203] Update _get_start_data to always grab the beginning
 of timestep time (#3414)

Co-authored-by: Paul Wilson <paul.wilson@wisc.edu>
Co-authored-by: Paul Romano <paul.k.romano@gmail.com>
---
 openmc/deplete/abc.py                     | 29 +++++++++++++++--
 tests/unit_tests/test_deplete_continue.py | 38 +++++++++++++++++++++++
 2 files changed, 65 insertions(+), 2 deletions(-)

diff --git a/openmc/deplete/abc.py b/openmc/deplete/abc.py
index c304b8dc6..4b43dd221 100644
--- a/openmc/deplete/abc.py
+++ b/openmc/deplete/abc.py
@@ -818,10 +818,35 @@ class Integrator(ABC):
             rates *= source_rate / res.source_rate
         return bos_conc, OperatorResult(k, rates)
 
-    def _get_start_data(self):
+    def _get_start_data(self) -> tuple[float, int]:
+        """
+        This function fetches the starting state of a depletion simulation in
+        terms of the simulation physical time at which to start and the index at
+        which the depletion simulation should start. When no previous results
+        exist, the time and index are both zero. When previous results do exist,
+        it returns the time corresponding to beginning the previous results last
+        timestep and the index as N-1 where N is the number of previous
+        StepResults found in the previous Results (as expected from 0-based
+        indexing).
+
+        Note that the openmc.deplete.Results.time object is a list of float with
+        [t,t+dt] where t is the beginning of timestep time and t+dt is the end
+        of timestep time. If the previous results correspond to a simulation
+        that finished to completeion, it will contain a results in the form of
+        [t,t], but if a simulation doesn't finish all the given timesteps, it is
+        the t that is the desired start time, not t+dt. Thus, it is always safe
+        to take time[0].
+
+        Returns
+        -------
+        start_time : float
+            Time at which depletion simulation should start in [s]
+        index : int
+            Index at which depletion simulation should start
+        """
         if self.operator.prev_res is None:
             return 0.0, 0
-        return (self.operator.prev_res[-1].time[-1],
+        return (self.operator.prev_res[-1].time[0],
                 len(self.operator.prev_res) - 1)
 
     def integrate(
diff --git a/tests/unit_tests/test_deplete_continue.py b/tests/unit_tests/test_deplete_continue.py
index 53c4c56d2..637c9d5e4 100644
--- a/tests/unit_tests/test_deplete_continue.py
+++ b/tests/unit_tests/test_deplete_continue.py
@@ -4,6 +4,7 @@ These tests run in two steps: first a normal run and then a continue run using t
 """
 
 import pytest
+import numpy as np
 import openmc.deplete
 
 from tests import dummy_operator
@@ -26,6 +27,43 @@ def test_continue(run_in_tmpdir):
     bundle.solver(operator, [1.0, 2.0, 3.0, 4.0], [1.0, 2.0, 3.0, 4.0],
                   continue_timesteps=True).integrate()
 
+    final_res = openmc.deplete.Results(operator.output_dir / "depletion_results.h5")
+
+    assert np.array_equal(
+        np.diff(final_res.get_times(time_units="s")),
+        [1.0, 2.0, 3.0, 4.0]
+    )
+
+
+def test_continue_continue(run_in_tmpdir):
+    """Test to ensure that a continue run can be continued"""
+    # set up the problem
+    bundle = dummy_operator.SCHEMES['predictor']
+    operator = dummy_operator.DummyOperator()
+
+    # initial depletion
+    bundle.solver(operator, [1.0, 2.0], [1.0, 2.0]).integrate()
+
+    # set up continue run
+    prev_res = openmc.deplete.Results(operator.output_dir / "depletion_results.h5")
+    operator = dummy_operator.DummyOperator(prev_res)
+
+    # first continue run
+    bundle.solver(operator, [1.0, 2.0, 3.0, 4.0], [1.0, 2.0, 3.0, 4.0],
+                  continue_timesteps=True).integrate()
+
+    prev_res = openmc.deplete.Results(operator.output_dir / "depletion_results.h5")
+    # second continue run
+    bundle.solver(operator, [1.0, 2.0, 3.0, 4.0, 5.0, 6.0], [1.0, 2.0, 3.0, 4.0, 5.0, 6.0],
+                  continue_timesteps=True).integrate()
+
+    final_res = openmc.deplete.Results(operator.output_dir / "depletion_results.h5")
+
+    assert np.array_equal(
+        np.diff(final_res.get_times(time_units="s")),
+        [1.0, 2.0, 3.0, 4.0, 5.0, 6.0]
+    )
+
 
 def test_mismatched_initial_times(run_in_tmpdir):
     """Test to ensure that a continue run with different initial steps is properly caught"""

From dadc4fe4184e66848a60a052c00d0b4cfeebb247 Mon Sep 17 00:00:00 2001
From: GuySten <62616591+GuySten@users.noreply.github.com>
Date: Thu, 5 Jun 2025 03:07:59 +0300
Subject: [PATCH 037/203] Fix no serialization of periodic_surface_id bug
 (#3421)

Co-authored-by: Paul Romano <paul.k.romano@gmail.com>
---
 include/openmc/boundary_condition.h |  4 +++
 openmc/summary.py                   | 12 +++++++++
 src/surface.cpp                     | 13 +++++++++
 tests/unit_tests/test_summary.py    | 41 +++++++++++++++++++++++++++++
 4 files changed, 70 insertions(+)
 create mode 100644 tests/unit_tests/test_summary.py

diff --git a/include/openmc/boundary_condition.h b/include/openmc/boundary_condition.h
index cd8988162..af40131f1 100644
--- a/include/openmc/boundary_condition.h
+++ b/include/openmc/boundary_condition.h
@@ -111,6 +111,10 @@ public:
 
   std::string type() const override { return "periodic"; }
 
+  int i_surf() const { return i_surf_; }
+
+  int j_surf() const { return j_surf_; }
+
 protected:
   int i_surf_;
   int j_surf_;
diff --git a/openmc/summary.py b/openmc/summary.py
index 6423f8ce1..ca5cfadd7 100644
--- a/openmc/summary.py
+++ b/openmc/summary.py
@@ -127,11 +127,23 @@ class Summary:
             self._fast_materials[material.id] = material
 
     def _read_surfaces(self):
+        periodic_surface_ids = set()
         for group in self._f['geometry/surfaces'].values():
             surface = openmc.Surface.from_hdf5(group)
             # surface may be None for DAGMC surfaces
             if surface:
                 self._fast_surfaces[surface.id] = surface
+                if surface.boundary_type == "periodic":
+                    periodic_surface_ids.add(surface.id)
+
+        # Assign periodic surfaces when information is in file
+        for surface_id in periodic_surface_ids:
+            group = self._f[f'geometry/surfaces/surface {surface_id}']
+            surface = self._fast_surfaces[surface_id]
+            if 'periodic_surface_id' in group:
+                periodic_surface_id = int(group['periodic_surface_id'][()])
+                surface.periodic_surface = self._fast_surfaces[periodic_surface_id]
+
 
     def _read_cells(self):
 
diff --git a/src/surface.cpp b/src/surface.cpp
index 0002275c3..ea19514a3 100644
--- a/src/surface.cpp
+++ b/src/surface.cpp
@@ -172,6 +172,19 @@ void Surface::to_hdf5(hid_t group_id) const
     if (bc_) {
       write_string(surf_group, "boundary_type", bc_->type(), false);
       bc_->to_hdf5(surf_group);
+
+      // write periodic surface ID
+      if (bc_->type() == "periodic") {
+        auto pbc = dynamic_cast<PeriodicBC*>(bc_.get());
+        Surface& surf1 {*model::surfaces[pbc->i_surf()]};
+        Surface& surf2 {*model::surfaces[pbc->j_surf()]};
+
+        if (id_ == surf1.id_) {
+          write_dataset(surf_group, "periodic_surface_id", surf2.id_);
+        } else {
+          write_dataset(surf_group, "periodic_surface_id", surf1.id_);
+        }
+      }
     } else {
       write_string(surf_group, "boundary_type", "transmission", false);
     }
diff --git a/tests/unit_tests/test_summary.py b/tests/unit_tests/test_summary.py
new file mode 100644
index 000000000..315ac0ba5
--- /dev/null
+++ b/tests/unit_tests/test_summary.py
@@ -0,0 +1,41 @@
+import openmc
+
+
+def test_periodic_surface_roundtrip(run_in_tmpdir):
+    # Create a simple model with periodic surfaces
+    mat = openmc.Material()
+    mat.add_nuclide('H1', 1.0)
+    mat.set_density('g/cm3', 1.0)
+    cyl = openmc.ZCylinder(r=1.0)
+    x0 = openmc.XPlane(-5.0, boundary_type='periodic')
+    y0 = openmc.YPlane(-5.0, boundary_type='periodic')
+    z0 = openmc.ZPlane(-5.0, boundary_type='periodic')
+    x1 = openmc.XPlane(5.0, boundary_type='periodic')
+    y1 = openmc.YPlane(5.0, boundary_type='periodic')
+    z1 = openmc.ZPlane(5.0, boundary_type='periodic')
+    x0.periodic_surface = x1
+    y0.periodic_surface = y1
+    z0.periodic_surface = z1
+    cell1 = openmc.Cell(fill=mat, region=-cyl)
+    cell2 = openmc.Cell(fill=mat, region=+cyl & +x0 & -x1 & +y0 & -y1 & +z0 & -z1)
+    model = openmc.Model()
+    model.geometry = openmc.Geometry([cell1, cell2])
+    model.settings.particles = 100
+    model.settings.batches = 1
+    model.settings.run_mode = 'fixed source'
+    model.settings.source = openmc.IndependentSource(
+        energy=openmc.stats.delta_function(1.0e4)
+    )
+
+    # Run model
+    model.run()
+
+    # Load summary data and check periodic surfaces
+    summary = openmc.Summary('summary.h5')
+    surfs = summary.geometry.get_all_surfaces()
+    for s in [x0, y0, z0, x1, y1, z1]:
+        assert surfs[s.id].boundary_type == 'periodic'
+    pairs = [(x0, x1), (y0, y1), (z0, z1)]
+    for s0, s1 in pairs:
+        assert surfs[s0.id].periodic_surface == surfs[s1.id]
+        assert surfs[s1.id].periodic_surface == surfs[s0.id]

From 4943fa363074e511cd0fa797a8d4c02af92c2443 Mon Sep 17 00:00:00 2001
From: Paul Romano <paul.k.romano@gmail.com>
Date: Thu, 5 Jun 2025 10:45:49 -0500
Subject: [PATCH 038/203] Avoid negative heating values during pair production
 and bremsstrahlung (#3426)

Co-authored-by: GuySten <guyste@post.bgu.ac.il>
---
 docs/source/methods/energy_deposition.rst     |  8 +++--
 include/openmc/particle_data.h                |  3 +-
 src/bremsstrahlung.cpp                        |  6 ++++
 src/tallies/tally_scoring.cpp                 | 29 ++++++++++++++----
 .../photon_production/results_true.dat        | 28 ++++++++---------
 .../results_true.dat                          | 16 +++++-----
 tests/unit_tests/test_photon_heating.py       | 30 +++++++++++++++++++
 7 files changed, 88 insertions(+), 32 deletions(-)
 create mode 100644 tests/unit_tests/test_photon_heating.py

diff --git a/docs/source/methods/energy_deposition.rst b/docs/source/methods/energy_deposition.rst
index 0babd7124..c43ee64ac 100644
--- a/docs/source/methods/energy_deposition.rst
+++ b/docs/source/methods/energy_deposition.rst
@@ -47,15 +47,17 @@ interactions, the energy-balance KERMA coefficient is
 
 where :math:`\bar{E}_{i, r, n}` is the average energy of secondary neutrons and
 :math:`\bar{E}_{i, r, \gamma}` is the average energy of secondary photons. For
-photon and charged particle interactions, the :math:`Q` value is zero and thus
-the KERMA coefficient is
+photon and charged particle interactions the KERMA coefficient is
 
 .. math::
     :label: energy-balance-photon
 
-    k_{i, r}(E) = \left(E - \sum\limits_x \bar{E}_{i, r, x}
+    k_{i, r}(E) = \left(E + Q_{i, r} - \sum\limits_x \bar{E}_{i, r, x}
     \right)\sigma_{i, r}(E).
 
+where the :math:`Q` value is zero for all interactions except for pair
+production and positron annihilation.
+
 -------
 Fission
 -------
diff --git a/include/openmc/particle_data.h b/include/openmc/particle_data.h
index 1570b780b..a07a99ffb 100644
--- a/include/openmc/particle_data.h
+++ b/include/openmc/particle_data.h
@@ -573,7 +573,8 @@ public:
   bool& fission() { return fission_; }            // true if implicit fission
   int& event_nuclide() { return event_nuclide_; } // index of collision nuclide
   const int& event_nuclide() const { return event_nuclide_; }
-  int& event_mt() { return event_mt_; }           // MT number of collision
+  int& event_mt() { return event_mt_; } // MT number of collision
+  const int& event_mt() const { return event_mt_; }
   int& delayed_group() { return delayed_group_; } // delayed group
   const int& parent_nuclide() const { return parent_nuclide_; }
   int& parent_nuclide() { return parent_nuclide_; } // Parent nuclide
diff --git a/src/bremsstrahlung.cpp b/src/bremsstrahlung.cpp
index d22d6392a..a2320e0b4 100644
--- a/src/bremsstrahlung.cpp
+++ b/src/bremsstrahlung.cpp
@@ -112,6 +112,12 @@ void thick_target_bremsstrahlung(Particle& p, double* E_lost)
                std::pow(a * (c - c_l) / (std::exp(w_l) * p_l) + 1.0, 1.0 / a);
 
     if (w > settings::energy_cutoff[photon]) {
+      // If the energy of the secondary photon is larger than the remaining
+      // energy of the primary particle, adjust it to the remaining energy
+      if (*E_lost + w > p.E()) {
+        w = p.E() - *E_lost;
+      }
+
       // Create secondary photon
       p.create_secondary(p.wgt(), p.u(), w, ParticleType::photon);
       *E_lost += w;
diff --git a/src/tallies/tally_scoring.cpp b/src/tallies/tally_scoring.cpp
index 62b002907..71b103cfb 100644
--- a/src/tallies/tally_scoring.cpp
+++ b/src/tallies/tally_scoring.cpp
@@ -325,6 +325,20 @@ double score_neutron_heating(const Particle& p, const Tally& tally, double flux,
   return score;
 }
 
+//! Helper function to obtain reaction Q value for photons and charged particles
+double get_reaction_q_value(const Particle& p)
+{
+  if (p.type() == ParticleType::photon && p.event_mt() == PAIR_PROD) {
+    // pair production
+    return -2 * MASS_ELECTRON_EV;
+  } else if (p.type() == ParticleType::positron) {
+    // positron annihilation
+    return 2 * MASS_ELECTRON_EV;
+  } else {
+    return 0.0;
+  }
+}
+
 //! Helper function to obtain particle heating [eV]
 
 double score_particle_heating(const Particle& p, const Tally& tally,
@@ -335,14 +349,17 @@ double score_particle_heating(const Particle& p, const Tally& tally,
       p, tally, flux, rxn_bin, i_nuclide, atom_density);
   if (i_nuclide == -1 || i_nuclide == p.event_nuclide() ||
       p.event_nuclide() == -1) {
+    // For pair production and positron annihilation, we need to account for the
+    // reaction Q value
+    double Q = get_reaction_q_value(p);
+
     // Get the pre-collision energy of the particle.
     auto E = p.E_last();
-    // The energy deposited is the difference between the pre-collision
-    // and post-collision energy...
-    double score = E - p.E();
-    // ...less the energy of any secondary particles since they will be
-    // transported individually later
-    score -= p.bank_second_E();
+
+    // The energy deposited is the sum of the incident energy and the reaction
+    // Q-value less the energy of any outgoing particles
+    double score = E + Q - p.E() - p.bank_second_E();
+
     score *= p.wgt_last();
 
     // if no event_nuclide (charged particle) scale energy deposition by
diff --git a/tests/regression_tests/photon_production/results_true.dat b/tests/regression_tests/photon_production/results_true.dat
index c16524689..413f6f0ca 100644
--- a/tests/regression_tests/photon_production/results_true.dat
+++ b/tests/regression_tests/photon_production/results_true.dat
@@ -55,14 +55,14 @@ tally 3:
 1.846062E-07
 2.297000E-01
 5.276209E-02
-7.055982E+03
-4.978688E+07
+4.196651E+00
+1.761188E+01
 0.000000E+00
 0.000000E+00
 2.297000E-01
 5.276209E-02
-7.055982E+03
-4.978688E+07
+4.196651E+00
+1.761188E+01
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -79,14 +79,14 @@ tally 3:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-7.692488E+03
-5.917437E+07
+1.474427E+04
+2.173936E+08
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-7.692488E+03
-5.917437E+07
+1.474427E+04
+2.173936E+08
 0.000000E+00
 0.000000E+00
 tally 4:
@@ -104,14 +104,14 @@ tally 4:
 0.000000E+00
 2.297000E-01
 5.276209E-02
-7.055982E+03
-4.978688E+07
+4.196651E+00
+1.761188E+01
 0.000000E+00
 0.000000E+00
 2.297000E-01
 5.276209E-02
-7.055982E+03
-4.978688E+07
+4.196651E+00
+1.761188E+01
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -134,7 +134,7 @@ tally 4:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-7.692488E+03
-5.917437E+07
+1.474427E+04
+2.173936E+08
 0.000000E+00
 0.000000E+00
diff --git a/tests/regression_tests/photon_production_fission/results_true.dat b/tests/regression_tests/photon_production_fission/results_true.dat
index cdbb1255c..b17b3621a 100644
--- a/tests/regression_tests/photon_production_fission/results_true.dat
+++ b/tests/regression_tests/photon_production_fission/results_true.dat
@@ -32,14 +32,14 @@ tally 2:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-2.479234E+06
-2.052367E+12
+1.675918E+05
+9.365733E+09
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-2.479234E+06
-2.052367E+12
+1.675918E+05
+9.365733E+09
 0.000000E+00
 0.000000E+00
 tally 3:
@@ -57,13 +57,13 @@ tally 3:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-2.479234E+06
-2.052367E+12
+1.675918E+05
+9.365733E+09
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-2.479234E+06
-2.052367E+12
+1.675918E+05
+9.365733E+09
 0.000000E+00
 0.000000E+00
diff --git a/tests/unit_tests/test_photon_heating.py b/tests/unit_tests/test_photon_heating.py
new file mode 100644
index 000000000..05473f5c6
--- /dev/null
+++ b/tests/unit_tests/test_photon_heating.py
@@ -0,0 +1,30 @@
+import openmc
+
+
+def test_negative_positron_heating():
+    m = openmc.Material()
+    m.add_element('Li', 1.0)
+    m.set_density('g/cm3', 10.0)
+
+    surf = openmc.Sphere(r=100.0, boundary_type='reflective')
+    cell = openmc.Cell(fill=m, region=-surf)
+    model = openmc.Model()
+    model.geometry = openmc.Geometry([cell])
+    model.settings.run_mode = 'fixed source'
+    model.settings.source = openmc.IndependentSource(
+        space=openmc.stats.Point(),
+        energy=openmc.stats.Discrete([5.0e6], [1.0]),
+        particle='photon',
+    )
+    model.settings.particles = 7
+    model.settings.batches = 1
+    model.settings.electron_treatment = 'led'
+    model.settings.seed = 513836
+
+    tally = openmc.Tally()
+    tally.filters = [openmc.ParticleFilter(['photon', 'electron', 'positron'])]
+    tally.scores = ['heating']
+    model.tallies = openmc.Tallies([tally])
+    model.run(apply_tally_results=True)
+
+    assert (tally.mean >= 0.0).all(), "Negative heating detected"

From 67aa0def9deabae1cc012214d5b96367c5743dcf Mon Sep 17 00:00:00 2001
From: John Tramm <john.tramm@gmail.com>
Date: Fri, 6 Jun 2025 14:51:39 -0500
Subject: [PATCH 039/203] Random Ray External Source Plotting Fix (#3430)

---
 src/random_ray/flat_source_domain.cpp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/random_ray/flat_source_domain.cpp b/src/random_ray/flat_source_domain.cpp
index cd073f350..367c63af4 100644
--- a/src/random_ray/flat_source_domain.cpp
+++ b/src/random_ray/flat_source_domain.cpp
@@ -919,10 +919,17 @@ void FlatSourceDomain::output_to_vtk() const
       std::fprintf(plot, "LOOKUP_TABLE default\n");
       for (int i = 0; i < Nx * Ny * Nz; i++) {
         int64_t fsr = voxel_indices[i];
+        int mat = source_regions_.material(fsr);
         float total_external = 0.0f;
         if (fsr >= 0) {
           for (int g = 0; g < negroups_; g++) {
-            total_external += source_regions_.external_source(fsr, g);
+            // External sources are already divided by sigma_t, so we need to
+            // multiply it back to get the true external source.
+            double sigma_t = 1.0;
+            if (mat != MATERIAL_VOID) {
+              sigma_t = sigma_t_[mat * negroups_ + g];
+            }
+            total_external += source_regions_.external_source(fsr, g) * sigma_t;
           }
         }
         total_external = convert_to_big_endian<float>(total_external);

From 7fda3eb84695f6b147705e3b0fd4a65a49e0735b Mon Sep 17 00:00:00 2001
From: Paul Romano <paul.k.romano@gmail.com>
Date: Fri, 6 Jun 2025 16:30:50 -0500
Subject: [PATCH 040/203] Implement a new MeshMaterialFilter (#3406)

Co-authored-by: Jonathan Shimwell <drshimwell@gmail.com>
Co-authored-by: Patrick Shriwise <pshriwise@gmail.com>
---
 CMakeLists.txt                               |   1 +
 docs/source/pythonapi/base.rst               |   1 +
 include/openmc/tallies/filter.h              |   1 +
 include/openmc/tallies/filter_mesh.h         |   6 +-
 include/openmc/tallies/filter_meshmaterial.h | 114 +++++++++++
 openmc/deplete/microxs.py                    |   9 +-
 openmc/filter.py                             | 190 ++++++++++++++++++-
 openmc/lib/filter.py                         |  20 +-
 openmc/tallies.py                            |   2 +-
 src/tallies/filter.cpp                       |   3 +
 src/tallies/filter_meshmaterial.cpp          | 185 ++++++++++++++++++
 tests/unit_tests/test_filter_meshmaterial.py |  65 +++++++
 tests/unit_tests/test_filters.py             |  33 ++++
 13 files changed, 614 insertions(+), 16 deletions(-)
 create mode 100644 include/openmc/tallies/filter_meshmaterial.h
 create mode 100644 src/tallies/filter_meshmaterial.cpp
 create mode 100644 tests/unit_tests/test_filter_meshmaterial.py

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4dff35418..6665682dd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -414,6 +414,7 @@ list(APPEND libopenmc_SOURCES
   src/tallies/filter_materialfrom.cpp
   src/tallies/filter_mesh.cpp
   src/tallies/filter_meshborn.cpp
+  src/tallies/filter_meshmaterial.cpp
   src/tallies/filter_meshsurface.cpp
   src/tallies/filter_mu.cpp
   src/tallies/filter_musurface.cpp
diff --git a/docs/source/pythonapi/base.rst b/docs/source/pythonapi/base.rst
index 1d8a93d47..d0e7d2439 100644
--- a/docs/source/pythonapi/base.rst
+++ b/docs/source/pythonapi/base.rst
@@ -129,6 +129,7 @@ Constructing Tallies
    openmc.SurfaceFilter
    openmc.MeshFilter
    openmc.MeshBornFilter
+   openmc.MeshMaterialFilter
    openmc.MeshSurfaceFilter
    openmc.EnergyFilter
    openmc.EnergyoutFilter
diff --git a/include/openmc/tallies/filter.h b/include/openmc/tallies/filter.h
index ee635b183..65098597a 100644
--- a/include/openmc/tallies/filter.h
+++ b/include/openmc/tallies/filter.h
@@ -33,6 +33,7 @@ enum class FilterType {
   MATERIALFROM,
   MESH,
   MESHBORN,
+  MESH_MATERIAL,
   MESH_SURFACE,
   MU,
   MUSURFACE,
diff --git a/include/openmc/tallies/filter_mesh.h b/include/openmc/tallies/filter_mesh.h
index 2f48b6d4d..4c9460d2e 100644
--- a/include/openmc/tallies/filter_mesh.h
+++ b/include/openmc/tallies/filter_mesh.h
@@ -9,9 +9,9 @@
 namespace openmc {
 
 //==============================================================================
-//! Indexes the location of particle events to a regular mesh.  For tracklength
-//! tallies, it will produce multiple valid bins and the bin weight will
-//! correspond to the fraction of the track length that lies in that bin.
+//! Indexes the location of particle events to a mesh. For tracklength tallies,
+//! it will produce multiple valid bins and the bin weight will correspond to
+//! the fraction of the track length that lies in that bin.
 //==============================================================================
 
 class MeshFilter : public Filter {
diff --git a/include/openmc/tallies/filter_meshmaterial.h b/include/openmc/tallies/filter_meshmaterial.h
new file mode 100644
index 000000000..42a4edcf0
--- /dev/null
+++ b/include/openmc/tallies/filter_meshmaterial.h
@@ -0,0 +1,114 @@
+#ifndef OPENMC_TALLIES_FILTER_MESHMATERIAL_H
+#define OPENMC_TALLIES_FILTER_MESHMATERIAL_H
+
+#include <cstdint>
+#include <string>
+#include <unordered_map>
+#include <unordered_set>
+
+#include "openmc/position.h"
+#include "openmc/random_ray/source_region.h"
+#include "openmc/span.h"
+#include "openmc/tallies/filter.h"
+#include "openmc/vector.h"
+
+namespace openmc {
+
+//==============================================================================
+//! Helper structs that define a combination of a mesh element index and a
+//! material index and a functor for hashing to place in an unordered_map
+//==============================================================================
+
+struct ElementMat {
+  //! Check for equality
+  bool operator==(const ElementMat& other) const
+  {
+    return index_element == other.index_element && index_mat == other.index_mat;
+  }
+
+  int32_t index_element;
+  int32_t index_mat;
+};
+
+struct ElementMatHash {
+  std::size_t operator()(const ElementMat& k) const
+  {
+    size_t seed = 0;
+    hash_combine(seed, k.index_element);
+    hash_combine(seed, k.index_mat);
+    return seed;
+  }
+};
+
+//==============================================================================
+//! Indexes the location of particle events to combinations of mesh element
+//! index and material.  For tracklength tallies, it will produce multiple valid
+//! bins and the bin weight will correspond to the fraction of the track length
+//! that lies in that bin.
+//==============================================================================
+
+class MeshMaterialFilter : public Filter {
+public:
+  //----------------------------------------------------------------------------
+  // Constructors, destructors
+
+  ~MeshMaterialFilter() = default;
+
+  //----------------------------------------------------------------------------
+  // Methods
+
+  std::string type_str() const override { return "meshmaterial"; }
+  FilterType type() const override { return FilterType::MESH_MATERIAL; }
+
+  void from_xml(pugi::xml_node node) override;
+
+  void get_all_bins(const Particle& p, TallyEstimator estimator,
+    FilterMatch& match) const override;
+
+  void to_statepoint(hid_t filter_group) const override;
+
+  std::string text_label(int bin) const override;
+
+  //----------------------------------------------------------------------------
+  // Accessors
+
+  int32_t mesh() const { return mesh_; }
+
+  void set_mesh(int32_t mesh);
+
+  //! Set the bins based on a flat vector of alternating element index and
+  //! material IDs
+  void set_bins(span<int32_t> bins);
+
+  //! Set the bins based on a vector of (element, material index) pairs
+  void set_bins(vector<ElementMat>&& bins);
+
+  virtual void set_translation(const Position& translation);
+
+  virtual void set_translation(const double translation[3]);
+
+  virtual const Position& translation() const { return translation_; }
+
+  virtual bool translated() const { return translated_; }
+
+private:
+  //----------------------------------------------------------------------------
+  // Data members
+
+  int32_t mesh_;            //!< Index of the mesh
+  bool translated_ {false}; //!< Whether or not the filter is translated
+  Position translation_ {0.0, 0.0, 0.0}; //!< Filter translation
+
+  //! The indices of the mesh element-material combinations binned by this
+  //! filter.
+  vector<ElementMat> bins_;
+
+  //! The set of materials used in this filter
+  std::unordered_set<int32_t> materials_;
+
+  //! A map from mesh element-material indices to filter bin indices.
+  std::unordered_map<ElementMat, int32_t, ElementMatHash> map_;
+};
+
+} // namespace openmc
+#endif // OPENMC_TALLIES_FILTER_MESHMATERIAL_H
diff --git a/openmc/deplete/microxs.py b/openmc/deplete/microxs.py
index bbe9b2a43..686d3bc38 100644
--- a/openmc/deplete/microxs.py
+++ b/openmc/deplete/microxs.py
@@ -56,8 +56,8 @@ def get_microxs_and_flux(
     ----------
     model : openmc.Model
         OpenMC model object. Must contain geometry, materials, and settings.
-    domains : list of openmc.Material or openmc.Cell or openmc.Universe, or openmc.MeshBase
-        Domains in which to tally reaction rates.
+    domains : list of openmc.Material or openmc.Cell or openmc.Universe, or openmc.MeshBase, or openmc.Filter
+        Domains in which to tally reaction rates, or a spatial tally filter.
     nuclides : list of str
         Nuclides to get cross sections for. If not specified, all burnable
         nuclides from the depletion chain file are used.
@@ -103,7 +103,10 @@ def get_microxs_and_flux(
         energy_filter = openmc.EnergyFilter.from_group_structure(energies)
     else:
         energy_filter = openmc.EnergyFilter(energies)
-    if isinstance(domains, openmc.MeshBase):
+
+    if isinstance(domains, openmc.Filter):
+        domain_filter = domains
+    elif isinstance(domains, openmc.MeshBase):
         domain_filter = openmc.MeshFilter(domains)
     elif isinstance(domains[0], openmc.Material):
         domain_filter = openmc.MaterialFilter(domains)
diff --git a/openmc/filter.py b/openmc/filter.py
index 4d37f1055..f29c54085 100644
--- a/openmc/filter.py
+++ b/openmc/filter.py
@@ -25,7 +25,8 @@ _FILTER_TYPES = (
     'energyout', 'mu', 'musurface', 'polar', 'azimuthal', 'distribcell', 'delayedgroup',
     'energyfunction', 'cellfrom', 'materialfrom', 'legendre', 'spatiallegendre',
     'sphericalharmonics', 'zernike', 'zernikeradial', 'particle', 'cellinstance',
-    'collision', 'time', 'parentnuclide', 'weight'
+    'collision', 'time', 'parentnuclide', 'weight', 'meshborn', 'meshsurface',
+    'meshmaterial',
 )
 
 _CURRENT_NAMES = (
@@ -900,8 +901,6 @@ class MeshFilter(Filter):
 
     @property
     def shape(self):
-        if isinstance(self, MeshSurfaceFilter):
-            return (self.num_bins,)
         return self.mesh.dimension
 
     @property
@@ -992,8 +991,11 @@ class MeshFilter(Filter):
             XML element containing filter data
 
         """
-        element = super().to_xml_element()
-        element[0].text = str(self.mesh.id)
+        element = ET.Element('filter')
+        element.set('id', str(self.id))
+        element.set('type', self.short_name.lower())
+        subelement = ET.SubElement(element, 'bins')
+        subelement.text = str(self.mesh.id)
         if self.translation is not None:
             element.set('translation', ' '.join(map(str, self.translation)))
         return element
@@ -1039,6 +1041,181 @@ class MeshBornFilter(MeshFilter):
     """
 
 
+class MeshMaterialFilter(MeshFilter):
+    """Filter events by combinations of mesh elements and materials.
+
+    .. versionadded:: 0.15.3
+
+    Parameters
+    ----------
+    mesh : openmc.MeshBase
+        The mesh object that events will be tallied onto
+    bins : iterable of 2-tuples or numpy.ndarray
+        Combinations of (mesh element, material) to tally, given as 2-tuples.
+        The first value in the tuple represents the index of the mesh element,
+        and the second value indicates the material (either a
+        :class:`openmc.Material` instance of the ID).
+    filter_id : int
+        Unique identifier for the filter
+
+    """
+    def __init__(self, mesh: openmc.MeshBase, bins, filter_id=None):
+        self.mesh = mesh
+        self.bins = bins
+        self.id = filter_id
+        self._translation = None
+
+    @classmethod
+    def from_volumes(cls, mesh: openmc.MeshBase, volumes: openmc.MeshMaterialVolumes):
+        """Construct a MeshMaterialFilter from a MeshMaterialVolumes object.
+
+        Parameters
+        ----------
+        mesh : openmc.MeshBase
+            The mesh object that events will be tallied onto
+        volumes : openmc.MeshMaterialVolumes
+            The mesh material volumes to use for the filter
+
+        Returns
+        -------
+        MeshMaterialFilter
+            A new MeshMaterialFilter instance
+
+        """
+        bins = list(zip(*np.where(volumes._materials > -1)))
+        return cls(mesh, bins)
+
+    def __hash__(self):
+        data = (type(self).__name__, self.mesh.id, tuple(self.bins.ravel()))
+        return hash(data)
+
+    def __repr__(self):
+        string = type(self).__name__ + '\n'
+        string += '{: <16}=\t{}\n'.format('\tID', self.id)
+        string += '{: <16}=\t{}\n'.format('\tMesh ID', self.mesh.id)
+        string += '{: <16}=\n{}\n'.format('\tBins', self.bins)
+        string += '{: <16}=\t{}\n'.format('\tTranslation', self.translation)
+        return string
+
+    @property
+    def shape(self):
+        return (self.num_bins,)
+
+    @property
+    def mesh(self):
+        return self._mesh
+
+    @mesh.setter
+    def mesh(self, mesh):
+        cv.check_type('filter mesh', mesh, openmc.MeshBase)
+        self._mesh = mesh
+
+    @Filter.bins.setter
+    def bins(self, bins):
+        pairs = np.empty((len(bins), 2), dtype=int)
+        for i, (elem, mat) in enumerate(bins):
+            cv.check_type('element', elem, Integral)
+            cv.check_type('material', mat, (Integral, openmc.Material))
+            pairs[i, 0] = elem
+            pairs[i, 1] = mat if isinstance(mat, Integral) else mat.id
+        self._bins = pairs
+
+    def to_xml_element(self):
+        """Return XML element representing the filter.
+
+        Returns
+        -------
+        element : lxml.etree._Element
+            XML element containing filter data
+
+        """
+        element = ET.Element('filter')
+        element.set('id', str(self.id))
+        element.set('type', self.short_name.lower())
+        element.set('mesh', str(self.mesh.id))
+
+        if self.translation is not None:
+            element.set('translation', ' '.join(map(str, self.translation)))
+
+        subelement = ET.SubElement(element, 'bins')
+        subelement.text = ' '.join(str(i) for i in self.bins.ravel())
+
+        return element
+
+    @classmethod
+    def from_xml_element(cls, elem: ET.Element, **kwargs) -> MeshMaterialFilter:
+        filter_id = int(elem.get('id'))
+        mesh_id = int(elem.get('mesh'))
+        mesh_obj = kwargs['meshes'][mesh_id]
+        bins = [int(x) for x in get_text(elem, 'bins').split()]
+        bins = list(zip(bins[::2], bins[1::2]))
+        out = cls(mesh_obj, bins, filter_id=filter_id)
+
+        translation = elem.get('translation')
+        if translation:
+            out.translation = [float(x) for x in translation.split()]
+        return out
+
+    @classmethod
+    def from_hdf5(cls, group, **kwargs):
+        if group['type'][()].decode() != cls.short_name.lower():
+            raise ValueError("Expected HDF5 data for filter type '"
+                             + cls.short_name.lower() + "' but got '"
+                             + group['type'][()].decode() + " instead")
+
+        if 'meshes' not in kwargs:
+            raise ValueError(cls.__name__ + " requires a 'meshes' keyword "
+                             "argument.")
+
+        mesh_id = group['mesh'][()]
+        mesh_obj = kwargs['meshes'][mesh_id]
+        bins = group['bins'][()]
+        filter_id = int(group.name.split('/')[-1].lstrip('filter '))
+        out = cls(mesh_obj, bins, filter_id=filter_id)
+
+        translation = group.get('translation')
+        if translation:
+            out.translation = translation[()]
+
+        return out
+
+    def get_pandas_dataframe(self, data_size, stride, **kwargs):
+        """Builds a Pandas DataFrame for the Filter's bins.
+
+        This method constructs a Pandas DataFrame object for the filter with
+        columns annotated by filter bin information. This is a helper method for
+        :meth:`Tally.get_pandas_dataframe`.
+
+        Parameters
+        ----------
+        data_size : int
+            The total number of bins in the tally corresponding to this filter
+        stride : int
+            Stride in memory for the filter
+
+        Returns
+        -------
+        pandas.DataFrame
+            A Pandas DataFrame with a multi-index column for the cell instance.
+            The number of rows in the DataFrame is the same as the total number
+            of bins in the corresponding tally, with the filter bin appropriately
+            tiled to map to the corresponding tally bins.
+
+        See also
+        --------
+        Tally.get_pandas_dataframe(), CrossFilter.get_pandas_dataframe()
+
+        """
+        # Repeat and tile bins as necessary to account for other filters.
+        bins = np.repeat(self.bins, stride, axis=0)
+        tile_factor = data_size // len(bins)
+        bins = np.tile(bins, (tile_factor, 1))
+
+        columns = pd.MultiIndex.from_product([[self.short_name.lower()],
+                                              ['element', 'material']])
+        return pd.DataFrame(bins, columns=columns)
+
+
 class MeshSurfaceFilter(MeshFilter):
     """Filter events by surface crossings on a mesh.
 
@@ -1065,6 +1242,9 @@ class MeshSurfaceFilter(MeshFilter):
         The number of filter bins
 
     """
+    @property
+    def shape(self):
+        return (self.num_bins,)
 
     @MeshFilter.mesh.setter
     def mesh(self, mesh):
diff --git a/openmc/lib/filter.py b/openmc/lib/filter.py
index 3a76b52a1..55b681d89 100644
--- a/openmc/lib/filter.py
+++ b/openmc/lib/filter.py
@@ -21,10 +21,10 @@ __all__ = [
     'CellInstanceFilter', 'CollisionFilter', 'DistribcellFilter', 'DelayedGroupFilter',
     'EnergyFilter', 'EnergyoutFilter', 'EnergyFunctionFilter', 'LegendreFilter',
     'MaterialFilter', 'MaterialFromFilter', 'MeshFilter', 'MeshBornFilter',
-    'MeshSurfaceFilter', 'MuFilter', 'MuSurfaceFilter', 'ParentNuclideFilter',
-    'ParticleFilter', 'PolarFilter', 'SphericalHarmonicsFilter',
-    'SpatialLegendreFilter', 'SurfaceFilter', 'UniverseFilter', 'ZernikeFilter',
-    'ZernikeRadialFilter', 'filters'
+    'MeshMaterialFilter', 'MeshSurfaceFilter', 'MuFilter', 'MuSurfaceFilter',
+    'ParentNuclideFilter', 'ParticleFilter', 'PolarFilter', 'SphericalHarmonicsFilter',
+    'SpatialLegendreFilter', 'SurfaceFilter', 'TimeFilter', 'UniverseFilter',
+    'WeightFilter', 'ZernikeFilter', 'ZernikeRadialFilter', 'filters'
 ]
 
 # Tally functions
@@ -480,6 +480,10 @@ class MeshBornFilter(Filter):
         _dll.openmc_meshborn_filter_set_translation(self._index, (c_double*3)(*translation))
 
 
+class MeshMaterialFilter(Filter):
+    filter_type = 'meshmaterial'
+
+
 class MeshSurfaceFilter(Filter):
     """MeshSurface filter stored internally.
 
@@ -606,6 +610,10 @@ class SurfaceFilter(Filter):
     filter_type = 'surface'
 
 
+class TimeFilter(Filter):
+    filter_type = 'time'
+
+
 class UniverseFilter(Filter):
     filter_type = 'universe'
 
@@ -643,6 +651,7 @@ _FILTER_TYPE_MAP = {
     'cellborn': CellbornFilter,
     'cellfrom': CellfromFilter,
     'cellinstance': CellInstanceFilter,
+    'collision': CollisionFilter,
     'delayedgroup': DelayedGroupFilter,
     'distribcell': DistribcellFilter,
     'energy': EnergyFilter,
@@ -653,6 +662,7 @@ _FILTER_TYPE_MAP = {
     'materialfrom': MaterialFromFilter,
     'mesh': MeshFilter,
     'meshborn': MeshBornFilter,
+    'meshmaterial': MeshMaterialFilter,
     'meshsurface': MeshSurfaceFilter,
     'mu': MuFilter,
     'musurface': MuSurfaceFilter,
@@ -662,7 +672,9 @@ _FILTER_TYPE_MAP = {
     'sphericalharmonics': SphericalHarmonicsFilter,
     'spatiallegendre': SpatialLegendreFilter,
     'surface': SurfaceFilter,
+    'time': TimeFilter,
     'universe': UniverseFilter,
+    'weight': WeightFilter,
     'zernike': ZernikeFilter,
     'zernikeradial': ZernikeRadialFilter
 }
diff --git a/openmc/tallies.py b/openmc/tallies.py
index e990a95f7..06de0205c 100644
--- a/openmc/tallies.py
+++ b/openmc/tallies.py
@@ -1575,7 +1575,7 @@ class Tally(IDManagerMixin):
         for i, f in enumerate(self.filters):
             if expand_dims:
                 # Mesh filter indices are backwards so we need to flip them
-                if isinstance(f, openmc.MeshFilter):
+                if type(f) in {openmc.MeshFilter, openmc.MeshBornFilter}:
                     fshape = f.shape[::-1]
                     new_shape += fshape
                     idx0, idx1 = i, i + len(fshape) - 1
diff --git a/src/tallies/filter.cpp b/src/tallies/filter.cpp
index 17e57a987..79817981d 100644
--- a/src/tallies/filter.cpp
+++ b/src/tallies/filter.cpp
@@ -25,6 +25,7 @@
 #include "openmc/tallies/filter_materialfrom.h"
 #include "openmc/tallies/filter_mesh.h"
 #include "openmc/tallies/filter_meshborn.h"
+#include "openmc/tallies/filter_meshmaterial.h"
 #include "openmc/tallies/filter_meshsurface.h"
 #include "openmc/tallies/filter_mu.h"
 #include "openmc/tallies/filter_musurface.h"
@@ -133,6 +134,8 @@ Filter* Filter::create(const std::string& type, int32_t id)
     return Filter::create<MeshFilter>(id);
   } else if (type == "meshborn") {
     return Filter::create<MeshBornFilter>(id);
+  } else if (type == "meshmaterial") {
+    return Filter::create<MeshMaterialFilter>(id);
   } else if (type == "meshsurface") {
     return Filter::create<MeshSurfaceFilter>(id);
   } else if (type == "mu") {
diff --git a/src/tallies/filter_meshmaterial.cpp b/src/tallies/filter_meshmaterial.cpp
new file mode 100644
index 000000000..6e1f30380
--- /dev/null
+++ b/src/tallies/filter_meshmaterial.cpp
@@ -0,0 +1,185 @@
+#include "openmc/tallies/filter_meshmaterial.h"
+
+#include <utility> // for move
+
+#include <fmt/core.h>
+
+#include "openmc/capi.h"
+#include "openmc/constants.h"
+#include "openmc/container_util.h"
+#include "openmc/error.h"
+#include "openmc/material.h"
+#include "openmc/mesh.h"
+#include "openmc/xml_interface.h"
+
+namespace openmc {
+
+void MeshMaterialFilter::from_xml(pugi::xml_node node)
+{
+  // Get mesh ID
+  auto mesh = get_node_array<int32_t>(node, "mesh");
+  if (mesh.size() != 1) {
+    fatal_error(
+      "Only one mesh can be specified per " + type_str() + " mesh filter.");
+  }
+
+  auto id = mesh[0];
+  auto search = model::mesh_map.find(id);
+  if (search == model::mesh_map.end()) {
+    fatal_error(
+      fmt::format("Could not find mesh {} specified on tally filter.", id));
+  }
+  set_mesh(search->second);
+
+  // Get pairs of (element index, material) and set the bins
+  auto bins = get_node_array<int32_t>(node, "bins");
+  this->set_bins(bins);
+
+  if (check_for_node(node, "translation")) {
+    set_translation(get_node_array<double>(node, "translation"));
+  }
+}
+
+void MeshMaterialFilter::set_bins(span<int32_t> bins)
+{
+  if (bins.size() % 2 != 0) {
+    fatal_error(
+      fmt::format("Size of mesh material bins is not even: {}", bins.size()));
+  }
+
+  // Create a vector of ElementMat pairs from the flat vector of bins
+  vector<ElementMat> element_mats;
+  for (int64_t i = 0; i < bins.size() / 2; ++i) {
+    int32_t element = bins[2 * i];
+    int32_t mat_id = bins[2 * i + 1];
+    auto search = model::material_map.find(mat_id);
+    if (search == model::material_map.end()) {
+      fatal_error(fmt::format(
+        "Could not find material {} specified on tally filter.", mat_id));
+    }
+    int32_t mat_index = search->second;
+    element_mats.push_back({element, mat_index});
+  }
+
+  this->set_bins(std::move(element_mats));
+}
+
+void MeshMaterialFilter::set_bins(vector<ElementMat>&& bins)
+{
+  // Swap internal bins_ with the provided vector to avoid copying
+  bins_.swap(bins);
+
+  // Clear and update the mapping and vector of materials
+  materials_.clear();
+  map_.clear();
+  for (std::size_t i = 0; i < bins_.size(); ++i) {
+    const auto& x = bins_[i];
+    assert(x.index_mat >= 0);
+    assert(x.index_mat < model::materials.size());
+    materials_.insert(x.index_mat);
+    map_[x] = i;
+  }
+
+  n_bins_ = bins_.size();
+}
+
+void MeshMaterialFilter::set_mesh(int32_t mesh)
+{
+  // perform any additional perparation for mesh tallies here
+  mesh_ = mesh;
+  model::meshes[mesh_]->prepare_for_point_location();
+}
+
+void MeshMaterialFilter::set_translation(const Position& translation)
+{
+  translated_ = true;
+  translation_ = translation;
+}
+
+void MeshMaterialFilter::set_translation(const double translation[3])
+{
+  this->set_translation({translation[0], translation[1], translation[2]});
+}
+
+void MeshMaterialFilter::get_all_bins(
+  const Particle& p, TallyEstimator estimator, FilterMatch& match) const
+{
+  // If current material is not in any bins, don't bother checking
+  if (!contains(materials_, p.material())) {
+    return;
+  }
+
+  Position last_r = p.r_last();
+  Position r = p.r();
+  Position u = p.u();
+
+  // apply translation if present
+  if (translated_) {
+    last_r -= translation();
+    r -= translation();
+  }
+
+  if (estimator != TallyEstimator::TRACKLENGTH) {
+    int32_t index_element = model::meshes[mesh_]->get_bin(r);
+    if (index_element >= 0) {
+      auto search = map_.find({index_element, p.material()});
+      if (search != map_.end()) {
+        match.bins_.push_back(search->second);
+        match.weights_.push_back(1.0);
+      }
+    }
+  } else {
+    // First determine which elements the particle crosses (may or may not
+    // actually match bins so we have to adjust bins_/weight_ after)
+    int32_t n_start = match.bins_.size();
+    model::meshes[mesh_]->bins_crossed(
+      last_r, r, u, match.bins_, match.weights_);
+    int32_t n_end = match.bins_.size();
+
+    // Go through bins and weights and check which ones are actually a match
+    // based on the (element, material) pair. For matches, overwrite the bin.
+    int i = 0;
+    for (int j = n_start; j < n_end; ++j) {
+      int32_t index_element = match.bins_[j];
+      double weight = match.weights_[j];
+      auto search = map_.find({index_element, p.material()});
+      if (search != map_.end()) {
+        match.bins_[n_start + i] = search->second;
+        match.weights_[n_start + i] = weight;
+        ++i;
+      }
+    }
+
+    // Resize the vectors to remove the unmatched bins
+    match.bins_.resize(n_start + i);
+  }
+}
+
+void MeshMaterialFilter::to_statepoint(hid_t filter_group) const
+{
+  Filter::to_statepoint(filter_group);
+  write_dataset(filter_group, "mesh", model::meshes[mesh_]->id_);
+
+  size_t n = bins_.size();
+  xt::xtensor<size_t, 2> data({n, 2});
+  for (int64_t i = 0; i < n; ++i) {
+    const auto& x = bins_[i];
+    data(i, 0) = x.index_element;
+    data(i, 1) = model::materials[x.index_mat]->id_;
+  }
+  write_dataset(filter_group, "bins", data);
+
+  if (translated_) {
+    write_dataset(filter_group, "translation", translation_);
+  }
+}
+
+std::string MeshMaterialFilter::text_label(int bin) const
+{
+  auto& x = bins_[bin];
+  auto& mesh = *model::meshes.at(mesh_);
+  return fmt::format("Mesh {}, {}, Material {}", mesh.id(),
+    mesh.bin_label(x.index_element), model::materials[x.index_mat]->id_);
+}
+
+} // namespace openmc
diff --git a/tests/unit_tests/test_filter_meshmaterial.py b/tests/unit_tests/test_filter_meshmaterial.py
new file mode 100644
index 000000000..120533209
--- /dev/null
+++ b/tests/unit_tests/test_filter_meshmaterial.py
@@ -0,0 +1,65 @@
+import numpy as np
+import openmc
+from pytest import approx
+
+
+def test_filter_mesh_material(run_in_tmpdir):
+    # Create four identical materials
+    openmc.reset_auto_ids()
+    materials = []
+    for i in range(4):
+        mat = openmc.Material()
+        mat.add_nuclide('Fe56', 1.0)
+        materials.append(mat)
+
+    # Create a slab model with four cells
+    z_values = [-10., -5., 0., 5., 10.]
+    planes = [openmc.ZPlane(z) for z in z_values]
+    planes[0].boundary_type = 'vacuum'
+    planes[-1].boundary_type = 'vacuum'
+    regions = [+left & -right for left, right in zip(planes[:-1], planes[1:])]
+    cells = [openmc.Cell(fill=m, region=r) for r, m in zip(regions, materials)]
+    model = openmc.Model()
+    model.geometry = openmc.Geometry(cells)
+    model.settings.particles = 1_000
+    model.settings.batches = 5
+    model.settings.run_mode = 'fixed source'
+
+    # Create a mesh that does not align with all planar surfaces
+    mesh = openmc.RegularMesh()
+    mesh.lower_left = (-1., -1., -10.)
+    mesh.upper_right = (1., 1., 10.)
+    mesh.dimension = (1, 1, 5)
+
+    # Determine material volumes in each mesh element and use result to create a
+    # MeshMaterialFilter with corresponding bins
+    vols = mesh.material_volumes(model)
+    mmf = openmc.MeshMaterialFilter.from_volumes(mesh, vols)
+    expected_bins = [(0, 1), (1, 1), (1, 2), (2, 2), (2, 3), (3, 3), (3, 4), (4, 4)]
+    np.testing.assert_equal(mmf.bins, expected_bins)
+
+    # Create two tallies, one with a mesh filter and one with mesh-material
+    mesh_tally = openmc.Tally()
+    mesh_tally.filters = [openmc.MeshFilter(mesh)]
+    mesh_tally.scores = ['flux']
+    mesh_material_tally = openmc.Tally()
+    mesh_material_tally.filters = [mmf]
+    mesh_material_tally.scores = ['flux']
+    model.tallies = [mesh_tally, mesh_material_tally]
+
+    # Run model to get results on the two tallies
+    model.run(apply_tally_results=True)
+
+    # The sum of the flux in each mesh-material combination within a single mesh
+    # element should be equal to the flux in that mesh element
+    mesh_mean = mesh_tally.mean.ravel()
+    meshmat_mean = mesh_material_tally.mean.ravel()
+    assert mesh_mean[0] == approx(meshmat_mean[0])
+    assert mesh_mean[1] == approx(meshmat_mean[1] + meshmat_mean[2])
+    assert mesh_mean[2] == approx(meshmat_mean[3] + meshmat_mean[4])
+    assert mesh_mean[3] == approx(meshmat_mean[5] + meshmat_mean[6])
+    assert mesh_mean[4] == approx(meshmat_mean[7])
+    assert mesh_tally.mean.sum() == approx(mesh_material_tally.mean.sum())
+
+    # Make sure get_pandas_dataframe method works
+    mesh_material_tally.get_pandas_dataframe()
diff --git a/tests/unit_tests/test_filters.py b/tests/unit_tests/test_filters.py
index 60a60e3f5..8c56a310e 100644
--- a/tests/unit_tests/test_filters.py
+++ b/tests/unit_tests/test_filters.py
@@ -333,3 +333,36 @@ def test_weight():
     new_f = openmc.Filter.from_xml_element(elem)
     assert new_f.id == f.id
     assert np.allclose(new_f.bins, f.bins)
+
+
+def test_mesh_material():
+    mat1 = openmc.Material()
+    mat2 = openmc.Material()
+
+    mesh = openmc.RegularMesh()
+    mesh.lower_left = (-1., -1., -1.)
+    mesh.upper_right = (1., 1., 1.)
+    mesh.dimension = (2, 4, 1)
+    bins = [(0, mat1), (0, mat2), (6, mat1), (7, mat2)]
+    f = openmc.MeshMaterialFilter(mesh, bins)
+
+    expected_bins = [(0, mat1.id), (0, mat2.id), (6, mat1.id), (7, mat2.id)]
+    assert np.allclose(f.bins, expected_bins)
+    assert f.mesh == mesh
+    assert f.shape == (4,)
+
+    # to_xml_element()
+    elem = f.to_xml_element()
+    assert elem.tag == 'filter'
+    assert elem.attrib['type'] == 'meshmaterial'
+
+    # from_xml_element()
+    new_f = openmc.Filter.from_xml_element(elem, meshes={mesh.id: mesh})
+    assert isinstance(new_f, openmc.MeshMaterialFilter)
+    assert new_f.id == f.id
+    assert new_f.mesh == f.mesh
+    assert np.allclose(new_f.bins, expected_bins)
+
+    # Test hash and str
+    hash(f)
+    str(f)

From 56b44aa4e8ed8e8c55a8f4a7ec0c347fe9390449 Mon Sep 17 00:00:00 2001
From: John Tramm <john.tramm@gmail.com>
Date: Tue, 10 Jun 2025 09:13:08 -0500
Subject: [PATCH 041/203] Random Ray Missed Cell Policy Change for Adjoint Mode
 (#3434)

---
 src/random_ray/flat_source_domain.cpp         |   2 +-
 .../flat/results_true.dat                     | 340 +++++++++---------
 .../linear/results_true.dat                   | 254 ++++++-------
 3 files changed, 298 insertions(+), 298 deletions(-)

diff --git a/src/random_ray/flat_source_domain.cpp b/src/random_ray/flat_source_domain.cpp
index 367c63af4..9df6513ae 100644
--- a/src/random_ray/flat_source_domain.cpp
+++ b/src/random_ray/flat_source_domain.cpp
@@ -298,7 +298,7 @@ int64_t FlatSourceDomain::add_source_to_scalar_flux()
         // in the cell we will use the previous iteration's flux estimate. This
         // injects a small degree of correlation into the simulation, but this
         // is going to be trivial when the miss rate is a few percent or less.
-        if (source_regions_.external_source_present(sr) && !adjoint_) {
+        if (source_regions_.external_source_present(sr)) {
           set_flux_to_old_flux(sr, g);
         } else {
           set_flux_to_source(sr, g);
diff --git a/tests/regression_tests/weightwindows_fw_cadis_mesh/flat/results_true.dat b/tests/regression_tests/weightwindows_fw_cadis_mesh/flat/results_true.dat
index e14b7e199..0354501d1 100644
--- a/tests/regression_tests/weightwindows_fw_cadis_mesh/flat/results_true.dat
+++ b/tests/regression_tests/weightwindows_fw_cadis_mesh/flat/results_true.dat
@@ -36,15 +36,15 @@ Lower Bounds
 1.73e-01
 2.44e-01
 3.63e-01
-1.23e-01
+1.22e-01
 1.71e-01
 1.66e-01
 1.69e-01
-1.71e-01
+1.70e-01
 1.67e-01
 1.71e-01
 1.64e-01
-1.56e-01
+1.55e-01
 1.67e-01
 1.64e-01
 1.68e-01
@@ -96,7 +96,7 @@ Lower Bounds
 1.80e-01
 2.59e-01
 2.97e-01
-1.07e-01
+1.06e-01
 1.68e-01
 1.60e-01
 1.58e-01
@@ -156,7 +156,7 @@ Lower Bounds
 1.49e-01
 2.14e-01
 1.76e-01
-6.71e-02
+6.70e-02
 1.72e-01
 1.66e-01
 1.74e-01
@@ -192,7 +192,7 @@ Lower Bounds
 2.37e-01
 2.51e-01
 2.64e-01
-2.43e-01
+2.42e-01
 2.39e-01
 2.32e-01
 2.32e-01
@@ -209,12 +209,12 @@ Lower Bounds
 2.86e-01
 3.17e-01
 2.60e-01
-2.39e-01
+2.38e-01
 1.88e-01
 1.97e-01
 1.84e-01
 1.50e-01
-9.99e-02
+9.98e-02
 3.88e-02
 1.90e-02
 2.18e-01
@@ -340,7 +340,7 @@ Lower Bounds
 1.65e-01
 1.63e-01
 1.59e-01
-1.58e-01
+1.57e-01
 1.59e-01
 1.54e-01
 1.54e-01
@@ -416,7 +416,7 @@ Lower Bounds
 2.65e-01
 2.54e-01
 2.58e-01
-2.81e-01
+2.80e-01
 2.53e-01
 2.33e-01
 2.40e-01
@@ -503,7 +503,7 @@ Lower Bounds
 3.36e-01
 1.29e-01
 1.57e-01
-1.68e-01
+1.67e-01
 1.66e-01
 1.63e-01
 1.63e-01
@@ -513,7 +513,7 @@ Lower Bounds
 1.56e-01
 1.59e-01
 1.65e-01
-1.60e-01
+1.59e-01
 2.43e-01
 3.30e-01
 1.08e-01
@@ -543,7 +543,7 @@ Lower Bounds
 1.54e-01
 1.56e-01
 1.67e-01
-1.70e-01
+1.69e-01
 2.42e-01
 3.48e-01
 1.32e-01
@@ -661,7 +661,7 @@ Lower Bounds
 2.34e-01
 2.20e-01
 1.88e-01
-1.78e-01
+1.77e-01
 1.34e-01
 1.25e-01
 1.07e-01
@@ -676,7 +676,7 @@ Lower Bounds
 8.09e-02
 8.37e-02
 5.69e-02
-6.46e-02
+6.45e-02
 3.15e-02
 3.86e-02
 3.51e-02
@@ -770,14 +770,14 @@ Lower Bounds
 1.53e-01
 1.64e-01
 2.46e-01
-3.03e-01
+3.02e-01
 1.11e-01
 1.63e-01
 1.59e-01
 1.68e-01
-1.56e-01
+1.59e-01
 1.52e-01
-1.55e-01
+1.54e-01
 1.56e-01
 1.49e-01
 1.49e-01
@@ -850,7 +850,7 @@ Lower Bounds
 1.73e-01
 1.65e-01
 1.70e-01
-7.83e-02
+1.66e-01
 1.73e-01
 1.78e-01
 1.65e-01
@@ -877,7 +877,7 @@ Lower Bounds
 2.14e-01
 8.26e-02
 2.65e-02
-3.07e-01
+3.06e-01
 2.51e-01
 2.10e-01
 2.95e-01
@@ -1091,7 +1091,7 @@ Lower Bounds
 2.30e-01
 2.33e-01
 2.43e-01
-2.46e-01
+2.45e-01
 2.48e-01
 2.46e-01
 2.21e-01
@@ -1124,7 +1124,7 @@ Lower Bounds
 1.07e-01
 8.75e-02
 1.17e-01
-5.68e-02
+5.67e-02
 7.16e-02
 5.22e-02
 3.31e-02
@@ -1317,7 +1317,7 @@ Lower Bounds
 2.20e-01
 2.27e-01
 2.41e-01
-2.35e-01
+2.34e-01
 2.13e-01
 2.04e-01
 2.13e-01
@@ -1359,14 +1359,14 @@ Lower Bounds
 8.92e-03
 1.61e-01
 1.59e-01
-1.57e-01
+1.56e-01
 1.59e-01
 1.51e-01
 1.49e-01
 1.54e-01
 1.51e-01
 1.53e-01
-1.49e-01
+1.48e-01
 1.52e-01
 1.48e-01
 2.27e-01
@@ -1478,12 +1478,12 @@ Lower Bounds
 1.68e-01
 5.02e-02
 1.53e-01
-7.09e-02
+1.48e-01
 1.47e-01
 1.48e-01
 1.43e-01
 1.46e-01
-6.84e-02
+1.42e-01
 1.27e-01
 1.24e-01
 1.31e-01
@@ -1523,7 +1523,7 @@ Lower Bounds
 7.50e-02
 2.64e-02
 1.58e-01
-1.56e-01
+1.55e-01
 1.50e-01
 1.45e-01
 1.50e-01
@@ -1575,7 +1575,7 @@ Lower Bounds
 6.95e-02
 7.10e-02
 4.92e-02
-4.74e-02
+4.73e-02
 3.52e-02
 4.69e-02
 4.03e-02
@@ -1669,7 +1669,7 @@ Lower Bounds
 1.34e-01
 1.36e-01
 1.50e-01
-1.96e-01
+1.95e-01
 1.29e-01
 4.48e-02
 1.49e-01
@@ -1784,7 +1784,7 @@ Lower Bounds
 1.53e-01
 1.76e-01
 1.13e-01
-9.77e-02
+9.76e-02
 8.62e-02
 1.49e-01
 1.29e-01
@@ -1898,7 +1898,7 @@ Lower Bounds
 1.53e-01
 5.25e-02
 1.45e-01
-1.41e-01
+1.44e-01
 1.44e-01
 1.36e-01
 1.36e-01
@@ -1928,13 +1928,13 @@ Lower Bounds
 7.71e-02
 3.01e-02
 1.38e-01
-1.12e-01
+1.35e-01
 1.38e-01
 1.41e-01
 1.44e-01
 1.46e-01
 1.34e-01
-1.11e-01
+1.28e-01
 1.24e-01
 1.20e-01
 1.22e-01
@@ -1955,7 +1955,7 @@ Lower Bounds
 1.21e-01
 1.25e-01
 1.84e-01
-9.19e-02
+9.18e-02
 2.31e-02
 1.48e-01
 1.32e-01
@@ -2039,7 +2039,7 @@ Lower Bounds
 1.55e-01
 1.46e-01
 1.44e-01
-1.48e-01
+1.47e-01
 1.42e-01
 1.44e-01
 1.40e-01
@@ -2067,7 +2067,7 @@ Lower Bounds
 1.43e-01
 1.44e-01
 1.46e-01
-1.54e-01
+1.53e-01
 1.50e-01
 1.51e-01
 1.54e-01
@@ -2214,7 +2214,7 @@ Lower Bounds
 1.83e-02
 2.39e-01
 1.91e-01
-1.79e-01
+1.80e-01
 2.07e-01
 1.97e-01
 2.03e-01
@@ -2238,7 +2238,7 @@ Lower Bounds
 1.30e-01
 1.06e-01
 9.60e-02
-7.07e-02
+7.06e-02
 4.00e-02
 1.71e-02
 7.45e-03
@@ -2343,7 +2343,7 @@ Lower Bounds
 1.32e-01
 1.41e-01
 1.41e-01
-1.40e-01
+1.39e-01
 2.04e-01
 1.15e-01
 3.10e-02
@@ -2471,7 +2471,7 @@ Lower Bounds
 3.06e-02
 3.68e-02
 4.09e-02
-5.27e-02
+5.26e-02
 4.71e-02
 3.30e-02
 4.67e-02
@@ -2493,7 +2493,7 @@ Lower Bounds
 1.53e-01
 1.51e-01
 1.54e-01
-1.45e-01
+1.44e-01
 1.43e-01
 3.50e-02
 1.38e-02
@@ -2533,7 +2533,7 @@ Lower Bounds
 1.54e-01
 1.59e-01
 1.65e-01
-5.07e-02
+1.63e-01
 1.43e-01
 1.52e-01
 1.45e-01
@@ -2548,7 +2548,7 @@ Lower Bounds
 1.55e-01
 1.59e-01
 1.59e-01
-1.53e-01
+1.54e-01
 1.47e-01
 1.53e-01
 1.51e-01
@@ -2648,7 +2648,7 @@ Lower Bounds
 5.02e-02
 1.48e-02
 1.33e-01
-5.34e-02
+1.31e-01
 1.34e-01
 1.36e-01
 1.35e-01
@@ -2678,7 +2678,7 @@ Lower Bounds
 2.21e-02
 7.42e-03
 1.30e-01
-7.03e-02
+7.02e-02
 8.47e-02
 1.05e-01
 8.11e-02
@@ -2726,7 +2726,7 @@ Lower Bounds
 2.10e-01
 2.47e-01
 2.20e-01
-2.21e-01
+2.20e-01
 2.29e-01
 2.22e-01
 2.06e-01
@@ -2776,7 +2776,7 @@ Lower Bounds
 2.54e-01
 2.18e-01
 2.16e-01
-2.24e-01
+2.23e-01
 1.99e-01
 1.77e-01
 1.57e-01
@@ -3026,7 +3026,7 @@ Lower Bounds
 1.80e-01
 2.09e-01
 2.09e-01
-1.83e-01
+1.82e-01
 2.00e-01
 1.82e-01
 1.57e-01
@@ -3120,7 +3120,7 @@ Lower Bounds
 8.59e-02
 7.51e-02
 7.34e-02
-6.11e-02
+6.10e-02
 6.19e-02
 4.42e-02
 3.60e-02
@@ -3164,7 +3164,7 @@ Lower Bounds
 1.09e-01
 8.20e-02
 7.49e-02
-7.94e-02
+7.93e-02
 7.32e-02
 5.71e-02
 3.93e-02
@@ -3188,7 +3188,7 @@ Lower Bounds
 1.79e-02
 8.68e-03
 8.76e-02
-6.94e-02
+6.93e-02
 1.01e-01
 9.79e-02
 5.28e-02
@@ -3236,7 +3236,7 @@ Lower Bounds
 5.48e-02
 7.05e-02
 7.64e-02
-6.19e-02
+6.18e-02
 5.28e-02
 6.84e-02
 5.17e-02
@@ -3404,7 +3404,7 @@ Upper Bounds
 7.61e-01
 8.32e-01
 8.60e-01
-8.42e-01
+8.41e-01
 8.42e-01
 8.32e-01
 8.34e-01
@@ -3412,15 +3412,15 @@ Upper Bounds
 8.65e-01
 1.22e+00
 1.82e+00
-6.13e-01
+6.12e-01
 8.56e-01
-8.32e-01
+8.31e-01
 8.43e-01
-8.53e-01
+8.52e-01
 8.33e-01
 8.57e-01
 8.19e-01
-7.78e-01
+7.77e-01
 8.33e-01
 8.19e-01
 8.41e-01
@@ -3472,8 +3472,8 @@ Upper Bounds
 8.98e-01
 1.29e+00
 1.49e+00
-5.33e-01
-8.40e-01
+5.32e-01
+8.39e-01
 7.98e-01
 7.91e-01
 8.03e-01
@@ -3526,7 +3526,7 @@ Upper Bounds
 7.71e-01
 7.75e-01
 7.58e-01
-7.64e-01
+7.63e-01
 7.06e-01
 7.64e-01
 7.43e-01
@@ -3556,7 +3556,7 @@ Upper Bounds
 8.72e-01
 7.91e-01
 8.39e-01
-7.95e-01
+7.94e-01
 7.87e-01
 7.88e-01
 7.38e-01
@@ -3589,7 +3589,7 @@ Upper Bounds
 9.40e-01
 9.83e-01
 9.19e-01
-7.52e-01
+7.51e-01
 4.99e-01
 1.94e-01
 9.48e-02
@@ -3615,7 +3615,7 @@ Upper Bounds
 8.13e-01
 7.97e-01
 8.76e-01
-8.45e-01
+8.44e-01
 7.95e-01
 8.18e-01
 8.84e-01
@@ -3649,7 +3649,7 @@ Upper Bounds
 8.01e-01
 8.48e-01
 8.52e-01
-8.71e-01
+8.70e-01
 1.31e+00
 1.65e+00
 5.73e-01
@@ -3713,10 +3713,10 @@ Upper Bounds
 1.17e+00
 1.50e+00
 5.74e-01
-8.24e-01
+8.23e-01
 8.15e-01
 7.95e-01
-7.88e-01
+7.87e-01
 7.97e-01
 7.70e-01
 7.69e-01
@@ -3761,7 +3761,7 @@ Upper Bounds
 8.45e-01
 8.73e-01
 8.56e-01
-8.16e-01
+8.15e-01
 8.44e-01
 8.36e-01
 7.99e-01
@@ -3774,11 +3774,11 @@ Upper Bounds
 6.73e-01
 2.04e-01
 8.93e-01
-8.59e-01
+8.60e-01
 8.64e-01
 8.51e-01
 8.70e-01
-8.91e-01
+8.90e-01
 8.41e-01
 7.94e-01
 7.85e-01
@@ -3856,10 +3856,10 @@ Upper Bounds
 8.14e-01
 7.91e-01
 8.00e-01
-7.95e-01
+7.94e-01
 8.24e-01
 8.16e-01
-8.87e-01
+8.86e-01
 1.22e+00
 1.96e+00
 8.18e-01
@@ -3879,7 +3879,7 @@ Upper Bounds
 1.68e+00
 6.47e-01
 7.87e-01
-8.38e-01
+8.37e-01
 8.29e-01
 8.15e-01
 8.16e-01
@@ -3889,13 +3889,13 @@ Upper Bounds
 7.82e-01
 7.95e-01
 8.24e-01
-7.98e-01
+7.97e-01
 1.22e+00
 1.65e+00
 5.42e-01
 8.09e-01
 8.09e-01
-8.05e-01
+8.04e-01
 7.72e-01
 8.14e-01
 8.20e-01
@@ -3919,7 +3919,7 @@ Upper Bounds
 7.72e-01
 7.80e-01
 8.33e-01
-8.48e-01
+8.47e-01
 1.21e+00
 1.74e+00
 6.61e-01
@@ -3934,7 +3934,7 @@ Upper Bounds
 7.56e-01
 7.70e-01
 7.83e-01
-7.97e-01
+7.96e-01
 1.13e+00
 1.26e+00
 4.66e-01
@@ -3943,7 +3943,7 @@ Upper Bounds
 7.98e-01
 7.75e-01
 7.87e-01
-7.92e-01
+7.91e-01
 7.70e-01
 7.35e-01
 7.31e-01
@@ -3959,7 +3959,7 @@ Upper Bounds
 8.01e-01
 7.99e-01
 7.90e-01
-7.89e-01
+7.88e-01
 7.83e-01
 7.33e-01
 7.48e-01
@@ -3975,7 +3975,7 @@ Upper Bounds
 8.32e-01
 7.85e-01
 7.86e-01
-7.51e-01
+7.50e-01
 7.01e-01
 7.38e-01
 7.30e-01
@@ -4037,13 +4037,13 @@ Upper Bounds
 1.17e+00
 1.10e+00
 9.39e-01
-8.88e-01
+8.87e-01
 6.70e-01
 6.23e-01
 5.35e-01
 2.34e-01
 6.47e-02
-6.45e-01
+6.44e-01
 4.31e-01
 7.11e-01
 6.80e-01
@@ -4063,7 +4063,7 @@ Upper Bounds
 8.31e-01
 8.52e-01
 8.43e-01
-8.06e-01
+8.05e-01
 7.88e-01
 7.57e-01
 7.58e-01
@@ -4083,7 +4083,7 @@ Upper Bounds
 7.76e-01
 7.95e-01
 8.30e-01
-7.96e-01
+7.95e-01
 8.37e-01
 1.18e+00
 1.62e+00
@@ -4105,7 +4105,7 @@ Upper Bounds
 5.36e-01
 8.08e-01
 8.15e-01
-8.00e-01
+7.99e-01
 8.03e-01
 7.68e-01
 7.86e-01
@@ -4122,7 +4122,7 @@ Upper Bounds
 7.72e-01
 8.04e-01
 8.28e-01
-7.75e-01
+7.74e-01
 7.64e-01
 7.80e-01
 7.54e-01
@@ -4151,12 +4151,12 @@ Upper Bounds
 8.13e-01
 7.95e-01
 8.40e-01
-7.80e-01
+7.97e-01
 7.59e-01
-7.73e-01
+7.72e-01
 7.80e-01
 7.46e-01
-7.45e-01
+7.44e-01
 7.55e-01
 7.27e-01
 7.44e-01
@@ -4226,8 +4226,8 @@ Upper Bounds
 8.65e-01
 8.27e-01
 8.48e-01
-3.91e-01
-8.66e-01
+8.31e-01
+8.65e-01
 8.92e-01
 8.23e-01
 7.50e-01
@@ -4265,7 +4265,7 @@ Upper Bounds
 9.09e-01
 6.43e-01
 6.18e-01
-5.19e-01
+5.18e-01
 2.26e-01
 8.71e-02
 5.78e-01
@@ -4367,7 +4367,7 @@ Upper Bounds
 7.08e-01
 7.78e-01
 7.45e-01
-7.62e-01
+7.61e-01
 7.55e-01
 7.92e-01
 1.16e+00
@@ -4376,7 +4376,7 @@ Upper Bounds
 7.40e-01
 7.79e-01
 7.94e-01
-7.60e-01
+7.59e-01
 7.99e-01
 7.16e-01
 7.14e-01
@@ -4420,7 +4420,7 @@ Upper Bounds
 2.76e-01
 8.13e-01
 8.09e-01
-7.87e-01
+7.86e-01
 7.66e-01
 7.26e-01
 7.62e-01
@@ -4531,7 +4531,7 @@ Upper Bounds
 7.86e-01
 7.98e-01
 7.43e-01
-7.69e-01
+7.68e-01
 7.51e-01
 7.70e-01
 8.08e-01
@@ -4583,7 +4583,7 @@ Upper Bounds
 1.19e+00
 1.33e+00
 5.12e-01
-7.76e-01
+7.75e-01
 7.68e-01
 7.84e-01
 7.62e-01
@@ -4631,14 +4631,14 @@ Upper Bounds
 7.78e-01
 7.65e-01
 7.86e-01
-7.10e-01
+7.09e-01
 7.60e-01
 7.43e-01
 7.27e-01
 6.62e-01
 6.51e-01
 6.35e-01
-7.04e-01
+7.03e-01
 7.07e-01
 1.06e+00
 7.73e-01
@@ -4648,7 +4648,7 @@ Upper Bounds
 7.63e-01
 7.80e-01
 7.34e-01
-7.23e-01
+7.24e-01
 7.02e-01
 6.87e-01
 7.13e-01
@@ -4724,7 +4724,7 @@ Upper Bounds
 4.81e-01
 4.96e-01
 3.78e-01
-5.26e-01
+5.25e-01
 3.10e-01
 2.83e-01
 1.99e-01
@@ -4735,14 +4735,14 @@ Upper Bounds
 4.46e-02
 8.04e-01
 7.95e-01
-7.83e-01
+7.82e-01
 7.95e-01
 7.54e-01
 7.47e-01
 7.72e-01
 7.56e-01
 7.67e-01
-7.43e-01
+7.42e-01
 7.58e-01
 7.40e-01
 1.14e+00
@@ -4779,7 +4779,7 @@ Upper Bounds
 1.24e+00
 5.06e-01
 7.87e-01
-7.41e-01
+7.40e-01
 7.55e-01
 7.36e-01
 7.30e-01
@@ -4821,7 +4821,7 @@ Upper Bounds
 7.08e-01
 7.57e-01
 1.07e+00
-7.06e-01
+7.05e-01
 2.16e-01
 7.82e-01
 7.85e-01
@@ -4854,12 +4854,12 @@ Upper Bounds
 8.40e-01
 2.51e-01
 7.67e-01
-3.55e-01
+7.41e-01
 7.36e-01
 7.41e-01
 7.16e-01
-7.29e-01
-3.42e-01
+7.28e-01
+7.11e-01
 6.33e-01
 6.18e-01
 6.57e-01
@@ -4874,7 +4874,7 @@ Upper Bounds
 7.36e-01
 7.09e-01
 6.77e-01
-6.93e-01
+6.94e-01
 6.91e-01
 6.86e-01
 6.77e-01
@@ -4899,8 +4899,8 @@ Upper Bounds
 3.75e-01
 1.32e-01
 7.90e-01
-7.78e-01
-7.50e-01
+7.77e-01
+7.49e-01
 7.25e-01
 7.49e-01
 7.50e-01
@@ -4964,7 +4964,7 @@ Upper Bounds
 7.66e-01
 7.81e-01
 7.83e-01
-7.80e-01
+7.79e-01
 7.68e-01
 7.20e-01
 7.09e-01
@@ -5045,7 +5045,7 @@ Upper Bounds
 6.71e-01
 6.81e-01
 7.49e-01
-9.78e-01
+9.77e-01
 6.44e-01
 2.24e-01
 7.44e-01
@@ -5148,7 +5148,7 @@ Upper Bounds
 8.35e-01
 8.39e-01
 9.59e-01
-9.14e-01
+9.15e-01
 7.74e-01
 5.71e-01
 1.72e-01
@@ -5191,7 +5191,7 @@ Upper Bounds
 7.60e-01
 7.46e-01
 7.71e-01
-7.12e-01
+7.11e-01
 6.80e-01
 6.82e-01
 7.51e-01
@@ -5229,7 +5229,7 @@ Upper Bounds
 8.27e-01
 2.75e-01
 7.59e-01
-7.20e-01
+7.19e-01
 7.47e-01
 7.32e-01
 7.40e-01
@@ -5256,7 +5256,7 @@ Upper Bounds
 7.13e-01
 7.47e-01
 9.68e-01
-6.86e-01
+6.85e-01
 2.05e-01
 7.59e-01
 7.40e-01
@@ -5266,22 +5266,22 @@ Upper Bounds
 6.98e-01
 7.04e-01
 6.61e-01
-6.80e-01
-6.80e-01
+6.79e-01
+6.79e-01
 6.86e-01
 7.42e-01
 1.01e+00
 7.65e-01
 2.63e-01
 7.27e-01
-7.07e-01
+7.22e-01
 7.21e-01
 6.82e-01
 6.82e-01
 6.79e-01
 6.66e-01
 6.58e-01
-6.32e-01
+6.31e-01
 6.61e-01
 6.87e-01
 6.88e-01
@@ -5304,13 +5304,13 @@ Upper Bounds
 3.86e-01
 1.50e-01
 6.91e-01
-5.58e-01
+6.77e-01
 6.91e-01
 7.07e-01
 7.18e-01
 7.31e-01
 6.70e-01
-5.57e-01
+6.39e-01
 6.18e-01
 6.02e-01
 6.11e-01
@@ -5349,7 +5349,7 @@ Upper Bounds
 4.84e-01
 1.41e-01
 7.40e-01
-6.74e-01
+6.73e-01
 6.74e-01
 7.15e-01
 7.22e-01
@@ -5415,16 +5415,16 @@ Upper Bounds
 7.76e-01
 7.30e-01
 7.18e-01
-7.38e-01
+7.37e-01
 7.09e-01
-7.21e-01
+7.20e-01
 7.00e-01
 7.72e-01
 9.68e-01
 6.90e-01
 2.52e-01
 7.57e-01
-7.65e-01
+7.64e-01
 7.45e-01
 7.47e-01
 7.46e-01
@@ -5433,9 +5433,9 @@ Upper Bounds
 7.52e-01
 7.26e-01
 6.82e-01
-7.10e-01
+7.09e-01
 7.86e-01
-1.05e+00
+1.04e+00
 7.77e-01
 2.28e-01
 7.74e-01
@@ -5443,7 +5443,7 @@ Upper Bounds
 7.17e-01
 7.21e-01
 7.29e-01
-7.68e-01
+7.67e-01
 7.52e-01
 7.57e-01
 7.68e-01
@@ -5504,7 +5504,7 @@ Upper Bounds
 7.08e-01
 7.09e-01
 7.14e-01
-6.80e-01
+6.79e-01
 6.85e-01
 6.58e-01
 6.83e-01
@@ -5519,7 +5519,7 @@ Upper Bounds
 7.21e-01
 7.00e-01
 6.83e-01
-6.44e-01
+6.43e-01
 6.62e-01
 6.42e-01
 6.10e-01
@@ -5566,7 +5566,7 @@ Upper Bounds
 6.70e-01
 6.87e-01
 6.53e-01
-6.04e-01
+6.03e-01
 5.84e-01
 5.54e-01
 5.65e-01
@@ -5574,7 +5574,7 @@ Upper Bounds
 4.40e-01
 1.48e-01
 7.67e-01
-6.96e-01
+6.97e-01
 7.26e-01
 7.26e-01
 6.91e-01
@@ -5590,7 +5590,7 @@ Upper Bounds
 9.16e-02
 1.20e+00
 9.57e-01
-8.97e-01
+8.98e-01
 1.03e+00
 9.83e-01
 1.01e+00
@@ -5655,7 +5655,7 @@ Upper Bounds
 7.63e-01
 7.61e-01
 7.53e-01
-7.70e-01
+7.69e-01
 7.59e-01
 7.54e-01
 7.39e-01
@@ -5667,18 +5667,18 @@ Upper Bounds
 7.39e-01
 7.32e-01
 7.64e-01
-7.36e-01
+7.35e-01
 7.69e-01
 7.88e-01
 7.27e-01
 7.35e-01
 7.32e-01
 7.27e-01
-7.50e-01
+7.49e-01
 9.97e-01
 7.08e-01
 2.42e-01
-7.31e-01
+7.30e-01
 7.41e-01
 7.80e-01
 7.20e-01
@@ -5719,7 +5719,7 @@ Upper Bounds
 6.58e-01
 7.03e-01
 7.03e-01
-6.98e-01
+6.97e-01
 1.02e+00
 5.77e-01
 1.55e-01
@@ -5766,12 +5766,12 @@ Upper Bounds
 6.04e-01
 6.27e-01
 8.72e-01
-4.59e-01
+4.58e-01
 1.30e-01
 6.94e-01
 6.76e-01
 6.98e-01
-7.17e-01
+7.16e-01
 7.24e-01
 6.61e-01
 6.58e-01
@@ -5815,7 +5815,7 @@ Upper Bounds
 7.13e-02
 9.78e-01
 8.94e-01
-9.01e-01
+9.02e-01
 9.75e-01
 9.93e-01
 9.72e-01
@@ -5869,7 +5869,7 @@ Upper Bounds
 7.65e-01
 7.57e-01
 7.69e-01
-7.23e-01
+7.22e-01
 7.14e-01
 1.75e-01
 6.92e-02
@@ -5901,7 +5901,7 @@ Upper Bounds
 7.12e-01
 8.00e-01
 1.03e+00
-5.17e-01
+5.16e-01
 1.38e-01
 7.80e-01
 7.93e-01
@@ -5909,7 +5909,7 @@ Upper Bounds
 7.70e-01
 7.94e-01
 8.27e-01
-2.53e-01
+8.15e-01
 7.14e-01
 7.62e-01
 7.24e-01
@@ -5924,7 +5924,7 @@ Upper Bounds
 7.75e-01
 7.94e-01
 7.94e-01
-7.67e-01
+7.68e-01
 7.35e-01
 7.64e-01
 7.55e-01
@@ -5940,7 +5940,7 @@ Upper Bounds
 7.62e-01
 7.55e-01
 7.49e-01
-7.14e-01
+7.15e-01
 7.33e-01
 7.29e-01
 6.88e-01
@@ -5953,10 +5953,10 @@ Upper Bounds
 7.63e-01
 7.78e-01
 7.67e-01
-7.39e-01
+7.38e-01
 7.39e-01
 7.04e-01
-6.89e-01
+6.90e-01
 7.02e-01
 7.00e-01
 6.50e-01
@@ -5967,7 +5967,7 @@ Upper Bounds
 7.31e-01
 7.02e-01
 7.48e-01
-7.26e-01
+7.25e-01
 7.23e-01
 7.48e-01
 7.26e-01
@@ -6005,7 +6005,7 @@ Upper Bounds
 5.90e-01
 6.17e-01
 5.70e-01
-8.00e-01
+7.99e-01
 3.80e-01
 1.34e-01
 6.68e-01
@@ -6024,7 +6024,7 @@ Upper Bounds
 2.51e-01
 7.41e-02
 6.65e-01
-2.67e-01
+6.54e-01
 6.72e-01
 6.79e-01
 6.77e-01
@@ -6036,11 +6036,11 @@ Upper Bounds
 5.40e-01
 5.07e-01
 5.77e-01
-2.23e-01
+2.24e-01
 6.42e-02
 8.66e-01
 8.00e-01
-8.00e-01
+8.01e-01
 8.48e-01
 8.27e-01
 8.32e-01
@@ -6048,13 +6048,13 @@ Upper Bounds
 9.02e-01
 9.05e-01
 7.29e-01
-6.76e-01
+6.75e-01
 5.88e-01
 3.48e-01
 1.10e-01
 3.71e-02
 6.49e-01
-3.52e-01
+3.51e-01
 4.24e-01
 5.24e-01
 4.05e-01
@@ -6103,7 +6103,7 @@ Upper Bounds
 1.23e+00
 1.10e+00
 1.10e+00
-1.15e+00
+1.14e+00
 1.11e+00
 1.03e+00
 9.91e-01
@@ -6147,7 +6147,7 @@ Upper Bounds
 1.03e+00
 1.06e+00
 1.10e+00
-1.04e+00
+1.05e+00
 1.13e+00
 1.27e+00
 1.09e+00
@@ -6184,7 +6184,7 @@ Upper Bounds
 8.41e-01
 9.51e-01
 9.08e-01
-7.46e-01
+7.45e-01
 7.77e-01
 3.05e-01
 9.78e-02
@@ -6218,7 +6218,7 @@ Upper Bounds
 8.06e-01
 2.24e-01
 7.49e-02
-9.70e-01
+9.69e-01
 1.03e+00
 1.10e+00
 1.01e+00
@@ -6229,7 +6229,7 @@ Upper Bounds
 8.30e-01
 8.02e-01
 8.09e-01
-8.10e-01
+8.11e-01
 7.80e-01
 2.46e-01
 7.63e-02
@@ -6250,7 +6250,7 @@ Upper Bounds
 7.72e-02
 7.36e-01
 7.62e-01
-8.87e-01
+8.86e-01
 8.71e-01
 9.21e-01
 9.57e-01
@@ -6287,7 +6287,7 @@ Upper Bounds
 2.20e-01
 2.69e-01
 4.39e-01
-2.89e-01
+2.88e-01
 1.35e-01
 1.30e-01
 7.47e-02
@@ -6335,7 +6335,7 @@ Upper Bounds
 7.01e-01
 6.46e-01
 5.40e-01
-4.50e-01
+4.49e-01
 2.04e-01
 7.38e-02
 1.18e+00
@@ -6345,7 +6345,7 @@ Upper Bounds
 9.38e-01
 1.19e+00
 9.74e-01
-1.02e+00
+1.01e+00
 9.23e-01
 8.23e-01
 8.89e-01
@@ -6362,7 +6362,7 @@ Upper Bounds
 1.36e+00
 1.18e+00
 1.09e+00
-8.67e-01
+8.66e-01
 6.32e-01
 4.57e-01
 3.13e-01
@@ -6402,7 +6402,7 @@ Upper Bounds
 9.01e-01
 1.04e+00
 1.05e+00
-9.13e-01
+9.12e-01
 1.00e+00
 9.12e-01
 7.83e-01
@@ -6515,7 +6515,7 @@ Upper Bounds
 1.43e-01
 8.60e-02
 5.91e-02
-4.19e-02
+4.18e-02
 2.09e-02
 1.01e-02
 6.92e-02
@@ -6639,7 +6639,7 @@ Upper Bounds
 3.97e-02
 3.67e-02
 1.54e-01
-2.67e-01
+2.66e-01
 2.58e-01
 2.66e-01
 2.93e-01
diff --git a/tests/regression_tests/weightwindows_fw_cadis_mesh/linear/results_true.dat b/tests/regression_tests/weightwindows_fw_cadis_mesh/linear/results_true.dat
index 3afdc56ca..c1066ae82 100644
--- a/tests/regression_tests/weightwindows_fw_cadis_mesh/linear/results_true.dat
+++ b/tests/regression_tests/weightwindows_fw_cadis_mesh/linear/results_true.dat
@@ -60,7 +60,7 @@ Lower Bounds
 1.68e-01
 1.70e-01
 1.75e-01
-1.73e-01
+1.72e-01
 1.73e-01
 1.65e-01
 1.84e-01
@@ -281,7 +281,7 @@ Lower Bounds
 1.86e-01
 1.81e-01
 1.83e-01
-1.73e-01
+1.74e-01
 1.67e-01
 1.72e-01
 1.75e-01
@@ -722,7 +722,7 @@ Lower Bounds
 1.63e-01
 1.58e-01
 1.70e-01
-1.70e-01
+1.69e-01
 1.84e-01
 2.44e-01
 2.71e-01
@@ -775,7 +775,7 @@ Lower Bounds
 1.69e-01
 1.67e-01
 1.76e-01
-1.59e-01
+1.64e-01
 1.59e-01
 1.58e-01
 1.64e-01
@@ -835,7 +835,7 @@ Lower Bounds
 1.76e-01
 1.78e-01
 1.68e-01
-1.78e-01
+1.79e-01
 1.73e-01
 1.69e-01
 1.62e-01
@@ -850,11 +850,11 @@ Lower Bounds
 1.88e-01
 1.77e-01
 1.78e-01
-8.59e-02
+1.76e-01
 1.82e-01
 1.90e-01
 1.76e-01
-1.63e-01
+1.62e-01
 1.69e-01
 1.69e-01
 1.69e-01
@@ -1201,7 +1201,7 @@ Lower Bounds
 1.57e-01
 1.58e-01
 1.58e-01
-1.57e-01
+1.56e-01
 1.58e-01
 1.66e-01
 2.50e-01
@@ -1223,7 +1223,7 @@ Lower Bounds
 2.18e-01
 9.03e-02
 1.68e-01
-1.70e-01
+1.69e-01
 1.64e-01
 1.56e-01
 1.58e-01
@@ -1382,7 +1382,7 @@ Lower Bounds
 1.52e-01
 1.59e-01
 1.52e-01
-1.49e-01
+1.48e-01
 1.55e-01
 2.25e-01
 2.01e-01
@@ -1478,12 +1478,12 @@ Lower Bounds
 1.63e-01
 4.89e-02
 1.64e-01
-6.61e-02
+1.55e-01
 1.57e-01
 1.53e-01
 1.48e-01
 1.53e-01
-7.58e-02
+1.52e-01
 1.40e-01
 1.38e-01
 1.40e-01
@@ -1539,7 +1539,7 @@ Lower Bounds
 2.68e-02
 2.40e-01
 2.25e-01
-2.21e-01
+2.22e-01
 2.27e-01
 2.31e-01
 2.20e-01
@@ -1572,7 +1572,7 @@ Lower Bounds
 8.97e-02
 4.80e-02
 4.87e-02
-6.44e-02
+6.43e-02
 6.38e-02
 4.70e-02
 4.40e-02
@@ -1581,7 +1581,7 @@ Lower Bounds
 4.03e-02
 1.52e-02
 8.66e-03
-6.15e-03
+6.14e-03
 1.56e-01
 1.57e-01
 1.54e-01
@@ -1637,7 +1637,7 @@ Lower Bounds
 1.53e-01
 1.47e-01
 1.42e-01
-1.57e-01
+1.56e-01
 1.66e-01
 2.10e-01
 1.46e-01
@@ -1792,7 +1792,7 @@ Lower Bounds
 4.29e-02
 1.08e-02
 4.27e-03
-7.46e-02
+7.45e-02
 7.65e-02
 5.07e-02
 4.76e-02
@@ -1898,7 +1898,7 @@ Lower Bounds
 1.50e-01
 5.21e-02
 1.53e-01
-1.49e-01
+1.53e-01
 1.52e-01
 1.45e-01
 1.45e-01
@@ -1928,13 +1928,13 @@ Lower Bounds
 7.19e-02
 2.90e-02
 1.48e-01
-1.19e-01
+1.44e-01
 1.48e-01
 1.48e-01
 1.49e-01
 1.54e-01
 1.45e-01
-1.21e-01
+1.38e-01
 1.29e-01
 1.30e-01
 1.31e-01
@@ -1970,7 +1970,7 @@ Lower Bounds
 1.18e-01
 1.31e-01
 1.83e-01
-9.56e-02
+9.55e-02
 2.75e-02
 1.63e-01
 1.47e-01
@@ -2058,7 +2058,7 @@ Lower Bounds
 1.58e-01
 1.43e-01
 1.49e-01
-1.60e-01
+1.59e-01
 2.21e-01
 1.56e-01
 4.57e-02
@@ -2208,7 +2208,7 @@ Lower Bounds
 1.36e-01
 1.33e-01
 1.26e-01
-1.10e-01
+1.11e-01
 1.31e-01
 5.72e-02
 1.80e-02
@@ -2245,7 +2245,7 @@ Lower Bounds
 7.21e-02
 6.08e-02
 6.40e-02
-5.54e-02
+5.53e-02
 6.28e-02
 5.59e-02
 4.39e-02
@@ -2405,7 +2405,7 @@ Lower Bounds
 1.23e-01
 1.24e-01
 1.55e-01
-8.14e-02
+8.15e-02
 2.87e-02
 1.44e-01
 1.47e-01
@@ -2416,7 +2416,7 @@ Lower Bounds
 1.42e-01
 1.37e-01
 1.27e-01
-1.28e-01
+1.29e-01
 1.17e-01
 1.21e-01
 1.63e-01
@@ -2479,12 +2479,12 @@ Lower Bounds
 2.61e-02
 2.32e-02
 1.25e-02
-9.63e-03
+9.62e-03
 6.12e-03
 3.33e-03
 1.57e-01
 1.68e-01
-1.77e-01
+1.76e-01
 1.71e-01
 1.70e-01
 1.76e-01
@@ -2533,7 +2533,7 @@ Lower Bounds
 1.65e-01
 1.69e-01
 1.74e-01
-6.32e-02
+1.78e-01
 1.61e-01
 1.64e-01
 1.57e-01
@@ -2547,8 +2547,8 @@ Lower Bounds
 1.61e-01
 1.66e-01
 1.68e-01
-1.70e-01
-1.63e-01
+1.71e-01
+1.64e-01
 1.61e-01
 1.62e-01
 1.60e-01
@@ -2647,8 +2647,8 @@ Lower Bounds
 1.45e-01
 4.24e-02
 1.27e-02
-1.42e-01
-6.20e-02
+1.43e-01
+1.40e-01
 1.44e-01
 1.45e-01
 1.42e-01
@@ -2660,7 +2660,7 @@ Lower Bounds
 1.15e-01
 1.07e-01
 1.24e-01
-3.83e-02
+3.91e-02
 1.19e-02
 1.85e-01
 1.70e-01
@@ -2678,7 +2678,7 @@ Lower Bounds
 2.05e-02
 7.17e-03
 1.27e-01
-6.47e-02
+6.46e-02
 8.27e-02
 1.04e-01
 7.86e-02
@@ -3043,7 +3043,7 @@ Lower Bounds
 1.57e-01
 1.80e-01
 1.80e-01
-1.24e-01
+1.23e-01
 1.22e-01
 8.18e-02
 7.30e-02
@@ -3055,7 +3055,7 @@ Lower Bounds
 1.13e-01
 1.37e-01
 1.61e-01
-2.21e-01
+2.20e-01
 1.71e-01
 1.51e-01
 1.16e-01
@@ -3187,14 +3187,14 @@ Lower Bounds
 2.64e-02
 1.76e-02
 8.34e-03
-8.72e-02
+8.71e-02
 6.82e-02
 1.03e-01
 9.93e-02
 4.68e-02
 8.00e-02
 6.54e-02
-5.74e-02
+5.73e-02
 5.88e-02
 4.17e-02
 6.05e-02
@@ -3252,7 +3252,7 @@ Lower Bounds
 7.34e-02
 7.91e-02
 4.60e-02
-5.73e-02
+5.72e-02
 6.01e-02
 5.26e-02
 5.01e-02
@@ -3399,7 +3399,7 @@ Upper Bounds
 2.14e+00
 7.89e-01
 8.70e-01
-9.12e-01
+9.11e-01
 9.06e-01
 8.15e-01
 8.92e-01
@@ -3436,7 +3436,7 @@ Upper Bounds
 8.38e-01
 8.52e-01
 8.74e-01
-8.63e-01
+8.62e-01
 8.63e-01
 8.27e-01
 9.20e-01
@@ -3509,8 +3509,8 @@ Upper Bounds
 9.09e-01
 8.56e-01
 8.36e-01
-8.27e-01
-8.09e-01
+8.26e-01
+8.10e-01
 7.69e-01
 7.73e-01
 7.71e-01
@@ -3642,14 +3642,14 @@ Upper Bounds
 8.80e-01
 8.68e-01
 8.83e-01
-8.81e-01
+8.82e-01
 8.83e-01
 8.68e-01
 8.89e-01
 8.61e-01
 9.00e-01
 9.04e-01
-9.07e-01
+9.06e-01
 1.33e+00
 1.66e+00
 5.75e-01
@@ -3657,7 +3657,7 @@ Upper Bounds
 9.28e-01
 9.04e-01
 9.15e-01
-8.67e-01
+8.68e-01
 8.37e-01
 8.58e-01
 8.74e-01
@@ -3673,7 +3673,7 @@ Upper Bounds
 8.97e-01
 8.66e-01
 8.29e-01
-8.49e-01
+8.48e-01
 8.85e-01
 8.47e-01
 8.39e-01
@@ -3734,7 +3734,7 @@ Upper Bounds
 8.72e-01
 8.86e-01
 8.25e-01
-8.06e-01
+8.05e-01
 7.70e-01
 7.66e-01
 7.77e-01
@@ -4084,7 +4084,7 @@ Upper Bounds
 8.23e-01
 8.70e-01
 8.45e-01
-8.81e-01
+8.80e-01
 1.24e+00
 1.66e+00
 6.51e-01
@@ -4098,7 +4098,7 @@ Upper Bounds
 8.14e-01
 7.91e-01
 8.49e-01
-8.48e-01
+8.47e-01
 9.21e-01
 1.22e+00
 1.35e+00
@@ -4124,7 +4124,7 @@ Upper Bounds
 8.56e-01
 8.12e-01
 7.90e-01
-8.10e-01
+8.09e-01
 7.88e-01
 8.08e-01
 8.07e-01
@@ -4141,7 +4141,7 @@ Upper Bounds
 7.98e-01
 8.23e-01
 8.40e-01
-8.12e-01
+8.11e-01
 8.01e-01
 8.15e-01
 8.78e-01
@@ -4149,14 +4149,14 @@ Upper Bounds
 1.49e+00
 5.48e-01
 8.43e-01
-8.37e-01
+8.36e-01
 8.81e-01
-7.97e-01
+8.18e-01
 7.95e-01
 7.90e-01
 8.20e-01
 7.94e-01
-7.75e-01
+7.74e-01
 7.96e-01
 7.56e-01
 8.00e-01
@@ -4176,10 +4176,10 @@ Upper Bounds
 7.46e-01
 7.89e-01
 1.17e+00
-9.25e-01
+9.24e-01
 3.31e-01
 8.47e-01
-8.26e-01
+8.25e-01
 8.14e-01
 8.34e-01
 8.09e-01
@@ -4211,7 +4211,7 @@ Upper Bounds
 8.80e-01
 8.88e-01
 8.39e-01
-8.92e-01
+8.93e-01
 8.67e-01
 8.43e-01
 8.12e-01
@@ -4226,11 +4226,11 @@ Upper Bounds
 9.42e-01
 8.84e-01
 8.89e-01
-4.30e-01
+8.81e-01
 9.12e-01
 9.52e-01
 8.80e-01
-8.13e-01
+8.12e-01
 8.44e-01
 8.47e-01
 8.47e-01
@@ -4284,7 +4284,7 @@ Upper Bounds
 1.28e-01
 6.06e-02
 8.53e-01
-8.42e-01
+8.41e-01
 8.16e-01
 8.39e-01
 8.62e-01
@@ -4293,7 +4293,7 @@ Upper Bounds
 7.57e-01
 7.84e-01
 8.17e-01
-7.86e-01
+7.85e-01
 8.91e-01
 1.29e+00
 1.58e+00
@@ -4384,7 +4384,7 @@ Upper Bounds
 7.51e-01
 7.69e-01
 7.83e-01
-7.95e-01
+7.94e-01
 1.09e+00
 1.03e+00
 3.79e-01
@@ -4439,7 +4439,7 @@ Upper Bounds
 8.29e-01
 8.34e-01
 8.10e-01
-8.16e-01
+8.15e-01
 8.13e-01
 7.91e-01
 7.58e-01
@@ -4500,7 +4500,7 @@ Upper Bounds
 5.38e-01
 4.35e-01
 5.87e-01
-2.74e-01
+2.73e-01
 3.52e-01
 2.53e-01
 1.54e-01
@@ -4577,7 +4577,7 @@ Upper Bounds
 7.84e-01
 7.91e-01
 7.91e-01
-7.83e-01
+7.82e-01
 7.90e-01
 8.30e-01
 1.25e+00
@@ -4590,7 +4590,7 @@ Upper Bounds
 7.98e-01
 7.82e-01
 7.55e-01
-7.52e-01
+7.51e-01
 8.14e-01
 8.19e-01
 7.83e-01
@@ -4599,7 +4599,7 @@ Upper Bounds
 1.09e+00
 4.51e-01
 8.40e-01
-8.48e-01
+8.47e-01
 8.18e-01
 7.81e-01
 7.89e-01
@@ -4623,7 +4623,7 @@ Upper Bounds
 7.25e-01
 7.18e-01
 7.55e-01
-7.87e-01
+7.86e-01
 8.22e-01
 1.16e+00
 5.88e-01
@@ -4658,7 +4658,7 @@ Upper Bounds
 1.05e+00
 6.00e-01
 1.91e-01
-8.27e-01
+8.26e-01
 7.94e-01
 8.07e-01
 8.05e-01
@@ -4758,7 +4758,7 @@ Upper Bounds
 7.61e-01
 7.94e-01
 7.58e-01
-7.43e-01
+7.42e-01
 7.76e-01
 1.12e+00
 1.01e+00
@@ -4784,12 +4784,12 @@ Upper Bounds
 7.60e-01
 7.73e-01
 8.04e-01
-7.87e-01
+7.86e-01
 7.68e-01
 7.69e-01
 7.72e-01
 7.79e-01
-8.20e-01
+8.19e-01
 1.12e+00
 7.80e-01
 3.07e-01
@@ -4817,7 +4817,7 @@ Upper Bounds
 7.52e-01
 7.32e-01
 7.17e-01
-7.61e-01
+7.60e-01
 7.74e-01
 8.04e-01
 1.13e+00
@@ -4854,12 +4854,12 @@ Upper Bounds
 8.15e-01
 2.44e-01
 8.21e-01
-3.30e-01
+7.75e-01
 7.87e-01
 7.66e-01
 7.39e-01
 7.65e-01
-3.79e-01
+7.62e-01
 6.99e-01
 6.88e-01
 6.98e-01
@@ -4962,10 +4962,10 @@ Upper Bounds
 7.87e-01
 7.72e-01
 8.00e-01
-8.25e-01
-8.31e-01
+8.24e-01
+8.30e-01
 8.27e-01
-7.89e-01
+7.88e-01
 7.35e-01
 7.02e-01
 6.79e-01
@@ -4991,13 +4991,13 @@ Upper Bounds
 7.91e-01
 7.84e-01
 8.12e-01
-8.14e-01
+8.13e-01
 7.93e-01
 7.86e-01
 7.80e-01
 7.88e-01
 7.62e-01
-7.26e-01
+7.25e-01
 7.48e-01
 8.00e-01
 1.08e+00
@@ -5013,7 +5013,7 @@ Upper Bounds
 7.67e-01
 7.34e-01
 7.08e-01
-7.83e-01
+7.82e-01
 8.28e-01
 1.05e+00
 7.28e-01
@@ -5043,7 +5043,7 @@ Upper Bounds
 7.26e-01
 7.36e-01
 7.31e-01
-7.41e-01
+7.40e-01
 7.92e-01
 1.07e+00
 6.18e-01
@@ -5089,7 +5089,7 @@ Upper Bounds
 6.75e-01
 6.66e-01
 7.38e-01
-7.32e-01
+7.31e-01
 9.88e-01
 5.41e-01
 1.68e-01
@@ -5219,7 +5219,7 @@ Upper Bounds
 7.96e-01
 8.02e-01
 7.57e-01
-7.80e-01
+7.79e-01
 7.99e-01
 7.43e-01
 7.26e-01
@@ -5251,7 +5251,7 @@ Upper Bounds
 7.54e-01
 7.53e-01
 7.66e-01
-7.41e-01
+7.40e-01
 7.01e-01
 7.50e-01
 8.07e-01
@@ -5274,9 +5274,9 @@ Upper Bounds
 7.50e-01
 2.61e-01
 7.64e-01
-7.45e-01
+7.65e-01
 7.60e-01
-7.26e-01
+7.25e-01
 7.24e-01
 7.17e-01
 6.99e-01
@@ -5294,7 +5294,7 @@ Upper Bounds
 7.14e-01
 7.38e-01
 7.21e-01
-6.81e-01
+6.80e-01
 6.69e-01
 6.84e-01
 6.84e-01
@@ -5304,13 +5304,13 @@ Upper Bounds
 3.59e-01
 1.45e-01
 7.38e-01
-5.93e-01
+7.18e-01
 7.38e-01
 7.39e-01
 7.46e-01
 7.70e-01
 7.25e-01
-6.07e-01
+6.90e-01
 6.46e-01
 6.49e-01
 6.56e-01
@@ -5318,7 +5318,7 @@ Upper Bounds
 9.65e-01
 3.98e-01
 1.02e-01
-7.63e-01
+7.64e-01
 7.31e-01
 7.32e-01
 7.05e-01
@@ -5369,7 +5369,7 @@ Upper Bounds
 1.11e+00
 1.11e+00
 1.08e+00
-9.96e-01
+9.95e-01
 1.02e+00
 9.59e-01
 1.01e+00
@@ -5434,7 +5434,7 @@ Upper Bounds
 7.89e-01
 7.16e-01
 7.47e-01
-7.98e-01
+7.97e-01
 1.11e+00
 7.82e-01
 2.29e-01
@@ -5447,7 +5447,7 @@ Upper Bounds
 7.75e-01
 7.99e-01
 8.00e-01
-7.27e-01
+7.26e-01
 7.00e-01
 7.95e-01
 1.12e+00
@@ -5584,7 +5584,7 @@ Upper Bounds
 6.82e-01
 6.66e-01
 6.30e-01
-5.52e-01
+5.53e-01
 6.56e-01
 2.86e-01
 9.02e-02
@@ -5603,7 +5603,7 @@ Upper Bounds
 5.90e-01
 1.70e-01
 6.04e-02
-9.35e-01
+9.34e-01
 7.67e-01
 7.48e-01
 8.36e-01
@@ -5688,7 +5688,7 @@ Upper Bounds
 7.74e-01
 7.69e-01
 7.48e-01
-7.27e-01
+7.26e-01
 7.70e-01
 1.04e+00
 5.38e-01
@@ -5698,7 +5698,7 @@ Upper Bounds
 7.98e-01
 7.72e-01
 8.10e-01
-7.95e-01
+7.96e-01
 7.80e-01
 7.69e-01
 7.86e-01
@@ -5776,7 +5776,7 @@ Upper Bounds
 7.07e-01
 6.87e-01
 6.74e-01
-6.34e-01
+6.35e-01
 6.34e-01
 6.14e-01
 6.22e-01
@@ -5792,10 +5792,10 @@ Upper Bounds
 7.08e-01
 6.86e-01
 6.37e-01
-6.42e-01
+6.43e-01
 5.84e-01
 6.05e-01
-8.13e-01
+8.14e-01
 2.50e-01
 7.65e-02
 7.35e-01
@@ -5805,7 +5805,7 @@ Upper Bounds
 7.24e-01
 7.52e-01
 7.60e-01
-7.36e-01
+7.35e-01
 6.72e-01
 6.44e-01
 6.12e-01
@@ -5860,7 +5860,7 @@ Upper Bounds
 1.67e-02
 7.86e-01
 8.39e-01
-8.83e-01
+8.82e-01
 8.55e-01
 8.50e-01
 8.79e-01
@@ -5901,7 +5901,7 @@ Upper Bounds
 7.49e-01
 8.31e-01
 1.07e+00
-4.89e-01
+4.88e-01
 1.30e-01
 8.26e-01
 8.49e-01
@@ -5909,7 +5909,7 @@ Upper Bounds
 8.27e-01
 8.44e-01
 8.70e-01
-3.16e-01
+8.88e-01
 8.04e-01
 8.19e-01
 7.85e-01
@@ -5923,8 +5923,8 @@ Upper Bounds
 8.03e-01
 8.28e-01
 8.39e-01
-8.52e-01
-8.17e-01
+8.53e-01
+8.18e-01
 8.07e-01
 8.12e-01
 8.02e-01
@@ -6023,8 +6023,8 @@ Upper Bounds
 7.24e-01
 2.12e-01
 6.37e-02
-7.12e-01
-3.10e-01
+7.13e-01
+6.99e-01
 7.21e-01
 7.24e-01
 7.11e-01
@@ -6036,7 +6036,7 @@ Upper Bounds
 5.74e-01
 5.37e-01
 6.18e-01
-1.92e-01
+1.95e-01
 5.93e-02
 9.23e-01
 8.49e-01
@@ -6053,8 +6053,8 @@ Upper Bounds
 3.58e-01
 1.02e-01
 3.58e-02
-6.34e-01
-3.24e-01
+6.33e-01
+3.23e-01
 4.14e-01
 5.18e-01
 3.93e-01
@@ -6067,7 +6067,7 @@ Upper Bounds
 2.08e-01
 1.27e-01
 3.00e-02
-9.84e-03
+9.83e-03
 2.53e-01
 1.24e-01
 1.72e-01
@@ -6211,7 +6211,7 @@ Upper Bounds
 1.03e+00
 1.15e+00
 1.11e+00
-9.64e-01
+9.63e-01
 1.01e+00
 9.05e-01
 8.67e-01
@@ -6229,8 +6229,8 @@ Upper Bounds
 8.93e-01
 8.70e-01
 8.58e-01
-8.56e-01
-8.00e-01
+8.57e-01
+8.01e-01
 2.31e-01
 7.13e-02
 9.12e-01
@@ -6249,7 +6249,7 @@ Upper Bounds
 2.01e-01
 7.22e-02
 7.80e-01
-8.00e-01
+7.99e-01
 9.64e-01
 9.33e-01
 9.70e-01
@@ -6277,7 +6277,7 @@ Upper Bounds
 5.08e-01
 3.32e-01
 9.24e-02
-4.15e-02
+4.14e-02
 3.42e-01
 2.04e-01
 2.56e-01
@@ -6414,12 +6414,12 @@ Upper Bounds
 1.17e-01
 7.24e-02
 5.31e-01
-7.17e-01
+7.16e-01
 8.03e-01
 7.87e-01
 9.01e-01
 9.00e-01
-6.18e-01
+6.17e-01
 6.08e-01
 4.09e-01
 3.65e-01
@@ -6545,7 +6545,7 @@ Upper Bounds
 2.87e-01
 1.88e-01
 1.85e-01
-1.80e-01
+1.79e-01
 1.07e-01
 3.77e-02
 5.65e-01
@@ -6578,13 +6578,13 @@ Upper Bounds
 1.41e-01
 5.88e-02
 6.26e-02
-4.47e-01
+4.46e-01
 3.47e-01
 5.27e-01
 6.11e-01
 3.91e-01
 4.22e-01
-4.77e-01
+4.76e-01
 4.54e-01
 4.31e-01
 3.19e-01
@@ -6727,14 +6727,14 @@ Upper Bounds
 5.73e-02
 5.81e-02
 1.92e-02
-6.10e-03
+6.09e-03
 2.72e-02
 4.77e-02
 4.74e-02
 3.34e-02
 5.41e-02
 7.93e-02
-6.70e-02
+6.69e-02
 7.67e-02
 9.31e-02
 5.17e-02

From f796fa04e06a074163f9071436724a06fd691931 Mon Sep 17 00:00:00 2001
From: Patrick Shriwise <pshriwise@gmail.com>
Date: Tue, 10 Jun 2025 09:01:28 -0600
Subject: [PATCH 042/203] Adding fix and tests for spherical mesh as spatial
 distribution (#3428)

Co-authored-by: Paul Wilson <paul.wilson@wisc.edu>
Co-authored-by: Paul Romano <paul.k.romano@gmail.com>
---
 openmc/mesh.py                            | 126 +++++++++++++++++-----
 src/mesh.cpp                              |   3 +-
 tests/unit_tests/test_mesh_from_domain.py |  32 +++++-
 tests/unit_tests/test_source_mesh.py      |  45 ++++++++
 4 files changed, 176 insertions(+), 30 deletions(-)

diff --git a/openmc/mesh.py b/openmc/mesh.py
index 27187b5dd..b046769fd 100644
--- a/openmc/mesh.py
+++ b/openmc/mesh.py
@@ -5,6 +5,7 @@ from collections.abc import Iterable, Sequence, Mapping
 from functools import wraps
 from math import pi, sqrt, atan2
 from numbers import Integral, Real
+from typing import Protocol
 
 import h5py
 import lxml.etree as ET
@@ -842,6 +843,11 @@ class StructuredMesh(MeshBase):
             )
 
 
+class HasBoundingBox(Protocol):
+    """Object that has a ``bounding_box`` attribute."""
+    bounding_box: openmc.BoundingBox
+
+
 class RegularMesh(StructuredMesh):
     """A regular Cartesian mesh in one, two, or three dimensions
 
@@ -1088,17 +1094,16 @@ class RegularMesh(StructuredMesh):
     @classmethod
     def from_domain(
         cls,
-        domain: 'openmc.Cell' | 'openmc.Region' | 'openmc.Universe' | 'openmc.Geometry',
+        domain: HasBoundingBox,
         dimension: Sequence[int] = (10, 10, 10),
         mesh_id: int | None = None,
         name: str = ''
     ):
-        """Create mesh from an existing openmc cell, region, universe or
-        geometry by making use of the objects bounding box property.
+        """Create RegularMesh from a domain using its bounding box.
 
         Parameters
         ----------
-        domain : {openmc.Cell, openmc.Region, openmc.Universe, openmc.Geometry}
+        domain : HasBoundingBox
             The object passed in will be used as a template for this mesh. The
             bounding box of the property of the object passed will be used to
             set the lower_left and upper_right and of the mesh instance
@@ -1115,11 +1120,8 @@ class RegularMesh(StructuredMesh):
             RegularMesh instance
 
         """
-        cv.check_type(
-            "domain",
-            domain,
-            (openmc.Cell, openmc.Region, openmc.Universe, openmc.Geometry),
-        )
+        if not hasattr(domain, 'bounding_box'):
+            raise TypeError("Domain must have a bounding_box property")
 
         mesh = cls(mesh_id=mesh_id, name=name)
         mesh.lower_left = domain.bounding_box[0]
@@ -1787,17 +1789,18 @@ class CylindricalMesh(StructuredMesh):
     @classmethod
     def from_domain(
         cls,
-        domain: 'openmc.Cell' | 'openmc.Region' | 'openmc.Universe' | 'openmc.Geometry',
+        domain: HasBoundingBox,
         dimension: Sequence[int] = (10, 10, 10),
         mesh_id: int | None = None,
         phi_grid_bounds: Sequence[float] = (0.0, 2*pi),
-        name: str = ''
+        name: str = '',
+        enclose_domain: bool = False
     ):
-        """Creates a regular CylindricalMesh from an existing openmc domain.
+        """Create CylindricalMesh from a domain using its bounding box.
 
         Parameters
         ----------
-        domain : openmc.Cell or openmc.Region or openmc.Universe or openmc.Geometry
+        domain : HasBoundingBox
             The object passed in will be used as a template for this mesh. The
             bounding box of the property of the object passed will be used to
             set the r_grid, z_grid ranges.
@@ -1811,6 +1814,9 @@ class CylindricalMesh(StructuredMesh):
             is (0, 2π), i.e., the full phi range.
         name : str
             Name of the mesh
+        enclose_domain : bool
+            If True, the mesh will encompass the bounding box of the domain. If
+            False, the mesh will be inscribed within the domain's bounding box.
 
         Returns
         -------
@@ -1818,25 +1824,20 @@ class CylindricalMesh(StructuredMesh):
             CylindricalMesh instance
 
         """
-        cv.check_type(
-            "domain",
-            domain,
-            (openmc.Cell, openmc.Region, openmc.Universe, openmc.Geometry),
-        )
+        if not hasattr(domain, 'bounding_box'):
+            raise TypeError("Domain must have a bounding_box property")
 
         # loaded once to avoid recalculating bounding box
         cached_bb = domain.bounding_box
-        max_bounding_box_radius = max(
-            [
-                cached_bb[0][0],
-                cached_bb[0][1],
-                cached_bb[1][0],
-                cached_bb[1][1],
-            ]
-        )
+
+        if enclose_domain:
+            outer_radius = 0.5 * np.linalg.norm(cached_bb.width[:2])
+        else:
+            outer_radius = 0.5 * min(cached_bb.width[:2])
+
         r_grid = np.linspace(
             0,
-            max_bounding_box_radius,
+            outer_radius,
             num=dimension[0]+1
         )
         phi_grid = np.linspace(
@@ -2167,6 +2168,77 @@ class SphericalMesh(StructuredMesh):
 
         return mesh
 
+    @classmethod
+    def from_domain(
+        cls,
+        domain: HasBoundingBox,
+        dimension: Sequence[int] = (10, 10, 10),
+        mesh_id: int | None = None,
+        phi_grid_bounds: Sequence[float] = (0.0, 2*pi),
+        theta_grid_bounds: Sequence[float] = (0.0, pi),
+        name: str = '',
+        enclose_domain: bool = False
+    ):
+        """Create SphericalMesh from a domain using its bounding box.
+
+        Parameters
+        ----------
+        domain : HasBoundingBox
+            The object passed in will be used as a template for this mesh. The
+            bounding box of the property of the object passed will be used to
+            set the r_grid, phi_grid, and theta_grid ranges.
+        dimension : Iterable of int
+            The number of equally spaced mesh cells in each direction (r_grid,
+            phi_grid, theta_grid). Spacing is in angular space (radians) for
+            phi and theta, and in absolute space for r.
+        mesh_id : int
+            Unique identifier for the mesh
+        phi_grid_bounds : numpy.ndarray
+            Mesh bounds points along the phi-axis in radians. The default value
+            is (0, 2π), i.e., the full phi range.
+        theta_grid_bounds : numpy.ndarray
+            Mesh bounds points along the theta-axis in radians. The default value
+            is (0, π), i.e., the full theta range.
+        name : str
+            Name of the mesh
+        enclose_domain : bool
+            If True, the mesh will encompass the bounding box of the domain. If
+            False, the mesh will be inscribed within the domain's bounding box.
+
+        Returns
+        -------
+        openmc.SphericalMesh
+            SphericalMesh instance
+
+        """
+        if not hasattr(domain, 'bounding_box'):
+            raise TypeError("Domain must have a bounding_box property")
+
+        # loaded once to avoid recalculating bounding box
+        cached_bb = domain.bounding_box
+
+        if enclose_domain:
+            outer_radius = 0.5 * np.linalg.norm(cached_bb.width)
+        else:
+            outer_radius = 0.5 * min(cached_bb.width)
+
+        r_grid = np.linspace(0, outer_radius, num=dimension[0] + 1)
+        theta_grid = np.linspace(
+            theta_grid_bounds[0],
+            theta_grid_bounds[1],
+            num=dimension[1]+1
+        )
+        phi_grid = np.linspace(
+            phi_grid_bounds[0],
+            phi_grid_bounds[1],
+            num=dimension[2]+1
+        )
+        origin = np.array([
+            cached_bb.center[0], cached_bb.center[1], cached_bb.center[2]])
+
+        return cls(r_grid=r_grid, phi_grid=phi_grid, theta_grid=theta_grid,
+                   origin=origin, mesh_id=mesh_id, name=name)
+
     def to_xml_element(self):
         """Return XML representation of the mesh
 
diff --git a/src/mesh.cpp b/src/mesh.cpp
index 8280177ac..d61058525 100644
--- a/src/mesh.cpp
+++ b/src/mesh.cpp
@@ -1794,7 +1794,8 @@ Position SphericalMesh::sample_element(
   double phi_min = this->phi(ijk[2] - 1);
   double phi_max = this->phi(ijk[2]);
 
-  double cos_theta = uniform_distribution(theta_min, theta_max, seed);
+  double cos_theta =
+    uniform_distribution(std::cos(theta_min), std::cos(theta_max), seed);
   double sin_theta = std::sin(std::acos(cos_theta));
   double phi = uniform_distribution(phi_min, phi_max, seed);
   double r_min_cub = std::pow(r_min, 3);
diff --git a/tests/unit_tests/test_mesh_from_domain.py b/tests/unit_tests/test_mesh_from_domain.py
index 0cbe413e8..0e3858913 100644
--- a/tests/unit_tests/test_mesh_from_domain.py
+++ b/tests/unit_tests/test_mesh_from_domain.py
@@ -40,7 +40,7 @@ def test_cylindrical_mesh_from_cell():
 
     assert isinstance(mesh, openmc.CylindricalMesh)
     assert np.array_equal(mesh.dimension, (1, 1, 1))
-    assert np.array_equal(mesh.r_grid, [0., 150.])
+    assert np.array_equal(mesh.r_grid, [0., 50.])
     assert np.array_equal(mesh.origin, [100., 0., 10.])
 
     # Cell is not centralized on Z, X or Y axis
@@ -49,7 +49,7 @@ def test_cylindrical_mesh_from_cell():
     mesh = openmc.CylindricalMesh.from_domain(domain=cell, dimension=[1, 1, 1])
 
     assert isinstance(mesh, openmc.CylindricalMesh)
-    assert np.array_equal(mesh.r_grid, [0., 220.])
+    assert np.array_equal(mesh.r_grid, [0., 50.])
     assert np.array_equal(mesh.origin, [100., 170., 10.])
 
 
@@ -87,6 +87,34 @@ def test_cylindrical_mesh_from_region():
     assert np.array_equal(mesh.origin, (0.0, 0.0, -30.))
 
 
+def test_spherical_mesh_from_domain():
+    """Tests a SphericalMesh can be made from a Region and the specified
+    dimensions are propagated through. Cell is not centralized"""
+    sphere = openmc.Sphere(r=5, x0=2, y0=3, z0=4)
+    region = -sphere
+
+    geometry = openmc.Geometry(openmc.Universe(cells=[openmc.Cell(region=region)]))
+
+    region_mesh = openmc.SphericalMesh.from_domain(
+        domain=region, dimension=(4, 3, 4))
+    universe_mesh = openmc.SphericalMesh.from_domain(
+        domain=geometry.root_universe, dimension=(4, 3, 4))
+    geometry_mesh = openmc.SphericalMesh.from_domain(
+        domain=geometry, dimension=(4, 3, 4))
+
+
+    for mesh in (region_mesh, universe_mesh, geometry_mesh):
+        assert isinstance(mesh, openmc.SphericalMesh)
+        assert np.array_equal(mesh.dimension, (4, 3, 4))
+        assert np.array_equal(mesh.r_grid, [0., 1.25, 2.5, 3.75, 5.0])
+        assert np.array_equal(mesh.theta_grid, [0., np.pi/3., 2*np.pi/3., np.pi])
+        assert np.array_equal(mesh.phi_grid, [0., np.pi/2., np.pi, 3*np.pi/2., 2*np.pi])
+        assert np.array_equal(mesh.origin, (2.0, 3.0, 4.0))
+
+        for p in mesh.centroids.reshape(-1, 3):
+            assert p in mesh.bounding_box
+
+
 def test_reg_mesh_from_universe():
     """Tests a RegularMesh can be made from a Universe and the default
     dimensions are propagated through. Universe is centralized"""
diff --git a/tests/unit_tests/test_source_mesh.py b/tests/unit_tests/test_source_mesh.py
index 43bb1678c..d023c1335 100644
--- a/tests/unit_tests/test_source_mesh.py
+++ b/tests/unit_tests/test_source_mesh.py
@@ -396,3 +396,48 @@ def test_mesh_source_file(run_in_tmpdir):
         assert site.u == source_particle.u
         assert site.time == source_particle.time
         assert site.r in bbox
+
+
+@pytest.mark.parametrize("mesh_type", ('rectangular', 'cylindrical', 'spherical'))
+def test_mesh_spatial(run_in_tmpdir, mesh_type):
+    """Test that a spherical mesh source works as expected."""
+    model = openmc.Model()
+
+    # Set up geometry, a box that is shifted in x, y, and z
+    box = openmc.model.RectangularParallelepiped(5.0, 25.0, -20.0, 20.0, -30.0, 30.0, boundary_type='vacuum')
+    mat = openmc.Material()
+    mat.add_nuclide('H1', 1.0)
+    model.geometry = openmc.Geometry([openmc.Cell(fill=mat, region=-box)])
+
+    # Create a mesh of each type in turn
+    if mesh_type == 'rectangular':
+        mesh = openmc.RegularMesh.from_domain(model.geometry, (10, 2, 2))
+    elif mesh_type == 'cylindrical':
+        mesh = openmc.CylindricalMesh.from_domain(model.geometry, (10, 2, 2))
+        assert max(mesh.r_grid) == 10.0, "Cylindrical mesh radius exceeds geometry bounds"
+        assert mesh.origin[0] == 15.0, "Cylindrical mesh origin x-coordinate is incorrect"
+    elif mesh_type == 'spherical':
+        mesh = openmc.SphericalMesh.from_domain(model.geometry, (10, 2, 2))
+        assert max(mesh.r_grid) == 10.0, "Spherical mesh radius exceeds geometry bounds"
+        assert mesh.origin[0] == 15.0, "Spherical mesh origin x-coordinate is incorrect"
+
+    # Create a mesh source with a single particle
+    ind_source = openmc.IndependentSource(space=openmc.stats.MeshSpatial(mesh, np.prod(mesh.dimension)*[1.0]))
+    model.settings.source = ind_source
+
+    model.settings.particles = 100
+    model.settings.batches = 10
+    model.settings.run_mode = 'fixed source'
+
+    model.export_to_model_xml()
+
+    openmc.lib.init()
+    openmc.lib.simulation_init()
+    sites = openmc.lib.sample_external_source(10)
+    openmc.lib.simulation_finalize()
+    openmc.lib.finalize()
+
+    # Check that the sites are within the spherical mesh bounds
+    bbox = mesh.bounding_box
+    for site in sites:
+        assert site.r in bbox

From f571be87c5e46587ce898dd5fa944512283b6ea3 Mon Sep 17 00:00:00 2001
From: Paul Romano <paul.k.romano@gmail.com>
Date: Tue, 10 Jun 2025 22:51:51 -0500
Subject: [PATCH 043/203] Add user setting for source rejection fraction
 (#3433)

---
 docs/source/io_formats/settings.rst | 12 ++++++-
 include/openmc/settings.h           |  2 ++
 include/openmc/source.h             |  5 ++-
 openmc/settings.py                  | 28 ++++++++++++++++
 src/error.cpp                       | 25 ++++++++-------
 src/finalize.cpp                    |  1 +
 src/settings.cpp                    |  7 ++++
 src/source.cpp                      | 50 +++++++++++++++--------------
 tests/unit_tests/test_settings.py   |  5 +--
 tests/unit_tests/test_source.py     | 33 +++++++++++++------
 10 files changed, 118 insertions(+), 50 deletions(-)

diff --git a/docs/source/io_formats/settings.rst b/docs/source/io_formats/settings.rst
index cef9bf911..26673faac 100644
--- a/docs/source/io_formats/settings.rst
+++ b/docs/source/io_formats/settings.rst
@@ -487,7 +487,7 @@ found in the :ref:`random ray user guide <random_ray>`.
 
         :type:
           The type of the domain. Can be ``material``, ``cell``, or ``universe``.
-  
+
   :diagonal_stabilization_rho:
     The rho factor for use with diagonal stabilization. This technique is
     applied when negative diagonal (in-group) elements are detected in
@@ -917,6 +917,16 @@ variable and whose sub-elements/attributes are as follows:
   :dist:
     This sub-element of a ``pair`` element provides information on the corresponding univariate distribution.
 
+---------------------------------------
+``<source_rejection_fraction>`` Element
+---------------------------------------
+
+The ``<source_rejection_fraction>`` element specifies the minimum fraction of
+external source sites that must be accepted when applying rejection sampling
+based on constraints.
+
+   *Default*: 0.05
+
 -------------------------
 ``<state_point>`` Element
 -------------------------
diff --git a/include/openmc/settings.h b/include/openmc/settings.h
index 9017b2d08..069d94c3b 100644
--- a/include/openmc/settings.h
+++ b/include/openmc/settings.h
@@ -145,6 +145,8 @@ extern std::unordered_set<int>
   statepoint_batch; //!< Batches when state should be written
 extern std::unordered_set<int>
   source_write_surf_id; //!< Surface ids where sources will be written
+extern double source_rejection_fraction; //!< Minimum fraction of source sites
+                                         //!< that must be accepted
 
 extern int
   max_history_splits; //!< maximum number of particle splits for weight windows
diff --git a/include/openmc/source.h b/include/openmc/source.h
index 6733eaeff..e82c42269 100644
--- a/include/openmc/source.h
+++ b/include/openmc/source.h
@@ -21,10 +21,9 @@ namespace openmc {
 // Constants
 //==============================================================================
 
-// Maximum number of external source spatial resamples to encounter before an
-// error is thrown.
+// Minimum number of external source sites rejected before checking againts the
+// source_rejection_fraction
 constexpr int EXTSRC_REJECT_THRESHOLD {10000};
-constexpr double EXTSRC_REJECT_FRACTION {0.05};
 
 //==============================================================================
 // Global variables
diff --git a/openmc/settings.py b/openmc/settings.py
index 4cacefbed..bd3a89e11 100644
--- a/openmc/settings.py
+++ b/openmc/settings.py
@@ -222,6 +222,10 @@ class Settings:
         Number of random numbers allocated for each source particle history
     source : Iterable of openmc.SourceBase
         Distribution of source sites in space, angle, and energy
+    source_rejection_fraction : float
+        Minimum fraction of source sites that must be accepted when applying
+        rejection sampling based on constraints. If not specified, the default
+        value is 0.05.
     sourcepoint : dict
         Options for writing source points. Acceptable keys are:
 
@@ -357,6 +361,7 @@ class Settings:
 
         # Source subelement
         self._source = cv.CheckedList(SourceBase, 'source distributions')
+        self._source_rejection_fraction = None
 
         self._confidence_intervals = None
         self._electron_treatment = None
@@ -1224,6 +1229,17 @@ class Settings:
         cv.check_type('use decay photons', value, bool)
         self._use_decay_photons = value
 
+    @property
+    def source_rejection_fraction(self) -> float:
+        return self._source_rejection_fraction
+
+    @source_rejection_fraction.setter
+    def source_rejection_fraction(self, source_rejection_fraction: float):
+        cv.check_type('source_rejection_fraction', source_rejection_fraction, Real)
+        cv.check_greater_than('source_rejection_fraction', source_rejection_fraction, 0)
+        cv.check_less_than('source_rejection_fraction', source_rejection_fraction, 1)
+        self._source_rejection_fraction = source_rejection_fraction
+
     def _create_run_mode_subelement(self, root):
         elem = ET.SubElement(root, "run_mode")
         elem.text = self._run_mode.value
@@ -1685,6 +1701,11 @@ class Settings:
                     subelement = ET.SubElement(element, key)
                     subelement.text = str(value)
 
+    def _create_source_rejection_fraction_subelement(self, root):
+        if self._source_rejection_fraction is not None:
+            element = ET.SubElement(root, "source_rejection_fraction")
+            element.text = str(self._source_rejection_fraction)
+
     def _eigenvalue_from_xml_element(self, root):
         elem = root.find('eigenvalue')
         if elem is not None:
@@ -2104,6 +2125,11 @@ class Settings:
         if text is not None:
             self.use_decay_photons = text in ('true', '1')
 
+    def _source_rejection_fraction_from_xml_element(self, root):
+        text = get_text(root, 'source_rejection_fraction')
+        if text is not None:
+            self.source_rejection_fraction = float(text)
+
     def to_xml_element(self, mesh_memo=None):
         """Create a 'settings' element to be written to an XML file.
 
@@ -2171,6 +2197,7 @@ class Settings:
         self._create_max_tracks_subelement(element)
         self._create_random_ray_subelement(element, mesh_memo)
         self._create_use_decay_photons_subelement(element)
+        self._create_source_rejection_fraction_subelement(element)
 
         # Clean the indentation in the file to be user-readable
         clean_indentation(element)
@@ -2279,6 +2306,7 @@ class Settings:
         settings._max_tracks_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)
 
         return settings
 
diff --git a/src/error.cpp b/src/error.cpp
index 566950a97..f99f5935f 100644
--- a/src/error.cpp
+++ b/src/error.cpp
@@ -110,23 +110,26 @@ void write_message(const std::string& message, int level)
 
 void fatal_error(const std::string& message, int err)
 {
+#pragma omp critical(FatalError)
+  {
 #ifdef _POSIX_VERSION
-  // Make output red if user is in a terminal
-  if (isatty(STDERR_FILENO)) {
-    std::cerr << "\033[0;31m";
-  }
+    // Make output red if user is in a terminal
+    if (isatty(STDERR_FILENO)) {
+      std::cerr << "\033[0;31m";
+    }
 #endif
 
-  // Write error message
-  std::cerr << " ERROR: ";
-  output(message, std::cerr, 8);
+    // Write error message
+    std::cerr << " ERROR: ";
+    output(message, std::cerr, 8);
 
 #ifdef _POSIX_VERSION
-  // Reset color for terminal
-  if (isatty(STDERR_FILENO)) {
-    std::cerr << "\033[0m";
-  }
+    // Reset color for terminal
+    if (isatty(STDERR_FILENO)) {
+      std::cerr << "\033[0m";
+    }
 #endif
+  }
 
 #ifdef OPENMC_MPI
   MPI_Abort(mpi::intracomm, err);
diff --git a/src/finalize.cpp b/src/finalize.cpp
index 54aa1d1d9..9cbebc878 100644
--- a/src/finalize.cpp
+++ b/src/finalize.cpp
@@ -119,6 +119,7 @@ int openmc_finalize()
   settings::run_CE = true;
   settings::run_mode = RunMode::UNSET;
   settings::source_latest = false;
+  settings::source_rejection_fraction = 0.05;
   settings::source_separate = false;
   settings::source_write = true;
   settings::ssw_cell_id = C_NONE;
diff --git a/src/settings.cpp b/src/settings.cpp
index c8230a10f..9afe74361 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -124,6 +124,7 @@ RunMode run_mode {RunMode::UNSET};
 SolverType solver_type {SolverType::MONTE_CARLO};
 std::unordered_set<int> sourcepoint_batch;
 std::unordered_set<int> statepoint_batch;
+double source_rejection_fraction {0.05};
 std::unordered_set<int> source_write_surf_id;
 int64_t ssw_max_particles;
 int64_t ssw_max_files;
@@ -644,6 +645,12 @@ void read_settings_xml(pugi::xml_node root)
     write_initial_source = get_node_value_bool(root, "write_initial_source");
   }
 
+  // Get relative number of lost particles
+  if (check_for_node(root, "source_rejection_fraction")) {
+    source_rejection_fraction =
+      std::stod(get_node_value(root, "source_rejection_fraction"));
+  }
+
   // Survival biasing
   if (check_for_node(root, "survival_biasing")) {
     survival_biasing = get_node_value_bool(root, "survival_biasing");
diff --git a/src/source.cpp b/src/source.cpp
index 8e6eb4f11..6ee0b5603 100644
--- a/src/source.cpp
+++ b/src/source.cpp
@@ -157,11 +157,28 @@ void Source::read_constraints(pugi::xml_node node)
   }
 }
 
+void check_rejection_fraction(int64_t n_reject, int64_t n_accept)
+{
+  // Don't check unless we've hit a minimum number of total sites rejected
+  if (n_reject < EXTSRC_REJECT_THRESHOLD)
+    return;
+
+  // Compute fraction of accepted sites and compare against minimum
+  double fraction = static_cast<double>(n_accept) / n_reject;
+  if (fraction <= settings::source_rejection_fraction) {
+    fatal_error(fmt::format(
+      "Too few source sites satisfied the constraints (minimum source "
+      "rejection fraction = {}). Please check your source definition or "
+      "set a lower value of Settings.source_rejection_fraction.",
+      settings::source_rejection_fraction));
+  }
+}
+
 SourceSite Source::sample_with_constraints(uint64_t* seed) const
 {
   bool accepted = false;
-  static int n_reject = 0;
-  static int n_accept = 0;
+  static int64_t n_reject = 0;
+  static int64_t n_accept = 0;
   SourceSite site;
 
   while (!accepted) {
@@ -176,13 +193,9 @@ SourceSite Source::sample_with_constraints(uint64_t* seed) const
                  satisfies_energy_constraints(site.E) &&
                  satisfies_time_constraints(site.time);
       if (!accepted) {
+        // Increment number of rejections and check against minimum fraction
         ++n_reject;
-        if (n_reject >= EXTSRC_REJECT_THRESHOLD &&
-            static_cast<double>(n_accept) / n_reject <=
-              EXTSRC_REJECT_FRACTION) {
-          fatal_error("More than 95% of external source sites sampled were "
-                      "rejected. Please check your source definition.");
-        }
+        check_rejection_fraction(n_reject, n_accept);
 
         // For the "kill" strategy, accept particle but set weight to 0 so that
         // it is terminated immediately
@@ -337,8 +350,8 @@ SourceSite IndependentSource::sample(uint64_t* seed) const
 
   // Repeat sampling source location until a good site has been accepted
   bool accepted = false;
-  static int n_reject = 0;
-  static int n_accept = 0;
+  static int64_t n_reject = 0;
+  static int64_t n_accept = 0;
 
   while (!accepted) {
 
@@ -351,12 +364,7 @@ SourceSite IndependentSource::sample(uint64_t* seed) const
     // Check for rejection
     if (!accepted) {
       ++n_reject;
-      if (n_reject >= EXTSRC_REJECT_THRESHOLD &&
-          static_cast<double>(n_accept) / n_reject <= EXTSRC_REJECT_FRACTION) {
-        fatal_error("More than 95% of external source sites sampled were "
-                    "rejected. Please check your external source's spatial "
-                    "definition.");
-      }
+      check_rejection_fraction(n_reject, n_accept);
     }
   }
 
@@ -381,18 +389,12 @@ SourceSite IndependentSource::sample(uint64_t* seed) const
       site.E = energy_->sample(seed);
 
       // Resample if energy falls above maximum particle energy
-      if (site.E < data::energy_max[p] and
+      if (site.E < data::energy_max[p] &&
           (satisfies_energy_constraints(site.E)))
         break;
 
       n_reject++;
-      if (n_reject >= EXTSRC_REJECT_THRESHOLD &&
-          static_cast<double>(n_accept) / n_reject <= EXTSRC_REJECT_FRACTION) {
-        fatal_error(
-          "More than 95% of external source sites sampled were "
-          "rejected. Please check your external source energy spectrum "
-          "definition.");
-      }
+      check_rejection_fraction(n_reject, n_accept);
     }
 
     // Sample particle creation time
diff --git a/tests/unit_tests/test_settings.py b/tests/unit_tests/test_settings.py
index 397d70434..7f202bcdc 100644
--- a/tests/unit_tests/test_settings.py
+++ b/tests/unit_tests/test_settings.py
@@ -66,8 +66,8 @@ def test_export_to_xml(run_in_tmpdir):
             space=openmc.stats.Box((-1., -1., -1.), (1., 1., 1.))
         )
     }
-
     s.max_particle_events = 100
+    s.source_rejection_fraction = 0.01
 
     # Make sure exporting XML works
     s.export_to_xml()
@@ -130,7 +130,7 @@ def test_export_to_xml(run_in_tmpdir):
     assert s.log_grid_bins == 2000
     assert not s.photon_transport
     assert s.electron_treatment == 'led'
-    assert s.write_initial_source == True
+    assert s.write_initial_source
     assert len(s.volume_calculations) == 1
     vol = s.volume_calculations[0]
     assert vol.domain_type == 'cell'
@@ -144,3 +144,4 @@ def test_export_to_xml(run_in_tmpdir):
     assert s.random_ray['distance_active'] == 100.0
     assert s.random_ray['ray_source'].space.lower_left == [-1., -1., -1.]
     assert s.random_ray['ray_source'].space.upper_right == [1., 1., 1.]
+    assert s.source_rejection_fraction == 0.01
diff --git a/tests/unit_tests/test_source.py b/tests/unit_tests/test_source.py
index c88fbcbe6..bb8a1b785 100644
--- a/tests/unit_tests/test_source.py
+++ b/tests/unit_tests/test_source.py
@@ -264,21 +264,36 @@ def test_constraints_file(sphere_box_model, run_in_tmpdir):
 
 
 @pytest.mark.skipif(config['mpi'], reason='Not compatible with MPI')
-def test_rejection_limit(sphere_box_model, run_in_tmpdir):
-    model, cell1 = sphere_box_model[:2]
+def test_rejection_fraction(run_in_tmpdir):
+    mat = openmc.Material()
+    mat.add_nuclide('H1', 1.0)
+    w = 0.25
+    rpp1 = openmc.model.RectangularParallelepiped(
+        -w/2, w/2, -w/2, w/2, -w/2, w/2)
+    rpp2 = openmc.model.RectangularParallelepiped(
+        -0.5, 0.5, -0.5, 0.5, -0.5, 0.5, boundary_type='vacuum')
+    cell1 = openmc.Cell(fill=mat, region=-rpp1)
+    cell2 = openmc.Cell(region=+rpp1 & -rpp2)
+    model = openmc.Model()
+    model.geometry = openmc.Geometry([cell1, cell2])
 
-    # Define a point source that will get rejected 100% of the time
+    # Create a box source over a 1 cm³ volume that is constrained to the source
+    # cell of volume (0.25 cm)³ = 0.0125 cm³, which means the default rejection
+    # fraction of 0.05 won't work
+    model.settings.particles = 1000
+    model.settings.batches = 1
+    model.settings.run_mode = 'fixed source'
     model.settings.source = openmc.IndependentSource(
-        space=openmc.stats.Point((-3., 0., 0.)),
+        space=openmc.stats.Box(*(-rpp2).bounding_box),
         constraints={'domains': [cell1]}
     )
-
-    # Confirm that OpenMC doesn't run in an infinite loop. Note that this may
-    # work when running with MPI since it won't necessarily capture the error
-    # message correctly
-    with pytest.raises(RuntimeError, match="rejected"):
+    with pytest.raises(RuntimeError, match='Too few source sites'):
         model.run(openmc_exec=config['exe'])
 
+    # With a source rejection fraction below 0.0125, the simulation should run
+    model.settings.source_rejection_fraction = 0.005
+    model.run(openmc_exec=config['exe'])
+
 
 def test_exceptions():
 

From 2eeba89992ee8832147957ec0e330aa363bf189e Mon Sep 17 00:00:00 2001
From: John Tramm <john.tramm@gmail.com>
Date: Wed, 11 Jun 2025 12:41:38 -0500
Subject: [PATCH 044/203] Apply Max Number of Events Check to Random Rays
 (#3438)

Co-authored-by: Jonathan Shimwell <drshimwell@gmail.com>
---
 src/random_ray/random_ray.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/random_ray/random_ray.cpp b/src/random_ray/random_ray.cpp
index 27819591c..36eab0628 100644
--- a/src/random_ray/random_ray.cpp
+++ b/src/random_ray/random_ray.cpp
@@ -265,6 +265,12 @@ uint64_t RandomRay::transport_history_based_single_ray()
     if (!alive())
       break;
     event_cross_surface();
+    // If ray has too many events, display warning and kill it
+    if (n_event() >= settings::max_particle_events) {
+      warning("Ray " + std::to_string(id()) +
+              " underwent maximum number of events, terminating ray.");
+      wgt() = 0.0;
+    }
   }
 
   return n_event();

From e678b1a057e4dfe079ee27fd73886a8b2249f0c5 Mon Sep 17 00:00:00 2001
From: GuySten <62616591+GuySten@users.noreply.github.com>
Date: Thu, 12 Jun 2025 01:54:04 +0300
Subject: [PATCH 045/203] Fix raytrace infinite loop. (#3423)

Co-authored-by: Paul Romano <paul.k.romano@gmail.com>
---
 src/mesh.cpp                  |  9 +++++++--
 tests/unit_tests/test_mesh.py | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+), 2 deletions(-)

diff --git a/src/mesh.cpp b/src/mesh.cpp
index d61058525..becbbd3fd 100644
--- a/src/mesh.cpp
+++ b/src/mesh.cpp
@@ -989,7 +989,7 @@ void StructuredMesh::raytrace_mesh(
       // For all directions outside the mesh, find the distance that we need
       // to travel to reach the next surface. Use the largest distance, as
       // only this will cross all outer surfaces.
-      int k_max {0};
+      int k_max {-1};
       for (int k = 0; k < n; ++k) {
         if ((ijk[k] < 1 || ijk[k] > shape_[k]) &&
             (distances[k].distance > traveled_distance)) {
@@ -997,6 +997,10 @@ void StructuredMesh::raytrace_mesh(
           k_max = k;
         }
       }
+      // Assure some distance is traveled
+      if (k_max == -1) {
+        traveled_distance += TINY_BIT;
+      }
 
       // If r1 is not inside the mesh, exit here
       if (traveled_distance >= total_distance)
@@ -1011,7 +1015,7 @@ void StructuredMesh::raytrace_mesh(
       }
 
       // If inside the mesh, Tally inward current
-      if (in_mesh)
+      if (in_mesh && k_max >= 0)
         tally.surface(ijk, k_max, !distances[k_max].max_surface, true);
     }
   }
@@ -1207,6 +1211,7 @@ StructuredMesh::MeshDistance RegularMesh::distance_to_grid_boundary(
     d.next_index--;
     d.distance = (negative_grid_boundary(ijk, i) - r0[i]) / u[i];
   }
+
   return d;
 }
 
diff --git a/tests/unit_tests/test_mesh.py b/tests/unit_tests/test_mesh.py
index 49556fce3..3c8e988c0 100644
--- a/tests/unit_tests/test_mesh.py
+++ b/tests/unit_tests/test_mesh.py
@@ -618,3 +618,36 @@ def test_mesh_material_volumes_serialize():
     assert new_volumes.by_element(1) == [(None, 1.0)]
     assert new_volumes.by_element(2) == [(2, 0.5), (1, 0.5)]
     assert new_volumes.by_element(3) == [(2, 1.0)]
+
+
+def test_raytrace_mesh_infinite_loop():
+    # Create a model with one large spherical cell
+    sphere = openmc.Sphere(r=100, boundary_type='vacuum')
+    cell = openmc.Cell(region=-sphere)
+    model = openmc.Model()
+    model.geometry = openmc.Geometry([cell])
+
+    # Create a regular mesh and associated tally
+    mesh_surface = openmc.RegularMesh()
+    mesh_surface.lower_left = (-30, -30, 30)
+    mesh_surface.upper_right = (30, 30, 60)
+    mesh_surface.dimension = (1, 1, 1)
+    reg_filter = openmc.MeshSurfaceFilter(mesh_surface)
+    mesh_surface_tally = openmc.Tally()
+    mesh_surface_tally.filters = [reg_filter]
+    mesh_surface_tally.scores = ['current']
+    model.tallies = [mesh_surface_tally]
+
+    # Define a source such that the z position is on a mesh boundary with a very
+    # small directional cosine in the z direction
+    polar = openmc.stats.delta_function(1.75e-7)
+    azimuthal = openmc.stats.Uniform(0.0, 2.0*pi)
+    model.settings.source = openmc.IndependentSource(
+        angle=openmc.stats.PolarAzimuthal(polar, azimuthal)
+    )
+    model.settings.run_mode = 'fixed source'
+    model.settings.particles = 10
+    model.settings.batches =  1
+
+    # Run the model; this should not cause an infinite loop
+    model.run()

From 6c9c69628cbab69ecd46dc50c2585ab9fd5251f6 Mon Sep 17 00:00:00 2001
From: April Novak <novak@berkeley.edu>
Date: Thu, 12 Jun 2025 11:49:59 -0500
Subject: [PATCH 046/203] update units for flux (#3441)

---
 docs/source/methods/random_ray.rst | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/docs/source/methods/random_ray.rst b/docs/source/methods/random_ray.rst
index 41f95f0a9..5e17316aa 100644
--- a/docs/source/methods/random_ray.rst
+++ b/docs/source/methods/random_ray.rst
@@ -109,9 +109,7 @@ terms on the right hand side.
 In Equation :eq:`transport`, :math:`\psi` is the angular neutron flux. This
 parameter represents the total distance traveled by all neutrons in a particular
 direction inside of a control volume per second, and is often given in units of
-:math:`1/(\text{cm}^{2} \text{s})`. As OpenMC does not support time dependence
-in the random ray solver mode, we consider the steady state equation, where the
-units of flux become :math:`1/\text{cm}^{2}`. The angular direction unit vector,
+:math:`1/(\text{cm}^{2} \text{s})`. The angular direction unit vector,
 :math:`\mathbf{\Omega}`, represents the direction of travel for the neutron. The
 spatial position vector, :math:`\mathbf{r}`,  represents the location within the
 simulation. The neutron energy, :math:`E`, or speed in continuous space, is

From f81962c960929edc055198527d544db36f150747 Mon Sep 17 00:00:00 2001
From: Jonathan Shimwell <mail@jshimwell.com>
Date: Thu, 12 Jun 2025 23:02:35 +0200
Subject: [PATCH 047/203] Allowing chain_file to be chain object to save
 reloading time (#3436)

Co-authored-by: Paul Romano <paul.k.romano@gmail.com>
---
 openmc/deplete/abc.py                         | 11 +++---
 openmc/deplete/chain.py                       | 38 ++++++++++++++++++-
 openmc/deplete/coupled_operator.py            |  6 +--
 openmc/deplete/d1s.py                         | 15 ++++----
 openmc/deplete/independent_operator.py        | 12 +++---
 openmc/deplete/microxs.py                     | 35 +++++------------
 openmc/deplete/openmc_operator.py             |  6 +--
 tests/unit_tests/test_d1s.py                  |  3 +-
 .../test_deplete_coupled_operator.py          |  6 ++-
 .../test_deplete_independent_operator.py      |  5 ++-
 10 files changed, 81 insertions(+), 56 deletions(-)

diff --git a/openmc/deplete/abc.py b/openmc/deplete/abc.py
index 4b43dd221..e6d4c1512 100644
--- a/openmc/deplete/abc.py
+++ b/openmc/deplete/abc.py
@@ -24,7 +24,7 @@ from openmc.mpi import comm
 from openmc.utility_funcs import change_directory
 from openmc import Material
 from .stepresult import StepResult
-from .chain import Chain
+from .chain import _get_chain
 from .results import Results, _SECONDS_PER_MINUTE, _SECONDS_PER_HOUR, \
     _SECONDS_PER_DAY, _SECONDS_PER_JULIAN_YEAR
 from .pool import deplete
@@ -126,8 +126,8 @@ class TransportOperator(ABC):
 
     Parameters
     ----------
-    chain_file : str
-        Path to the depletion chain XML file
+    chain_file : PathLike or Chain
+        Path to the depletion chain XML file or instance of openmc.deplete.Chain.
     fission_q : dict, optional
         Dictionary of nuclides and their fission Q values [eV]. If not given,
         values will be pulled from the ``chain_file``.
@@ -145,11 +145,12 @@ class TransportOperator(ABC):
         The depletion chain information necessary to form matrices and tallies.
 
     """
-    def __init__(self, chain_file, fission_q=None, prev_results=None):
+    def __init__(self, chain_file=None, fission_q=None, prev_results=None):
         self.output_dir = '.'
 
         # Read depletion chain
-        self.chain = Chain.from_xml(chain_file, fission_q)
+        self.chain = _get_chain(chain_file, fission_q)
+
         if prev_results is None:
             self.prev_res = None
         else:
diff --git a/openmc/deplete/chain.py b/openmc/deplete/chain.py
index 9f234683a..07db48799 100644
--- a/openmc/deplete/chain.py
+++ b/openmc/deplete/chain.py
@@ -17,8 +17,9 @@ from typing import List
 import lxml.etree as ET
 import scipy.sparse as sp
 
-from openmc.checkvalue import check_type, check_greater_than
+from openmc.checkvalue import check_type, check_greater_than, PathLike
 from openmc.data import gnds_name, zam
+from openmc.exceptions import DataError
 from .nuclide import FissionYieldDistribution, Nuclide
 import openmc.data
 
@@ -1246,3 +1247,38 @@ class Chain:
         found.update(isotopes)
 
         return found
+
+
+def _get_chain(
+    chain_file: PathLike | Chain | None = None,
+    fission_q: dict | None = None
+) -> Chain:
+    """Get a depletion chain from a file or the runtime configuration.
+
+    Parameters
+    ----------
+    chain_file : PathLike or Chain, optional
+        Path to depletion chain XML file, a Chain instance, or None to use
+        the file specified in ``openmc.config['chain_file']``.
+    fission_q : dict, optional
+        Dictionary of nuclides and their fission Q values [eV]. If not given,
+        values will be pulled from the ``chain_file``.
+
+    Returns
+    -------
+    Chain
+        Depletion chain instance.
+    """
+    if isinstance(chain_file, Chain):
+        return chain_file
+    elif isinstance(chain_file, PathLike | None):
+        if chain_file is None:
+            chain_file = openmc.config.get('chain_file')
+            if 'chain_file' not in openmc.config:
+                raise DataError(
+                    "No depletion chain specified and could not find depletion "
+                    "chain in openmc.config['chain_file']"
+                )
+        return Chain.from_xml(chain_file, fission_q)
+    else:
+        raise TypeError("chain_file must be path-like, a Chain, or None")
diff --git a/openmc/deplete/coupled_operator.py b/openmc/deplete/coupled_operator.py
index 7ecfd5a08..34bb28b49 100644
--- a/openmc/deplete/coupled_operator.py
+++ b/openmc/deplete/coupled_operator.py
@@ -102,9 +102,9 @@ class CoupledOperator(OpenMCOperator):
     ----------
     model : openmc.model.Model
         OpenMC model object
-    chain_file : str, optional
-        Path to the depletion chain XML file. Defaults to
-        ``openmc.config['chain_file']``.
+    chain_file : PathLike or Chain, optional
+        Path to the depletion chain XML file or instance of openmc.deplete.Chain.
+        Defaults to ``openmc.config['chain_file']``.
     prev_results : Results, optional
         Results from a previous depletion calculation. If this argument is
         specified, the depletion calculation will start from the latest state
diff --git a/openmc/deplete/d1s.py b/openmc/deplete/d1s.py
index 0a1ed74b1..e9f8bfe79 100644
--- a/openmc/deplete/d1s.py
+++ b/openmc/deplete/d1s.py
@@ -14,19 +14,20 @@ import numpy as np
 import openmc
 from openmc.data import half_life
 from .abc import _normalize_timesteps
-from .chain import Chain
+from .chain import Chain, _get_chain
+from ..checkvalue import PathLike
 
 
-def get_radionuclides(model: openmc.Model, chain_file: str | None = None) -> list[str]:
+def get_radionuclides(model: openmc.Model, chain_file: PathLike | Chain | None = None) -> list[str]:
     """Determine all radionuclides that can be produced during D1S.
 
     Parameters
     ----------
     model : openmc.Model
         Model that should be used for determining what nuclides are present
-    chain_file : str, optional
-        Which chain file to use for inspecting decay data. If None is passed,
-        defaults to ``openmc.config['chain_file']``
+    chain_file : PathLike | Chain
+        Path to the depletion chain XML file or instance of openmc.deplete.Chain.
+        Used for inspecting decay data. Defaults to ``openmc.config['chain_file']``
 
     Returns
     -------
@@ -39,9 +40,7 @@ def get_radionuclides(model: openmc.Model, chain_file: str | None = None) -> lis
                       for nuc in mat.get_nuclides()}
 
     # Load chain file
-    if chain_file is None:
-        chain_file = openmc.config['chain_file']
-    chain = Chain.from_xml(chain_file)
+    chain = _get_chain(chain_file)
 
     radionuclides = set()
     for nuclide in chain.nuclides:
diff --git a/openmc/deplete/independent_operator.py b/openmc/deplete/independent_operator.py
index b3fe9a78f..3eb50b05e 100644
--- a/openmc/deplete/independent_operator.py
+++ b/openmc/deplete/independent_operator.py
@@ -50,9 +50,9 @@ class IndependentOperator(OpenMCOperator):
         Cross sections in [b] for each domain. If the
         :class:`~openmc.deplete.MicroXS` object is empty, a decay-only
         calculation will be run.
-    chain_file : str
-        Path to the depletion chain XML file. Defaults to
-        ``openmc.config['chain_file']``.
+    chain_file : PathLike or Chain, optional
+        Path to the depletion chain XML file or instance of openmc.deplete.Chain.
+        Defaults to ``openmc.config['chain_file']``.
     keff : 2-tuple of float, optional
        keff eigenvalue and uncertainty from transport calculation.
     prev_results : Results, optional
@@ -179,9 +179,9 @@ class IndependentOperator(OpenMCOperator):
         micro_xs : MicroXS
             Cross sections in [b]. If the :class:`~openmc.deplete.MicroXS`
             object is empty, a decay-only calculation will be run.
-        chain_file : str, optional
-            Path to the depletion chain XML file. Defaults to
-            ``openmc.config['chain_file']``.
+        chain_file : PathLike or Chain, optional
+            Path to the depletion chain XML file or instance of
+            openmc.deplete.Chain. Defaults to ``openmc.config['chain_file']``.
         nuc_units : {'atom/cm3', 'atom/b-cm'}, optional
             Units for nuclide concentration.
         keff : 2-tuple of float, optional
diff --git a/openmc/deplete/microxs.py b/openmc/deplete/microxs.py
index 686d3bc38..d478db11b 100644
--- a/openmc/deplete/microxs.py
+++ b/openmc/deplete/microxs.py
@@ -12,13 +12,12 @@ import pandas as pd
 import numpy as np
 
 from openmc.checkvalue import check_type, check_value, check_iterable_type, PathLike
-from openmc.exceptions import DataError
 from openmc.utility_funcs import change_directory
 from openmc import StatePoint
 from openmc.mgxs import GROUP_STRUCTURES
 from openmc.data import REACTION_MT
 import openmc
-from .chain import Chain, REACTIONS
+from .chain import Chain, REACTIONS, _get_chain
 from .coupled_operator import _find_cross_sections, _get_nuclides_with_data
 import openmc.lib
 from openmc.mpi import comm
@@ -28,24 +27,13 @@ _valid_rxns.append('fission')
 _valid_rxns.append('damage-energy')
 
 
-def _resolve_chain_file_path(chain_file: str | None):
-    if chain_file is None:
-        chain_file = openmc.config.get('chain_file')
-        if 'chain_file' not in openmc.config:
-            raise DataError(
-                "No depletion chain specified and could not find depletion "
-                "chain in openmc.config['chain_file']"
-            )
-    return chain_file
-
-
 def get_microxs_and_flux(
         model: openmc.Model,
         domains,
         nuclides: Iterable[str] | None = None,
         reactions: Iterable[str] | None = None,
         energies: Iterable[float] | str | None = None,
-        chain_file: PathLike | None = None,
+        chain_file: PathLike | Chain | None = None,
         run_kwargs=None
     ) -> tuple[list[np.ndarray], list[MicroXS]]:
     """Generate a microscopic cross sections and flux from a Model
@@ -66,9 +54,9 @@ def get_microxs_and_flux(
         reactions listed in the depletion chain file are used.
     energies : iterable of float or str
         Energy group boundaries in [eV] or the name of the group structure
-    chain_file : str, optional
-        Path to the depletion chain XML file that will be used in depletion
-        simulation. Used to determine cross sections for materials not
+    chain_file : PathLike or Chain, optional
+        Path to the depletion chain XML file or an instance of
+        openmc.deplete.Chain. Used to determine cross sections for materials not
         present in the inital composition. Defaults to
         ``openmc.config['chain_file']``.
     run_kwargs : dict, optional
@@ -86,8 +74,7 @@ def get_microxs_and_flux(
     original_tallies = model.tallies
 
     # Determine what reactions and nuclides are available in chain
-    chain_file = _resolve_chain_file_path(chain_file)
-    chain = Chain.from_xml(chain_file)
+    chain = _get_chain(chain_file)
     if reactions is None:
         reactions = chain.reactions
     if not nuclides:
@@ -245,9 +232,9 @@ class MicroXS:
             Energy group boundaries in [eV] or the name of the group structure
         multi_group_flux : iterable of float
             Energy-dependent multigroup flux values
-        chain_file : str, optional
-            Path to the depletion chain XML file that will be used in depletion
-            simulation.  Defaults to ``openmc.config['chain_file']``.
+        chain_file : PathLike or Chain, optional
+            Path to the depletion chain XML file or an instance of
+            openmc.deplete.Chain. Defaults to ``openmc.config['chain_file']``.
         temperature : int, optional
             Temperature for cross section evaluation in [K].
         nuclides : list of str, optional
@@ -278,9 +265,7 @@ class MicroXS:
         if len(multigroup_flux) != len(energies) - 1:
             raise ValueError('Length of flux array should be len(energies)-1')
 
-        chain_file_path = _resolve_chain_file_path(chain_file)
-        chain = Chain.from_xml(chain_file_path)
-
+        chain = _get_chain(chain_file)
         cross_sections = _find_cross_sections(model=None)
         nuclides_with_data = _get_nuclides_with_data(cross_sections)
 
diff --git a/openmc/deplete/openmc_operator.py b/openmc/deplete/openmc_operator.py
index 4ef867372..2d7694093 100644
--- a/openmc/deplete/openmc_operator.py
+++ b/openmc/deplete/openmc_operator.py
@@ -36,9 +36,9 @@ class OpenMCOperator(TransportOperator):
     cross_sections : str or list of MicroXS
         Path to continuous energy cross section library, or list of objects
         containing cross sections.
-    chain_file : str, optional
-        Path to the depletion chain XML file. Defaults to
-        openmc.config['chain_file'].
+    chain_file : PathLike or Chain, optional
+        Path to the depletion chain XML file or instance of openmc.deplete.Chain.
+        Defaults to ``openmc.config['chain_file']``.
     prev_results : Results, optional
         Results from a previous depletion calculation. If this argument is
         specified, the depletion calculation will start from the latest state
diff --git a/tests/unit_tests/test_d1s.py b/tests/unit_tests/test_d1s.py
index 7c92dd6d9..115759489 100644
--- a/tests/unit_tests/test_d1s.py
+++ b/tests/unit_tests/test_d1s.py
@@ -22,7 +22,8 @@ def model():
 
 def test_get_radionuclides(model):
     # Check that radionuclides are correct and are unstable
-    nuclides = d1s.get_radionuclides(model, CHAIN_PATH)
+    chain = openmc.deplete.Chain.from_xml(CHAIN_PATH)
+    nuclides = d1s.get_radionuclides(model, chain)
     assert sorted(nuclides) == [
         'Co58', 'Co60', 'Co61', 'Co62', 'Co64',
         'Fe55', 'Fe59', 'Fe61', 'Ni57', 'Ni59', 'Ni63', 'Ni65'
diff --git a/tests/unit_tests/test_deplete_coupled_operator.py b/tests/unit_tests/test_deplete_coupled_operator.py
index ba291e07d..119a15923 100644
--- a/tests/unit_tests/test_deplete_coupled_operator.py
+++ b/tests/unit_tests/test_deplete_coupled_operator.py
@@ -5,7 +5,7 @@
 from pathlib import Path
 
 import pytest
-from openmc.deplete import CoupledOperator
+from openmc.deplete import CoupledOperator, Chain
 import openmc
 import numpy as np
 
@@ -106,11 +106,13 @@ def test_diff_volume_method_match_cell(model_with_volumes):
 def test_diff_volume_method_divide_equally(model_with_volumes):
     """Tests the volumes assigned to the materials are divided equally"""
 
+    chain = Chain.from_xml(CHAIN_PATH)
+
     operator = openmc.deplete.CoupledOperator(
         model=model_with_volumes,
         diff_burnable_mats=True,
         diff_volume_method='divide equally',
-        chain_file=CHAIN_PATH
+        chain_file=chain
     )
 
     all_cells = list(operator.model.geometry.get_all_cells().values())
diff --git a/tests/unit_tests/test_deplete_independent_operator.py b/tests/unit_tests/test_deplete_independent_operator.py
index c765d0650..aca83399a 100644
--- a/tests/unit_tests/test_deplete_independent_operator.py
+++ b/tests/unit_tests/test_deplete_independent_operator.py
@@ -7,7 +7,7 @@ from pathlib import Path
 import pytest
 
 from openmc import Material
-from openmc.deplete import IndependentOperator, MicroXS
+from openmc.deplete import IndependentOperator, MicroXS, Chain
 
 CHAIN_PATH = Path(__file__).parents[1] / "chain_simple.xml"
 ONE_GROUP_XS = Path(__file__).parents[1] / "micro_xs_simple.csv"
@@ -25,8 +25,9 @@ def test_operator_init():
                 'O17': 1.7588724018066158e+19}
     flux = 1.0
     micro_xs = MicroXS.from_csv(ONE_GROUP_XS)
+    chain = Chain.from_xml(CHAIN_PATH)
     IndependentOperator.from_nuclides(
-        volume, nuclides, flux, micro_xs, CHAIN_PATH, nuc_units='atom/cm3')
+        volume, nuclides, flux, micro_xs, chain, nuc_units='atom/cm3')
 
     fuel = Material(name="uo2")
     fuel.add_element("U", 1, percent_type="ao", enrichment=4.25)

From aeb1052c1907e4d12890fcbbc2bb53ee3c737aa3 Mon Sep 17 00:00:00 2001
From: John Tramm <john.tramm@gmail.com>
Date: Thu, 12 Jun 2025 19:54:35 -0500
Subject: [PATCH 048/203] Fix Resetting of Auto IDs When Generating MGXS
 (#3437)

---
 openmc/model/model.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/openmc/model/model.py b/openmc/model/model.py
index c19c8ac9f..7e679d10a 100644
--- a/openmc/model/model.py
+++ b/openmc/model/model.py
@@ -1552,7 +1552,6 @@ class Model:
                       "if a material has a k-infinity > 1.0.")
         mgxs_sets = []
         for material in self.materials:
-            openmc.reset_auto_ids()
             model = openmc.Model()
 
             # Set materials on the model
@@ -1749,7 +1748,6 @@ class Model:
         directory : str
             Directory to run the simulation in, so as to contain XML files.
         """
-        openmc.reset_auto_ids()
         model = openmc.Model()
         model.materials = self.materials
 
@@ -1861,7 +1859,6 @@ class Model:
         directory : PathLike
             Directory to run the simulation in, so as to contain XML files.
         """
-        openmc.reset_auto_ids()
         model = copy.deepcopy(self)
         model.tallies = openmc.Tallies()
 
@@ -1973,7 +1970,7 @@ class Model:
             # Make sure all materials have a name, and that the name is a valid HDF5
             # dataset name
             for material in self.materials:
-                if material.name is None:
+                if not material.name or not material.name.strip():
                     material.name = f"material {material.id}"
                 material.name = re.sub(r'[^a-zA-Z0-9]', '_', material.name)
 

From b11eb02655ab0112ce6001546c9311692d08c9b2 Mon Sep 17 00:00:00 2001
From: Paul Romano <paul.k.romano@gmail.com>
Date: Fri, 13 Jun 2025 15:38:16 -0500
Subject: [PATCH 049/203] Change Dockerfile from debian:bookworm-slim to
 ubuntu:24.04 (#3442)

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 1ae615a50..9745f1512 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -24,7 +24,7 @@ ARG compile_cores=1
 ARG build_dagmc=off
 ARG build_libmesh=off
 
-FROM debian:bookworm-slim AS dependencies
+FROM ubuntu:24.04 AS dependencies
 
 ARG compile_cores
 ARG build_dagmc

From 23eab2c89bb6537cf3bf264215b38c6013a518e0 Mon Sep 17 00:00:00 2001
From: Jan Malec <jan.malec@ijs.si>
Date: Sat, 14 Jun 2025 08:39:31 +0200
Subject: [PATCH 050/203] Allow specifying number of equiprobable angles for
 thermal scattering data generation (#3346)

Co-authored-by: Paul Romano <paul.k.romano@gmail.com>
---
 openmc/data/njoy.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/openmc/data/njoy.py b/openmc/data/njoy.py
index e025cff0d..4c538bd6e 100644
--- a/openmc/data/njoy.py
+++ b/openmc/data/njoy.py
@@ -201,12 +201,12 @@ acer / %%%%%%%%%%%%%%%%%%%%%%%% Write out in ACE format %%%%%%%%%%%%%%%%%%%%%%%%
 _THERMAL_TEMPLATE_THERMR = """
 thermr / %%%%%%%%%%%%%%%% Add thermal scattering data (free gas) %%%%%%%%%%%%%%%
 0 {nthermr1_in} {nthermr1}
-0 {mat} 12 {num_temp} 1 0 {iform} 1 221 1/
+0 {mat} {nbin} {num_temp} 1 0 {iform} 1 221 1/
 {temps}
 {error} {energy_max}
 thermr / %%%%%%%%%%%%%%%% Add thermal scattering data (bound) %%%%%%%%%%%%%%%%%%
 {nthermal_endf} {nthermr2_in} {nthermr2}
-{mat_thermal} {mat} 16 {num_temp} {inelastic} {elastic} {iform} {natom} 222 1/
+{mat_thermal} {mat} {nbin} {num_temp} {inelastic} {elastic} {iform} {natom} 222 1/
 {temps}
 {error} {energy_max}
 """
@@ -495,7 +495,7 @@ def make_ace(filename, temperatures=None, acer=True, xsdir=None,
 def make_ace_thermal(filename, filename_thermal, temperatures=None,
                      ace=None, xsdir=None, output_dir=None, error=0.001,
                      iwt=2, evaluation=None, evaluation_thermal=None,
-                     table_name=None, zaids=None, nmix=None, **kwargs):
+                     table_name=None, zaids=None, nmix=None, nbin=16, **kwargs):
     """Generate thermal scattering ACE file from ENDF files
 
     Parameters
@@ -532,6 +532,8 @@ def make_ace_thermal(filename, filename_thermal, temperatures=None,
         ZAIDs that the thermal scattering data applies to
     nmix : int, optional
         Number of atom types in mixed moderator
+    nbin : int, optional
+        Number of equi-probable angles
     **kwargs
         Keyword arguments passed to :func:`openmc.data.njoy.run`
 

From 7a1cafa6c17d456dabdd4a2aa33fd5e586e98794 Mon Sep 17 00:00:00 2001
From: Jonathan Shimwell <mail@jshimwell.com>
Date: Wed, 18 Jun 2025 00:36:35 +0200
Subject: [PATCH 051/203] adding plot function to DAGMCUnvierse (#3451)

Co-authored-by: Paul Romano <paul.k.romano@gmail.com>
---
 openmc/dagmc.py                     | 16 ++++++++++++++++
 tests/unit_tests/dagmc/test_plot.py | 14 +++++++++++---
 2 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/openmc/dagmc.py b/openmc/dagmc.py
index 8ab0aaf69..3f20fb0ac 100644
--- a/openmc/dagmc.py
+++ b/openmc/dagmc.py
@@ -13,6 +13,7 @@ from .checkvalue import check_type, check_value
 from .surface import _BOUNDARY_TYPES
 from .bounding_box import BoundingBox
 from .utility_funcs import input_path
+from .plots import add_plot_params
 
 
 class DAGMCUniverse(openmc.UniverseBase):
@@ -566,6 +567,21 @@ class DAGMCUniverse(openmc.UniverseBase):
                 fill = mats_per_id[dag_cell.fill.id] if dag_cell.fill else None
             self.add_cell(openmc.DAGMCCell(cell_id=dag_cell_id, fill=fill))
 
+    @add_plot_params
+    def plot(self, *args, **kwargs):
+        """Display a slice plot of the DAGMCUniverse.
+        """
+        model = openmc.Model()
+        model.geometry = openmc.Geometry(self)
+
+        for mat_name in self.material_names:
+            material = openmc.Material(name=mat_name)
+            # Placeholder nuclide to ensure material is not empty
+            material.add_nuclide('H1', 1.0)
+            model.materials.append(material)
+
+        return model.plot(*args, **kwargs)
+
 
 class DAGMCCell(openmc.Cell):
     """A cell class for DAGMC-based geometries.
diff --git a/tests/unit_tests/dagmc/test_plot.py b/tests/unit_tests/dagmc/test_plot.py
index 83f6df767..d768ba508 100644
--- a/tests/unit_tests/dagmc/test_plot.py
+++ b/tests/unit_tests/dagmc/test_plot.py
@@ -7,9 +7,9 @@ pytestmark = pytest.mark.skipif(
     not openmc.lib._dagmc_enabled(), reason="DAGMC CAD geometry is not enabled."
 )
 
-def test_plotting_dagmc_geometry(request):
-    """Test plotting a DAGMC geometry with OpenMC. This is different to CSG
-    geometry plotting as the path to the DAGMC file needs handling."""
+def test_plotting_dagmc_model(request):
+    """Test plotting a DAGMC model with OpenMC. This is different to CSG
+    model plotting as the path to the DAGMC file needs handling."""
 
     dag_universe = openmc.DAGMCUniverse(request.path.parent / 'dagmc.h5m')
     csg_with_dag_inside = dag_universe.bounded_universe()
@@ -30,3 +30,11 @@ def test_plotting_dagmc_geometry(request):
     model.settings.particles = 50
 
     model.plot()
+
+
+def test_plotting_dagmc_universe(request):
+    """Test plotting a DAGMCUniverse with OpenMC. This is different to plotting
+    UniverseBase as the materials are not defined withing the DAGMCUniverse."""
+
+    dag_universe = openmc.DAGMCUniverse(request.path.parent / 'dagmc.h5m')
+    dag_universe.plot()

From f31130d36798aef0ca7bed6a73e24a9281c6c51c Mon Sep 17 00:00:00 2001
From: John Tramm <john.tramm@gmail.com>
Date: Wed, 18 Jun 2025 06:34:56 -0500
Subject: [PATCH 052/203] Prevent Adjoint Sources from Trending towards
 Infinity (#3449)

---
 include/openmc/constants.h            |  5 ++++
 src/random_ray/flat_source_domain.cpp | 43 +++++++++++++++++++++------
 2 files changed, 39 insertions(+), 9 deletions(-)

diff --git a/include/openmc/constants.h b/include/openmc/constants.h
index 252194528..ae7056079 100644
--- a/include/openmc/constants.h
+++ b/include/openmc/constants.h
@@ -63,6 +63,11 @@ constexpr int MAX_SAMPLE {100000};
 // source region in the random ray solver
 constexpr double MIN_HITS_PER_BATCH {1.5};
 
+// The minimum flux value to be considered non-zero when computing adjoint
+// sources. Positive values below this cutoff will be treated as zero, so as to
+// prevent extremely large adjoint source terms from being generated.
+constexpr double ZERO_FLUX_CUTOFF {1e-22};
+
 // ============================================================================
 // MATH AND PHYSICAL CONSTANTS
 
diff --git a/src/random_ray/flat_source_domain.cpp b/src/random_ray/flat_source_domain.cpp
index 9df6513ae..7404a0b29 100644
--- a/src/random_ray/flat_source_domain.cpp
+++ b/src/random_ray/flat_source_domain.cpp
@@ -304,6 +304,13 @@ int64_t FlatSourceDomain::add_source_to_scalar_flux()
           set_flux_to_source(sr, g);
         }
       }
+      // Halt if NaN implosion is detected
+      if (!std::isfinite(source_regions_.scalar_flux_new(sr, g))) {
+        fatal_error("A source region scalar flux is not finite. "
+                    "This indicates a numerical instability in the "
+                    "simulation. Consider increasing ray density or adjusting "
+                    "the source region mesh.");
+      }
     }
   }
 
@@ -1154,9 +1161,9 @@ void FlatSourceDomain::flatten_xs()
           m.get_xs(MgxsType::TOTAL, g_out, NULL, NULL, NULL, t, a);
         sigma_t_.push_back(sigma_t);
 
-        double nu_Sigma_f =
+        double nu_sigma_f =
           m.get_xs(MgxsType::NU_FISSION, g_out, NULL, NULL, NULL, t, a);
-        nu_sigma_f_.push_back(nu_Sigma_f);
+        nu_sigma_f_.push_back(nu_sigma_f);
 
         double sigma_f =
           m.get_xs(MgxsType::FISSION, g_out, NULL, NULL, NULL, t, a);
@@ -1164,6 +1171,11 @@ void FlatSourceDomain::flatten_xs()
 
         double chi =
           m.get_xs(MgxsType::CHI_PROMPT, g_out, &g_out, NULL, NULL, t, a);
+        if (!std::isfinite(chi)) {
+          // MGXS interface may return NaN in some cases, such as when material
+          // is fissionable but has very small sigma_f.
+          chi = 0.0;
+        }
         chi_.push_back(chi);
 
         for (int g_in = 0; g_in < negroups_; g_in++) {
@@ -1191,17 +1203,30 @@ void FlatSourceDomain::flatten_xs()
 
 void FlatSourceDomain::set_adjoint_sources(const vector<double>& forward_flux)
 {
-  // Set the external source to 1/forward_flux. If the forward flux is negative
-  // or zero, set the adjoint source to zero, as this is likely a very small
-  // source region that we don't need to bother trying to vector particles
-  // towards. Flux negativity in random ray is not related to the flux being
-  // small in magnitude, but rather due to the source region being physically
-  // small in volume and thus having a noisy flux estimate.
+  // Set the adjoint external source to 1/forward_flux. If the forward flux is
+  // negative, zero, or extremely close to zero, set the adjoint source to zero,
+  // as this is likely a very small source region that we don't need to bother
+  // trying to vector particles towards. In the case of flux "being extremely
+  // close to zero", we define this as being a fixed fraction of the maximum
+  // forward flux, below which we assume the flux would be physically
+  // undetectable.
+
+  // First, find the maximum forward flux value
+  double max_flux = 0.0;
+#pragma omp parallel for reduction(max : max_flux)
+  for (int64_t se = 0; se < n_source_elements(); se++) {
+    double flux = forward_flux[se];
+    if (flux > max_flux) {
+      max_flux = flux;
+    }
+  }
+
+  // Then, compute the adjoint source for each source region
 #pragma omp parallel for
   for (int64_t sr = 0; sr < n_source_regions(); sr++) {
     for (int g = 0; g < negroups_; g++) {
       double flux = forward_flux[sr * negroups_ + g];
-      if (flux <= 0.0) {
+      if (flux <= ZERO_FLUX_CUTOFF * max_flux) {
         source_regions_.external_source(sr, g) = 0.0;
       } else {
         source_regions_.external_source(sr, g) = 1.0 / flux;

From 1c5aa6559be235abeb1c7a4c5d596d5ec617947d Mon Sep 17 00:00:00 2001
From: GuySten <62616591+GuySten@users.noreply.github.com>
Date: Wed, 18 Jun 2025 18:10:03 +0300
Subject: [PATCH 053/203] fixing expansion of elemental Ta bug (#3443)

Co-authored-by: Paul Romano <paul.k.romano@gmail.com>
---
 openmc/data/data.py              | 2 +-
 openmc/element.py                | 9 +++++----
 tests/unit_tests/test_element.py | 7 +++++++
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/openmc/data/data.py b/openmc/data/data.py
index 408adf2e4..8ccc8d263 100644
--- a/openmc/data/data.py
+++ b/openmc/data/data.py
@@ -94,7 +94,7 @@ NATURAL_ABUNDANCE = {
     'Yb174': 0.32025, 'Yb176': 0.12995, 'Lu175': 0.97401,
     'Lu176': 0.02599, 'Hf174': 0.0016, 'Hf176': 0.0526,
     'Hf177': 0.186, 'Hf178': 0.2728, 'Hf179': 0.1362,
-    'Hf180': 0.3508, 'Ta180': 0.0001201, 'Ta181': 0.9998799,
+    'Hf180': 0.3508, 'Ta180_m1': 0.0001201, 'Ta181': 0.9998799,
     'W180': 0.0012, 'W182': 0.265, 'W183': 0.1431,
     'W184': 0.3064, 'W186': 0.2843, 'Re185': 0.374,
     'Re187': 0.626, 'Os184': 0.0002, 'Os186': 0.0159,
diff --git a/openmc/element.py b/openmc/element.py
index 082bee522..f1d8f5f24 100644
--- a/openmc/element.py
+++ b/openmc/element.py
@@ -144,8 +144,7 @@ class Element(str):
             root = tree.getroot()
             for child in root.findall('library'):
                 nuclide = child.attrib['materials']
-                if re.match(r'{}\d+'.format(self), nuclide) and \
-                   '_m' not in nuclide:
+                if re.match(r'{}\d+'.format(self), nuclide):
                     library_nuclides.add(nuclide)
 
             # Get a set of the mutual and absent nuclides. Convert to lists
@@ -185,8 +184,10 @@ class Element(str):
                 for nuclide in absent_nuclides:
                     if nuclide in ['O17', 'O18'] and 'O16' in mutual_nuclides:
                         abundances['O16'] += NATURAL_ABUNDANCE[nuclide]
-                    elif nuclide == 'Ta180' and 'Ta181' in mutual_nuclides:
-                        abundances['Ta181'] += NATURAL_ABUNDANCE[nuclide]
+                    elif nuclide == 'Ta180_m1' and 'Ta180' in library_nuclides:
+                            abundances['Ta180'] = NATURAL_ABUNDANCE[nuclide]
+                    elif nuclide == 'Ta180_m1' and 'Ta181' in mutual_nuclides:
+                            abundances['Ta181'] += NATURAL_ABUNDANCE[nuclide]
                     elif nuclide == 'W180' and 'W182' in mutual_nuclides:
                         abundances['W182'] += NATURAL_ABUNDANCE[nuclide]
                     else:
diff --git a/tests/unit_tests/test_element.py b/tests/unit_tests/test_element.py
index d3555701e..d91cfaf6e 100644
--- a/tests/unit_tests/test_element.py
+++ b/tests/unit_tests/test_element.py
@@ -44,6 +44,13 @@ def test_expand_no_isotopes():
         element.expand(100.0, 'ao')
 
 
+def test_expand_ta():
+    ref = {'Ta180': 0.01201, 'Ta181': 99.98799}
+    element = openmc.Element('Ta')
+    for isotope in element.expand(100.0, 'ao'):
+        assert isotope[1] == approx(ref[isotope[0]])
+    
+
 def test_expand_exceptions():
     """ Test that correct exceptions are raised for invalid input """
 

From 3e32aed2da312a04fb4db2c22648d66d78a0e745 Mon Sep 17 00:00:00 2001
From: Jonathan Shimwell <mail@jshimwell.com>
Date: Wed, 18 Jun 2025 20:34:07 +0200
Subject: [PATCH 054/203] Fixing crash when calling Geometry.plot when
 DAGMCUniverse in geometry (#3455)

Co-authored-by: Paul Romano <paul.k.romano@gmail.com>
---
 openmc/dagmc.py                     | 11 +----------
 openmc/geometry.py                  | 15 ++++++++++++++-
 openmc/model/model.py               | 14 ++++++++++++++
 openmc/universe.py                  |  8 --------
 tests/unit_tests/dagmc/test_plot.py | 21 +++++++++++++++++++++
 5 files changed, 50 insertions(+), 19 deletions(-)

diff --git a/openmc/dagmc.py b/openmc/dagmc.py
index 3f20fb0ac..2486f7516 100644
--- a/openmc/dagmc.py
+++ b/openmc/dagmc.py
@@ -571,16 +571,7 @@ class DAGMCUniverse(openmc.UniverseBase):
     def plot(self, *args, **kwargs):
         """Display a slice plot of the DAGMCUniverse.
         """
-        model = openmc.Model()
-        model.geometry = openmc.Geometry(self)
-
-        for mat_name in self.material_names:
-            material = openmc.Material(name=mat_name)
-            # Placeholder nuclide to ensure material is not empty
-            material.add_nuclide('H1', 1.0)
-            model.materials.append(material)
-
-        return model.plot(*args, **kwargs)
+        return openmc.Geometry(self).plot(*args, **kwargs)
 
 
 class DAGMCCell(openmc.Cell):
diff --git a/openmc/geometry.py b/openmc/geometry.py
index c069d5796..9b2af7b4a 100644
--- a/openmc/geometry.py
+++ b/openmc/geometry.py
@@ -754,4 +754,17 @@ class Geometry:
 
         .. versionadded:: 0.14.0
         """
-        return self.root_universe.plot(*args, **kwargs)
+        model = openmc.Model()
+        model.geometry = self
+        model.materials = self.get_all_materials().values()
+
+        # Add placeholder materials for DAGMCUniverses
+        universes = self.get_all_universes()
+        for universe in universes.values():
+            if isinstance(universe, openmc.DAGMCUniverse):
+                for name in universe.material_names:
+                    mat_dag = openmc.Material(name=name)
+                    mat_dag.add_nuclide('H1', 1.0)
+                    model.materials.append(mat_dag)
+
+        return model.plot(*args, **kwargs)
diff --git a/openmc/model/model.py b/openmc/model/model.py
index 7e679d10a..55f309bfb 100644
--- a/openmc/model/model.py
+++ b/openmc/model/model.py
@@ -986,7 +986,16 @@ class Model:
         y_min = (origin[y] - 0.5*width[1]) * axis_scaling_factor[axis_units]
         y_max = (origin[y] + 0.5*width[1]) * axis_scaling_factor[axis_units]
 
+        # Determine whether any materials contains macroscopic data and if so,
+        # set energy mode accordingly
+        _energy_mode = self.settings._energy_mode
+        for mat in self.geometry.get_all_materials().values():
+            if mat._macroscopic is not None:
+                self.settings.energy_mode = 'multi-group'
+                break
+
         with TemporaryDirectory() as tmpdir:
+            _plot_seed = self.settings.plot_seed
             if seed is not None:
                 self.settings.plot_seed = seed
 
@@ -1007,6 +1016,11 @@ class Model:
             # Run OpenMC in geometry plotting mode
             self.plot_geometry(False, cwd=tmpdir, openmc_exec=openmc_exec)
 
+            # Undo changes to model
+            self.plots.pop()
+            self.settings._plot_seed = _plot_seed
+            self.settings._energy_mode = _energy_mode
+
             # Read image from file
             img_path = Path(tmpdir) / f'plot_{plot.id}.png'
             if not img_path.is_file():
diff --git a/openmc/universe.py b/openmc/universe.py
index 02b794dee..0e64693ba 100644
--- a/openmc/universe.py
+++ b/openmc/universe.py
@@ -337,14 +337,6 @@ class UniverseBase(ABC, IDManagerMixin):
         """
         model = openmc.Model()
         model.geometry = openmc.Geometry(self)
-
-        # Determine whether any materials contains macroscopic data and if
-        # so, set energy mode accordingly
-        for mat in self.get_all_materials().values():
-            if mat._macroscopic is not None:
-                model.settings.energy_mode = 'multi-group'
-                break
-
         return model.plot(*args, **kwargs)
 
     def get_nuclides(self):
diff --git a/tests/unit_tests/dagmc/test_plot.py b/tests/unit_tests/dagmc/test_plot.py
index d768ba508..afc2c395e 100644
--- a/tests/unit_tests/dagmc/test_plot.py
+++ b/tests/unit_tests/dagmc/test_plot.py
@@ -38,3 +38,24 @@ def test_plotting_dagmc_universe(request):
 
     dag_universe = openmc.DAGMCUniverse(request.path.parent / 'dagmc.h5m')
     dag_universe.plot()
+
+
+def test_plotting_geometry_filled_with_dagmc_universe(request):
+    """Test plotting a geometry with OpenMC. This is an edge case when plotting
+    geometry as often geometry objects don't include a DAGMCUniverse. The
+    inclusion of a DAGMCUniverse requires special handling for the materials."""
+
+    dag_universe = openmc.DAGMCUniverse(request.path.parent / 'dagmc.h5m', auto_geom_ids=True)
+
+    sphere1 = openmc.Sphere(r=50.0)
+    sphere2 = openmc.Sphere(r=60.0, boundary_type='vacuum')
+
+    # Adding a material to the CSG Universe to check all materials are accounted for
+    csg_material = openmc.Material(name='csg_material')
+    csg_material.add_nuclide("H1", 1.0)
+
+    cell1 = openmc.Cell(fill=dag_universe, region=-sphere1)
+    cell2 = openmc.Cell(fill=csg_material, region=+sphere1 & -sphere2)
+
+    geometry = openmc.Geometry([cell1, cell2])
+    geometry.plot()

From 3d16d4b1007fbee2f48e823d08f2ae0ab29aea73 Mon Sep 17 00:00:00 2001
From: Jonathan Shimwell <mail@jshimwell.com>
Date: Thu, 19 Jun 2025 22:43:45 +0200
Subject: [PATCH 055/203] Adding checks to geometry.plot to avoid material name
 overlaps (#3458)

Co-authored-by: Patrick Shriwise <pshriwise@gmail.com>
---
 openmc/geometry.py                  | 30 +++++++++++++++++++++--------
 tests/unit_tests/dagmc/test_plot.py | 11 +++++++++--
 2 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/openmc/geometry.py b/openmc/geometry.py
index 9b2af7b4a..f56b9b6fe 100644
--- a/openmc/geometry.py
+++ b/openmc/geometry.py
@@ -758,13 +758,27 @@ class Geometry:
         model.geometry = self
         model.materials = self.get_all_materials().values()
 
-        # Add placeholder materials for DAGMCUniverses
-        universes = self.get_all_universes()
-        for universe in universes.values():
-            if isinstance(universe, openmc.DAGMCUniverse):
-                for name in universe.material_names:
-                    mat_dag = openmc.Material(name=name)
-                    mat_dag.add_nuclide('H1', 1.0)
-                    model.materials.append(mat_dag)
+        # collect all the material names from the geometry
+        all_material_names = {m.name for m in model.materials if m.name is not None}
+
+        # makes a placeholder material for each material name if it isn't
+        # already present on the model. These materials are otherwise missing
+        # from the geometry and are needed for plotting.
+        for universe in model.geometry.get_all_universes().values():
+            if not isinstance(universe, openmc.DAGMCUniverse):
+                continue
+            for name in universe.material_names:
+                # if this name is already present in the model, skip it
+                # (this can happen if the same material name is used in multiple
+                # universes)
+                if name in all_material_names:
+                    continue
+                # if the material name is not present on the model,
+                # create a placeholder material with the same name
+                # and add it to the model
+                mat_dag = openmc.Material(name=name)
+                mat_dag.add_nuclide('H1', 1.0)
+                model.materials.append(mat_dag)
+                all_material_names.add(name)
 
         return model.plot(*args, **kwargs)
diff --git a/tests/unit_tests/dagmc/test_plot.py b/tests/unit_tests/dagmc/test_plot.py
index afc2c395e..62022b258 100644
--- a/tests/unit_tests/dagmc/test_plot.py
+++ b/tests/unit_tests/dagmc/test_plot.py
@@ -48,14 +48,21 @@ def test_plotting_geometry_filled_with_dagmc_universe(request):
     dag_universe = openmc.DAGMCUniverse(request.path.parent / 'dagmc.h5m', auto_geom_ids=True)
 
     sphere1 = openmc.Sphere(r=50.0)
-    sphere2 = openmc.Sphere(r=60.0, boundary_type='vacuum')
+    sphere2 = openmc.Sphere(r=60.0)
+    sphere2 = openmc.Sphere(r=70.0, boundary_type='vacuum')
 
-    # Adding a material to the CSG Universe to check all materials are accounted for
+    # Adding a material to the CSG Universe to check universe materials are accounted for
     csg_material = openmc.Material(name='csg_material')
     csg_material.add_nuclide("H1", 1.0)
 
+    # Adding a material with the same name as a dagmc material to check that
+    # the plot can handel two materials with the same name from different universes
+    csg_material = openmc.Material(name=dag_universe.material_names[0])
+    csg_material.add_nuclide("H1", 1.0)
+
     cell1 = openmc.Cell(fill=dag_universe, region=-sphere1)
     cell2 = openmc.Cell(fill=csg_material, region=+sphere1 & -sphere2)
 
     geometry = openmc.Geometry([cell1, cell2])
+
     geometry.plot()

From eaef13b9bc4606e9f70253b5a044064975d98b09 Mon Sep 17 00:00:00 2001
From: John Tramm <john.tramm@gmail.com>
Date: Mon, 23 Jun 2025 15:53:27 -0500
Subject: [PATCH 056/203] Weight Window Birth Scaling (#3459)

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: Paul Romano <paul.k.romano@gmail.com>
---
 include/openmc/particle_data.h |  5 +++++
 src/simulation.cpp             |  4 ++++
 src/weight_windows.cpp         | 16 ++++++++++++++++
 3 files changed, 25 insertions(+)

diff --git a/include/openmc/particle_data.h b/include/openmc/particle_data.h
index a07a99ffb..82b101c22 100644
--- a/include/openmc/particle_data.h
+++ b/include/openmc/particle_data.h
@@ -435,6 +435,7 @@ private:
 
   double wgt_ {1.0};
   double wgt_born_ {1.0};
+  double wgt_ww_born_ {-1.0};
   double mu_;
   double time_ {0.0};
   double time_last_ {0.0};
@@ -545,6 +546,10 @@ public:
   double& wgt_born() { return wgt_born_; }
   double wgt_born() const { return wgt_born_; }
 
+  // Weight window value at birth
+  double& wgt_ww_born() { return wgt_ww_born_; }
+  const double& wgt_ww_born() const { return wgt_ww_born_; }
+
   // Statistic weight of particle at last collision
   double& wgt_last() { return wgt_last_; }
   const double& wgt_last() const { return wgt_last_; }
diff --git a/src/simulation.cpp b/src/simulation.cpp
index e4521c06d..f8d4e5470 100644
--- a/src/simulation.cpp
+++ b/src/simulation.cpp
@@ -614,6 +614,10 @@ void initialize_history(Particle& p, int64_t index_source)
   // Set particle track.
   p.write_track() = check_track_criteria(p);
 
+  // Set the particle's initial weight window value.
+  p.wgt_ww_born() = -1.0;
+  apply_weight_windows(p);
+
   // Display message if high verbosity or trace is on
   if (settings::verbosity >= 9 || p.trace()) {
     write_message("Simulating Particle {}", p.id());
diff --git a/src/weight_windows.cpp b/src/weight_windows.cpp
index 0efa5a6ae..50f3fb2ed 100644
--- a/src/weight_windows.cpp
+++ b/src/weight_windows.cpp
@@ -73,10 +73,26 @@ void apply_weight_windows(Particle& p)
     if (weight_window.is_valid())
       break;
   }
+
+  // If particle has not yet had its birth weight window value set, set it to
+  // the current weight window (or 1.0 if not born in a weight window).
+  if (p.wgt_ww_born() == -1.0) {
+    if (weight_window.is_valid()) {
+      p.wgt_ww_born() =
+        (weight_window.lower_weight + weight_window.upper_weight) / 2;
+    } else {
+      p.wgt_ww_born() = 1.0;
+    }
+  }
+
   // particle is not in any of the ww domains, do nothing
   if (!weight_window.is_valid())
     return;
 
+  // Normalize weight windows based on particle's starting weight
+  // and the value of the weight window the particle was born in.
+  weight_window.scale(p.wgt_born() / p.wgt_ww_born());
+
   // get the paramters
   double weight = p.wgt();
 

From 7c6aaf7204163464d13e14a4547b48269a70c3d1 Mon Sep 17 00:00:00 2001
From: John Tramm <john.tramm@gmail.com>
Date: Mon, 23 Jun 2025 17:20:36 -0500
Subject: [PATCH 057/203] Fix Weight Window Infinite Loop Bug (#3457)

Co-authored-by: Paul Romano <paul.k.romano@gmail.com>
---
 include/openmc/particle_data.h |  2 +-
 src/particle.cpp               | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/include/openmc/particle_data.h b/include/openmc/particle_data.h
index 82b101c22..be7fa7483 100644
--- a/include/openmc/particle_data.h
+++ b/include/openmc/particle_data.h
@@ -47,7 +47,7 @@ struct SourceSite {
   double time {0.0};
   double wgt {1.0};
   int delayed_group {0};
-  int surf_id {0};
+  int surf_id {SURFACE_NONE};
   ParticleType particle;
 
   // Extra attributes that don't show up in source written to file
diff --git a/src/particle.cpp b/src/particle.cpp
index 324276d15..6cfdf2175 100644
--- a/src/particle.cpp
+++ b/src/particle.cpp
@@ -104,6 +104,14 @@ void Particle::split(double wgt)
   bank.u = u();
   bank.E = settings::run_CE ? E() : g();
   bank.time = time();
+
+  // Convert signed index to a singed surface ID
+  if (surface() == SURFACE_NONE) {
+    bank.surf_id = SURFACE_NONE;
+  } else {
+    int surf_id = model::surfaces[surface_index()]->id_;
+    bank.surf_id = (surface() > 0) ? surf_id : -surf_id;
+  }
 }
 
 void Particle::from_source(const SourceSite* src)
@@ -140,6 +148,12 @@ void Particle::from_source(const SourceSite* src)
   time() = src->time;
   time_last() = src->time;
   parent_nuclide() = src->parent_nuclide;
+
+  // Convert signed surface ID to signed index
+  if (src->surf_id != SURFACE_NONE) {
+    int index_plus_one = model::surface_map[std::abs(src->surf_id)] + 1;
+    surface() = (src->surf_id > 0) ? index_plus_one : -index_plus_one;
+  }
 }
 
 void Particle::event_calculate_xs()

From 3a8894c3f86a4e7c013eb5bd6e795aadead8ef7d Mon Sep 17 00:00:00 2001
From: Paul Romano <paul.k.romano@gmail.com>
Date: Tue, 24 Jun 2025 04:29:16 -0500
Subject: [PATCH 058/203] Fix Dockerfile DAGMC build (#3463)

---
 Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Dockerfile b/Dockerfile
index 9745f1512..a163a2810 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -96,6 +96,7 @@ RUN if [ "$build_dagmc" = "on" ]; then \
         # Install addition packages required for DAGMC
         apt-get -y install libeigen3-dev libnetcdf-dev libtbb-dev libglfw3-dev \
         && pip install --upgrade numpy \
+        && pip install --no-cache-dir setuptools cython \
         # Clone and install EMBREE
         && mkdir -p $HOME/EMBREE && cd $HOME/EMBREE \
         && git clone --single-branch -b ${EMBREE_TAG} --depth 1 ${EMBREE_REPO} \

From 2a0299aec7e83fd978cb584ba8051c7ec6fb8866 Mon Sep 17 00:00:00 2001
From: John Tramm <john.tramm@gmail.com>
Date: Tue, 24 Jun 2025 15:20:26 -0500
Subject: [PATCH 059/203] Limit Random Ray Weight Window Generation to Final
 Batch (#3464)

---
 src/simulation.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/simulation.cpp b/src/simulation.cpp
index f8d4e5470..d9a4fd131 100644
--- a/src/simulation.cpp
+++ b/src/simulation.cpp
@@ -400,8 +400,11 @@ void finalize_batch()
   simulation::time_tallies.stop();
 
   // update weight windows if needed
-  for (const auto& wwg : variance_reduction::weight_windows_generators) {
-    wwg->update();
+  if (settings::solver_type != SolverType::RANDOM_RAY ||
+      simulation::current_batch == settings::n_batches) {
+    for (const auto& wwg : variance_reduction::weight_windows_generators) {
+      wwg->update();
+    }
   }
 
   // Reset global tally results

From 15dfe7e8b96a762086a0f4cf3c90d7f2cc31e833 Mon Sep 17 00:00:00 2001
From: John Tramm <john.tramm@gmail.com>
Date: Wed, 25 Jun 2025 08:46:40 -0500
Subject: [PATCH 060/203] Parallelization of Weight Window Update (#3467)

---
 src/weight_windows.cpp | 189 ++++++++++++++++++++++++++---------------
 1 file changed, 120 insertions(+), 69 deletions(-)

diff --git a/src/weight_windows.cpp b/src/weight_windows.cpp
index 50f3fb2ed..26762ad18 100644
--- a/src/weight_windows.cpp
+++ b/src/weight_windows.cpp
@@ -6,11 +6,11 @@
 #include <set>
 #include <string>
 
+#include "xtensor/xdynamic_view.hpp"
 #include "xtensor/xindex_view.hpp"
 #include "xtensor/xio.hpp"
 #include "xtensor/xmasked_view.hpp"
 #include "xtensor/xnoalias.hpp"
-#include "xtensor/xstrided_view.hpp"
 #include "xtensor/xview.hpp"
 
 #include "openmc/error.h"
@@ -506,8 +506,18 @@ void WeightWindows::update_weights(const Tally* tally, const std::string& value,
   ///////////////////////////
   this->check_tally_update_compatibility(tally);
 
-  lower_ww_.fill(-1);
-  upper_ww_.fill(-1);
+  // Dimensions of weight window arrays
+  int e_bins = lower_ww_.shape()[0];
+  int64_t mesh_bins = lower_ww_.shape()[1];
+
+  // Initialize weight window arrays to -1.0 by default
+#pragma omp parallel for collapse(2) schedule(static)
+  for (int e = 0; e < e_bins; e++) {
+    for (int64_t m = 0; m < mesh_bins; m++) {
+      lower_ww_(e, m) = -1.0;
+      upper_ww_(e, m) = -1.0;
+    }
+  }
 
   // determine which value to use
   const std::set<std::string> allowed_values = {"mean", "rel_err"};
@@ -605,10 +615,12 @@ void WeightWindows::update_weights(const Tally* tally, const std::string& value,
   }
 
   // down-select data based on particle and score
-  auto sum = xt::view(transposed_view, particle_idx, xt::all(), xt::all(),
-    score_index, static_cast<int>(TallyResult::SUM));
-  auto sum_sq = xt::view(transposed_view, particle_idx, xt::all(), xt::all(),
-    score_index, static_cast<int>(TallyResult::SUM_SQ));
+  auto sum = xt::dynamic_view(
+    transposed_view, {particle_idx, xt::all(), xt::all(), score_index,
+                       static_cast<int>(TallyResult::SUM)});
+  auto sum_sq = xt::dynamic_view(
+    transposed_view, {particle_idx, xt::all(), xt::all(), score_index,
+                       static_cast<int>(TallyResult::SUM_SQ)});
   int n = tally->n_realizations_;
 
   //////////////////////////////////////////////
@@ -626,78 +638,117 @@ void WeightWindows::update_weights(const Tally* tally, const std::string& value,
   auto& new_bounds = this->lower_ww_;
   auto& rel_err = this->upper_ww_;
 
-  // noalias avoids memory allocation here
-  xt::noalias(new_bounds) = sum / n;
-
-  xt::noalias(rel_err) =
-    xt::sqrt(((sum_sq / n) - xt::square(new_bounds)) / (n - 1)) / new_bounds;
-  xt::filter(rel_err, sum <= 0.0).fill(INFTY);
-
-  if (value == "rel_err")
-    xt::noalias(new_bounds) = 1 / rel_err;
-
   // get mesh volumes
   auto mesh_vols = this->mesh()->volumes();
 
-  int e_bins = new_bounds.shape()[0];
-
-  if (method == WeightWindowUpdateMethod::MAGIC) {
-    // If we are computing weight windows with forward fluxes derived from a
-    // Monte Carlo or forward random ray solve, we use the MAGIC algorithm.
-    for (int e = 0; e < e_bins; e++) {
-      // select all
-      auto group_view = xt::view(new_bounds, e);
-
-      // divide by volume of mesh elements
-      for (int i = 0; i < group_view.size(); i++) {
-        group_view[i] /= mesh_vols[i];
+  // Calculate mean (new_bounds) and relative error
+#pragma omp parallel for collapse(2) schedule(static)
+  for (int e = 0; e < e_bins; e++) {
+    for (int64_t m = 0; m < mesh_bins; m++) {
+      // Calculate mean
+      new_bounds(e, m) = sum(e, m) / n;
+      // Calculate relative error
+      if (sum(e, m) > 0.0) {
+        double mean_val = new_bounds(e, m);
+        double variance = (sum_sq(e, m) / n - mean_val * mean_val) / (n - 1);
+        rel_err(e, m) = std::sqrt(variance) / mean_val;
+      } else {
+        rel_err(e, m) = INFTY;
       }
-
-      double group_max =
-        *std::max_element(group_view.begin(), group_view.end());
-      // normalize values in this energy group by the maximum value for this
-      // group
-      if (group_max > 0.0)
-        group_view /= 2.0 * group_max;
-    }
-  } else {
-    // If we are computing weight windows with adjoint fluxes derived from an
-    // adjoint random ray solve, we use the FW-CADIS algorithm.
-    for (int e = 0; e < e_bins; e++) {
-      // select all
-      auto group_view = xt::view(new_bounds, e);
-
-      // divide by volume of mesh elements
-      for (int i = 0; i < group_view.size(); i++) {
-        group_view[i] /= mesh_vols[i];
+      if (value == "rel_err") {
+        new_bounds(e, m) = 1.0 / rel_err(e, m);
       }
     }
-
-    // We take the inverse, but are careful not to divide by zero e.g. if some
-    // mesh bins are not reachable in the physical geometry.
-    xt::noalias(new_bounds) =
-      xt::where(xt::not_equal(new_bounds, 0.0), 1.0 / new_bounds, 0.0);
-    auto max_val = xt::amax(new_bounds)();
-    xt::noalias(new_bounds) = new_bounds / (2.0 * max_val);
-
-    // For bins that were missed, we use the minimum weight window value. This
-    // shouldn't matter except for plotting.
-    auto min_val = xt::amin(new_bounds)();
-    xt::noalias(new_bounds) =
-      xt::where(xt::not_equal(new_bounds, 0.0), new_bounds, min_val);
   }
 
-  // make sure that values where the mean is zero are set s.t. the weight window
-  // value will be ignored
-  xt::filter(new_bounds, sum <= 0.0).fill(-1.0);
+  // Divide by volume of mesh elements
+#pragma omp parallel for collapse(2) schedule(static)
+  for (int e = 0; e < e_bins; e++) {
+    for (int64_t m = 0; m < mesh_bins; m++) {
+      new_bounds(e, m) /= mesh_vols[m];
+    }
+  }
 
-  // make sure the weight windows are ignored for any locations where the
-  // relative error is higher than the specified relative error threshold
-  xt::filter(new_bounds, rel_err > threshold).fill(-1.0);
+  if (method == WeightWindowUpdateMethod::MAGIC) {
+    // For MAGIC, weight windows are proportional to the forward fluxes.
+    // We normalize weight windows independently for each energy group.
 
-  // update the bounds of this weight window class
-  // noalias avoids additional memory allocation
-  xt::noalias(upper_ww_) = ratio * lower_ww_;
+    // Find group maximum and normalize (per energy group)
+    for (int e = 0; e < e_bins; e++) {
+      double group_max = 0.0;
+
+      // Find maximum value across all elements in this energy group
+#pragma omp parallel for schedule(static) reduction(max : group_max)
+      for (int64_t m = 0; m < mesh_bins; m++) {
+        if (new_bounds(e, m) > group_max) {
+          group_max = new_bounds(e, m);
+        }
+      }
+
+      // Normalize values in this energy group by the maximum value
+      if (group_max > 0.0) {
+        double norm_factor = 1.0 / (2.0 * group_max);
+#pragma omp parallel for schedule(static)
+        for (int64_t m = 0; m < mesh_bins; m++) {
+          new_bounds(e, m) *= norm_factor;
+        }
+      }
+    }
+  } else {
+    // For FW-CADIS, weight windows are inversely proportional to the adjoint
+    // fluxes. We normalize the weight windows across all energy groups.
+#pragma omp parallel for collapse(2) schedule(static)
+    for (int e = 0; e < e_bins; e++) {
+      for (int64_t m = 0; m < mesh_bins; m++) {
+        // Take the inverse, but are careful not to divide by zero
+        if (new_bounds(e, m) != 0.0) {
+          new_bounds(e, m) = 1.0 / new_bounds(e, m);
+        } else {
+          new_bounds(e, m) = 0.0;
+        }
+      }
+    }
+
+    // Find the maximum value across all elements
+    double max_val = 0.0;
+#pragma omp parallel for collapse(2) schedule(static) reduction(max : max_val)
+    for (int e = 0; e < e_bins; e++) {
+      for (int64_t m = 0; m < mesh_bins; m++) {
+        if (new_bounds(e, m) > max_val) {
+          max_val = new_bounds(e, m);
+        }
+      }
+    }
+
+    // Parallel normalization
+    if (max_val > 0.0) {
+      double norm_factor = 1.0 / (2.0 * max_val);
+#pragma omp parallel for collapse(2) schedule(static)
+      for (int e = 0; e < e_bins; e++) {
+        for (int64_t m = 0; m < mesh_bins; m++) {
+          new_bounds(e, m) *= norm_factor;
+        }
+      }
+    }
+  }
+
+  // Final processing
+#pragma omp parallel for collapse(2) schedule(static)
+  for (int e = 0; e < e_bins; e++) {
+    for (int64_t m = 0; m < mesh_bins; m++) {
+      // Values where the mean is zero should be ignored
+      if (sum(e, m) <= 0.0) {
+        new_bounds(e, m) = -1.0;
+      }
+      // Values where the relative error is higher than the threshold should be
+      // ignored
+      else if (rel_err(e, m) > threshold) {
+        new_bounds(e, m) = -1.0;
+      }
+      // Set the upper bounds
+      upper_ww_(e, m) = ratio * lower_ww_(e, m);
+    }
+  }
 }
 
 void WeightWindows::check_tally_update_compatibility(const Tally* tally)

From a6db05ac8b5f250e41d858d1f803fae811bf125f Mon Sep 17 00:00:00 2001
From: John Tramm <john.tramm@gmail.com>
Date: Wed, 25 Jun 2025 08:47:23 -0500
Subject: [PATCH 061/203] Optimize Mapping of Random Ray Source Regions to
 Tallies (#3465)

---
 .../openmc/random_ray/flat_source_domain.h    |  2 +-
 src/random_ray/flat_source_domain.cpp         | 19 +++++++++++++------
 src/random_ray/random_ray_simulation.cpp      |  5 +++--
 src/random_ray/source_region.cpp              |  8 --------
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/include/openmc/random_ray/flat_source_domain.h b/include/openmc/random_ray/flat_source_domain.h
index 9fdd55875..78351fcc5 100644
--- a/include/openmc/random_ray/flat_source_domain.h
+++ b/include/openmc/random_ray/flat_source_domain.h
@@ -34,7 +34,7 @@ public:
 
   int64_t add_source_to_scalar_flux();
   virtual void batch_reset();
-  void convert_source_regions_to_tallies();
+  void convert_source_regions_to_tallies(int64_t start_sr_id);
   void reset_tally_volumes();
   void random_ray_tally();
   virtual void accumulate_iteration_flux();
diff --git a/src/random_ray/flat_source_domain.cpp b/src/random_ray/flat_source_domain.cpp
index 7404a0b29..41e93ec94 100644
--- a/src/random_ray/flat_source_domain.cpp
+++ b/src/random_ray/flat_source_domain.cpp
@@ -421,7 +421,12 @@ double FlatSourceDomain::compute_k_eff(double k_eff_old) const
 // be passed back to the caller to alert them that this function doesn't
 // need to be called for the remainder of the simulation.
 
-void FlatSourceDomain::convert_source_regions_to_tallies()
+// It takes as an argument the starting index in the source region array,
+// and it will operate from that index until the end of the array. This
+// is useful as it can be called for both explicit user source regions or
+// when a source region mesh is overlaid.
+
+void FlatSourceDomain::convert_source_regions_to_tallies(int64_t start_sr_id)
 {
   openmc::simulation::time_tallies.start();
 
@@ -430,7 +435,7 @@ void FlatSourceDomain::convert_source_regions_to_tallies()
 
 // Attempt to generate mapping for all source regions
 #pragma omp parallel for
-  for (int64_t sr = 0; sr < n_source_regions(); sr++) {
+  for (int64_t sr = start_sr_id; sr < n_source_regions(); sr++) {
 
     // If this source region has not been hit by a ray yet, then
     // we aren't going to be able to map it, so skip it.
@@ -468,7 +473,7 @@ void FlatSourceDomain::convert_source_regions_to_tallies()
       // Loop over all active tallies. This logic is essentially identical
       // to what happens when scanning for applicable tallies during
       // MC transport.
-      for (auto i_tally : model::active_tallies) {
+      for (int i_tally = 0; i_tally < model::tallies.size(); i_tally++) {
         Tally& tally {*model::tallies[i_tally]};
 
         // Initialize an iterator over valid filter bin combinations.
@@ -1525,6 +1530,9 @@ void FlatSourceDomain::finalize_discovered_source_regions()
     // order due to shared memory threading.
     std::sort(keys.begin(), keys.end());
 
+    // Remember the index of the first new source region
+    int64_t start_sr_id = source_regions_.n_source_regions();
+
     // Append the source regions in the sorted key order.
     for (const auto& key : keys) {
       const SourceRegion& sr = discovered_source_regions_[key];
@@ -1532,9 +1540,8 @@ void FlatSourceDomain::finalize_discovered_source_regions()
       source_regions_.push_back(sr);
     }
 
-    // If any new source regions were discovered, we need to update the
-    // tally mapping between source regions and tally bins.
-    mapped_all_tallies_ = false;
+    // Map all new source regions to tallies
+    convert_source_regions_to_tallies(start_sr_id);
   }
 
   discovered_source_regions_.clear();
diff --git a/src/random_ray/random_ray_simulation.cpp b/src/random_ray/random_ray_simulation.cpp
index 40a08c3af..388a778b8 100644
--- a/src/random_ray/random_ray_simulation.cpp
+++ b/src/random_ray/random_ray_simulation.cpp
@@ -508,8 +508,9 @@ void RandomRaySimulation::simulate()
         domain_->accumulate_iteration_flux();
 
         // Generate mapping between source regions and tallies
-        if (!domain_->mapped_all_tallies_) {
-          domain_->convert_source_regions_to_tallies();
+        if (!domain_->mapped_all_tallies_ &&
+            !RandomRay::mesh_subdivision_enabled_) {
+          domain_->convert_source_regions_to_tallies(0);
         }
 
         // Use above mapping to contribute FSR flux data to appropriate
diff --git a/src/random_ray/source_region.cpp b/src/random_ray/source_region.cpp
index 69541f7f8..1205b995a 100644
--- a/src/random_ray/source_region.cpp
+++ b/src/random_ray/source_region.cpp
@@ -259,15 +259,11 @@ void SourceRegionContainer::adjoint_reset()
     MomentMatrix {0.0, 0.0, 0.0, 0.0, 0.0, 0.0});
   std::fill(mom_matrix_t_.begin(), mom_matrix_t_.end(),
     MomentMatrix {0.0, 0.0, 0.0, 0.0, 0.0, 0.0});
-  for (auto& task_set : volume_task_) {
-    task_set.clear();
-  }
   std::fill(scalar_flux_old_.begin(), scalar_flux_old_.end(), 0.0);
   std::fill(scalar_flux_new_.begin(), scalar_flux_new_.end(), 0.0);
   std::fill(scalar_flux_final_.begin(), scalar_flux_final_.end(), 0.0);
   std::fill(source_.begin(), source_.end(), 0.0f);
   std::fill(external_source_.begin(), external_source_.end(), 0.0f);
-
   std::fill(source_gradients_.begin(), source_gradients_.end(),
     MomentArray {0.0, 0.0, 0.0});
   std::fill(flux_moments_old_.begin(), flux_moments_old_.end(),
@@ -276,10 +272,6 @@ void SourceRegionContainer::adjoint_reset()
     MomentArray {0.0, 0.0, 0.0});
   std::fill(flux_moments_t_.begin(), flux_moments_t_.end(),
     MomentArray {0.0, 0.0, 0.0});
-
-  for (auto& task_set : tally_task_) {
-    task_set.clear();
-  }
 }
 
 } // namespace openmc

From 01fa8056d130d0f0271d4c5c25867dae5f91b3c1 Mon Sep 17 00:00:00 2001
From: Paul Romano <paul.k.romano@gmail.com>
Date: Wed, 25 Jun 2025 13:44:53 -0500
Subject: [PATCH 062/203] Introduce WeightWindowsList class that enables export
 to HDF5 (#3456)

---
 docs/source/pythonapi/base.rst                |   9 +-
 docs/source/usersguide/variance_reduction.rst |   2 +-
 openmc/settings.py                            |  14 +-
 openmc/weight_windows.py                      | 495 +++++++++++-------
 .../weightwindows/inputs_true.dat             |   4 +-
 .../unit_tests/weightwindows/test_ww_list.py  |  23 +
 6 files changed, 337 insertions(+), 210 deletions(-)
 create mode 100644 tests/unit_tests/weightwindows/test_ww_list.py

diff --git a/docs/source/pythonapi/base.rst b/docs/source/pythonapi/base.rst
index d0e7d2439..2a9d0876c 100644
--- a/docs/source/pythonapi/base.rst
+++ b/docs/source/pythonapi/base.rst
@@ -37,7 +37,6 @@ Simulation Settings
 
    openmc.read_source_file
    openmc.write_source_file
-   openmc.wwinp_to_wws
 
 Material Specification
 ----------------------
@@ -259,8 +258,16 @@ Variance Reduction
    :template: myclass
 
    openmc.WeightWindows
+   openmc.WeightWindowsList
    openmc.WeightWindowGenerator
+
+.. autosummary::
+   :toctree: generated
+   :nosignatures:
+   :template: myfunction.rst
+
    openmc.hdf5_to_wws
+   openmc.wwinp_to_wws
 
 
 Coarse Mesh Finite Difference Acceleration
diff --git a/docs/source/usersguide/variance_reduction.rst b/docs/source/usersguide/variance_reduction.rst
index 3256fa35f..369e33e2d 100644
--- a/docs/source/usersguide/variance_reduction.rst
+++ b/docs/source/usersguide/variance_reduction.rst
@@ -162,7 +162,7 @@ solver, the Python input just needs to load the h5 file::
 
     settings.weight_window_checkpoints = {'collision': True, 'surface': True}
     settings.survival_biasing = False
-    settings.weight_windows = openmc.hdf5_to_wws('weight_windows.h5')
+    settings.weight_windows = openmc.WeightWindowsList.from_hdf5('weight_windows.h5')
     settings.weight_windows_on = True
 
 The :class:`~openmc.WeightWindowGenerator` instance is not needed to load an
diff --git a/openmc/settings.py b/openmc/settings.py
index bd3a89e11..36eaec6cb 100644
--- a/openmc/settings.py
+++ b/openmc/settings.py
@@ -16,7 +16,7 @@ from .mesh import _read_meshes, RegularMesh, MeshBase
 from .source import SourceBase, MeshSource, IndependentSource
 from .utility_funcs import input_path
 from .volume import VolumeCalculation
-from .weight_windows import WeightWindows, WeightWindowGenerator
+from .weight_windows import WeightWindows, WeightWindowGenerator, WeightWindowsList
 
 
 class RunMode(Enum):
@@ -313,7 +313,7 @@ class Settings:
         described in :ref:`verbosity`.
     volume_calculations : VolumeCalculation or iterable of VolumeCalculation
         Stochastic volume calculation specifications
-    weight_windows : WeightWindows or iterable of WeightWindows
+    weight_windows : WeightWindowsList
         Weight windows to use for variance reduction
 
         .. versionadded:: 0.13
@@ -424,7 +424,7 @@ class Settings:
         self._max_particles_in_flight = None
         self._max_particle_events = None
         self._write_initial_source = None
-        self._weight_windows = cv.CheckedList(WeightWindows, 'weight windows')
+        self._weight_windows = WeightWindowsList()
         self._weight_window_generators = cv.CheckedList(WeightWindowGenerator, 'weight window generators')
         self._weight_windows_on = None
         self._weight_windows_file = None
@@ -1095,14 +1095,14 @@ class Settings:
         self._write_initial_source = value
 
     @property
-    def weight_windows(self) -> list[WeightWindows]:
+    def weight_windows(self) -> WeightWindowsList:
         return self._weight_windows
 
     @weight_windows.setter
-    def weight_windows(self, value: WeightWindows | Iterable[WeightWindows]):
-        if not isinstance(value, MutableSequence):
+    def weight_windows(self, value: WeightWindows | Sequence[WeightWindows]):
+        if not isinstance(value, Sequence):
             value = [value]
-        self._weight_windows = cv.CheckedList(WeightWindows, 'weight windows', value)
+        self._weight_windows = WeightWindowsList(value)
 
     @property
     def weight_windows_on(self) -> bool:
diff --git a/openmc/weight_windows.py b/openmc/weight_windows.py
index d52b81925..1b44747d5 100644
--- a/openmc/weight_windows.py
+++ b/openmc/weight_windows.py
@@ -1,6 +1,8 @@
 from __future__ import annotations
 from numbers import Real, Integral
 from collections.abc import Iterable, Sequence
+from pathlib import Path
+from typing import Self
 import warnings
 
 import lxml.etree as ET
@@ -14,6 +16,7 @@ import openmc.checkvalue as cv
 from openmc.checkvalue import PathLike
 from ._xml import get_text, clean_indentation
 from .mixin import IDManagerMixin
+from .utility_funcs import change_directory
 
 
 class WeightWindows(IDManagerMixin):
@@ -90,7 +93,7 @@ class WeightWindows(IDManagerMixin):
     survival_ratio : float
         Ratio of the survival weight to the lower weight window bound for
         rouletting
-    max_lower_bound_ratio: float
+    max_lower_bound_ratio : float
         Maximum allowed ratio of a particle's weight to the weight window's
         lower bound. (Default: 1.0)
     max_split : int
@@ -114,7 +117,7 @@ class WeightWindows(IDManagerMixin):
         upper_bound_ratio: float | None = None,
         energy_bounds: Iterable[Real] | None = None,
         particle_type: str = 'neutron',
-        survival_ratio: float = 3,
+        survival_ratio: float = 3.0,
         max_lower_bound_ratio: float | None = None,
         max_split: int = 10,
         weight_cutoff: float = 1.e-38,
@@ -354,7 +357,7 @@ class WeightWindows(IDManagerMixin):
         return element
 
     @classmethod
-    def from_xml_element(cls, elem: ET.Element, meshes: dict[int, MeshBase]) -> WeightWindows:
+    def from_xml_element(cls, elem: ET.Element, meshes: dict[int, MeshBase]) -> Self:
         """Generate weight window settings from an XML element
 
         Parameters
@@ -408,7 +411,7 @@ class WeightWindows(IDManagerMixin):
         )
 
     @classmethod
-    def from_hdf5(cls, group: h5py.Group, meshes: dict[int, MeshBase]) -> WeightWindows:
+    def from_hdf5(cls, group: h5py.Group, meshes: dict[int, MeshBase]) -> Self:
         """Create weight windows from HDF5 group
 
         Parameters
@@ -458,7 +461,7 @@ class WeightWindows(IDManagerMixin):
         )
 
 
-def wwinp_to_wws(path: PathLike) -> list[WeightWindows]:
+def wwinp_to_wws(path: PathLike) -> WeightWindowsList:
     """Create WeightWindows instances from a wwinp file
 
     .. versionadded:: 0.13.1
@@ -470,190 +473,13 @@ def wwinp_to_wws(path: PathLike) -> list[WeightWindows]:
 
     Returns
     -------
-    list of openmc.WeightWindows
+    WeightWindowsList
     """
-
-    with open(path) as wwinp:
-        # BLOCK 1
-        header = wwinp.readline().split(None, 4)
-        # read file type, time-dependence, number of
-        # particles, mesh type and problem identifier
-        _if, iv, ni, nr = [int(x) for x in header[:4]]
-
-        # header value checks
-        if _if != 1:
-            raise ValueError(f'Found incorrect file type, if: {_if}')
-
-        if iv > 1:
-            # read number of time bins for each particle, 'nt(1...ni)'
-            nt = np.fromstring(wwinp.readline(), sep=' ', dtype=int)
-
-            # raise error if time bins are present for now
-            raise ValueError('Time-dependent weight windows '
-                             'are not yet supported')
-        else:
-            nt = ni * [1]
-
-        # read number of energy bins for each particle, 'ne(1...ni)'
-        ne = np.fromstring(wwinp.readline(), sep=' ', dtype=int)
-
-        # read coarse mesh dimensions and lower left corner
-        mesh_description = np.fromstring(wwinp.readline(), sep=' ')
-        nfx, nfy, nfz = mesh_description[:3].astype(int)
-        xyz0 = mesh_description[3:]
-
-        # read cylindrical and spherical mesh vectors if present
-        if nr == 16:
-            # read number of coarse bins
-            line_arr = np.fromstring(wwinp.readline(), sep=' ')
-            ncx, ncy, ncz = line_arr[:3].astype(int)
-            # read polar vector (x1, y1, z1)
-            xyz1 = line_arr[3:]
-            # read azimuthal vector (x2, y2, z2)
-            line_arr = np.fromstring(wwinp.readline(), sep=' ')
-            xyz2 = line_arr[:3]
-
-            # Get polar and azimuthal axes
-            polar_axis = xyz1 - xyz0
-            azimuthal_axis = xyz2 - xyz0
-
-            # Check for polar axis other than (0, 0, 1)
-            norm = np.linalg.norm(polar_axis)
-            if not np.isclose(polar_axis[2]/norm, 1.0):
-                raise NotImplementedError('Polar axis not aligned to z-axis not supported')
-
-            # Check for azimuthal axis other than (1, 0, 0)
-            norm = np.linalg.norm(azimuthal_axis)
-            if not np.isclose(azimuthal_axis[0]/norm, 1.0):
-                raise NotImplementedError('Azimuthal axis not aligned to x-axis not supported')
-
-            # read geometry type
-            nwg = int(line_arr[-1])
-
-        elif nr == 10:
-            # read rectilinear data:
-            # number of coarse mesh bins and mesh type
-            ncx, ncy, ncz, nwg = \
-                np.fromstring(wwinp.readline(), sep=' ').astype(int)
-        else:
-            raise RuntimeError(f'Invalid mesh description (nr) found: {nr}')
-
-        # read BLOCK 2 and BLOCK 3 data into a single array
-        ww_data = np.fromstring(wwinp.read(), sep=' ')
-
-    # extract mesh data from the ww_data array
-    start_idx = 0
-
-    # first values in the mesh definition arrays are the first
-    # coordinate of the grid
-    end_idx = start_idx + 1 + 3 * ncx
-    i0, i_vals = ww_data[start_idx], ww_data[start_idx+1:end_idx]
-    start_idx = end_idx
-
-    end_idx = start_idx + 1 + 3 * ncy
-    j0, j_vals = ww_data[start_idx], ww_data[start_idx+1:end_idx]
-    start_idx = end_idx
-
-    end_idx = start_idx + 1 + 3 * ncz
-    k0, k_vals = ww_data[start_idx], ww_data[start_idx+1:end_idx]
-    start_idx = end_idx
-
-    # mesh consistency checks
-    if nr == 16 and nwg == 1 or nr == 10 and nwg != 1:
-        raise ValueError(f'Mesh description in header ({nr}) '
-                         f'does not match the mesh type ({nwg})')
-
-    if nr == 10 and (xyz0 != (i0, j0, k0)).any():
-        raise ValueError(f'Mesh origin in the header ({xyz0}) '
-                         f' does not match the origin in the mesh '
-                         f' description ({i0, j0, k0})')
-
-    # create openmc mesh object
-    grids = []
-    mesh_definition = [(i0, i_vals, nfx), (j0, j_vals, nfy), (k0, k_vals, nfz)]
-    for grid0, grid_vals, n_pnts in mesh_definition:
-        # file spec checks for the mesh definition
-        if (grid_vals[2::3] != 1.0).any():
-            raise ValueError('One or more mesh ratio value, qx, '
-                             'is not equal to one')
-
-        s = int(grid_vals[::3].sum())
-        if s != n_pnts:
-            raise ValueError(f'Sum of the fine bin entries, {s}, does '
-                             f'not match the number of fine bins, {n_pnts}')
-
-        # extend the grid based on the next coarse bin endpoint, px
-        # and the number of fine bins in the coarse bin, sx
-        intervals = grid_vals.reshape(-1, 3)
-        coords = [grid0]
-        for sx, px, qx in intervals:
-            coords += np.linspace(coords[-1], px, int(sx + 1)).tolist()[1:]
-
-        grids.append(np.array(coords))
-
-    if nwg == 1:
-        mesh = RectilinearMesh()
-        mesh.x_grid, mesh.y_grid, mesh.z_grid = grids
-    elif nwg == 2:
-        mesh = CylindricalMesh(
-            r_grid=grids[0],
-            z_grid=grids[1],
-            phi_grid=grids[2],
-            origin = xyz0,
-        )
-    elif nwg == 3:
-        mesh = SphericalMesh(
-            r_grid=grids[0],
-            theta_grid=grids[1],
-            phi_grid=grids[2],
-            origin = xyz0
-        )
-
-    # extract weight window values from array
-    wws = []
-    for ne_i, nt_i, particle_type in zip(ne, nt, ('neutron', 'photon')):
-        # no information to read for this particle if
-        # either the energy bins or time bins are empty
-        if ne_i == 0 or nt_i == 0:
-            continue
-
-        if iv > 1:
-            # time bins are parsed but unused for now
-            end_idx = start_idx + nt_i
-            time_bounds = ww_data[start_idx:end_idx]
-            np.insert(time_bounds, (0,), (0.0,))
-            start_idx = end_idx
-
-        # read energy boundaries
-        end_idx = start_idx + ne_i
-        energy_bounds = np.insert(ww_data[start_idx:end_idx], (0,), (0.0,))
-        # convert from MeV to eV
-        energy_bounds *= 1e6
-        start_idx = end_idx
-
-        # read weight window values
-        end_idx = start_idx + (nfx * nfy * nfz) * nt_i * ne_i
-
-        # read values and reshape according to ordering
-        # slowest to fastest: t, e, z, y, x
-        # reorder with transpose since our ordering is x, y, z, e, t
-        ww_shape = (nt_i, ne_i, nfz, nfy, nfx)
-        ww_values = ww_data[start_idx:end_idx].reshape(ww_shape).T
-        # Only use first time bin since we don't support time dependent weight
-        # windows yet.
-        ww_values = ww_values[:, :, :, :, 0]
-        start_idx = end_idx
-
-        # create a weight window object
-        ww = WeightWindows(id=None,
-                           mesh=mesh,
-                           lower_ww_bounds=ww_values,
-                           upper_bound_ratio=5.0,
-                           energy_bounds=energy_bounds,
-                           particle_type=particle_type)
-        wws.append(ww)
-
-    return wws
+    warnings.warn(
+        "This function is deprecated in favor of 'WeightWindowsList.from_wwinp'",
+        FutureWarning
+    )
+    return WeightWindowsList.from_wwinp(path)
 
 
 class WeightWindowGenerator:
@@ -886,7 +712,7 @@ class WeightWindowGenerator:
         return element
 
     @classmethod
-    def from_xml_element(cls, elem: ET.Element, meshes: dict) -> WeightWindowGenerator:
+    def from_xml_element(cls, elem: ET.Element, meshes: dict) -> Self:
         """
         Create a weight window generation object from an XML element
 
@@ -929,8 +755,8 @@ class WeightWindowGenerator:
 
         return wwg
 
-def hdf5_to_wws(path='weight_windows.h5'):
-    """Create WeightWindows instances from a weight windows HDF5 file
+def hdf5_to_wws(path='weight_windows.h5') -> WeightWindowsList:
+    """Create a WeightWindowsList from a weight windows HDF5 file
 
     .. versionadded:: 0.14.0
 
@@ -941,13 +767,284 @@ def hdf5_to_wws(path='weight_windows.h5'):
 
     Returns
     -------
-    list of openmc.WeightWindows
+    WeightWindowsList
     """
+    warnings.warn(
+        "This function is deprecated in favor of 'WeightWindowsList.from_hdf5'",
+        FutureWarning
+    )
+    return WeightWindowsList.from_hdf5(path)
 
-    with h5py.File(path) as h5_file:
-        # read in all of the meshes in the mesh node
-        meshes = {}
-        for mesh_group in h5_file['meshes']:
-            mesh = MeshBase.from_hdf5(h5_file['meshes'][mesh_group])
-            meshes[mesh.id] = mesh
-        return [WeightWindows.from_hdf5(ww, meshes) for ww in h5_file['weight_windows'].values()]
+
+class WeightWindowsList(list):
+    """A list of WeightWindows objects.
+
+    .. versionadded:: 0.15.3
+
+    Parameters
+    ----------
+    iterable : iterable of openmc.WeightWindows
+        An iterable of WeightWindows objects to initialize the list with
+
+    """
+    def __init__(self, iterable: Iterable[WeightWindows] = ()):
+        super().__init__(iterable)
+
+    @classmethod
+    def from_hdf5(cls, path: PathLike = 'weight_windows.h5') -> Self:
+        """Create WeightWindowsList from a weight windows HDF5 file.
+
+        Parameters
+        ----------
+        path : PathLike
+            Path to the weight windows hdf5 file
+
+        Returns
+        -------
+        WeightWindowsList
+            A list of WeightWindows objects read from the file
+        """
+
+        with h5py.File(path) as h5_file:
+            # read in all of the meshes in the mesh node
+            meshes = {}
+            for mesh_group in h5_file['meshes']:
+                mesh = MeshBase.from_hdf5(h5_file['meshes'][mesh_group])
+                meshes[mesh.id] = mesh
+            wws = [
+                WeightWindows.from_hdf5(ww, meshes)
+                for ww in h5_file['weight_windows'].values()
+            ]
+
+        return cls(wws)
+
+    @classmethod
+    def from_wwinp(cls, path: PathLike) -> Self:
+        """Create WeightWindowsList from a wwinp file.
+
+        Parameters
+        ----------
+        path : PathLike
+            Path to the wwinp file
+
+        Returns
+        -------
+        WeightWindowsList
+            A list of WeightWindows objects read from the file
+        """
+
+        with open(path) as wwinp:
+            # BLOCK 1
+            header = wwinp.readline().split(None, 4)
+            # read file type, time-dependence, number of
+            # particles, mesh type and problem identifier
+            _if, iv, ni, nr = [int(x) for x in header[:4]]
+
+            # header value checks
+            if _if != 1:
+                raise ValueError(f'Found incorrect file type, if: {_if}')
+
+            if iv > 1:
+                # read number of time bins for each particle, 'nt(1...ni)'
+                nt = np.fromstring(wwinp.readline(), sep=' ', dtype=int)
+
+                # raise error if time bins are present for now
+                raise ValueError('Time-dependent weight windows '
+                                'are not yet supported')
+            else:
+                nt = ni * [1]
+
+            # read number of energy bins for each particle, 'ne(1...ni)'
+            ne = np.fromstring(wwinp.readline(), sep=' ', dtype=int)
+
+            # read coarse mesh dimensions and lower left corner
+            mesh_description = np.fromstring(wwinp.readline(), sep=' ')
+            nfx, nfy, nfz = mesh_description[:3].astype(int)
+            xyz0 = mesh_description[3:]
+
+            # read cylindrical and spherical mesh vectors if present
+            if nr == 16:
+                # read number of coarse bins
+                line_arr = np.fromstring(wwinp.readline(), sep=' ')
+                ncx, ncy, ncz = line_arr[:3].astype(int)
+                # read polar vector (x1, y1, z1)
+                xyz1 = line_arr[3:]
+                # read azimuthal vector (x2, y2, z2)
+                line_arr = np.fromstring(wwinp.readline(), sep=' ')
+                xyz2 = line_arr[:3]
+
+                # Get polar and azimuthal axes
+                polar_axis = xyz1 - xyz0
+                azimuthal_axis = xyz2 - xyz0
+
+                # Check for polar axis other than (0, 0, 1)
+                norm = np.linalg.norm(polar_axis)
+                if not np.isclose(polar_axis[2]/norm, 1.0):
+                    raise NotImplementedError('Polar axis not aligned to z-axis not supported')
+
+                # Check for azimuthal axis other than (1, 0, 0)
+                norm = np.linalg.norm(azimuthal_axis)
+                if not np.isclose(azimuthal_axis[0]/norm, 1.0):
+                    raise NotImplementedError('Azimuthal axis not aligned to x-axis not supported')
+
+                # read geometry type
+                nwg = int(line_arr[-1])
+
+            elif nr == 10:
+                # read rectilinear data:
+                # number of coarse mesh bins and mesh type
+                ncx, ncy, ncz, nwg = \
+                    np.fromstring(wwinp.readline(), sep=' ').astype(int)
+            else:
+                raise RuntimeError(f'Invalid mesh description (nr) found: {nr}')
+
+            # read BLOCK 2 and BLOCK 3 data into a single array
+            ww_data = np.fromstring(wwinp.read(), sep=' ')
+
+        # extract mesh data from the ww_data array
+        start_idx = 0
+
+        # first values in the mesh definition arrays are the first
+        # coordinate of the grid
+        end_idx = start_idx + 1 + 3 * ncx
+        i0, i_vals = ww_data[start_idx], ww_data[start_idx+1:end_idx]
+        start_idx = end_idx
+
+        end_idx = start_idx + 1 + 3 * ncy
+        j0, j_vals = ww_data[start_idx], ww_data[start_idx+1:end_idx]
+        start_idx = end_idx
+
+        end_idx = start_idx + 1 + 3 * ncz
+        k0, k_vals = ww_data[start_idx], ww_data[start_idx+1:end_idx]
+        start_idx = end_idx
+
+        # mesh consistency checks
+        if nr == 16 and nwg == 1 or nr == 10 and nwg != 1:
+            raise ValueError(f'Mesh description in header ({nr}) '
+                            f'does not match the mesh type ({nwg})')
+
+        if nr == 10 and (xyz0 != (i0, j0, k0)).any():
+            raise ValueError(f'Mesh origin in the header ({xyz0}) '
+                            f' does not match the origin in the mesh '
+                            f' description ({i0, j0, k0})')
+
+        # create openmc mesh object
+        grids = []
+        mesh_definition = [(i0, i_vals, nfx), (j0, j_vals, nfy), (k0, k_vals, nfz)]
+        for grid0, grid_vals, n_pnts in mesh_definition:
+            # file spec checks for the mesh definition
+            if (grid_vals[2::3] != 1.0).any():
+                raise ValueError('One or more mesh ratio value, qx, '
+                                'is not equal to one')
+
+            s = int(grid_vals[::3].sum())
+            if s != n_pnts:
+                raise ValueError(f'Sum of the fine bin entries, {s}, does '
+                                f'not match the number of fine bins, {n_pnts}')
+
+            # extend the grid based on the next coarse bin endpoint, px
+            # and the number of fine bins in the coarse bin, sx
+            intervals = grid_vals.reshape(-1, 3)
+            coords = [grid0]
+            for sx, px, qx in intervals:
+                coords += np.linspace(coords[-1], px, int(sx + 1)).tolist()[1:]
+
+            grids.append(np.array(coords))
+
+        if nwg == 1:
+            mesh = RectilinearMesh()
+            mesh.x_grid, mesh.y_grid, mesh.z_grid = grids
+        elif nwg == 2:
+            mesh = CylindricalMesh(
+                r_grid=grids[0],
+                z_grid=grids[1],
+                phi_grid=grids[2],
+                origin = xyz0,
+            )
+        elif nwg == 3:
+            mesh = SphericalMesh(
+                r_grid=grids[0],
+                theta_grid=grids[1],
+                phi_grid=grids[2],
+                origin = xyz0
+            )
+
+        # extract weight window values from array
+        wws = cls()
+        for ne_i, nt_i, particle_type in zip(ne, nt, ('neutron', 'photon')):
+            # no information to read for this particle if
+            # either the energy bins or time bins are empty
+            if ne_i == 0 or nt_i == 0:
+                continue
+
+            if iv > 1:
+                # time bins are parsed but unused for now
+                end_idx = start_idx + nt_i
+                time_bounds = ww_data[start_idx:end_idx]
+                np.insert(time_bounds, (0,), (0.0,))
+                start_idx = end_idx
+
+            # read energy boundaries
+            end_idx = start_idx + ne_i
+            energy_bounds = np.insert(ww_data[start_idx:end_idx], (0,), (0.0,))
+            # convert from MeV to eV
+            energy_bounds *= 1e6
+            start_idx = end_idx
+
+            # read weight window values
+            end_idx = start_idx + (nfx * nfy * nfz) * nt_i * ne_i
+
+            # read values and reshape according to ordering
+            # slowest to fastest: t, e, z, y, x
+            # reorder with transpose since our ordering is x, y, z, e, t
+            ww_shape = (nt_i, ne_i, nfz, nfy, nfx)
+            ww_values = ww_data[start_idx:end_idx].reshape(ww_shape).T
+            # Only use first time bin since we don't support time dependent weight
+            # windows yet.
+            ww_values = ww_values[:, :, :, :, 0]
+            start_idx = end_idx
+
+            # create a weight window object
+            ww = WeightWindows(id=None,
+                            mesh=mesh,
+                            lower_ww_bounds=ww_values,
+                            upper_bound_ratio=5.0,
+                            energy_bounds=energy_bounds,
+                            particle_type=particle_type)
+            wws.append(ww)
+
+        return wws
+
+    def export_to_hdf5(self, path: PathLike = 'weight_windows.h5', **init_kwargs):
+        """Write weight windows to an HDF5 file.
+
+        Parameters
+        ----------
+        path : PathLike
+            Path to the file to write weight windows to
+        **init_kwargs
+            Keyword arguments passed to :func:`openmc.lib.init`
+
+        """
+        import openmc.lib
+        cv.check_type('path', path, PathLike)
+
+        # Create a temporary model with the weight windows
+        model = openmc.Model()
+        sph = openmc.Sphere(boundary_type='vacuum')
+        cell = openmc.Cell(region=-sph)
+        model.geometry = openmc.Geometry([cell])
+        model.settings.weight_windows = self
+        model.settings.particles = 100
+        model.settings.batches = 1
+
+        # Get absolute path before moving to temporary directory
+        path = Path(path).resolve()
+
+        with change_directory(tmpdir=True):
+            # Write the model to an XML file
+            model.export_to_model_xml()
+
+            # Load the model with openmc.lib and then export it to an HDF5 file
+            with openmc.lib.run_in_memory(**init_kwargs):
+                openmc.lib.export_weight_windows(path)
diff --git a/tests/regression_tests/weightwindows/inputs_true.dat b/tests/regression_tests/weightwindows/inputs_true.dat
index dcc41ae84..91fec4af9 100644
--- a/tests/regression_tests/weightwindows/inputs_true.dat
+++ b/tests/regression_tests/weightwindows/inputs_true.dat
@@ -49,7 +49,7 @@
       <energy_bounds>0.0 0.5 20000000.0</energy_bounds>
       <lower_ww_bounds>-1.0 0.007673145137236567 6.542700644645627e-07 0.0017541380096893788 0.0007245451610090619 7.476545089278482e-06 2.253382683081525e-06 2.1040609012865134e-05 0.08285899874014539 -1.0 1.0262431550731535e-13 3.3164825349503764e-16 0.0064803314120165335 3.5981031766416143e-06 -1.0 1.6205064883026195e-11 1.7770136411255912e-05 0.0001670700632870335 4.323138781337963e-05 -1.0 -1.0 6.922231352729155e-05 0.06550426960512012 -1.0 2.5639656866250453e-06 1.4508262073256659e-13 -1.0 -1.0 0.0009127050763987511 3.8523247550378815e-12 -1.0 0.0008175033526488423 -1.0 0.015148978428271613 2.5157355790201773e-07 2.1612150425221703e-06 1.3181562352445092e-10 2.9282097947816224e-05 2.762955748645507e-05 2.936268747135548e-14 1.6859219614058024e-19 3.937160538176268e-07 2.6011787393916806e-06 0.001570829313580841 -1.0 1.7041669224797384e-09 1.6421491993751715e-11 0.4899999304038166 6.948292975998466e-07 -1.0 -1.0 0.08657573566388353 0.006639379668946672 1.681305446488884e-11 2.2487617828938326e-05 4.109066205029878e-05 0.08288806458368345 -1.0 0.007385384405891666 -1.0 -1.0 1.008394964750947e-06 6.655926357459275e-08 0.0016279794552427574 1.4825219199133353e-12 -1.0 1.93847081892941e-05 1.284759166582202e-05 5.1161740516205715e-05 2.5447281241730366e-07 3.853097455417877e-06 -1.0 8.887234042637684e-05 0.01621821782442112 -1.0 1.8747824667478637e-14 5.97653814110781e-06 -1.0 -1.0 1.2296747260635405e-06 -1.0 -1.0 7.754700849337902e-06 7.091263906557291e-05 3.2799045883372075e-06 0.00020573181450240786 5.6949597066784976e-05 1.271128669411295e-07 0.0010019432401508087 -1.0 -1.0 6.848642863465585e-07 5.783974359937857e-06 2.380955631371226e-06 4.756872959630257e-05 2.1360401784344975e-18 0.00046029617115127556 1.0092905083158804e-11 0.08095280568305474 3.89841667138598e-08 4.354946981329799e-05 -1.0 0.5 0.0015447823995470042 -1.0 -1.0 0.001959411999677113 0.48573842213878143 -1.0 7.962899789920809e-06 5.619835883512353e-14 0.0835648710074336 2.7207433165796702e-11 0.00027464244062887683 4.076762579823379e-17 2.124999182004655e-05 8.037131813528501e-07 8.846493399850663e-06 1.080711295768551e-05 -1.0 -1.0 0.0010737081832502356 2.679340942769232e-06 2.1648918040467363e-05 0.0002668579837809081 1.3455341306162382e-05 2.5629068330446215e-05 1.3228013765525015e-05 -1.0 -1.0 7.002861620919232e-08 1.5172912057312398e-14 -1.0 7.989579285134734e-06 2.639268952045579e-10 -1.0 0.013330619853379314 0.00021534568699157805 2.4469456008493614e-09 8.211982683649991e-09 1.951356547084204e-15 0.00016419031150495913 5.985108617124989e-06 1.28584557092134e-05 1.5476769237571295e-14 5.5379154134462336e-08 0.0016637126543321873 2.499931357628383e-07 8.020767115181574e-07 2.7697233171399416e-13 -1.0 0.007197662162700777 -1.0 0.0833931797381589 2.8226276944532696e-05 3.353295403842037e-05 5.504813693036933e-12 0.007136750029575816 0.08636569925236791 -1.0 -1.0 6.315154082213375e-07 0.4877856021170283 -1.0 3.7051518220083886e-06 -1.0 0.0017950613169359904 7.84289689494925e-06 9.041149893307806e-07 -1.0 8.48176145671274e-10 9.03108551826469e-05 3.634644995026692e-05 2.0295213621716706e-09 1.0305672698745657e-11 1.5550455959178486e-06 0.01664109232689093 8.533030345699353e-17 0.0009252532821720597 -1.0 7.695031155172816e-14 0.0007151459162818186 -1.0 -1.0 5.182269672663266e-10 3.0160758454323657e-07 -1.0 0.06539005235506369 3.452537179033895e-05 -1.0 -1.0 3.855884234344845e-06 0.00017699858357744463 2.594951085377588e-06 1.1333627604823673e-09 -1.0 2.4306375693722205e-06 0.0063790654507599135 2.2060992580622125e-11 -1.0 -1.0 0.0848872967381878 3.932389299316285e-06 1.2911827198500372e-08 1.957092814065688e-05 0.0007213722022489493 0.0018327593437608 1.6699254277734109e-06 0.007188410694198128 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0</lower_ww_bounds>
       <upper_ww_bounds>-10.0 0.07673145137236567 6.5427006446456266e-06 0.017541380096893787 0.0072454516100906195 7.476545089278483e-05 2.253382683081525e-05 0.00021040609012865135 0.828589987401454 -10.0 1.0262431550731535e-12 3.3164825349503764e-15 0.06480331412016534 3.5981031766416144e-05 -10.0 1.6205064883026195e-10 0.0001777013641125591 0.001670700632870335 0.0004323138781337963 -10.0 -10.0 0.0006922231352729155 0.6550426960512012 -10.0 2.5639656866250452e-05 1.4508262073256658e-12 -10.0 -10.0 0.009127050763987512 3.852324755037882e-11 -10.0 0.008175033526488424 -10.0 0.15148978428271614 2.515735579020177e-06 2.1612150425221703e-05 1.3181562352445092e-09 0.00029282097947816227 0.0002762955748645507 2.9362687471355483e-13 1.6859219614058023e-18 3.937160538176268e-06 2.6011787393916804e-05 0.015708293135808408 -10.0 1.7041669224797384e-08 1.6421491993751715e-10 4.899999304038166 6.948292975998466e-06 -10.0 -10.0 0.8657573566388354 0.06639379668946672 1.681305446488884e-10 0.00022487617828938325 0.0004109066205029878 0.8288806458368345 -10.0 0.07385384405891665 -10.0 -10.0 1.0083949647509469e-05 6.655926357459275e-07 0.016279794552427576 1.4825219199133352e-11 -10.0 0.000193847081892941 0.0001284759166582202 0.0005116174051620571 2.5447281241730365e-06 3.853097455417877e-05 -10.0 0.0008887234042637684 0.16218217824421122 -10.0 1.8747824667478637e-13 5.97653814110781e-05 -10.0 -10.0 1.2296747260635405e-05 -10.0 -10.0 7.754700849337902e-05 0.0007091263906557291 3.2799045883372076e-05 0.0020573181450240785 0.0005694959706678497 1.271128669411295e-06 0.010019432401508087 -10.0 -10.0 6.848642863465585e-06 5.7839743599378564e-05 2.380955631371226e-05 0.0004756872959630257 2.1360401784344976e-17 0.004602961711512756 1.0092905083158804e-10 0.8095280568305474 3.89841667138598e-07 0.00043549469813297995 -10.0 5.0 0.015447823995470043 -10.0 -10.0 0.01959411999677113 4.8573842213878144 -10.0 7.96289978992081e-05 5.619835883512353e-13 0.8356487100743359 2.7207433165796704e-10 0.002746424406288768 4.076762579823379e-16 0.00021249991820046548 8.037131813528501e-06 8.846493399850663e-05 0.0001080711295768551 -10.0 -10.0 0.010737081832502356 2.679340942769232e-05 0.00021648918040467362 0.0026685798378090807 0.00013455341306162382 0.00025629068330446217 0.00013228013765525016 -10.0 -10.0 7.002861620919232e-07 1.51729120573124e-13 -10.0 7.989579285134734e-05 2.639268952045579e-09 -10.0 0.13330619853379314 0.0021534568699157807 2.4469456008493615e-08 8.211982683649991e-08 1.951356547084204e-14 0.0016419031150495913 5.985108617124989e-05 0.000128584557092134 1.5476769237571296e-13 5.537915413446234e-07 0.016637126543321872 2.499931357628383e-06 8.020767115181574e-06 2.7697233171399415e-12 -10.0 0.07197662162700777 -10.0 0.8339317973815891 0.000282262769445327 0.00033532954038420373 5.504813693036933e-11 0.07136750029575815 0.8636569925236791 -10.0 -10.0 6.3151540822133754e-06 4.877856021170283 -10.0 3.7051518220083885e-05 -10.0 0.017950613169359905 7.84289689494925e-05 9.041149893307805e-06 -10.0 8.48176145671274e-09 0.000903108551826469 0.0003634644995026692 2.0295213621716707e-08 1.0305672698745658e-10 1.5550455959178486e-05 0.1664109232689093 8.533030345699353e-16 0.009252532821720597 -10.0 7.695031155172816e-13 0.007151459162818186 -10.0 -10.0 5.182269672663266e-09 3.0160758454323656e-06 -10.0 0.6539005235506369 0.0003452537179033895 -10.0 -10.0 3.855884234344845e-05 0.0017699858357744464 2.594951085377588e-05 1.1333627604823672e-08 -10.0 2.4306375693722206e-05 0.06379065450759913 2.2060992580622125e-10 -10.0 -10.0 0.848872967381878 3.9323892993162844e-05 1.2911827198500372e-07 0.0001957092814065688 0.0072137220224894934 0.018327593437608 1.669925427773411e-05 0.07188410694198127 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0</upper_ww_bounds>
-      <survival_ratio>3</survival_ratio>
+      <survival_ratio>3.0</survival_ratio>
       <max_lower_bound_ratio>1.5</max_lower_bound_ratio>
       <max_split>10</max_split>
       <weight_cutoff>1e-38</weight_cutoff>
@@ -65,7 +65,7 @@
       <energy_bounds>0.0 0.5 20000000.0</energy_bounds>
       <lower_ww_bounds>-1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 -1.0 0.06827568359008944 0.00017329528628152923 0.018541112907970003 0.011113024641218336 8.76041935303527e-05 8.168081568291806e-05 0.00046693784586018913 0.4952432605379829 2.2512327083641865e-10 4.6258592060517866e-07 2.7044817176109556e-05 0.054902816619122045 0.00014126153603265097 8.304845400451923e-08 2.2950716170641463e-05 0.0001335621430311088 0.003432919201293737 0.0005197081842709918 5.726152701849347e-16 -1.0 0.0013332554437480327 0.4346984808472855 7.691527781829036e-17 0.00011042047857307253 3.0571050855707084e-06 -1.0 4.986698316296507e-06 0.011128424196387618 1.3106335518133802e-05 5.447493368067179e-10 0.011440381012864086 4.670673837764874e-08 0.12364069326350118 0.00012558879474108074 3.136829920007009e-05 2.34750482787598e-05 0.001537590300149361 0.0017693279949094218 6.717625881826167e-05 4.587143797469485e-08 2.6211239246796104e-05 0.00030002326388383244 0.01729816946709781 4.5757238372058234e-11 6.92296299242814e-05 3.792209399652396e-06 -1.0 9.256616392487858e-05 8.541606727879512e-07 -1.0 0.49317081643076643 0.05500108683629957 1.298062961617927e-05 0.0006870228272606287 0.0008231482263927564 0.5 3.419181071650816e-06 0.06433819434431046 6.574706543646946e-16 4.0404626147344e-13 0.0003782322077390033 0.00012637534695610975 0.017602971074583987 1.0044390728858277e-05 -1.0 0.0008787411098754915 0.00023686818807101741 0.0009304497896205121 6.949587369646497e-05 0.00012918433677593975 2.0707648529746894e-06 0.0023295401596005313 0.11819165666519223 -1.0 2.1606550732170693e-05 0.00022057970761624768 -1.0 1.0325207105027347e-08 0.0002029396545382813 2.1234980618763222e-13 -1.0 0.00024175998138228048 0.001178616843705956 0.0001399807456616496 0.0038811025614225057 0.0011076796092102186 0.00010814452764860558 0.010955637485319249 -1.0 9.382800796426366e-17 5.098747893974248e-05 0.00027052054298385255 0.00021305826462238593 0.000808100901275472 4.233410073487772e-06 0.0051513292132259495 8.616027294555462e-07 0.4873897581604287 2.9093345975075226e-05 0.000469589568463265 -1.0 -1.0 0.017802624844035688 1.3116807133030035e-15 2.617878055106949e-16 0.01884234453311008 -1.0 2.027381220364608e-16 0.0004299195570308035 1.4628847959717225e-05 0.4899952354672477 2.774067049392004e-07 0.004441328419270369 4.279460329782799e-09 0.0012297303081805393 0.0002792896409558745 0.0006934466049804711 8.370896020975689e-05 3.8270536025799805e-15 -1.0 0.01208261392046878 0.0001497958445994315 0.0015016500045374082 0.005384625561469684 0.00025519632243117644 0.0011028020390507682 0.0002362355168421952 -1.0 -1.0 8.862760180332873e-05 1.3806577785135177e-06 -1.0 0.0001319677450153934 2.6866894852481906e-05 -1.0 0.11510120013926417 0.002672923773363389 1.2257360246712472e-05 8.544159282151438e-05 2.777791741571174e-05 0.0014957033281168012 0.0003257646134837451 0.0008919466185572302 1.2907171695294846e-13 4.6842350882367666e-05 0.01721806295736377 0.00025106741008066317 0.00022234471595443313 2.101790478097517e-09 5.752120832330886e-11 0.06428782790571179 3.2478301680021854e-08 0.4903495510314233 0.001146714816952061 0.0004777967757842694 1.0882011018684852e-06 0.05708498338352203 0.4981497862127628 -1.0 3.2790914744011534e-06 0.00010077009726691265 -1.0 2.210707325798542e-07 4.3166052799897375e-05 -1.0 0.01825795827020865 0.0003182108781955478 3.8561696337086434e-05 1.0995322456277382e-06 9.53380658669839e-06 0.001550036616828061 0.0012648333883989995 5.272021975060514e-06 1.9257248009114363e-05 0.00016757997590048827 0.11891251244906934 5.515522196186723e-06 0.01102706140784316 9.904481358675478e-13 3.520674728719278e-05 0.011294708566804167 7.239087311622819e-08 -1.0 3.5740607788414942e-06 0.00035983547999740665 1.0588257623722672e-07 0.42372713683725016 0.0011273340972061078 8.582011716859219e-15 1.1514579117272292e-10 0.00043130977711323417 0.0027847329307350423 0.00017287873387910357 6.401055165502384e-06 1.722191123879782e-08 0.00020848309220162036 0.05639071613735579 1.8064550990294753e-05 1.289814511028015e-06 1.078687446476881e-14 0.4897735047310072 0.0002981891705231209 0.00016079768514218546 9.332371598523186e-05 0.011724714376848187 0.019040707071165303 0.00014242053195529864 0.06684484191345574 -1.0</lower_ww_bounds>
       <upper_ww_bounds>-10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 -10.0 0.6827568359008944 0.0017329528628152924 0.18541112907970003 0.11113024641218336 0.0008760419353035269 0.0008168081568291806 0.004669378458601891 4.952432605379829 2.2512327083641864e-09 4.625859206051786e-06 0.00027044817176109554 0.5490281661912204 0.0014126153603265096 8.304845400451923e-07 0.00022950716170641464 0.001335621430311088 0.03432919201293737 0.0051970818427099184 5.726152701849347e-15 -10.0 0.013332554437480326 4.346984808472855 7.6915277818290365e-16 0.0011042047857307254 3.0571050855707086e-05 -10.0 4.986698316296507e-05 0.11128424196387618 0.000131063355181338 5.447493368067179e-09 0.11440381012864086 4.670673837764874e-07 1.2364069326350118 0.0012558879474108074 0.0003136829920007009 0.000234750482787598 0.01537590300149361 0.01769327994909422 0.0006717625881826168 4.587143797469485e-07 0.000262112392467961 0.0030002326388383245 0.1729816946709781 4.5757238372058235e-10 0.0006922962992428139 3.792209399652396e-05 -10.0 0.0009256616392487858 8.541606727879512e-06 -10.0 4.931708164307665 0.5500108683629957 0.00012980629616179268 0.006870228272606287 0.008231482263927564 5.0 3.419181071650816e-05 0.6433819434431045 6.574706543646946e-15 4.0404626147344005e-12 0.003782322077390033 0.0012637534695610975 0.17602971074583987 0.00010044390728858278 -10.0 0.008787411098754914 0.002368681880710174 0.00930449789620512 0.0006949587369646498 0.0012918433677593976 2.0707648529746893e-05 0.023295401596005315 1.1819165666519222 -10.0 0.00021606550732170693 0.0022057970761624767 -10.0 1.0325207105027347e-07 0.0020293965453828133 2.123498061876322e-12 -10.0 0.0024175998138228046 0.01178616843705956 0.0013998074566164962 0.03881102561422506 0.011076796092102187 0.0010814452764860557 0.10955637485319249 -10.0 9.382800796426367e-16 0.0005098747893974248 0.0027052054298385255 0.0021305826462238594 0.00808100901275472 4.233410073487772e-05 0.0515132921322595 8.61602729455546e-06 4.873897581604287 0.0002909334597507523 0.0046958956846326495 -10.0 -10.0 0.1780262484403569 1.3116807133030034e-14 2.6178780551069492e-15 0.1884234453311008 -10.0 2.027381220364608e-15 0.004299195570308035 0.00014628847959717226 4.899952354672477 2.774067049392004e-06 0.04441328419270369 4.279460329782799e-08 0.012297303081805393 0.002792896409558745 0.006934466049804711 0.0008370896020975689 3.8270536025799805e-14 -10.0 0.1208261392046878 0.001497958445994315 0.015016500045374082 0.05384625561469684 0.0025519632243117644 0.011028020390507681 0.002362355168421952 -10.0 -10.0 0.0008862760180332873 1.3806577785135176e-05 -10.0 0.001319677450153934 0.00026866894852481903 -10.0 1.1510120013926417 0.026729237733633893 0.00012257360246712473 0.0008544159282151438 0.0002777791741571174 0.014957033281168012 0.0032576461348374514 0.008919466185572301 1.2907171695294846e-12 0.00046842350882367664 0.17218062957363772 0.0025106741008066318 0.0022234471595443312 2.101790478097517e-08 5.752120832330886e-10 0.6428782790571179 3.2478301680021856e-07 4.903495510314233 0.01146714816952061 0.004777967757842694 1.0882011018684853e-05 0.5708498338352204 4.981497862127628 -10.0 3.279091474401153e-05 0.0010077009726691265 -10.0 2.210707325798542e-06 0.00043166052799897375 -10.0 0.1825795827020865 0.0031821087819554777 0.00038561696337086434 1.0995322456277382e-05 9.53380658669839e-05 0.01550036616828061 0.012648333883989995 5.272021975060514e-05 0.00019257248009114364 0.0016757997590048828 1.1891251244906933 5.515522196186723e-05 0.1102706140784316 9.904481358675478e-12 0.0003520674728719278 0.11294708566804167 7.239087311622819e-07 -10.0 3.574060778841494e-05 0.0035983547999740664 1.0588257623722672e-06 4.237271368372502 0.011273340972061077 8.582011716859219e-14 1.151457911727229e-09 0.004313097771132342 0.027847329307350423 0.0017287873387910357 6.401055165502385e-05 1.722191123879782e-07 0.0020848309220162036 0.5639071613735579 0.00018064550990294753 1.289814511028015e-05 1.078687446476881e-13 4.897735047310072 0.002981891705231209 0.0016079768514218546 0.0009332371598523186 0.11724714376848187 0.19040707071165303 0.0014242053195529865 0.6684484191345574 -10.0</upper_ww_bounds>
-      <survival_ratio>3</survival_ratio>
+      <survival_ratio>3.0</survival_ratio>
       <max_lower_bound_ratio>1.5</max_lower_bound_ratio>
       <max_split>10</max_split>
       <weight_cutoff>1e-38</weight_cutoff>
diff --git a/tests/unit_tests/weightwindows/test_ww_list.py b/tests/unit_tests/weightwindows/test_ww_list.py
new file mode 100644
index 000000000..d148f382a
--- /dev/null
+++ b/tests/unit_tests/weightwindows/test_ww_list.py
@@ -0,0 +1,23 @@
+import openmc
+
+
+def test_ww_roundtrip(request, run_in_tmpdir):
+    # Load weight windows from a wwinp file
+    wwinp_file = request.path.with_name('wwinp_n')
+    wws = openmc.WeightWindowsList.from_wwinp(wwinp_file)
+
+    # Roundtrip them, writing to HDF5 and reading back in
+    wws.export_to_hdf5('ww.h5')
+    wws_new = openmc.WeightWindowsList.from_hdf5('ww.h5')
+
+    # Check that the new weight windows are the same as the original
+    assert len(wws) == len(wws_new)
+    for ww, ww_new in zip(wws, wws_new):
+        assert ww.particle_type == ww_new.particle_type
+        assert (ww.lower_ww_bounds == ww_new.lower_ww_bounds).all()
+        assert (ww.upper_ww_bounds == ww_new.upper_ww_bounds).all()
+        assert ww.survival_ratio == ww_new.survival_ratio
+        assert ww.num_energy_bins == ww_new.num_energy_bins
+        assert ww.max_split == ww_new.max_split
+        assert ww.weight_cutoff == ww_new.weight_cutoff
+        assert ww.mesh.id == ww_new.mesh.id

From 5c10214465107277b4f046b58ff9d00e34ba4ce4 Mon Sep 17 00:00:00 2001
From: Jonathan Shimwell <mail@jshimwell.com>
Date: Thu, 26 Jun 2025 03:29:45 +0200
Subject: [PATCH 063/203] added openmc.Material.mean_free_path function (#3469)

---
 openmc/material.py                | 30 ++++++++++++++++++++++++++++++
 tests/unit_tests/test_material.py | 13 +++++++++++++
 2 files changed, 43 insertions(+)

diff --git a/openmc/material.py b/openmc/material.py
index 770722f74..c6765178e 100644
--- a/openmc/material.py
+++ b/openmc/material.py
@@ -1718,6 +1718,36 @@ class Material(IDManagerMixin):
         return mat
 
 
+    def mean_free_path(self, energy: float) -> float:
+        """Calculate the mean free path of neutrons in the material at a given
+        energy.
+
+        .. versionadded:: 0.15.3
+
+        Parameters
+        ----------
+        energy : float
+            Neutron energy in eV
+
+        Returns
+        -------
+        float
+            Mean free path in cm
+
+        """
+        from openmc.plotter import _calculate_cexs_elem_mat
+
+        energy_grid, cexs = _calculate_cexs_elem_mat(
+            this=self,
+            types=["total"],
+        )
+        total_cexs = cexs[0]
+
+        interpolated_cexs = float(np.interp(energy, energy_grid, total_cexs))
+
+        return 1.0 / interpolated_cexs
+
+
 class Materials(cv.CheckedList):
     """Collection of Materials used for an OpenMC simulation.
 
diff --git a/tests/unit_tests/test_material.py b/tests/unit_tests/test_material.py
index 8ad579563..db5f4ce32 100644
--- a/tests/unit_tests/test_material.py
+++ b/tests/unit_tests/test_material.py
@@ -710,3 +710,16 @@ def test_avoid_subnormal(run_in_tmpdir):
     # When read back in, the density should be zero
     mats = openmc.Materials.from_xml()
     assert mats[0].get_nuclide_atom_densities()['H2'] == 0.0
+
+
+def test_mean_free_path():
+
+    mat1 = openmc.Material()
+    mat1.add_nuclide('Si28', 1.0)
+    mat1.set_density('g/cm3', 2.32)
+    assert mat1.mean_free_path(energy=14e6) == pytest.approx(11.41, abs=1e-2)
+
+    mat2 = openmc.Material()
+    mat2.add_nuclide('Pb208', 1.0)
+    mat2.set_density('g/cm3', 11.34)
+    assert mat2.mean_free_path(energy=14e6) == pytest.approx(5.65, abs=1e-2)

From c116288ea389f01420600fe31f000ff7276990dc Mon Sep 17 00:00:00 2001
From: John Tramm <john.tramm@gmail.com>
Date: Thu, 26 Jun 2025 18:50:26 -0500
Subject: [PATCH 064/203] Updated Docs to Not Give Specific Python Version
 Requirement (#3473)

---
 docs/source/usersguide/install.rst | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/docs/source/usersguide/install.rst b/docs/source/usersguide/install.rst
index 7a8cb8020..2621109f7 100644
--- a/docs/source/usersguide/install.rst
+++ b/docs/source/usersguide/install.rst
@@ -515,10 +515,13 @@ to install the Python package in :ref:`"editable" mode <devguide_editable>`.
 Prerequisites
 -------------
 
-The Python API works with Python 3.8+. In addition to Python itself, the API
-relies on a number of third-party packages. All prerequisites can be installed
-using Conda_ (recommended), pip_, or through the package manager in most Linux
-distributions.
+In addition to Python itself, the OpenMC Python API relies on a number of
+third-party packages. All prerequisites can be installed using Conda_
+(recommended), pip_, or through the package manager in most Linux distributions.
+The current required Python version and up-to-date list of package dependencies
+can be found in the `pyproject.toml <https://github.com/openmc-dev/openmc/blob/develop/pyproject.toml>`_
+file in the root directory of the OpenMC repository. An overview of these
+dependencies is provided below.
 
 .. admonition:: Required
    :class: error

From 25d64c9b26b0bf4d4b0aad4829ea8ec225226905 Mon Sep 17 00:00:00 2001
From: Ahnaf Tahmid Chowdhury <ahnaf-tahmid@outlook.com>
Date: Fri, 27 Jun 2025 06:49:55 +0600
Subject: [PATCH 065/203] Refactor and Harden Configuration Management (#3461)

Co-authored-by: Paul Romano <paul.k.romano@gmail.com>
---
 openmc/config.py                | 230 +++++++++++++++++++++++---------
 tests/unit_tests/test_config.py | 115 +++++++++++-----
 2 files changed, 247 insertions(+), 98 deletions(-)

diff --git a/openmc/config.py b/openmc/config.py
index 56d8a4072..d61fb2d31 100644
--- a/openmc/config.py
+++ b/openmc/config.py
@@ -1,8 +1,23 @@
+"""Module for handling global configuration in OpenMC.
+
+This module exports a single object, `config`, that can be used to control
+various settings, primarily paths to data files. It acts like a dictionary but
+with special behaviors.
+
+Examples
+--------
+>>> import openmc
+>>> openmc.config['cross_sections'] = '/path/to/my/cross_sections.xml'
+>>> print(openmc.config)
+{'resolve_paths': True, 'cross_sections': PosixPath('/path/to/my/cross_sections.xml')}
+
+"""
 from collections.abc import MutableMapping
 from contextlib import contextmanager
 import os
 from pathlib import Path
 import warnings
+from typing import Any, Dict, Iterator
 
 from openmc.data import DataLibrary
 from openmc.data.decay import _DECAY_ENERGY, _DECAY_PHOTON_ENERGY
@@ -11,104 +26,195 @@ __all__ = ["config"]
 
 
 class _Config(MutableMapping):
-    def __init__(self, data=()):
-        self._mapping = {'resolve_paths': True}
+    """A configuration dictionary for OpenMC with special handling for path-like values.
+
+    This class enforces valid configuration keys and synchronizes path-related
+    settings with their corresponding environment variables.
+
+    Attributes
+    ----------
+    cross_sections : pathlib.Path
+        Path to a cross_sections.xml file. Also sets/unsets the
+        OPENMC_CROSS_SECTIONS environment variable.
+    mg_cross_sections : pathlib.Path
+        Path to a multi-group cross_sections.h5 file. Also sets/unsets
+        the OPENMC_MG_CROSS_SECTIONS environment variable.
+    chain_file : pathlib.Path
+        Path to a depletion chain XML file. Also sets/unsets the
+        OPENMC_CHAIN_FILE environment variable. Setting or deleting this
+        clears internal decay data caches.
+    resolve_paths : bool
+        If True (default), all paths assigned are resolved to absolute
+        paths. If False, paths are stored as they are provided.
+
+    """
+    _PATH_KEYS: Dict[str, str] = {
+        'cross_sections': 'OPENMC_CROSS_SECTIONS',
+        'mg_cross_sections': 'OPENMC_MG_CROSS_SECTIONS',
+        'chain_file': 'OPENMC_CHAIN_FILE'
+    }
+
+    def __init__(self, data: dict = ()):
+        self._mapping: Dict[str, Any] = {'resolve_paths': True}
         self.update(data)
 
-    def __getitem__(self, key):
+    def __getitem__(self, key: str) -> Any:
         return self._mapping[key]
 
-    def __delitem__(self, key):
-        del self._mapping[key]
-        if key == 'cross_sections':
-            del os.environ['OPENMC_CROSS_SECTIONS']
-        elif key == 'mg_cross_sections':
-            del os.environ['OPENMC_MG_CROSS_SECTIONS']
-        elif key == 'chain_file':
-            del os.environ['OPENMC_CHAIN_FILE']
-            # Reset photon source data since it relies on chain file
-            _DECAY_PHOTON_ENERGY.clear()
+    def __delitem__(self, key: str):
+        """Delete a configuration key.
 
-    def __setitem__(self, key, value):
-        if key == 'cross_sections':
-            # Force environment variable to match
-            self._set_path(key, value)
-            os.environ['OPENMC_CROSS_SECTIONS'] = str(value)
-        elif key == 'mg_cross_sections':
-            self._set_path(key, value)
-            os.environ['OPENMC_MG_CROSS_SECTIONS'] = str(value)
-        elif key == 'chain_file':
-            self._set_path(key, value)
-            os.environ['OPENMC_CHAIN_FILE'] = str(value)
-            # Reset photon source data since it relies on chain file
+        This also deletes the corresponding environment variable if the key is a
+        path-like key, and clears decay data caches if 'chain_file' is deleted.
+        'resolve_paths' cannot be deleted.
+
+        """
+        if key == 'resolve_paths':
+            raise KeyError("'resolve_paths' cannot be deleted.")
+        del self._mapping[key]
+        if key in self._PATH_KEYS:
+            env_var = self._PATH_KEYS[key]
+            if env_var in os.environ:
+                del os.environ[env_var]
+        if key == 'chain_file':
             _DECAY_PHOTON_ENERGY.clear()
             _DECAY_ENERGY.clear()
+
+    def __setitem__(self, key: str, value: Any):
+        """Set a configuration key and its corresponding value.
+
+        For path-like keys, this method performs several actions:
+        1. Resolves the path to an absolute path if `resolve_paths` is True.
+        2. Stores the `pathlib.Path` object.
+        3. Sets the corresponding environment variable (e.g., OPENMC_CROSS_SECTIONS).
+        4. For 'chain_file', clears internal decay data caches.
+        5. Issues a `UserWarning` if the final path does not exist.
+
+        """
+        if key in self._PATH_KEYS:
+            p = Path(value)
+            # Use .get() for robustness, defaulting to True
+            if self._mapping.get('resolve_paths', True):
+                stored_path = p.resolve(strict=False)
+            else:
+                stored_path = p
+
+            self._mapping[key] = stored_path
+            os.environ[self._PATH_KEYS[key]] = str(stored_path)
+
+            if key == 'chain_file':
+                _DECAY_PHOTON_ENERGY.clear()
+                _DECAY_ENERGY.clear()
+
+            if not stored_path.exists():
+                warnings.warn(f"Path '{stored_path}' does not exist.", UserWarning)
+
         elif key == 'resolve_paths':
+            if not isinstance(value, bool):
+                raise TypeError("'resolve_paths' must be a boolean.")
             self._mapping[key] = value
         else:
-            raise KeyError(f'Unrecognized config key: {key}. Acceptable keys '
-                           'are "cross_sections", "mg_cross_sections", '
-                           '"chain_file", and "resolve_paths".')
+            valid_keys = list(self._PATH_KEYS.keys()) + ['resolve_paths']
+            raise KeyError(
+                f"Unrecognized config key: {key}. Acceptable keys are: "
+                f"{', '.join(repr(k) for k in valid_keys)}."
+            )
 
-    def __iter__(self):
+    def __iter__(self) -> Iterator[str]:
         return iter(self._mapping)
 
-    def __len__(self):
+    def __len__(self) -> int:
         return len(self._mapping)
 
-    def __repr__(self):
+    def __repr__(self) -> str:
         return repr(self._mapping)
 
-    def _set_path(self, key, value):
-        self._mapping[key] = p = Path(value).resolve()
-        if not p.exists():
-            warnings.warn(f"'{value}' does not exist.")
+    def clear(self):
+        """Clear all configuration keys except for 'resolve_paths'.
+
+        This ensures that the path resolution behavior is not accidentally reset
+        when clearing the configuration.
+
+        """
+        # Create a copy of keys to iterate over for safe deletion
+        keys_to_delete = [k for k in self._mapping if k != 'resolve_paths']
+        for key in keys_to_delete:
+            del self[key]
 
     @contextmanager
-    def patch(self, key, value):
-        """Temporarily change a value in the configuration.
+    def patch(self, key: str, value: Any):
+        """Context manager to temporarily change a configuration value.
+
+        After the `with` block, the configuration is restored to its original
+        state.
 
         Parameters
         ----------
         key : str
-            Key to change
-        value : object
-            New value
+            The key of the configuration value to change.
+        value
+            The new temporary value.
+
+        Examples
+        --------
+        >>> openmc.config['cross_sections'] = 'endf71.xml'
+        >>> with openmc.config.patch('cross_sections', 'fendl32.xml'):
+        ...     # Code in this block sees the new value
+        ...     print(f"Inside with block: {openmc.config['cross_sections']}")
+        >>> # Outside the block, the value is restored
+        >>> print(f"Outside with block: {openmc.config['cross_sections']}")
+        Inside with block: fendl32.xml
+        Outside with block: endf71.xml
+
         """
         previous_value = self.get(key)
         self[key] = value
-        yield
-        if previous_value is None:
-            del self[key]
-        else:
-            self[key] = previous_value
+        try:
+            yield
+        finally:
+            if previous_value is None:
+                del self[key]
+            else:
+                self[key] = previous_value
 
-def _default_config():
-    """Return default configuration"""
+
+def _default_config() -> _Config:
+    """Create a configuration initialized from environment variables.
+
+    This function checks for OPENMC_CROSS_SECTIONS, OPENMC_MG_CROSS_SECTIONS,
+    and OPENMC_CHAIN_FILE environment variables. It also has logic to find
+    a chain file within a `cross_sections.xml` file if one is not
+    explicitly set.
+
+    Returns
+    -------
+    _Config
+        A new configuration object.
+
+    """
     config = _Config()
-
-    # Set cross sections using environment variable
     if "OPENMC_CROSS_SECTIONS" in os.environ:
         config['cross_sections'] = os.environ["OPENMC_CROSS_SECTIONS"]
     if "OPENMC_MG_CROSS_SECTIONS" in os.environ:
         config['mg_cross_sections'] = os.environ["OPENMC_MG_CROSS_SECTIONS"]
-
-    # Set depletion chain
     chain_file = os.environ.get("OPENMC_CHAIN_FILE")
-    if (chain_file is None and
-        config.get('cross_sections') is not None and
-        config['cross_sections'].exists()
-        ):
-        # Check for depletion chain in cross_sections.xml
-        data = DataLibrary.from_xml(config['cross_sections'])
-        for lib in reversed(data.libraries):
-            if lib['type'] == 'depletion_chain':
-                chain_file = lib['path']
-                break
+    xs_path = config.get('cross_sections')
+    if chain_file is None and xs_path is not None and xs_path.exists():
+        try:
+            data = DataLibrary.from_xml(xs_path)
+        except Exception:
+            # Let this pass silently if cross_sections.xml can't be parsed
+            # or if a dependency like lxml is not available.
+            pass
+        else:
+            for lib in reversed(data.libraries):
+                if lib['type'] == 'depletion_chain':
+                    chain_file = xs_path.parent / lib['path']
+                    break
     if chain_file is not None:
         config['chain_file'] = chain_file
-
     return config
 
 
+# Global configuration dictionary for OpenMC settings.
 config = _default_config()
diff --git a/tests/unit_tests/test_config.py b/tests/unit_tests/test_config.py
index 4e87de4b7..242c59b5e 100644
--- a/tests/unit_tests/test_config.py
+++ b/tests/unit_tests/test_config.py
@@ -3,58 +3,101 @@ import os
 from pathlib import Path
 
 import openmc
+from openmc.config import _default_config
+from openmc.data import decay
 import pytest
 
 
-@pytest.fixture(autouse=True, scope='module')
-def reset_config():
-    config = dict(openmc.config)
+@pytest.fixture(autouse=True, scope='function')
+def reset_config_and_env():
+    """A fixture to ensure each test has a clean config, env, and CWD."""
+    original_env = dict(os.environ)
+    original_cwd = os.getcwd()
+
+    # Reset environment variables that affect config
+    for key in ['OPENMC_CROSS_SECTIONS', 'OPENMC_MG_CROSS_SECTIONS', 'OPENMC_CHAIN_FILE']:
+        if key in os.environ:
+            del os.environ[key]
+
+    # Re-initialize the global config object
+    openmc.config = _default_config()
+
     try:
         yield
     finally:
-        openmc.config.clear()
-        openmc.config.update(config)
+        # Restore environment and CWD
+        os.environ.clear()
+        os.environ.update(original_env)
+        os.chdir(original_cwd)
+
+        # Restore config one last time for safety between modules
+        openmc.config = _default_config()
 
 
 def test_config_basics():
     assert isinstance(openmc.config, Mapping)
-    for key, value in openmc.config.items():
-        assert isinstance(key, str)
-        if key == 'resolve_paths':
-            assert isinstance(value, bool)
-        else:
-            assert isinstance(value, os.PathLike)
-
-    # Set and delete
-    openmc.config['cross_sections'] = '/path/to/cross_sections.xml'
+    with pytest.warns(UserWarning):
+        openmc.config['cross_sections'] = '/path/to/cross_sections.xml'
     del openmc.config['cross_sections']
     assert 'cross_sections' not in openmc.config
     assert 'OPENMC_CROSS_SECTIONS' not in os.environ
-
-    # Can't use any key
-    with pytest.raises(KeyError):
-        openmc.config['🐖'] = '/like/to/eat/bacon'
-
-    # ensure relative paths are expanded into absolute
-    # paths
-    chain_path = Path('./chain.xml')
-    openmc.config['chain_file'] = chain_path
-    assert openmc.config['chain_file'] == chain_path.resolve()
+    with pytest.raises(KeyError, match="Unrecognized config key: nuke"):
+        openmc.config['nuke'] = '/like/to/eat/bacon'
+    with pytest.raises(TypeError):
+        openmc.config['resolve_paths'] = 'not a bool'
 
 
-def test_config_patch():
-    openmc.config['cross_sections'] = '/path/to/cross_sections.xml'
-    with openmc.config.patch('cross_sections', '/path/to/other.xml'):
-        assert str(openmc.config['cross_sections']) == '/path/to/other.xml'
-    assert str(openmc.config['cross_sections']) == '/path/to/cross_sections.xml'
+def test_config_path_resolution(tmp_path):
+    """Test path resolution logic."""
+    os.chdir(tmp_path)
+    relative_path = Path("some/file.xml")
+    absolute_path = relative_path.resolve()
+
+    # Test with resolve_paths = True (default)
+    with pytest.warns(UserWarning):
+        openmc.config['cross_sections'] = relative_path
+    assert openmc.config['cross_sections'] == absolute_path
+    assert openmc.config['cross_sections'].is_absolute()
+
+    # Test with resolve_paths = False
+    with openmc.config.patch('resolve_paths', False):
+        with pytest.warns(UserWarning):
+            openmc.config['chain_file'] = relative_path
+        assert openmc.config['chain_file'] == relative_path
+        assert not openmc.config['chain_file'].is_absolute()
+
+    assert openmc.config['resolve_paths'] is True
 
 
-def test_config_set_envvar():
-    openmc.config['cross_sections'] = '/path/to/cross_sections.xml'
-    assert os.environ['OPENMC_CROSS_SECTIONS'] == '/path/to/cross_sections.xml'
+def test_config_patch(tmp_path):
+    file_a = tmp_path / "a.xml"; file_a.touch()
+    file_b = tmp_path / "b.xml"; file_b.touch()
+    openmc.config['cross_sections'] = file_a
+    with openmc.config.patch('cross_sections', file_b):
+        assert openmc.config['cross_sections'] == file_b.resolve()
+    assert openmc.config['cross_sections'] == file_a.resolve()
 
-    openmc.config['mg_cross_sections'] = '/path/to/mg_cross_sections.h5'
-    assert os.environ['OPENMC_MG_CROSS_SECTIONS'] == '/path/to/mg_cross_sections.h5'
+def test_config_set_envvar(tmp_path):
+    """Test that setting config also sets environment variables correctly."""
+    os.chdir(tmp_path)
+    relative_path = Path("relative.xml")
+    with pytest.warns(UserWarning):
+        openmc.config['cross_sections'] = relative_path
+    expected_path = str(relative_path.resolve())
+    assert os.environ['OPENMC_CROSS_SECTIONS'] == expected_path
 
-    openmc.config['chain_file'] = '/path/to/chain_file.xml'
-    assert os.environ['OPENMC_CHAIN_FILE'] == '/path/to/chain_file.xml'
+
+def test_config_warning_nonexistent_path(tmp_path):
+    """Test that a warning is issued for a path that does not exist."""
+    bad_path = tmp_path / "a/path/that/does/not/exist.xml"
+    with pytest.warns(UserWarning, match=f"Path '{bad_path}' does not exist."):
+        openmc.config['chain_file'] = bad_path
+
+
+def test_config_chain_side_effect(tmp_path):
+    """Test that modifying chain_file clears decay data caches."""
+    chain_file = tmp_path / "chain.xml"; chain_file.touch()
+    decay._DECAY_ENERGY['U235'] = (1.0, 2.0)
+    decay._DECAY_PHOTON_ENERGY['PU239'] = {}
+    openmc.config['chain_file'] = chain_file
+    assert not decay._DECAY_ENERGY and not decay._DECAY_PHOTON_ENERGY

From b939f9003b65b8b7c1070256f51638c25e8d8c30 Mon Sep 17 00:00:00 2001
From: John Tramm <john.tramm@gmail.com>
Date: Mon, 30 Jun 2025 03:33:22 -0500
Subject: [PATCH 066/203] Stabilize Adjoint Source (#3476)

---
 src/random_ray/flat_source_domain.cpp | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/src/random_ray/flat_source_domain.cpp b/src/random_ray/flat_source_domain.cpp
index 41e93ec94..4a5b43036 100644
--- a/src/random_ray/flat_source_domain.cpp
+++ b/src/random_ray/flat_source_domain.cpp
@@ -1242,6 +1242,30 @@ void FlatSourceDomain::set_adjoint_sources(const vector<double>& forward_flux)
     }
   }
 
+  // "Small" source regions in OpenMC are defined as those that are hit by
+  // MIN_HITS_PER_BATCH rays or fewer each batch. These regions typically have
+  // very small volumes combined with a low aspect ratio, and are often
+  // generated when applying a source region mesh that clips the edge of a
+  // curved surface. As perhaps only a few rays will visit these regions over
+  // the entire forward simulation, the forward flux estimates are extremely
+  // noisy and unreliable. In some cases, the noise may make the forward fluxes
+  // extremely low, leading to unphysically large adjoint source terms,
+  // resulting in weight windows that aggressively try to drive particles
+  // towards these regions. To fix this, we simply filter out any "small" source
+  // regions from consideration. If a source region is "small", we
+  // set its adjoint source to zero. This adds negligible bias to the adjoint
+  // flux solution, as the true total adjoint source contribution from small
+  // regions is likely to be negligible.
+#pragma omp parallel for
+  for (int64_t sr = 0; sr < n_source_regions(); sr++) {
+    if (source_regions_.is_small(sr)) {
+      for (int g = 0; g < negroups_; g++) {
+        source_regions_.external_source(sr, g) = 0.0;
+      }
+      source_regions_.external_source_present(sr) = 0;
+    }
+  }
+
   // Divide the fixed source term by sigma t (to save time when applying each
   // iteration)
 #pragma omp parallel for

From dab8af5672d7367996fd78a40b0c75d852efe0db Mon Sep 17 00:00:00 2001
From: Paul Romano <paul.k.romano@gmail.com>
Date: Tue, 1 Jul 2025 05:43:28 -0500
Subject: [PATCH 067/203] Support flux collapse method in
 `get_microxs_and_flux` (#3466)

Co-authored-by: Jonathan Shimwell <drshimwell@gmail.com>
---
 openmc/deplete/microxs.py                     | 134 +++++++++++++-----
 openmc/filter_expansion.py                    |   2 +-
 tests/regression_tests/microxs/test.py        |  71 +++++-----
 .../microxs/test_reference_materials.csv      |  25 ----
 .../test_reference_materials_direct.csv       |   7 +
 .../microxs/test_reference_materials_flux.csv |   7 +
 .../microxs/test_reference_mesh.csv           |  25 ----
 .../microxs/test_reference_mesh_direct.csv    |   7 +
 .../microxs/test_reference_mesh_flux.csv      |   7 +
 9 files changed, 163 insertions(+), 122 deletions(-)
 delete mode 100644 tests/regression_tests/microxs/test_reference_materials.csv
 create mode 100644 tests/regression_tests/microxs/test_reference_materials_direct.csv
 create mode 100644 tests/regression_tests/microxs/test_reference_materials_flux.csv
 delete mode 100644 tests/regression_tests/microxs/test_reference_mesh.csv
 create mode 100644 tests/regression_tests/microxs/test_reference_mesh_direct.csv
 create mode 100644 tests/regression_tests/microxs/test_reference_mesh_flux.csv

diff --git a/openmc/deplete/microxs.py b/openmc/deplete/microxs.py
index d478db11b..cbc8b1c88 100644
--- a/openmc/deplete/microxs.py
+++ b/openmc/deplete/microxs.py
@@ -5,8 +5,10 @@ IndependentOperator class for depletion.
 """
 
 from __future__ import annotations
-from collections.abc import Iterable, Sequence
+from collections.abc import Sequence
+import shutil
 from tempfile import TemporaryDirectory
+from typing import Union, TypeAlias
 
 import pandas as pd
 import numpy as np
@@ -27,19 +29,39 @@ _valid_rxns.append('fission')
 _valid_rxns.append('damage-energy')
 
 
+# TODO: Replace with type statement when support is Python 3.12+
+DomainTypes: TypeAlias = Union[
+    Sequence[openmc.Material],
+    Sequence[openmc.Cell],
+    Sequence[openmc.Universe],
+    openmc.MeshBase,
+    openmc.Filter
+]
+
+
 def get_microxs_and_flux(
-        model: openmc.Model,
-        domains,
-        nuclides: Iterable[str] | None = None,
-        reactions: Iterable[str] | None = None,
-        energies: Iterable[float] | str | None = None,
-        chain_file: PathLike | Chain | None = None,
-        run_kwargs=None
-    ) -> tuple[list[np.ndarray], list[MicroXS]]:
-    """Generate a microscopic cross sections and flux from a Model
+    model: openmc.Model,
+    domains: DomainTypes,
+    nuclides: Sequence[str] | None = None,
+    reactions: Sequence[str] | None = None,
+    energies: Sequence[float] | str | None = None,
+    reaction_rate_mode: str = 'direct',
+    chain_file: PathLike | Chain | None = None,
+    path_statepoint: PathLike | None = None,
+    run_kwargs=None
+) -> tuple[list[np.ndarray], list[MicroXS]]:
+    """Generate microscopic cross sections and fluxes for multiple domains.
+
+    This function runs a neutron transport solve to obtain the flux and reaction
+    rates in the specified domains and computes multigroup microscopic cross
+    sections that can be used in depletion calculations with the
+    :class:`~openmc.deplete.IndependentOperator` class.
 
     .. versionadded:: 0.14.0
 
+    .. versionchanged:: 0.15.3
+        Added `reaction_rate_mode` and `path_statepoint` arguments.
+
     Parameters
     ----------
     model : openmc.Model
@@ -53,12 +75,22 @@ def get_microxs_and_flux(
         Reactions to get cross sections for. If not specified, all neutron
         reactions listed in the depletion chain file are used.
     energies : iterable of float or str
-        Energy group boundaries in [eV] or the name of the group structure
+        Energy group boundaries in [eV] or the name of the group structure.
+        If left as None energies will default to [0.0, 100e6]
+    reaction_rate_mode : {"direct", "flux"}, optional
+        Indicate how reaction rates should be calculated. The "direct" method
+        tallies reaction rates directly. The "flux" method tallies a multigroup
+        flux spectrum and then collapses multigroup reaction rates after a
+        transport solve (with an option to tally some reaction rates directly).
     chain_file : PathLike or Chain, optional
         Path to the depletion chain XML file or an instance of
         openmc.deplete.Chain. Used to determine cross sections for materials not
         present in the inital composition. Defaults to
         ``openmc.config['chain_file']``.
+    path_statepoint : path-like, optional
+        Path to write the statepoint file from the neutron transport solve to.
+        By default, The statepoint file is written to a temporary directory and
+        is not kept.
     run_kwargs : dict, optional
         Keyword arguments passed to :meth:`openmc.Model.run`
 
@@ -69,7 +101,13 @@ def get_microxs_and_flux(
     list of MicroXS
         Cross section data in [b] for each domain
 
+    See Also
+    --------
+    openmc.deplete.IndependentOperator
+
     """
+    check_value('reaction_rate_mode', reaction_rate_mode, {'direct', 'flux'})
+
     # Save any original tallies on the model
     original_tallies = model.tallies
 
@@ -85,8 +123,8 @@ def get_microxs_and_flux(
 
     # Set up the reaction rate and flux tallies
     if energies is None:
-        energy_filter = openmc.EnergyFilter([0.0, 100.0e6])
-    elif isinstance(energies, str):
+        energies = [0.0, 100.0e6]
+    if isinstance(energies, str):
         energy_filter = openmc.EnergyFilter.from_group_structure(energies)
     else:
         energy_filter = openmc.EnergyFilter(energies)
@@ -104,16 +142,18 @@ def get_microxs_and_flux(
     else:
         raise ValueError(f"Unsupported domain type: {type(domains[0])}")
 
-    rr_tally = openmc.Tally(name='MicroXS RR')
-    rr_tally.filters = [domain_filter, energy_filter]
-    rr_tally.nuclides = nuclides
-    rr_tally.multiply_density = False
-    rr_tally.scores = reactions
-
     flux_tally = openmc.Tally(name='MicroXS flux')
     flux_tally.filters = [domain_filter, energy_filter]
     flux_tally.scores = ['flux']
-    model.tallies = openmc.Tallies([rr_tally, flux_tally])
+    model.tallies = [flux_tally]
+
+    if reaction_rate_mode == 'direct':
+        rr_tally = openmc.Tally(name='MicroXS RR')
+        rr_tally.filters = [domain_filter, energy_filter]
+        rr_tally.nuclides = nuclides
+        rr_tally.multiply_density = False
+        rr_tally.scores = reactions
+        model.tallies.append(rr_tally)
 
     if openmc.lib.is_initialized:
         openmc.lib.finalize()
@@ -134,33 +174,55 @@ def get_microxs_and_flux(
         statepoint_path = model.run(**run_kwargs)
 
         if comm.rank == 0:
+            # Move the statepoint file if it is being saved to a specific path
+            if path_statepoint is not None:
+                shutil.move(statepoint_path, path_statepoint)
+                statepoint_path = path_statepoint
+
             with StatePoint(statepoint_path) as sp:
-                rr_tally = sp.tallies[rr_tally.id]
-                rr_tally._read_results()
+                if reaction_rate_mode == 'direct':
+                    rr_tally = sp.tallies[rr_tally.id]
+                    rr_tally._read_results()
                 flux_tally = sp.tallies[flux_tally.id]
                 flux_tally._read_results()
 
-    rr_tally = comm.bcast(rr_tally)
+    # Get flux values and make energy groups last dimension
     flux_tally = comm.bcast(flux_tally)
-    # Get reaction rates and flux values
-    reaction_rates = rr_tally.get_reshaped_data()  # (domains, groups, nuclides, reactions)
     flux = flux_tally.get_reshaped_data()  # (domains, groups, 1, 1)
-
-    # Make energy groups last dimension
-    reaction_rates = np.moveaxis(reaction_rates, 1, -1)  # (domains, nuclides, reactions, groups)
     flux = np.moveaxis(flux, 1, -1)  # (domains, 1, 1, groups)
 
-    # Divide RR by flux to get microscopic cross sections
-    xs = np.empty_like(reaction_rates) # (domains, nuclides, reactions, groups)
-    d, _, _, g = np.nonzero(flux)
-    xs[d, ..., g] = reaction_rates[d, ..., g] / flux[d, :, :, g]
+    # Create list where each item corresponds to one domain
+    fluxes = list(flux.squeeze((1, 2)))
+
+    if reaction_rate_mode == 'direct':
+        # Get reaction rates
+        rr_tally = comm.bcast(rr_tally)
+        reaction_rates = rr_tally.get_reshaped_data()  # (domains, groups, nuclides, reactions)
+
+        # Make energy groups last dimension
+        reaction_rates = np.moveaxis(reaction_rates, 1, -1)  # (domains, nuclides, reactions, groups)
+
+        # Divide RR by flux to get microscopic cross sections. The indexing
+        # ensures that only non-zero flux values are used, and broadcasting is
+        # applied to align the shapes of reaction_rates and flux for division.
+        xs = np.empty_like(reaction_rates) # (domains, nuclides, reactions, groups)
+        d, _, _, g = np.nonzero(flux)
+        xs[d, ..., g] = reaction_rates[d, ..., g] / flux[d, :, :, g]
+
+        # Create lists where each item corresponds to one domain
+        micros = [MicroXS(xs_i, nuclides, reactions) for xs_i in xs]
+    else:
+        micros = [MicroXS.from_multigroup_flux(
+            energies=energies,
+            multigroup_flux=flux_i,
+            chain_file=chain_file,
+            nuclides=nuclides,
+            reactions=reactions
+        ) for flux_i in fluxes]
 
     # Reset tallies
     model.tallies = original_tallies
 
-    # Create lists where each item corresponds to one domain
-    fluxes = list(flux.squeeze((1, 2)))
-    micros = [MicroXS(xs_i, nuclides, reactions) for xs_i in xs]
     return fluxes, micros
 
 
@@ -230,7 +292,7 @@ class MicroXS:
         ----------
         energies : iterable of float or str
             Energy group boundaries in [eV] or the name of the group structure
-        multi_group_flux : iterable of float
+        multigroup_flux : iterable of float
             Energy-dependent multigroup flux values
         chain_file : PathLike or Chain, optional
             Path to the depletion chain XML file or an instance of
diff --git a/openmc/filter_expansion.py b/openmc/filter_expansion.py
index f8e677578..cdb2f20e0 100644
--- a/openmc/filter_expansion.py
+++ b/openmc/filter_expansion.py
@@ -3,7 +3,7 @@ from numbers import Integral, Real
 import lxml.etree as ET
 
 import openmc.checkvalue as cv
-from . import Filter
+from .filter import Filter
 
 
 class ExpansionFilter(Filter):
diff --git a/tests/regression_tests/microxs/test.py b/tests/regression_tests/microxs/test.py
index a35150a1b..70833bb39 100644
--- a/tests/regression_tests/microxs/test.py
+++ b/tests/regression_tests/microxs/test.py
@@ -13,55 +13,56 @@ CHAIN_FILE = Path(__file__).parents[2] / "chain_simple.xml"
 @pytest.fixture(scope="module")
 def model():
     fuel = openmc.Material(name="uo2")
-    fuel.add_element("U", 1, percent_type="ao", enrichment=4.25)
-    fuel.add_element("O", 2)
+    fuel.add_nuclide("U235", 1.0)
+    fuel.add_nuclide("O16", 2.0)
     fuel.set_density("g/cc", 10.4)
 
-    clad = openmc.Material(name="clad")
-    clad.add_element("Zr", 1)
-    clad.set_density("g/cc", 6)
-
-    water = openmc.Material(name="water")
-    water.add_element("O", 1)
-    water.add_element("H", 2)
-    water.set_density("g/cc", 1.0)
-    water.add_s_alpha_beta("c_H_in_H2O")
-
-    radii = [0.42, 0.45]
-    fuel.volume = np.pi * radii[0] ** 2
-
-    materials = openmc.Materials([fuel, clad, water])
-
-    pin_surfaces = [openmc.ZCylinder(r=r) for r in radii]
-    pin_univ = openmc.model.pin(pin_surfaces, materials)
-    bound_box = openmc.model.RectangularPrism(1.24, 1.24, boundary_type="reflective")
-    root_cell = openmc.Cell(fill=pin_univ, region=-bound_box)
-    geometry = openmc.Geometry([root_cell])
+    sphere = openmc.Sphere(r=10.0, boundary_type='vacuum')
+    cell = openmc.Cell(region=-sphere, fill=fuel)
+    geometry = openmc.Geometry([cell])
 
     settings = openmc.Settings()
     settings.particles = 1000
     settings.inactive = 5
     settings.batches = 10
 
-    return openmc.Model(geometry, materials, settings)
+    return openmc.Model(geometry, settings=settings)
 
 
-@pytest.mark.parametrize("domain_type", ["materials", "mesh"])
-def test_from_model(model, domain_type):
+@pytest.mark.parametrize(
+    "domain_type, rr_mode",
+    [
+        ("materials", "direct"),
+        ("materials", "flux"),
+        ("mesh", "direct"),
+        ("mesh", "flux"),
+    ]
+)
+def test_from_model(model, domain_type, rr_mode):
     if domain_type == 'materials':
-        domains = model.materials[:1]
+        domains = list(model.geometry.get_all_materials().values())
     elif domain_type == 'mesh':
         mesh = openmc.RegularMesh()
-        mesh.lower_left = (-0.62, -0.62)
-        mesh.upper_right = (0.62, 0.62)
-        mesh.dimension = (3, 3)
+        mesh.lower_left = (-10., -10.)
+        mesh.upper_right = (10., 10.)
+        mesh.dimension = (1, 1)
         domains = mesh
-    nuclides = ['U234', 'U235', 'U238', 'U236', 'O16', 'O17', 'I135', 'Xe135',
-                'Xe136', 'Cs135', 'Gd157', 'Gd156']
-    _, test_xs = get_microxs_and_flux(model, domains, nuclides, chain_file=CHAIN_FILE)
+    nuclides = ['U235', 'O16', 'Xe135']
+    kwargs = {
+        'reaction_rate_mode': rr_mode,
+        'chain_file': CHAIN_FILE,
+        'path_statepoint': 'neutron_transport.h5',
+    }
+    if rr_mode == 'flux':
+        kwargs['energies'] = 'CASMO-40'
+    _, test_xs = get_microxs_and_flux(model, domains, nuclides, **kwargs)
     if config['update']:
-        test_xs[0].to_csv(f'test_reference_{domain_type}.csv')
-
-    ref_xs = MicroXS.from_csv(f'test_reference_{domain_type}.csv')
+        test_xs[0].to_csv(f'test_reference_{domain_type}_{rr_mode}.csv')
 
+    # Make sure results match reference results
+    ref_xs = MicroXS.from_csv(f'test_reference_{domain_type}_{rr_mode}.csv')
     np.testing.assert_allclose(test_xs[0].data, ref_xs.data, rtol=1e-11)
+
+    # Make sure statepoint file was saved
+    assert Path('neutron_transport.h5').exists()
+    Path('neutron_transport.h5').unlink()
diff --git a/tests/regression_tests/microxs/test_reference_materials.csv b/tests/regression_tests/microxs/test_reference_materials.csv
deleted file mode 100644
index 3e679f980..000000000
--- a/tests/regression_tests/microxs/test_reference_materials.csv
+++ /dev/null
@@ -1,25 +0,0 @@
-nuclides,reactions,groups,xs
-U234,"(n,gamma)",1,21.418670317831076
-U234,fission,1,0.5014588470882162
-U235,"(n,gamma)",1,10.343944102483215
-U235,fission,1,47.46718472611895
-U238,"(n,gamma)",1,0.8741166723597229
-U238,fission,1,0.10829568455139067
-U236,"(n,gamma)",1,9.08348678468935
-U236,fission,1,0.3325287927011424
-O16,"(n,gamma)",1,7.548646353912426e-05
-O16,fission,1,0.0
-O17,"(n,gamma)",1,0.00040184862213103105
-O17,fission,1,0.0
-I135,"(n,gamma)",1,6.691256508942912
-I135,fission,1,0.0
-Xe135,"(n,gamma)",1,223998.6418566729
-Xe135,fission,1,0.0
-Xe136,"(n,gamma)",1,0.022934362666193503
-Xe136,fission,1,0.0
-Cs135,"(n,gamma)",1,2.2845395222353204
-Cs135,fission,1,0.0
-Gd157,"(n,gamma)",1,12582.07962003624
-Gd157,fission,1,0.0
-Gd156,"(n,gamma)",1,2.942112751533234
-Gd156,fission,1,0.0
diff --git a/tests/regression_tests/microxs/test_reference_materials_direct.csv b/tests/regression_tests/microxs/test_reference_materials_direct.csv
new file mode 100644
index 000000000..3259d0151
--- /dev/null
+++ b/tests/regression_tests/microxs/test_reference_materials_direct.csv
@@ -0,0 +1,7 @@
+nuclides,reactions,groups,xs
+U235,"(n,gamma)",1,0.14765501510184456
+U235,fission,1,1.2517200956290817
+O16,"(n,gamma)",1,0.00010872314985710938
+O16,fission,1,0.0
+Xe135,"(n,gamma)",1,0.014333667335215764
+Xe135,fission,1,0.0
diff --git a/tests/regression_tests/microxs/test_reference_materials_flux.csv b/tests/regression_tests/microxs/test_reference_materials_flux.csv
new file mode 100644
index 000000000..5023e0d0e
--- /dev/null
+++ b/tests/regression_tests/microxs/test_reference_materials_flux.csv
@@ -0,0 +1,7 @@
+nuclides,reactions,groups,xs
+U235,"(n,gamma)",1,0.15018326758942505
+U235,fission,1,1.2603151141390958
+O16,"(n,gamma)",1,0.00012159621938463765
+O16,fission,1,0.0
+Xe135,"(n,gamma)",1,0.015180177095633546
+Xe135,fission,1,0.0
diff --git a/tests/regression_tests/microxs/test_reference_mesh.csv b/tests/regression_tests/microxs/test_reference_mesh.csv
deleted file mode 100644
index 1882372b1..000000000
--- a/tests/regression_tests/microxs/test_reference_mesh.csv
+++ /dev/null
@@ -1,25 +0,0 @@
-nuclides,reactions,groups,xs
-U234,"(n,gamma)",1,27.027171724208227
-U234,fission,1,0.04333740860093498
-U235,"(n,gamma)",1,12.683875995776193
-U235,fission,1,4.2596665957162605
-U238,"(n,gamma)",1,4.479719141496804
-U238,fission,1,0.009460665924409056
-U236,"(n,gamma)",1,8.469286849810802
-U236,fission,1,0.027373590840715795
-O16,"(n,gamma)",1,7.478160204479271e-05
-O16,fission,1,0.0
-O17,"(n,gamma)",1,0.0004743959164164789
-O17,fission,1,0.0
-I135,"(n,gamma)",1,8.33959524761822
-I135,fission,1,0.0
-Xe135,"(n,gamma)",1,282068.447252079
-Xe135,fission,1,0.0
-Xe136,"(n,gamma)",1,0.02888928065916194
-Xe136,fission,1,0.0
-Cs135,"(n,gamma)",1,2.5863526577468408
-Cs135,fission,1,0.0
-Gd157,"(n,gamma)",1,16518.24083307153
-Gd157,fission,1,0.0
-Gd156,"(n,gamma)",1,2.838514589417232
-Gd156,fission,1,0.0
diff --git a/tests/regression_tests/microxs/test_reference_mesh_direct.csv b/tests/regression_tests/microxs/test_reference_mesh_direct.csv
new file mode 100644
index 000000000..bd07a3237
--- /dev/null
+++ b/tests/regression_tests/microxs/test_reference_mesh_direct.csv
@@ -0,0 +1,7 @@
+nuclides,reactions,groups,xs
+U235,"(n,gamma)",1,0.14765501510184456
+U235,fission,1,1.2517200956290815
+O16,"(n,gamma)",1,0.00010872314985710936
+O16,fission,1,0.0
+Xe135,"(n,gamma)",1,0.014333667335215761
+Xe135,fission,1,0.0
diff --git a/tests/regression_tests/microxs/test_reference_mesh_flux.csv b/tests/regression_tests/microxs/test_reference_mesh_flux.csv
new file mode 100644
index 000000000..d946ada80
--- /dev/null
+++ b/tests/regression_tests/microxs/test_reference_mesh_flux.csv
@@ -0,0 +1,7 @@
+nuclides,reactions,groups,xs
+U235,"(n,gamma)",1,0.15018326758942507
+U235,fission,1,1.2603151141390958
+O16,"(n,gamma)",1,0.00012159621938463766
+O16,fission,1,0.0
+Xe135,"(n,gamma)",1,0.015180177095633546
+Xe135,fission,1,0.0

From ecfb666db735544dd6a76b88c02f57049111cbf2 Mon Sep 17 00:00:00 2001
From: Paul Romano <paul.k.romano@gmail.com>
Date: Tue, 1 Jul 2025 09:03:28 -0500
Subject: [PATCH 068/203] Allow spatial constraints on element sources within
 MeshSource (#3431)

---
 include/openmc/source.h              | 29 +++++++---
 src/source.cpp                       | 53 ++++++++++--------
 tests/unit_tests/test_source_mesh.py | 81 ++++++++++++++--------------
 3 files changed, 94 insertions(+), 69 deletions(-)

diff --git a/include/openmc/source.h b/include/openmc/source.h
index e82c42269..d58195f10 100644
--- a/include/openmc/source.h
+++ b/include/openmc/source.h
@@ -139,6 +139,9 @@ public:
   DomainType domain_type() const { return domain_type_; }
   const std::unordered_set<int32_t>& domain_ids() const { return domain_ids_; }
 
+  // Setter for spatial distribution
+  void set_space(UPtrSpace space) { space_ = std::move(space); }
+
 protected:
   // Indicates whether derived class already handles constraints
   bool constraints_applied() const override { return true; }
@@ -205,6 +208,23 @@ typedef unique_ptr<Source> create_compiled_source_t(std::string parameters);
 //! Mesh-based source with different distributions for each element
 //==============================================================================
 
+// Helper class to sample spatial position on a single mesh element
+class MeshElementSpatial : public SpatialDistribution {
+public:
+  MeshElementSpatial(int32_t mesh_index, int elem_index)
+    : mesh_index_(mesh_index), elem_index_(elem_index)
+  {}
+
+  //! Sample a position from the distribution
+  //! \param seed Pseudorandom number seed pointer
+  //! \return Sampled position
+  Position sample(uint64_t* seed) const override;
+
+private:
+  int32_t mesh_index_ {C_NONE}; //!< Index in global meshes array
+  int elem_index_;              //! Index of mesh element
+};
+
 class MeshSource : public Source {
 public:
   // Constructors
@@ -219,18 +239,15 @@ public:
   double strength() const override { return space_->total_strength(); }
 
   // Accessors
-  const std::unique_ptr<Source>& source(int32_t i) const
+  const unique_ptr<IndependentSource>& source(int32_t i) const
   {
     return sources_.size() == 1 ? sources_[0] : sources_[i];
   }
 
-protected:
-  bool constraints_applied() const override { return true; }
-
 private:
   // Data members
-  unique_ptr<MeshSpatial> space_;           //!< Mesh spatial
-  vector<std::unique_ptr<Source>> sources_; //!< Source distributions
+  unique_ptr<MeshSpatial> space_;                 //!< Mesh spatial
+  vector<unique_ptr<IndependentSource>> sources_; //!< Source distributions
 };
 
 //==============================================================================
diff --git a/src/source.cpp b/src/source.cpp
index 6ee0b5603..65873f5a7 100644
--- a/src/source.cpp
+++ b/src/source.cpp
@@ -239,7 +239,9 @@ bool Source::satisfies_spatial_constraints(Position r) const
   if (!domain_ids_.empty()) {
     if (domain_type_ == DomainType::MATERIAL) {
       auto mat_index = geom_state.material();
-      if (mat_index != MATERIAL_VOID) {
+      if (mat_index == MATERIAL_VOID) {
+        accepted = false;
+      } else {
         accepted = contains(domain_ids_, model::materials[mat_index]->id());
       }
     } else {
@@ -525,6 +527,15 @@ CompiledSourceWrapper::~CompiledSourceWrapper()
 #endif
 }
 
+//==============================================================================
+// MeshElementSpatial implementation
+//==============================================================================
+
+Position MeshElementSpatial::sample(uint64_t* seed) const
+{
+  return model::meshes[mesh_index_]->sample_element(elem_index_, seed);
+}
+
 //==============================================================================
 // MeshSource implementation
 //==============================================================================
@@ -539,10 +550,23 @@ MeshSource::MeshSource(pugi::xml_node node) : Source(node)
   // read all source distributions and populate strengths vector for MeshSpatial
   // object
   for (auto source_node : node.children("source")) {
-    sources_.emplace_back(Source::create(source_node));
+    auto src = Source::create(source_node);
+    if (auto ptr = dynamic_cast<IndependentSource*>(src.get())) {
+      src.release();
+      sources_.emplace_back(ptr);
+    } else {
+      fatal_error(
+        "The source assigned to each element must be an IndependentSource.");
+    }
     strengths.push_back(sources_.back()->strength());
   }
 
+  // Set spatial distributions for each mesh element
+  for (int elem_index = 0; elem_index < sources_.size(); ++elem_index) {
+    sources_[elem_index]->set_space(
+      std::make_unique<MeshElementSpatial>(mesh_idx, elem_index));
+  }
+
   // the number of source distributions should either be one or equal to the
   // number of mesh elements
   if (sources_.size() > 1 && sources_.size() != mesh->n_bins()) {
@@ -556,29 +580,12 @@ MeshSource::MeshSource(pugi::xml_node node) : Source(node)
 
 SourceSite MeshSource::sample(uint64_t* seed) const
 {
-  // Sample the CDF defined in initialization above
+  // Sample a mesh element based on the relative strengths
   int32_t element = space_->sample_element_index(seed);
 
-  // Sample position and apply rejection on spatial domains
-  Position r;
-  do {
-    r = space_->mesh()->sample_element(element, seed);
-  } while (!this->satisfies_spatial_constraints(r));
-
-  SourceSite site;
-  while (true) {
-    // Sample source for the chosen element and replace the position
-    site = source(element)->sample_with_constraints(seed);
-    site.r = r;
-
-    // Apply other rejections
-    if (satisfies_energy_constraints(site.E) &&
-        satisfies_time_constraints(site.time)) {
-      break;
-    }
-  }
-
-  return site;
+  // Sample the distribution for the specific mesh element; note that the
+  // spatial distribution has been set for each element using MeshElementSpatial
+  return source(element)->sample_with_constraints(seed);
 }
 
 //==============================================================================
diff --git a/tests/unit_tests/test_source_mesh.py b/tests/unit_tests/test_source_mesh.py
index d023c1335..2550cb87e 100644
--- a/tests/unit_tests/test_source_mesh.py
+++ b/tests/unit_tests/test_source_mesh.py
@@ -1,5 +1,7 @@
 from itertools import product
 from pathlib import Path
+from math import sqrt
+import random
 
 import pytest
 import numpy as np
@@ -334,13 +336,10 @@ def test_umesh_source_independent(run_in_tmpdir, request, void_model, library):
     n_elements = 12_000
     model.settings.source = openmc.MeshSource(uscd_mesh, n_elements*[ind_source])
     model.export_to_model_xml()
-    try:
-        openmc.lib.init()
+    with openmc.lib.run_in_memory():
         openmc.lib.simulation_init()
         sites = openmc.lib.sample_external_source(10)
         openmc.lib.statepoint_write('statepoint.h5')
-    finally:
-        openmc.lib.finalize()
 
     with openmc.StatePoint('statepoint.h5') as sp:
         uscd_mesh = sp.meshes[uscd_mesh.id]
@@ -351,51 +350,53 @@ def test_umesh_source_independent(run_in_tmpdir, request, void_model, library):
         assert site.r in bounding_box
 
 
-def test_mesh_source_file(run_in_tmpdir):
-    # Creating a source file with a single particle
-    source_particle = openmc.SourceParticle(time=10.0)
-    openmc.write_source_file([source_particle], 'source.h5')
-    file_source = openmc.FileSource('source.h5')
+def test_mesh_source_constraints(run_in_tmpdir):
+    """Test application of constraints to underlying mesh element sources"""
 
+    # Create simple model with two cells
+    m1 = openmc.Material()
+    m1.add_nuclide('H1', 1.0)
+    m2 = m1.clone()
+    sph = openmc.Sphere(r=100, boundary_type='vacuum')
+    box1 = openmc.model.RectangularParallelepiped(-1, 0, -1, 1, -1, 1)
+    box2 = openmc.model.RectangularParallelepiped(0, 2, -1, 1, -1, 1)
+    cell1 = openmc.Cell(fill=m1, region=-box1)
+    cell2 = openmc.Cell(fill=m2, region=-box2)
+    outer = openmc.Cell(region=-sph & (+box1 | +box2))
     model = openmc.Model()
+    model.geometry = openmc.Geometry([cell1, cell2, outer])
 
-    rect_prism = openmc.model.RectangularParallelepiped(
-        -5.0, 5.0, -5.0, 5.0, -5.0, 5.0, boundary_type='vacuum')
-
-    mat = openmc.Material()
-    mat.add_nuclide('H1', 1.0)
-
-    model.geometry = openmc.Geometry([openmc.Cell(fill=mat, region=-rect_prism)])
-    model.settings.particles = 1000
-    model.settings.batches = 10
-    model.settings.run_mode = 'fixed source'
-
+    # Define a mesh covering the two cells: the first mesh element contains
+    # cell1 (-1 < x < 0) and the second element contains cells2 (0 < x < 2)
     mesh = openmc.RegularMesh()
-    mesh.lower_left = (-1, -2, -3)
-    mesh.upper_right = (2, 3, 4)
-    mesh.dimension = (1, 1, 1)
+    mesh.lower_left = (-3., -1., -1.)
+    mesh.upper_right = (3., 1., 1.)
+    mesh.dimension = (2, 1, 1)
 
-    model.settings.source = openmc.MeshSource(mesh, [file_source])
+    # Define a mesh source with a randomly chosen probability
+    p = random.random()
+    src1 = openmc.IndependentSource(strength=p, constraints={'domains': [cell1]})
+    src2 = openmc.IndependentSource(strength=1 - p, constraints={'domains': [cell2]})
+    model.settings.source = openmc.MeshSource(mesh, [src1, src2])
 
+    # Finish settings and export
+    model.settings.particles = 100
+    model.settings.batches = 1
     model.export_to_model_xml()
 
-    openmc.lib.init()
-    openmc.lib.simulation_init()
-    sites = openmc.lib.sample_external_source(10)
-    openmc.lib.simulation_finalize()
-    openmc.lib.finalize()
+    with openmc.lib.run_in_memory():
+        # Sample sites from the source
+        sites = openmc.lib.sample_external_source(N := 1000)
 
-    # The mesh bounds do not contain the point of the lone source site in the
-    # file source, so it should not appear in the set of source sites produced
-    # from the mesh source. Additionally, the source should be located within
-    # the mesh
-    bbox = mesh.bounding_box
-    for site in sites:
-        assert site.r != (0, 0, 0)
-        assert site.E == source_particle.E
-        assert site.u == source_particle.u
-        assert site.time == source_particle.time
-        assert site.r in bbox
+        # Check that all sites are either in cell1 or cell2
+        xs = np.array([s.r[0] for s in sites])
+        assert (xs >= -1.0).all()
+        assert (xs <= 2.0).all()
+
+        # Check that the correct percentage of the sites are in cell1
+        sigma = sqrt(p*(1- p)/N)
+        frac = xs[(-1.0 <= xs) & (xs <= 0.0)].size / N
+        assert frac == pytest.approx(p, abs=5*sigma)
 
 
 @pytest.mark.parametrize("mesh_type", ('rectangular', 'cylindrical', 'spherical'))

From eb74d497d2cfa784d9d628a79fda9f4c509b87d4 Mon Sep 17 00:00:00 2001
From: Paul Romano <paul.k.romano@gmail.com>
Date: Tue, 1 Jul 2025 12:43:45 -0500
Subject: [PATCH 069/203] Introduce `openmc.lib.TemporarySession` context
 manager (#3475)

---
 docs/source/pythonapi/capi.rst         |  1 +
 openmc/deplete/chain.py                | 57 ++++++++++++++++------
 openmc/deplete/microxs.py              | 51 ++++++++------------
 openmc/lib/core.py                     | 65 ++++++++++++++++++++++++++
 openmc/lib/nuclide.py                  |  6 +++
 openmc/mesh.py                         | 37 +++++++--------
 openmc/weight_windows.py               | 10 ++--
 src/nuclide.cpp                        |  3 +-
 tests/unit_tests/test_deplete_chain.py |  6 +--
 9 files changed, 160 insertions(+), 76 deletions(-)

diff --git a/docs/source/pythonapi/capi.rst b/docs/source/pythonapi/capi.rst
index 63fc5d11b..67eca0094 100644
--- a/docs/source/pythonapi/capi.rst
+++ b/docs/source/pythonapi/capi.rst
@@ -89,6 +89,7 @@ Classes
    SphericalMesh
    SurfaceFilter
    Tally
+   TemporarySession
    UniverseFilter
    UnstructuredMesh
    WeightFilter
diff --git a/openmc/deplete/chain.py b/openmc/deplete/chain.py
index 07db48799..8e24f716b 100644
--- a/openmc/deplete/chain.py
+++ b/openmc/deplete/chain.py
@@ -11,6 +11,7 @@ import re
 from collections import defaultdict, namedtuple
 from collections.abc import Mapping, Iterable
 from numbers import Real, Integral
+from pathlib import Path
 from warnings import warn
 from typing import List
 
@@ -278,7 +279,6 @@ class Chain:
         """Number of nuclides in chain."""
         return len(self.nuclides)
 
-
     @property
     def stable_nuclides(self) -> List[Nuclide]:
         """List of stable nuclides available in the chain"""
@@ -298,6 +298,7 @@ class Chain:
             Nuclide to add
 
         """
+        _invalidate_chain_cache(self)
         self.nuclide_dict[nuclide.name] = len(self.nuclides)
         self.nuclides.append(nuclide)
 
@@ -463,7 +464,6 @@ class Chain:
                     nuclide.add_reaction('fission', None, q_value, 1.0)
                     fissionable = True
 
-
             if fissionable:
                 if parent in fpy_data:
                     fpy = fpy_data[parent]
@@ -558,6 +558,9 @@ class Chain:
             nuc = Nuclide.from_xml(nuclide_elem, root, this_q)
             chain.add_nuclide(nuc)
 
+        # Store path of XML file (used for handling cache invalidation)
+        chain._xml_path = str(Path(filename).resolve())
+
         return chain
 
     def export_to_xml(self, filename):
@@ -888,7 +891,7 @@ class Chain:
         --------
         :meth:`get_branch_ratios`
         """
-
+        _invalidate_chain_cache(self)
         # Store some useful information through the validation stage
 
         sums = {}
@@ -1027,6 +1030,7 @@ class Chain:
 
     @fission_yields.setter
     def fission_yields(self, yields):
+        _invalidate_chain_cache(self)
         if yields is not None:
             if isinstance(yields, Mapping):
                 yields = [yields]
@@ -1249,6 +1253,10 @@ class Chain:
         return found
 
 
+# A global cache for Chain objects
+_CHAIN_CACHE = {}
+
+
 def _get_chain(
     chain_file: PathLike | Chain | None = None,
     fission_q: dict | None = None
@@ -1269,16 +1277,39 @@ def _get_chain(
     Chain
         Depletion chain instance.
     """
+    # If chain_file is already a Chain, return it directly
     if isinstance(chain_file, Chain):
         return chain_file
-    elif isinstance(chain_file, PathLike | None):
-        if chain_file is None:
-            chain_file = openmc.config.get('chain_file')
-            if 'chain_file' not in openmc.config:
-                raise DataError(
-                    "No depletion chain specified and could not find depletion "
-                    "chain in openmc.config['chain_file']"
-                )
-        return Chain.from_xml(chain_file, fission_q)
-    else:
+
+    # Resolve chain_file based on config if None
+    if chain_file is None:
+        chain_file = openmc.config.get('chain_file')
+        if 'chain_file' not in openmc.config:
+            raise DataError(
+                "No depletion chain specified and could not find depletion "
+                "chain in openmc.config['chain_file']"
+            )
+    elif not isinstance(chain_file, PathLike):
         raise TypeError("chain_file must be path-like, a Chain, or None")
+
+    # Determine the key for the cache, which consists of the absolute path, the
+    # file modification time, the file size, and the fission Q values.
+    chain_path = Path(chain_file).resolve()
+    stat_result = chain_path.stat()
+    fq_tuple = tuple(sorted(fission_q.items())) if fission_q else ()
+    key = (chain_path, stat_result.st_mtime, stat_result.st_size, fq_tuple)
+
+    # Check the global cache. If not cached, load the chain from XML and store
+    global _CHAIN_CACHE
+    if key not in _CHAIN_CACHE:
+        _CHAIN_CACHE[key] = Chain.from_xml(chain_path, fission_q)
+    return _CHAIN_CACHE[key]
+
+
+def _invalidate_chain_cache(chain):
+    """Invalidate the cache for a specific Chain (when it is modifed)."""
+    if hasattr(chain, '_xml_path'):
+        # Remove all entries with the same path as self._xml_path
+        for key in list(_CHAIN_CACHE.keys()):
+            if str(key[0]) == chain._xml_path:
+                del _CHAIN_CACHE[key]
diff --git a/openmc/deplete/microxs.py b/openmc/deplete/microxs.py
index cbc8b1c88..df78f8a26 100644
--- a/openmc/deplete/microxs.py
+++ b/openmc/deplete/microxs.py
@@ -14,7 +14,6 @@ import pandas as pd
 import numpy as np
 
 from openmc.checkvalue import check_type, check_value, check_iterable_type, PathLike
-from openmc.utility_funcs import change_directory
 from openmc import StatePoint
 from openmc.mgxs import GROUP_STRUCTURES
 from openmc.data import REACTION_MT
@@ -286,6 +285,10 @@ class MicroXS:
         sections available. MicroXS entry will be 0 if the nuclide cross section
         is not found.
 
+        It is recommended to make repeated calls to this method within a context
+        manager using the :class:`openmc.lib.TemporarySession` class to avoid
+        re-initializing OpenMC and loading cross sections each time.
+
         .. versionadded:: 0.15.0
 
         Parameters
@@ -349,37 +352,23 @@ class MicroXS:
         # Create 3D array for microscopic cross sections
         microxs_arr = np.zeros((len(nuclides), len(mts), 1))
 
-        # Create a material with all nuclides
-        mat_all_nucs = openmc.Material()
-        for nuc in nuclides:
-            if nuc in nuclides_with_data:
-                mat_all_nucs.add_nuclide(nuc, 1.0)
-        mat_all_nucs.set_density("atom/b-cm", 1.0)
+        def compute_microxs():
+            # For each nuclide and reaction, compute the flux-averaged xs
+            for nuc_index, nuc in enumerate(nuclides):
+                if nuc not in nuclides_with_data:
+                    continue
+                lib_nuc = openmc.lib.load_nuclide(nuc)
+                for mt_index, mt in enumerate(mts):
+                    microxs_arr[nuc_index, mt_index, 0] = lib_nuc.collapse_rate(
+                        mt, temperature, energies, multigroup_flux
+                    )
 
-        # Create simple model containing the above material
-        surf1 = openmc.Sphere(boundary_type="vacuum")
-        surf1_cell = openmc.Cell(fill=mat_all_nucs, region=-surf1)
-        model = openmc.Model()
-        model.geometry = openmc.Geometry([surf1_cell])
-        model.settings = openmc.Settings(
-            particles=1, batches=1, output={'summary': False})
-
-        with change_directory(tmpdir=True):
-            # Export model within temporary directory
-            model.export_to_model_xml()
-
-            with openmc.lib.run_in_memory(**init_kwargs):
-                # For each nuclide and reaction, compute the flux-averaged
-                # cross section
-                for nuc_index, nuc in enumerate(nuclides):
-                    if nuc not in nuclides_with_data:
-                        continue
-                    lib_nuc = openmc.lib.nuclides[nuc]
-                    for mt_index, mt in enumerate(mts):
-                        xs = lib_nuc.collapse_rate(
-                            mt, temperature, energies, multigroup_flux
-                        )
-                        microxs_arr[nuc_index, mt_index, 0] = xs
+        # Compute microscopic cross sections within a temporary session
+        if not openmc.lib.is_initialized:
+            with openmc.lib.TemporarySession(**init_kwargs):
+                compute_microxs()
+        else:
+            compute_microxs()
 
         return cls(microxs_arr, nuclides, reactions)
 
diff --git a/openmc/lib/core.py b/openmc/lib/core.py
index 577913dcb..eac0e1784 100644
--- a/openmc/lib/core.py
+++ b/openmc/lib/core.py
@@ -4,7 +4,9 @@ from ctypes import (c_bool, c_int, c_int32, c_int64, c_double, c_char_p,
                     c_uint64, c_size_t)
 import sys
 import os
+from pathlib import Path
 from random import getrandbits
+from tempfile import TemporaryDirectory
 
 import numpy as np
 from numpy.ctypeslib import as_array
@@ -617,6 +619,69 @@ def run_in_memory(**kwargs):
         finalize()
 
 
+class TemporarySession:
+    """Context manager for running via openmc.lib in a temporary directory.
+
+    This class is useful for accessing functionality from openmc.lib without
+    polluting your current working directory with OpenMC files. It is used
+    internally as a persistent session to avoid loading cross sections multiple
+    times.
+
+    Parameters
+    ----------
+    model : openmc.Model, optional
+        OpenMC model to use for the session. If None, a minimal working model is
+        created.
+    **init_kwargs
+        Keyword arguments to pass to :func:`openmc.lib.init`.
+
+    Attributes
+    ----------
+    model : openmc.Model
+        The OpenMC model used for the session.
+
+    """
+    def __init__(self, model=None, **init_kwargs):
+        self.init_kwargs = init_kwargs
+        if model is None:
+            surf = openmc.Sphere(boundary_type="vacuum")
+            cell = openmc.Cell(region=-surf)
+            model = openmc.Model()
+            model.geometry = openmc.Geometry([cell])
+            model.settings = openmc.Settings(
+                particles=1, batches=1, output={'summary': False})
+        self.model = model
+
+    def __enter__(self):
+        """Initialize the OpenMC library in a temporary directory."""
+        # Make sure OpenMC is not already initialized
+        if openmc.lib.is_initialized:
+            raise RuntimeError("openmc.lib is already initialized.")
+
+        # Store original working directory
+        self.orig_dir = Path.cwd()
+
+        # Set up temporary directory
+        self.tmp_dir = TemporaryDirectory()
+        working_dir = Path(self.tmp_dir.name)
+        working_dir.mkdir(parents=True, exist_ok=True)
+        os.chdir(working_dir)
+
+        # Export model and initialize OpenMC
+        self.model.export_to_model_xml()
+        openmc.lib.init(**self.init_kwargs)
+
+        return self
+
+    def __exit__(self, exc_type, exc_value, traceback):
+        """Finalize the OpenMC library and clean up temporary directory."""
+        try:
+            openmc.lib.finalize()
+        finally:
+            os.chdir(self.orig_dir)
+            self.tmp_dir.cleanup()
+
+
 class _DLLGlobal:
     """Data descriptor that exposes global variables from libopenmc."""
     def __init__(self, ctype, name):
diff --git a/openmc/lib/nuclide.py b/openmc/lib/nuclide.py
index 8078882cf..ef1287cf3 100644
--- a/openmc/lib/nuclide.py
+++ b/openmc/lib/nuclide.py
@@ -40,8 +40,14 @@ def load_nuclide(name):
     name : str
         Name of the nuclide, e.g. 'U235'
 
+    Returns
+    -------
+    Nuclide
+        The class:`Nuclide` that was just loaded.
+
     """
     _dll.openmc_load_nuclide(name.encode(), None, 0)
+    return nuclides[name]
 
 
 class Nuclide(_FortranObject):
diff --git a/openmc/mesh.py b/openmc/mesh.py
index b046769fd..56fe2bd1c 100644
--- a/openmc/mesh.py
+++ b/openmc/mesh.py
@@ -400,31 +400,30 @@ class MeshBase(IDManagerMixin, ABC):
         """
         import openmc.lib
 
-        with change_directory(tmpdir=True):
-            # In order to get mesh into model, we temporarily replace the
-            # tallies with a single mesh tally using the current mesh
-            original_tallies = model.tallies
-            new_tally = openmc.Tally()
-            new_tally.filters = [openmc.MeshFilter(self)]
-            new_tally.scores = ['flux']
-            model.tallies = [new_tally]
+        # In order to get mesh into model, we temporarily replace the
+        # tallies with a single mesh tally using the current mesh
+        original_tallies = model.tallies
+        new_tally = openmc.Tally()
+        new_tally.filters = [openmc.MeshFilter(self)]
+        new_tally.scores = ['flux']
+        model.tallies = [new_tally]
 
-            # Export model to XML
-            model.export_to_model_xml()
+        # Set default arguments
+        kwargs.setdefault('output', True)
+        if 'args' in kwargs:
+            kwargs['args'] = ['-c'] + kwargs['args']
+        kwargs.setdefault('args', ['-c'])
 
-            # Get material volume fractions
-            kwargs.setdefault('output', True)
-            if 'args' in kwargs:
-                kwargs['args'] = ['-c'] + kwargs['args']
-            kwargs.setdefault('args', ['-c'])
-            openmc.lib.init(**kwargs)
+        with openmc.lib.TemporarySession(model, **kwargs):
+            # Get mesh from single tally
             mesh = openmc.lib.tallies[new_tally.id].filters[0].mesh
+
+            # Compute material volumes
             volumes = mesh.material_volumes(
                 n_samples, max_materials, output=kwargs['output'])
-            openmc.lib.finalize()
 
-            # Restore original tallies
-            model.tallies = original_tallies
+        # Restore original tallies
+        model.tallies = original_tallies
 
         return volumes
 
diff --git a/openmc/weight_windows.py b/openmc/weight_windows.py
index 1b44747d5..90856ebab 100644
--- a/openmc/weight_windows.py
+++ b/openmc/weight_windows.py
@@ -1041,10 +1041,6 @@ class WeightWindowsList(list):
         # Get absolute path before moving to temporary directory
         path = Path(path).resolve()
 
-        with change_directory(tmpdir=True):
-            # Write the model to an XML file
-            model.export_to_model_xml()
-
-            # Load the model with openmc.lib and then export it to an HDF5 file
-            with openmc.lib.run_in_memory(**init_kwargs):
-                openmc.lib.export_weight_windows(path)
+        # Load the model with openmc.lib and then export it to an HDF5 file
+        with openmc.lib.TemporarySession(model, **init_kwargs):
+            openmc.lib.export_weight_windows(path)
diff --git a/src/nuclide.cpp b/src/nuclide.cpp
index eaac2f756..7cb84640d 100644
--- a/src/nuclide.cpp
+++ b/src/nuclide.cpp
@@ -1114,7 +1114,7 @@ extern "C" size_t nuclides_size()
 extern "C" int openmc_load_nuclide(const char* name, const double* temps, int n)
 {
   if (data::nuclide_map.find(name) == data::nuclide_map.end() ||
-      data::nuclide_map.at(name) >= data::elements.size()) {
+      data::nuclide_map.at(name) >= data::nuclides.size()) {
     LibraryKey key {Library::Type::neutron, name};
     const auto& it = data::library_map.find(key);
     if (it == data::library_map.end()) {
@@ -1215,7 +1215,6 @@ extern "C" int openmc_nuclide_collapse_rate(int index, int MT,
     *xs = data::nuclides[index]->collapse_rate(
       MT, temperature, {energy, energy + n + 1}, {flux, flux + n});
   } catch (const std::out_of_range& e) {
-    fmt::print("Caught error\n");
     set_errmsg(e.what());
     return OPENMC_E_OUT_OF_BOUNDS;
   }
diff --git a/tests/unit_tests/test_deplete_chain.py b/tests/unit_tests/test_deplete_chain.py
index 13267cb05..bd5cc2263 100644
--- a/tests/unit_tests/test_deplete_chain.py
+++ b/tests/unit_tests/test_deplete_chain.py
@@ -310,8 +310,7 @@ def test_capture_branch_infer_ground():
     # Create nuclide to be added into the chain
     xe136m = nuclide.Nuclide("Xe136_m1")
 
-    chain.nuclides.append(xe136m)
-    chain.nuclide_dict[xe136m.name] = len(chain.nuclides) - 1
+    chain.add_nuclide(xe136m)
 
     chain.set_branch_ratios(infer_br, "(n,gamma)")
 
@@ -327,8 +326,7 @@ def test_capture_branch_no_rxn():
 
     u5m = nuclide.Nuclide("U235_m1")
 
-    chain.nuclides.append(u5m)
-    chain.nuclide_dict[u5m.name] = len(chain.nuclides) - 1
+    chain.add_nuclide(u5m)
 
     with pytest.raises(AttributeError, match="U234"):
         chain.set_branch_ratios(u4br)

From 6636b7e32b3347c5846aa26c434138eda6f0ee84 Mon Sep 17 00:00:00 2001
From: GuySten <62616591+GuySten@users.noreply.github.com>
Date: Thu, 3 Jul 2025 06:52:39 +0300
Subject: [PATCH 070/203] fix zam parsing (#3484)

---
 openmc/data/data.py                | 2 +-
 tests/unit_tests/test_data_misc.py | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/openmc/data/data.py b/openmc/data/data.py
index 8ccc8d263..2142a5dc9 100644
--- a/openmc/data/data.py
+++ b/openmc/data/data.py
@@ -607,7 +607,7 @@ def zam(name):
 
     """
     try:
-        symbol, A, state = _GNDS_NAME_RE.match(name).groups()
+        symbol, A, state = _GNDS_NAME_RE.fullmatch(name).groups()
     except AttributeError:
         raise ValueError(f"'{name}' does not appear to be a nuclide name in "
                          "GNDS format")
diff --git a/tests/unit_tests/test_data_misc.py b/tests/unit_tests/test_data_misc.py
index 226d848a5..b65c704af 100644
--- a/tests/unit_tests/test_data_misc.py
+++ b/tests/unit_tests/test_data_misc.py
@@ -131,7 +131,8 @@ def test_zam():
     assert openmc.data.zam('Am242_m10') == (95, 242, 10)
     with pytest.raises(ValueError):
         openmc.data.zam('garbage')
-
+    with pytest.raises(ValueError):
+        openmc.data.zam('Am242-m1')
 
 def test_half_life():
     assert openmc.data.half_life('H2') is None

From efcf8f649e7be1d709a308c587d67c8bd58db6b8 Mon Sep 17 00:00:00 2001
From: Micah Gale <mgale@fastmail.com>
Date: Thu, 3 Jul 2025 03:32:43 -0500
Subject: [PATCH 071/203] Added citation metadata file (#3409)

---
 CITATION.cff | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 CITATION.cff

diff --git a/CITATION.cff b/CITATION.cff
new file mode 100644
index 000000000..c1bc1443f
--- /dev/null
+++ b/CITATION.cff
@@ -0,0 +1,33 @@
+preferred-citation:
+  authors:
+  - family-names: Romano
+    given-names: Paul K.
+    orcid: "https://orcid.org/0000-0002-1147-045X"
+  - final-names: Horelik
+    given-names: Nicholas E.
+  - family-names: Herman
+    given-names: Bryan R.
+  - family-names: Nelson
+    given-names: Adam G.
+  - family-names: Forget
+    given-names: Benoit
+    orcid: "https://orcid.org/0000-0003-1459-7672"
+  - family-names: Smith
+    given-names: Kord
+  contact:
+  - family-names: Romano
+    given-names: Paul K.
+    orcid: "https://orcid.org/0000-0002-1147-045X"
+  date-published: 2015-08
+  doi: 10.1016/j.anucene.2014.07.048
+  issn: 1873-2100
+  volume: 82
+  journal: Annals of Nuclear Energy
+  publisher:
+    name: Elsevier
+  start: 90
+  title: "OpenMC: A state-of-the-art Monte Carlo code for research and development"
+  type: article
+  url: "https://www.sciencedirect.com/science/article/pii/S030645491400379X"
+  volume: 10
+

From b6c6ac078b391b3647510360529dcac0ac72c93a Mon Sep 17 00:00:00 2001
From: Nathan Glaser <123763273+nglaser3@users.noreply.github.com>
Date: Thu, 3 Jul 2025 09:49:25 -0500
Subject: [PATCH 072/203] Add flag to CMakeLists to use submodules instead of
 searching (#3480)

Co-authored-by: Paul Romano <paul.k.romano@gmail.com>
---
 CMakeLists.txt                     | 38 +++++++++++++++++++++++-------
 docs/source/usersguide/install.rst |  5 ++++
 2 files changed, 35 insertions(+), 8 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6665682dd..48f3bfc39 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -38,6 +38,7 @@ option(OPENMC_USE_LIBMESH     "Enable support for libMesh unstructured mesh tall
 option(OPENMC_USE_MPI         "Enable MPI"                                           OFF)
 option(OPENMC_USE_MCPL        "Enable MCPL"                                          OFF)
 option(OPENMC_USE_UWUW        "Enable UWUW"                                          OFF)
+option(OPENMC_FORCE_VENDORED_LIBS "Explicitly use submodules defined in 'vendor'"    OFF)
 
 message(STATUS "OPENMC_USE_OPENMP ${OPENMC_USE_OPENMP}")
 message(STATUS "OPENMC_BUILD_TESTS ${OPENMC_BUILD_TESTS}")
@@ -48,6 +49,7 @@ message(STATUS "OPENMC_USE_LIBMESH ${OPENMC_USE_LIBMESH}")
 message(STATUS "OPENMC_USE_MPI ${OPENMC_USE_MPI}")
 message(STATUS "OPENMC_USE_MCPL ${OPENMC_USE_MCPL}")
 message(STATUS "OPENMC_USE_UWUW ${OPENMC_USE_UWUW}")
+message(STATUS "OPENMC_FORCE_VENDORED_LIBS ${OPENMC_FORCE_VENDORED_LIBS}")
 
 # Warnings for deprecated options
 foreach(OLD_OPT IN ITEMS "openmp" "profile" "coverage" "dagmc" "libmesh")
@@ -256,31 +258,47 @@ endif()
 # pugixml library
 #===============================================================================
 
-find_package_write_status(pugixml)
-if (NOT pugixml_FOUND)
+if(OPENMC_FORCE_VENDORED_LIBS)
   add_subdirectory(vendor/pugixml)
   set_target_properties(pugixml PROPERTIES CXX_STANDARD 14 CXX_EXTENSIONS OFF)
+else()
+  find_package_write_status(pugixml)
+  if (NOT pugixml_FOUND)
+    add_subdirectory(vendor/pugixml)
+    set_target_properties(pugixml PROPERTIES CXX_STANDARD 14 CXX_EXTENSIONS OFF)
+  endif()
 endif()
 
 #===============================================================================
 # {fmt} library
 #===============================================================================
 
-find_package_write_status(fmt)
-if (NOT fmt_FOUND)
+if(OPENMC_FORCE_VENDORED_LIBS)
   set(FMT_INSTALL ON CACHE BOOL "Generate the install target.")
   add_subdirectory(vendor/fmt)
+else()
+  find_package_write_status(fmt)
+  if (NOT fmt_FOUND)
+    set(FMT_INSTALL ON CACHE BOOL "Generate the install target.")
+    add_subdirectory(vendor/fmt)
+  endif()
 endif()
 
 #===============================================================================
 # xtensor header-only library
 #===============================================================================
 
-find_package_write_status(xtensor)
-if (NOT xtensor_FOUND)
+if(OPENMC_FORCE_VENDORED_LIBS)
   add_subdirectory(vendor/xtl)
   set(xtl_DIR ${CMAKE_CURRENT_BINARY_DIR}/vendor/xtl)
   add_subdirectory(vendor/xtensor)
+else()
+  find_package_write_status(xtensor)
+  if (NOT xtensor_FOUND)
+    add_subdirectory(vendor/xtl)
+    set(xtl_DIR ${CMAKE_CURRENT_BINARY_DIR}/vendor/xtl)
+    add_subdirectory(vendor/xtensor)
+  endif()
 endif()
 
 #===============================================================================
@@ -288,9 +306,13 @@ endif()
 #===============================================================================
 
 if(OPENMC_BUILD_TESTS)
-  find_package_write_status(Catch2)
-  if (NOT Catch2_FOUND)
+  if (OPENMC_FORCE_VENDORED_LIBS)
     add_subdirectory(vendor/Catch2)
+  else()
+    find_package_write_status(Catch2)
+    if (NOT Catch2_FOUND)
+      add_subdirectory(vendor/Catch2)
+    endif()
   endif()
 endif()
 
diff --git a/docs/source/usersguide/install.rst b/docs/source/usersguide/install.rst
index 2621109f7..063c985f4 100644
--- a/docs/source/usersguide/install.rst
+++ b/docs/source/usersguide/install.rst
@@ -380,6 +380,11 @@ OPENMC_USE_MPI
   options, please see the `FindMPI.cmake documentation
   <https://cmake.org/cmake/help/latest/module/FindMPI.html>`_.
 
+OPENMC_FORCE_VENDORED_LIBS
+  Forces OpenMC to use the submodules located in the vendor directory, as
+  opposed to searching the system for already installed versions of those
+  modules.
+
 To set any of these options (e.g., turning on profiling), the following form
 should be used:
 

From dd8d621f0b7d99db02e7b9dc855e514bac756096 Mon Sep 17 00:00:00 2001
From: April Novak <novak@berkeley.edu>
Date: Thu, 3 Jul 2025 09:10:12 -0600
Subject: [PATCH 073/203] Only show warning if in restart mode. Refs #3477
 (#3478)

---
 src/state_point.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/state_point.cpp b/src/state_point.cpp
index 3b822715c..12dfeb82a 100644
--- a/src/state_point.cpp
+++ b/src/state_point.cpp
@@ -436,7 +436,8 @@ extern "C" int openmc_statepoint_load(const char* filename)
   // Read batch number to restart at
   read_dataset(file_id, "current_batch", simulation::restart_batch);
 
-  if (simulation::restart_batch >= settings::n_max_batches) {
+  if (settings::restart_run &&
+      simulation::restart_batch >= settings::n_max_batches) {
     warning(fmt::format(
       "The number of batches specified for simulation ({}) is smaller "
       "than or equal to the number of batches in the restart statepoint file "

From d700d395de02d95190eab35514f25f9ea29d516f Mon Sep 17 00:00:00 2001
From: Paul Romano <paul.k.romano@gmail.com>
Date: Thu, 3 Jul 2025 17:59:40 -0500
Subject: [PATCH 074/203] Update conda install instructions for macOS Apple
 silicon (#3488)

---
 CITATION.cff                       | 11 ++++++-----
 docs/source/quickinstall.rst       |  7 +++++++
 docs/source/usersguide/install.rst |  7 +++++++
 3 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/CITATION.cff b/CITATION.cff
index c1bc1443f..19b4213a1 100644
--- a/CITATION.cff
+++ b/CITATION.cff
@@ -9,6 +9,7 @@ preferred-citation:
     given-names: Bryan R.
   - family-names: Nelson
     given-names: Adam G.
+    orcid: "https://orcid.org/0000-0002-3614-0676"
   - family-names: Forget
     given-names: Benoit
     orcid: "https://orcid.org/0000-0003-1459-7672"
@@ -18,16 +19,16 @@ preferred-citation:
   - family-names: Romano
     given-names: Paul K.
     orcid: "https://orcid.org/0000-0002-1147-045X"
-  date-published: 2015-08
   doi: 10.1016/j.anucene.2014.07.048
-  issn: 1873-2100
+  issn: 0306-4549
   volume: 82
   journal: Annals of Nuclear Energy
   publisher:
     name: Elsevier
   start: 90
+  end: 97
+  year: 2015
+  month: 8
   title: "OpenMC: A state-of-the-art Monte Carlo code for research and development"
   type: article
-  url: "https://www.sciencedirect.com/science/article/pii/S030645491400379X"
-  volume: 10
-
+  url: "https://doi.org/10.1016/j.anucene.2014.07.048"
diff --git a/docs/source/quickinstall.rst b/docs/source/quickinstall.rst
index 21526242f..47c257dfe 100644
--- a/docs/source/quickinstall.rst
+++ b/docs/source/quickinstall.rst
@@ -35,6 +35,13 @@ you wish) with OpenMC installed.
     conda create --name openmc-env openmc
     conda activate openmc-env
 
+If you are installing on macOS with an Apple silicon ARM-based processor, you
+will also need to specify the `--platform` option:
+
+.. code-block:: sh
+
+    conda create --name openmc-env --platform osx-arm64 openmc
+
 You are now in a conda environment called `openmc-env` that has OpenMC
 installed.
 
diff --git a/docs/source/usersguide/install.rst b/docs/source/usersguide/install.rst
index 063c985f4..775e38109 100644
--- a/docs/source/usersguide/install.rst
+++ b/docs/source/usersguide/install.rst
@@ -35,6 +35,13 @@ you wish) with OpenMC installed.
     conda create --name openmc-env openmc
     conda activate openmc-env
 
+If you are installing on macOS with an Apple silicon ARM-based processor, you
+will also need to specify the `--platform` option:
+
+.. code-block:: sh
+
+    conda create --name openmc-env --platform osx-arm64 openmc
+
 You are now in a conda environment called `openmc-env` that has OpenMC
 installed.
 

From 58ee8d825dfc6d5bcb98a0156a46e023a84e9aea Mon Sep 17 00:00:00 2001
From: Shikhar Kumar <shikhar413@gmail.com>
Date: Tue, 15 Jul 2025 16:53:52 -0400
Subject: [PATCH 075/203] Update OSX install instructions to point to x64
 platform (#3501)

---
 docs/source/quickinstall.rst       | 2 +-
 docs/source/usersguide/install.rst | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/source/quickinstall.rst b/docs/source/quickinstall.rst
index 47c257dfe..0f887940e 100644
--- a/docs/source/quickinstall.rst
+++ b/docs/source/quickinstall.rst
@@ -40,7 +40,7 @@ will also need to specify the `--platform` option:
 
 .. code-block:: sh
 
-    conda create --name openmc-env --platform osx-arm64 openmc
+    conda create --name openmc-env --platform osx-64 openmc
 
 You are now in a conda environment called `openmc-env` that has OpenMC
 installed.
diff --git a/docs/source/usersguide/install.rst b/docs/source/usersguide/install.rst
index 775e38109..cec3a541d 100644
--- a/docs/source/usersguide/install.rst
+++ b/docs/source/usersguide/install.rst
@@ -40,7 +40,7 @@ will also need to specify the `--platform` option:
 
 .. code-block:: sh
 
-    conda create --name openmc-env --platform osx-arm64 openmc
+    conda create --name openmc-env --platform osx-64 openmc
 
 You are now in a conda environment called `openmc-env` that has OpenMC
 installed.

From 6372c29cfad804ce49ac79179659eff9d9cddfcd Mon Sep 17 00:00:00 2001
From: Patrick Shriwise <pshriwise@gmail.com>
Date: Wed, 16 Jul 2025 08:31:49 -0500
Subject: [PATCH 076/203] Provide a way to get ID maps from plot parameters on
 the Model class (#3481)

Co-authored-by: Jonathan Shimwell <drshimwell@gmail.com>
Co-authored-by: Paul Romano <paul.k.romano@gmail.com>
---
 openmc/lib/plot.py             |   1 +
 openmc/model/model.py          | 173 ++++++++++++++++-------
 openmc/plots.py                |  13 +-
 tests/unit_tests/test_model.py | 243 +++++++++++++++++++++++++++++++++
 4 files changed, 378 insertions(+), 52 deletions(-)

diff --git a/openmc/lib/plot.py b/openmc/lib/plot.py
index d98636676..f97348b20 100644
--- a/openmc/lib/plot.py
+++ b/openmc/lib/plot.py
@@ -90,6 +90,7 @@ class _PlotBase(Structure):
 
     def __init__(self):
         self.level_ = -1
+        self.basis_ = 1
         self.color_overlaps_ = False
 
     @property
diff --git a/openmc/model/model.py b/openmc/model/model.py
index 55f309bfb..93e029a33 100644
--- a/openmc/model/model.py
+++ b/openmc/model/model.py
@@ -20,7 +20,7 @@ from openmc.dummy_comm import DummyCommunicator
 from openmc.executor import _process_CLI_arguments
 from openmc.checkvalue import check_type, check_value, PathLike
 from openmc.exceptions import InvalidIDError
-from openmc.plots import add_plot_params
+from openmc.plots import add_plot_params, _BASIS_INDICES
 from openmc.utility_funcs import change_directory
 
 
@@ -902,6 +902,111 @@ class Model:
                             openmc.lib.materials[domain_id].volume = \
                                 vol_calc.volumes[domain_id].n
 
+
+    def _set_plot_defaults(
+        self,
+        origin: Sequence[float] | None,
+        width: Sequence[float] | None,
+        pixels: int | Sequence[int],
+        basis: str
+    ):
+        x, y, _ = _BASIS_INDICES[basis]
+
+        bb = self.bounding_box
+        # checks to see if bounding box contains -inf or inf values
+        if np.isinf(bb.extent[basis]).any():
+            if origin is None:
+                origin = (0, 0, 0)
+            if width is None:
+                width = (10, 10)
+        else:
+            if origin is None:
+                # if nan values in the bb.center they get replaced with 0.0
+                # this happens when the bounding_box contains inf values
+                with warnings.catch_warnings():
+                    warnings.simplefilter("ignore", RuntimeWarning)
+                    origin = np.nan_to_num(bb.center)
+            if width is None:
+                bb_width = bb.width
+                width = (bb_width[x], bb_width[y])
+
+        if isinstance(pixels, int):
+            aspect_ratio = width[0] / width[1]
+            pixels_y = math.sqrt(pixels / aspect_ratio)
+            pixels = (int(pixels / pixels_y), int(pixels_y))
+
+        return origin, width, pixels
+
+    def id_map(
+        self,
+        origin: Sequence[float] | None = None,
+        width: Sequence[float] | None = None,
+        pixels: int | Sequence[int] = 40000,
+        basis: str = 'xy',
+        **init_kwargs
+    ) -> np.ndarray:
+        """Generate an ID map for domains based on the plot parameters
+
+        If the model is not yet initialized, it will be initialized with
+        openmc.lib. If the model is initialized, the model will remain
+        initialized after this method call exits.
+
+        .. versionadded:: 0.15.3
+
+        Parameters
+        ----------
+        origin : Sequence[float], optional
+            Origin of the plot. If unspecified, this argument defaults to the
+            center of the bounding box if the bounding box does not contain inf
+            values for the provided basis, otherwise (0.0, 0.0, 0.0).
+        width : Sequence[float], optional
+            Width of the plot. If unspecified, this argument defaults to the
+            width of the bounding box if the bounding box does not contain inf
+            values for the provided basis, otherwise (10.0, 10.0).
+        pixels : int | Sequence[int], optional
+            If an iterable of ints is provided then this directly sets the
+            number of pixels to use in each basis direction. If a single int is
+            provided then this sets the total number of pixels in the plot and
+            the number of pixels in each basis direction is calculated from this
+            total and the image aspect ratio based on the width argument.
+        basis : {'xy', 'yz', 'xz'}, optional
+            Basis of the plot.
+        **init_kwargs
+            Keyword arguments passed to :meth:`Model.init_lib`.
+
+        Returns
+        -------
+        id_map : numpy.ndarray
+            A NumPy array with shape (vertical pixels, horizontal pixels, 3) of
+            OpenMC property IDs with dtype int32. The last dimension of the
+            array contains cell IDs, cell instances, and material IDs (in that
+            order).
+        """
+        import openmc.lib
+
+        origin, width, pixels = self._set_plot_defaults(
+            origin, width, pixels, basis)
+
+        # initialize the openmc.lib.plot._PlotBase object
+        plot_obj = openmc.lib.plot._PlotBase()
+        plot_obj.origin = origin
+        plot_obj.width = width[0]
+        plot_obj.height = width[1]
+        plot_obj.h_res = pixels[0]
+        plot_obj.v_res = pixels[1]
+        plot_obj.basis = basis
+
+        if self.is_initialized:
+            return openmc.lib.id_map(plot_obj)
+        else:
+            # Silence output by default. Also set arguments to start in volume
+            # calculation mode to avoid loading cross sections
+            init_kwargs.setdefault('output', False)
+            init_kwargs.setdefault('args', ['-c'])
+
+            with openmc.lib.TemporarySession(self, **init_kwargs):
+                return openmc.lib.id_map(plot_obj)
+
     @add_plot_params
     def plot(
         self,
@@ -945,39 +1050,13 @@ class Model:
             source_kwargs = {}
         source_kwargs.setdefault('marker', 'x')
 
+        # Set indices using basis and create axis labels
+        x, y, z = _BASIS_INDICES[basis]
+        xlabel, ylabel = f'{basis[0]} [{axis_units}]', f'{basis[1]} [{axis_units}]'
+
         # Determine extents of plot
-        if basis == 'xy':
-            x, y, z = 0, 1, 2
-            xlabel, ylabel = f'x [{axis_units}]', f'y [{axis_units}]'
-        elif basis == 'yz':
-            x, y, z = 1, 2, 0
-            xlabel, ylabel = f'y [{axis_units}]', f'z [{axis_units}]'
-        elif basis == 'xz':
-            x, y, z = 0, 2, 1
-            xlabel, ylabel = f'x [{axis_units}]', f'z [{axis_units}]'
-
-        bb = self.bounding_box
-        # checks to see if bounding box contains -inf or inf values
-        if np.isinf(bb.extent[basis]).any():
-            if origin is None:
-                origin = (0, 0, 0)
-            if width is None:
-                width = (10, 10)
-        else:
-            if origin is None:
-                # if nan values in the bb.center they get replaced with 0.0
-                # this happens when the bounding_box contains inf values
-                with warnings.catch_warnings():
-                    warnings.simplefilter("ignore", RuntimeWarning)
-                    origin = np.nan_to_num(bb.center)
-            if width is None:
-                bb_width = bb.width
-                width = (bb_width[x], bb_width[y])
-
-        if isinstance(pixels, int):
-            aspect_ratio = width[0] / width[1]
-            pixels_y = math.sqrt(pixels / aspect_ratio)
-            pixels = (int(pixels / pixels_y), int(pixels_y))
+        origin, width, pixels = self._set_plot_defaults(
+            origin, width, pixels, basis)
 
         axis_scaling_factor = {'km': 0.00001, 'm': 0.01, 'cm': 1, 'mm': 10}
 
@@ -1124,10 +1203,10 @@ class Model:
         return axes
 
     def sample_external_source(
-            self,
-            n_samples: int = 1000,
-            prn_seed: int | None = None,
-            **init_kwargs
+        self,
+        n_samples: int = 1000,
+        prn_seed: int | None = None,
+        **init_kwargs
     ) -> openmc.ParticleList:
         """Sample external source and return source particles.
 
@@ -1150,17 +1229,17 @@ class Model:
         """
         import openmc.lib
 
-        # Silence output by default. Also set arguments to start in volume
-        # calculation mode to avoid loading cross sections
-        init_kwargs.setdefault('output', False)
-        init_kwargs.setdefault('args', ['-c'])
+        if self.is_initialized:
+            return openmc.lib.sample_external_source(
+                n_samples=n_samples, prn_seed=prn_seed
+            )
+        else:
+            # Silence output by default. Also set arguments to start in volume
+            # calculation mode to avoid loading cross sections
+            init_kwargs.setdefault('output', False)
+            init_kwargs.setdefault('args', ['-c'])
 
-        with change_directory(tmpdir=True):
-            # Export model within temporary directory
-            self.export_to_model_xml()
-
-            # Sample external source sites
-            with openmc.lib.run_in_memory(**init_kwargs):
+            with openmc.lib.TemporarySession(self, **init_kwargs):
                 return openmc.lib.sample_external_source(
                     n_samples=n_samples, prn_seed=prn_seed
                 )
diff --git a/openmc/plots.py b/openmc/plots.py
index 40fcf0c78..9e097e2b9 100644
--- a/openmc/plots.py
+++ b/openmc/plots.py
@@ -15,6 +15,8 @@ from .mixin import IDManagerMixin
 
 _BASES = {'xy', 'xz', 'yz'}
 
+_BASIS_INDICES = {'xy': (0, 1, 2), 'xz': (0, 2, 1), 'yz': (1, 2, 0)}
+
 _SVG_COLORS = {
     'aliceblue': (240, 248, 255),
     'antiquewhite': (250, 235, 215),
@@ -178,11 +180,12 @@ _PLOT_PARAMS = """
             ascertain the plot width. Defaults to (10, 10) if the bounding box
             contains inf values.
         pixels : Iterable of int or int
-            If iterable of ints provided then this directly sets the number of
-            pixels to use in each basis direction. If int provided then this
-            sets the total number of pixels in the plot and the number of
-            pixels in each basis direction is calculated from this total and
-            the image aspect ratio.
+            If an iterable of ints is provided then this directly sets the
+            number of pixels to use in each basis direction. If a single int
+            is provided then this sets the total number of pixels in the plot
+            and the number of pixels in each basis direction is calculated
+            from this total and the image aspect ratio based on the width
+            argument.
         basis : {'xy', 'xz', 'yz'}
             The basis directions for the plot
         color_by : {'cell', 'material'}
diff --git a/tests/unit_tests/test_model.py b/tests/unit_tests/test_model.py
index aa844e2f2..3797188ba 100644
--- a/tests/unit_tests/test_model.py
+++ b/tests/unit_tests/test_model.py
@@ -649,3 +649,246 @@ def test_model_plot():
     # ensure that all of the data in the image data is either white or red
     test_mask = (image_data == white) | (image_data == red)
     assert np.all(test_mask), "Colors other than white or red found in overlap plot image"
+
+
+def test_model_id_map_initialization(run_in_tmpdir):
+    model = openmc.examples.pwr_assembly()
+    model.init_lib(output=False)
+
+    id_map = model.id_map(
+        pixels=(100, 100),
+        basis='xy',
+        origin=(0, 0, 0),
+        width=(10, 10),
+    )
+
+    assert id_map.shape == (100, 100, 3)
+    assert id_map.dtype == np.int32
+
+    max_cell_id = max(model.geometry.get_all_cells().keys())
+    max_material_id = max(model.geometry.get_all_materials().keys())
+
+    # add some spot checks for the id_map
+    # Check that the array contains valid cell/material IDs (not all -2)
+    # The -2 values indicate outside the geometry
+    assert not np.all(id_map == -2), "All values are -2, indicating no valid geometry found"
+
+    # Check that we have valid cell IDs (first dimension)
+    valid_cell_ids = id_map[:, :, 0]
+    assert np.any(valid_cell_ids >= 0), "No valid cell IDs found in the id_map"
+
+    # Check that we have valid material IDs (third dimension)
+    valid_material_ids = id_map[:, :, 2]
+    assert np.any(valid_material_ids >= 0), "No valid material IDs found in the id_map"
+
+    # Check that the middle dimension (cell instances) is consistent
+    # Cell instances should be >= 0 when cell IDs are valid
+    cell_instances = id_map[:, :, 1]
+    valid_cells = valid_cell_ids >= 0
+    if np.any(valid_cells):
+        assert np.all(cell_instances[valid_cells] >= 0), "Invalid cell instances found for valid cells"
+
+    # Check that the array contains reasonable ranges of values
+    # Cell IDs should be within the expected range for the assembly
+    if np.any(valid_cell_ids >= 0):
+        max_map_cell_id = np.max(valid_cell_ids)
+        assert max_map_cell_id <= max_cell_id, \
+            f"Cell ID {max_map_cell_id} in the map is greater than the maximum cell ID {max_cell_id}"
+
+    # Material IDs should be within the expected range
+    if np.any(valid_material_ids >= 0):
+        max_map_material_id = np.max(valid_material_ids)
+        assert max_map_material_id <= max_material_id, \
+            f"Material ID {max_map_material_id} in the map is greater than the maximum material ID {max_material_id}"
+
+    # Test id_map with pixels outside the model geometry
+    # Use a plot that's far from the model center to ensure we get -2 values
+    outside_id_map = model.id_map(
+        pixels=(50, 50),
+        basis='xy',
+        origin=(1000, 1000, 0),  # Far from the model center
+        width=(10, 10),
+    )
+
+    assert outside_id_map.shape == (50, 50, 3)
+    assert outside_id_map.dtype == np.int32
+
+    # All values should be -2 (outside geometry) for this plot
+    assert np.all(outside_id_map == -2), "Expected all values to be -2 for plot outside model geometry"
+
+    # Verify that the outside plot has the correct structure
+    assert np.all(outside_id_map[:, :, 0] == -2), "Cell IDs should all be -2 outside geometry"
+    assert np.all(outside_id_map[:, :, 1] == -2), "Cell instances should all be -2 outside geometry"
+    assert np.all(outside_id_map[:, :, 2] == -2), "Material IDs should all be -2 outside geometry"
+
+    # if the model is already initialized, it should not be finalized
+    # after calling this method
+    model.id_map(
+        pixels=(100, 100),
+        basis='xy',
+        origin=(0, 0, 0),
+        width=(10, 10),
+    )
+    assert model.is_initialized
+
+    # if the model is not initialized, it should be finalized
+    # before exiting this method
+    model.finalize_lib()
+    model.id_map(
+        pixels=(100, 100),
+        basis='xy',
+        origin=(0, 0, 0),
+        width=(10, 10),
+    )
+    assert not model.is_initialized
+
+
+def test_id_map_aligned_model():
+    """Test id_map with a 2x2 lattice where pixel boundaries align to cell boundaries"""
+    # Create materials -- identical compositions, different IDs
+    mat1 = openmc.Material(material_id=1, name='Material 1')
+    mat1.set_density('g/cm3', 1.0)
+    mat1.add_element('H', 1.0)
+
+    mat2 = openmc.Material(material_id=2, name='Material 2')
+    mat2.set_density('g/cm3', 1.0)
+    mat2.add_element('H', 1.0)
+
+    mat3 = openmc.Material(material_id=3, name='Material 3')
+    mat3.set_density('g/cm3', 1.0)
+    mat3.add_element('H', 1.0)
+
+    mat4 = openmc.Material(material_id=4, name='Material 4')
+    mat4.set_density('g/cm3', 1.0)
+    mat4.add_element('H', 1.0)
+
+    outer_mat = openmc.Material(material_id=5, name='Material 5')
+    outer_mat.set_density('g/cm3', 1.0)
+    outer_mat.add_element('H', 1.0)
+
+    inner_materials = [mat1, mat2, mat3, mat4]
+
+    # Create square surface that fits inside the lattice cell
+    # Lattice cell is 1 cm x 1 cm, so square will be 0.6 cm x 0.6 cm centered on the origin
+    square = openmc.model.RectangularPrism(0.6, 0.6, boundary_type='transmission')
+
+    # Create cells for this universe
+    inner_cell = openmc.Cell(cell_id=10, region=-square, name='inner_cell')
+    inner_cell.fill = inner_materials
+
+    outer_cell = openmc.Cell(cell_id=20, region=+square, name='outer_cell')
+    outer_cell.fill = outer_mat
+
+    # Create universe
+    universe = openmc.Universe(universe_id=100, cells=[inner_cell, outer_cell])
+
+    # Create 2x2 lattice
+    lattice = openmc.RectLattice(lattice_id=1)
+    lattice.lower_left = [-1.0, -1.0]
+    lattice.pitch = [1.0, 1.0]
+    lattice.universes = [[universe, universe], [universe, universe]]
+
+    # Create outer boundary
+    outer_boundary = openmc.model.RectangularPrism(2.0, 2.0, boundary_type='vacuum')
+
+    # Create root cell
+    root_cell = openmc.Cell(cell_id=1, name='root', fill=lattice, region=-outer_boundary)
+
+    # Create geometry
+    geometry = openmc.Geometry([root_cell])
+
+    # Create settings
+    settings = openmc.Settings()
+    settings.particles = 1000
+    settings.batches = 10
+
+    # Create model
+    model = openmc.Model(settings=settings, geometry=geometry)
+
+    # Generate id_map with pixel boundaries aligned to cell boundaries
+    # The model is 2 cm x 2 cm, so we'll use 200x200 pixels to get 0.01 cm resolution
+    # This allows us to align pixels with the squares inside each lattice cell
+    id_map = model.id_map(
+        pixels=(200, 200),
+        basis='xy',
+        origin=(0.0, 0.0, 0.0),  # Align with lattice lower_left
+        width=(2.0, 2.0),     # Align with lattice size
+    )
+
+    # Verify id_map properties
+    assert id_map.shape == (200, 200, 3)
+    assert id_map.dtype == np.int32
+
+    cell_id_map = id_map[:, :, 0]
+    material_ids_map = id_map[:, :, 2]
+
+    # Check that we have valid cell IDs (not all -2)
+    assert np.any(cell_id_map >= 0), "No valid cell IDs found in the id_map"
+
+    # Check that we have valid material IDs
+    assert np.any(material_ids_map >= 0), "No valid material IDs found in the id_map"
+
+    # Check that the expected cell IDs are present
+    expected_cell_ids = [10, 20]  # Root cell, inner cell, outer cell
+    found_cell_ids = np.unique(cell_id_map[cell_id_map >= 0])
+    for cell_id in expected_cell_ids:
+        assert cell_id in found_cell_ids, f"Expected cell ID {cell_id} not found in id_map"
+
+    # Check that the expected material IDs are present
+    expected_material_ids = [1, 2, 3, 4, 5]  # All materials defined above
+    found_material_ids = np.unique(material_ids_map[material_ids_map >= 0])
+    for mat_id in expected_material_ids:
+        assert mat_id in found_material_ids, f"Expected material ID {mat_id} not found in id_map"
+
+    # Test specific regions to verify lattice structure
+    # Check center of each lattice cell (should be inner cells)
+    # Lattice cell centers are at (-0.5, -0.5), (0.5, -0.5), (-0.5, 0.5), (0.5, 0.5)
+    # With 200x200 pixels over 2x2 units, each pixel is 0.01 units
+
+    # Bottom-left lattice cell center (should be inner cell 10)
+    bl_cell, bl_instance, bl_material = id_map[-50, 50]
+    assert bl_cell == 10, f"Expected cell ID 10 at bottom-left center, got {bl_cell}"
+    assert bl_instance == 0, f"Expected cell instance 0 at bottom-left center, got {bl_instance}"
+    assert bl_material == 1, f"Expected material ID 1 at bottom-left center, got {bl_material}"
+
+    # Bottom-right lattice cell center (should be inner cell 10)
+    br_cell, br_instance, br_material = id_map[-50, 150]
+    assert br_cell == 10, f"Expected cell ID 10 at bottom-right center, got {br_cell}"
+    assert br_instance == 1, f"Expected cell instance 1 at bottom-right center, got {br_instance}"
+    assert br_material == 2, f"Expected material ID 2 at bottom-right center, got {br_material}"
+
+    # Top-left lattice cell center (should be inner cell 10)
+    tl_cell, tl_instance, tl_material = id_map[-150, 50]
+    assert tl_cell == 10, f"Expected cell ID 10 at top-left center, got {tl_cell}"
+    assert tl_instance == 2, f"Expected cell instance 2 at top-left center, got {tl_instance}"
+    assert tl_material == 3, f"Expected material ID 3 at top-left center, got {tl_material}"
+
+    # Top-right lattice cell center (should be inner cell 10)
+    tr_cell, tr_instance, tr_material = id_map[-150, 150]
+    assert tr_cell == 10, f"Expected cell ID 10 at top-right center, got {tr_cell}"
+    assert tr_instance == 3, f"Expected cell instance 3 at top-right center, got {tr_instance}"
+    assert tr_material == 4, f"Expected material ID 4 at top-right center, got {tr_material}"
+
+    # Check that the model is properly finalized after id_map call
+    assert not model.is_initialized, "Model should be finalized after id_map call"
+
+    # Check that the values at the corners are correctly set as the outer cell and material
+    bl_cell, bl_instance, bl_material = id_map[-1, 0]
+    assert bl_cell == 20, f"Expected cell ID 20 at bottom-left corner, got {bl_cell}"
+    assert bl_instance == 0, f"Expected cell instance 0 at bottom-left corner, got {bl_instance}"
+    assert bl_material == 5, f"Expected material ID 5 at bottom-left corner, got {bl_material}"
+
+    br_cell, br_instance, br_material = id_map[-1, -1]
+    assert br_cell == 20, f"Expected cell ID 20 at bottom-right corner, got {br_cell}"
+    assert br_instance == 1, f"Expected cell instance 1 at bottom-right corner, got {br_instance}"
+    assert br_material == 5, f"Expected material ID 5 at bottom-right corner, got {br_material}"
+
+    tl_cell, tl_instance, tl_material = id_map[0, 0]
+    assert tl_cell == 20, f"Expected cell ID 20 at top-left corner, got {tl_cell}"
+    assert tl_instance == 2, f"Expected cell instance 2 at top-left corner, got {tl_instance}"
+    assert tl_material == 5, f"Expected material ID 5 at top-left corner, got {tl_material}"
+
+    tr_cell, tr_instance, tr_material = id_map[0, -1]
+    assert tr_cell == 20, f"Expected cell ID 20 at top-right corner, got {tr_cell}"
+    assert tr_instance == 3, f"Expected cell instance 3 at top-right corner, got {tr_instance}"
+    assert tr_material == 5, f"Expected material ID 5 at top-right corner, got {tr_material}"

From 24f78e6e924f5163e5e45dd307f8819d78073bfe Mon Sep 17 00:00:00 2001
From: Perry <100789850+yrrepy@users.noreply.github.com>
Date: Wed, 16 Jul 2025 17:40:02 -0700
Subject: [PATCH 077/203] Use auto-chunking for StepResult HDF5 writing (#3498)

---
 openmc/deplete/stepresult.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/openmc/deplete/stepresult.py b/openmc/deplete/stepresult.py
index 9cf33898f..7c86b8645 100644
--- a/openmc/deplete/stepresult.py
+++ b/openmc/deplete/stepresult.py
@@ -328,13 +328,13 @@ class StepResult:
 
         handle.create_dataset("number", (1, n_stages, n_mats, n_nuc_number),
                               maxshape=(None, n_stages, n_mats, n_nuc_number),
-                              chunks=(1, 1, n_mats, n_nuc_number),
+                              chunks=True,
                               dtype='float64')
 
         if n_nuc_rxn > 0 and n_rxn > 0:
             handle.create_dataset("reaction rates", (1, n_stages, n_mats, n_nuc_rxn, n_rxn),
                                 maxshape=(None, n_stages, n_mats, n_nuc_rxn, n_rxn),
-                                chunks=(1, 1, n_mats, n_nuc_rxn, n_rxn),
+                                chunks=True,
                                 dtype='float64')
 
         handle.create_dataset("eigenvalues", (1, n_stages, 2),

From 5318ea6e2b46000f3805d29edfbae1530694951d Mon Sep 17 00:00:00 2001
From: Ahnaf Tahmid Chowdhury <tahmid@nukehub.org>
Date: Thu, 17 Jul 2025 08:46:39 +0600
Subject: [PATCH 078/203] Make MCPL a Runtime Optional Dependency (#3429)

Co-authored-by: Paul Romano <paul.k.romano@gmail.com>
---
 CMakeLists.txt                                |  23 -
 cmake/OpenMCConfig.cmake.in                   |   4 -
 docs/source/usersguide/install.rst            |   4 -
 include/openmc/mcpl_interface.h               |  22 +-
 openmc/lib/__init__.py                        |   3 -
 src/mcpl_interface.cpp                        | 537 ++++++++++++++----
 src/settings.cpp                              |  12 -
 .../source_mcpl_file/settings.xml             |   9 +-
 .../regression_tests/source_mcpl_file/test.py |  27 +-
 9 files changed, 438 insertions(+), 203 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 48f3bfc39..2b863eb08 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -36,7 +36,6 @@ option(OPENMC_ENABLE_COVERAGE "Compile with coverage analysis flags"
 option(OPENMC_USE_DAGMC       "Enable support for DAGMC (CAD) geometry"              OFF)
 option(OPENMC_USE_LIBMESH     "Enable support for libMesh unstructured mesh tallies" OFF)
 option(OPENMC_USE_MPI         "Enable MPI"                                           OFF)
-option(OPENMC_USE_MCPL        "Enable MCPL"                                          OFF)
 option(OPENMC_USE_UWUW        "Enable UWUW"                                          OFF)
 option(OPENMC_FORCE_VENDORED_LIBS "Explicitly use submodules defined in 'vendor'"    OFF)
 
@@ -47,7 +46,6 @@ message(STATUS "OPENMC_ENABLE_COVERAGE ${OPENMC_ENABLE_COVERAGE}")
 message(STATUS "OPENMC_USE_DAGMC ${OPENMC_USE_DAGMC}")
 message(STATUS "OPENMC_USE_LIBMESH ${OPENMC_USE_LIBMESH}")
 message(STATUS "OPENMC_USE_MPI ${OPENMC_USE_MPI}")
-message(STATUS "OPENMC_USE_MCPL ${OPENMC_USE_MCPL}")
 message(STATUS "OPENMC_USE_UWUW ${OPENMC_USE_UWUW}")
 message(STATUS "OPENMC_FORCE_VENDORED_LIBS ${OPENMC_FORCE_VENDORED_LIBS}")
 
@@ -191,22 +189,6 @@ if(${HDF5_VERSION} VERSION_GREATER_EQUAL 1.12.0)
   list(APPEND cxxflags -DH5Oget_info_by_idx_vers=1 -DH5O_info_t_vers=1)
 endif()
 
-#===============================================================================
-# MCPL
-#===============================================================================
-
-if (OPENMC_USE_MCPL)
-  if (NOT DEFINED MCPL_DIR)
-    execute_process(
-      COMMAND mcpl-config --show cmakedir
-      OUTPUT_VARIABLE MCPL_DIR
-      OUTPUT_STRIP_TRAILING_WHITESPACE
-    )
-  endif()
-  find_package(MCPL REQUIRED)
-  message(STATUS "Found MCPL: ${MCPL_DIR} (found version \"${MCPL_VERSION}\")")
-endif()
-
 #===============================================================================
 # Set compile/link flags based on which compiler is being used
 #===============================================================================
@@ -557,11 +539,6 @@ if (OPENMC_BUILD_TESTS)
   add_subdirectory(tests/cpp_unit_tests)
 endif()
 
-if (OPENMC_USE_MCPL)
-  target_compile_definitions(libopenmc PUBLIC OPENMC_MCPL)
-  target_link_libraries(libopenmc MCPL::mcpl)
-endif()
-
 #===============================================================================
 # Log build info that this executable can report later
 #===============================================================================
diff --git a/cmake/OpenMCConfig.cmake.in b/cmake/OpenMCConfig.cmake.in
index 7416013fb..3fe0c1bcd 100644
--- a/cmake/OpenMCConfig.cmake.in
+++ b/cmake/OpenMCConfig.cmake.in
@@ -29,10 +29,6 @@ if(@OPENMC_USE_OPENMP@)
   find_package(OpenMP REQUIRED)
 endif()
 
-if(@OPENMC_USE_MCPL@)
-  find_package(MCPL REQUIRED HINTS @MCPL_DIR@)
-endif()
-
 if(@OPENMC_USE_UWUW@ AND NOT ${DAGMC_BUILD_UWUW})
   message(FATAL_ERROR "UWUW is enabled in OpenMC but the DAGMC installation discovered was not configured with UWUW.")
 endif()
diff --git a/docs/source/usersguide/install.rst b/docs/source/usersguide/install.rst
index cec3a541d..64d480179 100644
--- a/docs/source/usersguide/install.rst
+++ b/docs/source/usersguide/install.rst
@@ -375,10 +375,6 @@ OPENMC_USE_DAGMC
   should also be defined as `DAGMC_ROOT` in the CMake configuration command.
   (Default: off)
 
-OPENMC_USE_MCPL
-  Turns on support for reading MCPL_ source files and writing MCPL source points
-  and surface sources. (Default: off)
-
 OPENMC_USE_LIBMESH
   Enables the use of unstructured mesh tallies with libMesh_. (Default: off)
 
diff --git a/include/openmc/mcpl_interface.h b/include/openmc/mcpl_interface.h
index e5c182280..f7323e10a 100644
--- a/include/openmc/mcpl_interface.h
+++ b/include/openmc/mcpl_interface.h
@@ -9,12 +9,6 @@
 
 namespace openmc {
 
-//==============================================================================
-// Constants
-//==============================================================================
-
-extern "C" const bool MCPL_ENABLED;
-
 //==============================================================================
 // Functions
 //==============================================================================
@@ -29,14 +23,18 @@ vector<SourceSite> mcpl_source_sites(std::string path);
 //
 //! \param[in] filename     Path to MCPL file
 //! \param[in] source_bank  Vector of SourceSites to write to file for this
-//!                         MPI rank. Note that this can't be const due to
-//!                         it being used as work space by MPI.
-//! \param[in] bank_indx    Pointer to vector of site index ranges over all
-//!                         MPI ranks. This can be computed by calling
-//!                         calculate_parallel_index_vector on
-//!                         source_bank.size().
+//!                         MPI rank.
+//! \param[in] bank_index   Pointer to vector of site index ranges over all
+//!                         MPI ranks.
 void write_mcpl_source_point(const char* filename, span<SourceSite> source_bank,
   const vector<int64_t>& bank_index);
+
+//! Check if MCPL functionality is available
+bool is_mcpl_interface_available();
+
+//! Initialize the MCPL interface
+void initialize_mcpl_interface_if_needed();
+
 } // namespace openmc
 
 #endif // OPENMC_MCPL_INTERFACE_H
diff --git a/openmc/lib/__init__.py b/openmc/lib/__init__.py
index 15642b42b..d2a794eb1 100644
--- a/openmc/lib/__init__.py
+++ b/openmc/lib/__init__.py
@@ -46,9 +46,6 @@ def _coord_levels():
 def _libmesh_enabled():
     return c_bool.in_dll(_dll, "LIBMESH_ENABLED").value
 
-def _mcpl_enabled():
-    return c_bool.in_dll(_dll, "MCPL_ENABLED").value
-
 def _uwuw_enabled():
     return c_bool.in_dll(_dll, "UWUW_ENABLED").value
 
diff --git a/src/mcpl_interface.cpp b/src/mcpl_interface.cpp
index 83ef63320..13915c3b8 100644
--- a/src/mcpl_interface.cpp
+++ b/src/mcpl_interface.cpp
@@ -11,32 +11,292 @@
 
 #include <fmt/core.h>
 
-#ifdef OPENMC_MCPL
-#include <mcpl.h>
+#include <cctype>
+#include <cstdint>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <memory>
+#include <mutex>
+#include <stdexcept>
+#include <string>
+
+#ifdef _WIN32
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#else
+#include <dlfcn.h>
 #endif
 
+// WARNING: These declarations MUST EXACTLY MATCH the structure and function
+// signatures of the libmcpl being loaded at runtime. Any discrepancy will
+// likely lead to crashes or incorrect behavior. This is a maintenance risk.
+// MCPL 2.2.0
+
+#pragma pack(push, 1)
+struct mcpl_particle_repr_t {
+  double ekin;
+  double polarisation[3];
+  double position[3];
+  double direction[3];
+  double time;
+  double weight;
+  int32_t pdgcode;
+  uint32_t userflags;
+};
+#pragma pack(pop)
+
+// Opaque struct definitions replicating the MCPL C-API to ensure ABI
+// compatibility without including mcpl.h. These must be kept in sync.
+struct mcpl_file_t {
+  void* internal;
+};
+struct mcpl_outfile_t {
+  void* internal;
+};
+
+// Function pointer types for the dynamically loaded MCPL library
+using mcpl_open_file_fpt = mcpl_file_t* (*)(const char* filename);
+using mcpl_hdr_nparticles_fpt = uint64_t (*)(mcpl_file_t* file_handle);
+using mcpl_read_fpt = const mcpl_particle_repr_t* (*)(mcpl_file_t* file_handle);
+using mcpl_close_file_fpt = void (*)(mcpl_file_t* file_handle);
+
+using mcpl_create_outfile_fpt = mcpl_outfile_t* (*)(const char* filename);
+using mcpl_hdr_set_srcname_fpt = void (*)(
+  mcpl_outfile_t* outfile_handle, const char* srcname);
+using mcpl_add_particle_fpt = void (*)(
+  mcpl_outfile_t* outfile_handle, const mcpl_particle_repr_t* particle);
+using mcpl_close_outfile_fpt = void (*)(mcpl_outfile_t* outfile_handle);
+
 namespace openmc {
 
-//==============================================================================
-// Constants
-//==============================================================================
-
-#ifdef OPENMC_MCPL
-const bool MCPL_ENABLED = true;
+#ifdef _WIN32
+using LibraryHandleType = HMODULE;
 #else
-const bool MCPL_ENABLED = false;
+using LibraryHandleType = void*;
 #endif
 
-//==============================================================================
-// Functions
-//==============================================================================
+std::string get_last_library_error()
+{
+#ifdef _WIN32
+  DWORD error_code = GetLastError();
+  if (error_code == 0)
+    return "No error reported by system."; // More accurate than "No error."
+  LPSTR message_buffer = nullptr;
+  size_t size =
+    FormatMessageA(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM |
+                     FORMAT_MESSAGE_IGNORE_INSERTS,
+      NULL, error_code, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
+      (LPSTR)&message_buffer, 0, NULL);
+  std::string message(message_buffer, size);
+  LocalFree(message_buffer);
+  while (
+    !message.empty() && (message.back() == '\n' || message.back() == '\r')) {
+    message.pop_back();
+  }
+  return message;
+#else
+  const char* err = dlerror();
+  return err ? std::string(err) : "No error reported by dlerror.";
+#endif
+}
 
-#ifdef OPENMC_MCPL
-SourceSite mcpl_particle_to_site(const mcpl_particle_t* particle)
+struct McplApi {
+  mcpl_open_file_fpt open_file;
+  mcpl_hdr_nparticles_fpt hdr_nparticles;
+  mcpl_read_fpt read;
+  mcpl_close_file_fpt close_file;
+  mcpl_create_outfile_fpt create_outfile;
+  mcpl_hdr_set_srcname_fpt hdr_set_srcname;
+  mcpl_add_particle_fpt add_particle;
+  mcpl_close_outfile_fpt close_outfile;
+
+  explicit McplApi(LibraryHandleType lib_handle)
+  {
+    if (!lib_handle)
+      throw std::runtime_error(
+        "MCPL library handle is null during API binding.");
+
+    auto load_symbol_platform = [lib_handle](const char* name) {
+      void* sym = nullptr;
+#ifdef _WIN32
+      sym = (void*)GetProcAddress(lib_handle, name);
+#else
+      sym = dlsym(lib_handle, name);
+#endif
+      if (!sym) {
+        throw std::runtime_error(
+          fmt::format("Failed to load MCPL symbol '{}': {}", name,
+            get_last_library_error()));
+      }
+      return sym;
+    };
+
+    open_file = reinterpret_cast<mcpl_open_file_fpt>(
+      load_symbol_platform("mcpl_open_file"));
+    hdr_nparticles = reinterpret_cast<mcpl_hdr_nparticles_fpt>(
+      load_symbol_platform("mcpl_hdr_nparticles"));
+    read = reinterpret_cast<mcpl_read_fpt>(load_symbol_platform("mcpl_read"));
+    close_file = reinterpret_cast<mcpl_close_file_fpt>(
+      load_symbol_platform("mcpl_close_file"));
+    create_outfile = reinterpret_cast<mcpl_create_outfile_fpt>(
+      load_symbol_platform("mcpl_create_outfile"));
+    hdr_set_srcname = reinterpret_cast<mcpl_hdr_set_srcname_fpt>(
+      load_symbol_platform("mcpl_hdr_set_srcname"));
+    add_particle = reinterpret_cast<mcpl_add_particle_fpt>(
+      load_symbol_platform("mcpl_add_particle"));
+    close_outfile = reinterpret_cast<mcpl_close_outfile_fpt>(
+      load_symbol_platform("mcpl_close_outfile"));
+  }
+};
+
+static LibraryHandleType g_mcpl_lib_handle = nullptr;
+static std::unique_ptr<McplApi> g_mcpl_api;
+static bool g_mcpl_init_attempted = false;
+static bool g_mcpl_successfully_loaded = false;
+static std::string g_mcpl_load_error_msg;
+static std::once_flag g_mcpl_init_flag;
+
+void append_error(std::string& existing_msg, const std::string& new_error)
+{
+  if (!existing_msg.empty()) {
+    existing_msg += "; ";
+  }
+  existing_msg += new_error;
+}
+
+void initialize_mcpl_interface_impl()
+{
+  g_mcpl_init_attempted = true;
+  g_mcpl_load_error_msg.clear();
+
+  // Try mcpl-config
+  if (!g_mcpl_lib_handle) {
+    FILE* pipe = nullptr;
+#ifdef _WIN32
+    pipe = _popen("mcpl-config --show libpath", "r");
+#else
+    pipe = popen("mcpl-config --show libpath 2>/dev/null", "r");
+#endif
+    if (pipe) {
+      char buffer[512];
+      if (fgets(buffer, sizeof(buffer), pipe) != nullptr) {
+        std::string shlibpath = buffer;
+        // Remove trailing whitespace
+        while (!shlibpath.empty() &&
+               std::isspace(static_cast<unsigned char>(shlibpath.back()))) {
+          shlibpath.pop_back();
+        }
+
+        if (!shlibpath.empty()) {
+#ifdef _WIN32
+          g_mcpl_lib_handle = LoadLibraryA(shlibpath.c_str());
+#else
+          g_mcpl_lib_handle = dlopen(shlibpath.c_str(), RTLD_LAZY);
+#endif
+          if (!g_mcpl_lib_handle) {
+            append_error(
+              g_mcpl_load_error_msg, fmt::format("From mcpl-config ({}): {}",
+                                       shlibpath, get_last_library_error()));
+          }
+        }
+      }
+#ifdef _WIN32
+      _pclose(pipe);
+#else
+      pclose(pipe);
+#endif
+    } else { // pipe failed to open
+      append_error(g_mcpl_load_error_msg,
+        "mcpl-config command not found or failed to execute");
+    }
+  }
+
+  // Try standard library names
+  if (!g_mcpl_lib_handle) {
+#ifdef _WIN32
+    const char* standard_names[] = {"mcpl.dll", "libmcpl.dll"};
+#else
+    const char* standard_names[] = {"libmcpl.so", "libmcpl.dylib"};
+#endif
+    for (const char* name : standard_names) {
+#ifdef _WIN32
+      g_mcpl_lib_handle = LoadLibraryA(name);
+#else
+      g_mcpl_lib_handle = dlopen(name, RTLD_LAZY);
+#endif
+      if (g_mcpl_lib_handle)
+        break;
+    }
+    if (!g_mcpl_lib_handle) {
+      append_error(
+        g_mcpl_load_error_msg, fmt::format("Using standard names (e.g. {}): {}",
+                                 standard_names[0], get_last_library_error()));
+    }
+  }
+
+  if (!g_mcpl_lib_handle) {
+    if (mpi::master) {
+      warning(fmt::format("MCPL library could not be loaded. MCPL-dependent "
+                          "features will be unavailable. Load attempts: {}",
+        g_mcpl_load_error_msg.empty()
+          ? "No specific error during load attempts."
+          : g_mcpl_load_error_msg));
+    }
+    g_mcpl_successfully_loaded = false;
+    return;
+  }
+
+  try {
+    g_mcpl_api = std::make_unique<McplApi>(g_mcpl_lib_handle);
+    g_mcpl_successfully_loaded = true;
+    // Do not call dlclose/FreeLibrary at exit. Leaking the handle is safer
+    // and standard practice for libraries used for the application's lifetime.
+  } catch (const std::runtime_error& e) {
+    append_error(g_mcpl_load_error_msg,
+      fmt::format(
+        "MCPL library loaded, but failed to bind symbols: {}", e.what()));
+    if (mpi::master) {
+      warning(g_mcpl_load_error_msg);
+    }
+#ifdef _WIN32
+    FreeLibrary(g_mcpl_lib_handle);
+#else
+    dlclose(g_mcpl_lib_handle);
+#endif
+    g_mcpl_lib_handle = nullptr;
+    g_mcpl_successfully_loaded = false;
+  }
+}
+
+void initialize_mcpl_interface_if_needed()
+{
+  std::call_once(g_mcpl_init_flag, initialize_mcpl_interface_impl);
+}
+
+bool is_mcpl_interface_available()
+{
+  initialize_mcpl_interface_if_needed();
+  return g_mcpl_successfully_loaded;
+}
+
+inline void ensure_mcpl_ready_or_fatal()
+{
+  initialize_mcpl_interface_if_needed();
+  if (!g_mcpl_successfully_loaded) {
+    fatal_error("MCPL functionality is required, but the MCPL library is not "
+                "available or failed to initialize. Please ensure MCPL is "
+                "installed and its library can be found (e.g., via PATH on "
+                "Windows, LD_LIBRARY_PATH on Linux, or DYLD_LIBRARY_PATH on "
+                "macOS). You can often install MCPL with 'pip install mcpl' or "
+                "'conda install mcpl'.");
+  }
+}
+
+SourceSite mcpl_particle_to_site(const mcpl_particle_repr_t* particle_repr)
 {
   SourceSite site;
-
-  switch (particle->pdgcode) {
+  switch (particle_repr->pdgcode) {
   case 2112:
     site.particle = ParticleType::neutron;
     break;
@@ -49,179 +309,204 @@ SourceSite mcpl_particle_to_site(const mcpl_particle_t* particle)
   case -11:
     site.particle = ParticleType::positron;
     break;
+  default:
+    fatal_error(fmt::format(
+      "MCPL: Encountered unexpected PDG code {} when converting to SourceSite.",
+      particle_repr->pdgcode));
+    break;
   }
 
   // Copy position and direction
-  site.r.x = particle->position[0];
-  site.r.y = particle->position[1];
-  site.r.z = particle->position[2];
-  site.u.x = particle->direction[0];
-  site.u.y = particle->direction[1];
-  site.u.z = particle->direction[2];
-
+  site.r.x = particle_repr->position[0];
+  site.r.y = particle_repr->position[1];
+  site.r.z = particle_repr->position[2];
+  site.u.x = particle_repr->direction[0];
+  site.u.y = particle_repr->direction[1];
+  site.u.z = particle_repr->direction[2];
   // MCPL stores kinetic energy in [MeV], time in [ms]
-  site.E = particle->ekin * 1e6;
-  site.time = particle->time * 1e-3;
-  site.wgt = particle->weight;
-
+  site.E = particle_repr->ekin * 1e6;
+  site.time = particle_repr->time * 1e-3;
+  site.wgt = particle_repr->weight;
   return site;
 }
-#endif
-
-//==============================================================================
 
 vector<SourceSite> mcpl_source_sites(std::string path)
 {
+  ensure_mcpl_ready_or_fatal();
   vector<SourceSite> sites;
 
-#ifdef OPENMC_MCPL
-  // Open MCPL file and determine number of particles
-  auto mcpl_file = mcpl_open_file(path.c_str());
-  size_t n_sites = mcpl_hdr_nparticles(mcpl_file);
+  mcpl_file_t* mcpl_file = g_mcpl_api->open_file(path.c_str());
+  if (!mcpl_file) {
+    fatal_error(fmt::format("MCPL: Could not open file '{}'. It might be "
+                            "missing, inaccessible, or not a valid MCPL file.",
+      path));
+  }
 
-  for (int i = 0; i < n_sites; i++) {
-    // Extract particle from mcpl-file, checking if it is a neutron, photon,
-    // electron, or positron. Otherwise skip.
-    const mcpl_particle_t* particle;
-    int pdg = 0;
-    while (pdg != 2112 && pdg != 22 && pdg != 11 && pdg != -11) {
-      particle = mcpl_read(mcpl_file);
-      pdg = particle->pdgcode;
+  size_t n_particles_in_file = g_mcpl_api->hdr_nparticles(mcpl_file);
+  size_t n_skipped = 0;
+  if (n_particles_in_file > 0) {
+    sites.reserve(n_particles_in_file);
+  }
+
+  for (size_t i = 0; i < n_particles_in_file; ++i) {
+    const mcpl_particle_repr_t* p_repr = g_mcpl_api->read(mcpl_file);
+    if (!p_repr) {
+      warning(fmt::format("MCPL: Read error or unexpected end of file '{}' "
+                          "after reading {} of {} expected particles.",
+        path, sites.size(), n_particles_in_file));
+      break;
+    }
+    if (p_repr->pdgcode == 2112 || p_repr->pdgcode == 22 ||
+        p_repr->pdgcode == 11 || p_repr->pdgcode == -11) {
+      sites.push_back(mcpl_particle_to_site(p_repr));
+    } else {
+      n_skipped++;
     }
-
-    // Convert to source site and add to vector
-    sites.push_back(mcpl_particle_to_site(particle));
   }
 
-  // Check that some sites were read
+  g_mcpl_api->close_file(mcpl_file);
+
+  if (n_skipped > 0 && n_particles_in_file > 0) {
+    double percent_skipped =
+      100.0 * static_cast<double>(n_skipped) / n_particles_in_file;
+    warning(fmt::format(
+      "MCPL: Skipped {} of {} total particles ({:.1f}%) in file '{}' because "
+      "their type is not supported by OpenMC.",
+      n_skipped, n_particles_in_file, percent_skipped, path));
+  }
+
   if (sites.empty()) {
-    fatal_error("MCPL file contained no neutron, photon, electron, or positron "
-                "source particles.");
+    if (n_particles_in_file > 0) {
+      fatal_error(fmt::format(
+        "MCPL file '{}' contained {} particles, but none were of the supported "
+        "types (neutron, photon, electron, positron). OpenMC cannot proceed "
+        "without source particles.",
+        path, n_particles_in_file));
+    } else {
+      fatal_error(fmt::format(
+        "MCPL file '{}' is empty or contains no particle data.", path));
+    }
   }
-
-  mcpl_close_file(mcpl_file);
-#else
-  fatal_error(
-    "Your build of OpenMC does not support reading MCPL source files.");
-#endif
-
   return sites;
 }
 
-//==============================================================================
-
-#ifdef OPENMC_MCPL
-void write_mcpl_source_bank(mcpl_outfile_t file_id,
-  span<SourceSite> source_bank, const vector<int64_t>& bank_index)
+void write_mcpl_source_bank_internal(mcpl_outfile_t* file_id,
+  span<SourceSite> local_source_bank,
+  const vector<int64_t>& bank_index_all_ranks)
 {
-  int64_t dims_size = settings::n_particles;
-  int64_t count_size = simulation::work_per_rank;
-
   if (mpi::master) {
-    // Particles are writeen to disk from the master node only
+    if (!file_id) {
+      fatal_error("MCPL: Internal error - master rank called "
+                  "write_mcpl_source_bank_internal with null file_id.");
+    }
+    vector<SourceSite> receive_buffer;
 
-    // Save source bank sites since the array is overwritten below
+    for (int rank_idx = 0; rank_idx < mpi::n_procs; ++rank_idx) {
+      size_t num_sites_on_rank = static_cast<size_t>(
+        bank_index_all_ranks[rank_idx + 1] - bank_index_all_ranks[rank_idx]);
+      if (num_sites_on_rank == 0)
+        continue;
+
+      span<const SourceSite> sites_to_write;
 #ifdef OPENMC_MPI
-    vector<SourceSite> temp_source {source_bank.begin(), source_bank.end()};
+      if (rank_idx == mpi::rank) {
+        sites_to_write = openmc::span<const SourceSite>(
+          local_source_bank.data(), num_sites_on_rank);
+      } else {
+        if (receive_buffer.size() < num_sites_on_rank) {
+          receive_buffer.resize(num_sites_on_rank);
+        }
+        MPI_Recv(receive_buffer.data(), num_sites_on_rank, mpi::source_site,
+          rank_idx, rank_idx, mpi::intracomm, MPI_STATUS_IGNORE);
+        sites_to_write = openmc::span<const SourceSite>(
+          receive_buffer.data(), num_sites_on_rank);
+      }
+#else
+      sites_to_write = openmc::span<const SourceSite>(
+        local_source_bank.data(), num_sites_on_rank);
 #endif
-
-    // loop over the other nodes and receive data - then write those.
-    for (int i = 0; i < mpi::n_procs; ++i) {
-      // number of particles for node node i
-      size_t count[] {static_cast<size_t>(bank_index[i + 1] - bank_index[i])};
-
-#ifdef OPENMC_MPI
-      if (i > 0)
-        MPI_Recv(source_bank.data(), count[0], mpi::source_site, i, i,
-          mpi::intracomm, MPI_STATUS_IGNORE);
-#endif
-      // now write the source_bank data again.
-      for (const auto& site : source_bank) {
-        // particle is now at the iterator
-        // write it to the mcpl-file
-        mcpl_particle_t p;
-        p.position[0] = site.r.x;
-        p.position[1] = site.r.y;
-        p.position[2] = site.r.z;
-
-        // mcpl requires that the direction vector is unit length
-        // which is also the case in openmc
-        p.direction[0] = site.u.x;
-        p.direction[1] = site.u.y;
-        p.direction[2] = site.u.z;
-
-        // MCPL stores kinetic energy in [MeV], time in [ms]
-        p.ekin = site.E * 1e-6;
-        p.time = site.time * 1e3;
-        p.weight = site.wgt;
-
+      for (const auto& site : sites_to_write) {
+        mcpl_particle_repr_t p_repr {};
+        p_repr.position[0] = site.r.x;
+        p_repr.position[1] = site.r.y;
+        p_repr.position[2] = site.r.z;
+        p_repr.direction[0] = site.u.x;
+        p_repr.direction[1] = site.u.y;
+        p_repr.direction[2] = site.u.z;
+        p_repr.ekin = site.E * 1e-6;
+        p_repr.time = site.time * 1e3;
+        p_repr.weight = site.wgt;
         switch (site.particle) {
         case ParticleType::neutron:
-          p.pdgcode = 2112;
+          p_repr.pdgcode = 2112;
           break;
         case ParticleType::photon:
-          p.pdgcode = 22;
+          p_repr.pdgcode = 22;
           break;
         case ParticleType::electron:
-          p.pdgcode = 11;
+          p_repr.pdgcode = 11;
           break;
         case ParticleType::positron:
-          p.pdgcode = -11;
+          p_repr.pdgcode = -11;
           break;
+        default:
+          continue;
         }
-
-        mcpl_add_particle(file_id, &p);
+        g_mcpl_api->add_particle(file_id, &p_repr);
       }
     }
-#ifdef OPENMC_MPI
-    // Restore state of source bank
-    std::copy(temp_source.begin(), temp_source.end(), source_bank.begin());
-#endif
   } else {
 #ifdef OPENMC_MPI
-    MPI_Send(source_bank.data(), count_size, mpi::source_site, 0, mpi::rank,
-      mpi::intracomm);
+    if (!local_source_bank.empty()) {
+      MPI_Send(local_source_bank.data(), local_source_bank.size(),
+        mpi::source_site, 0, mpi::rank, mpi::intracomm);
+    }
 #endif
   }
 }
-#endif
-
-//==============================================================================
 
 void write_mcpl_source_point(const char* filename, span<SourceSite> source_bank,
   const vector<int64_t>& bank_index)
 {
+  ensure_mcpl_ready_or_fatal();
+
   std::string filename_(filename);
   const auto extension = get_file_extension(filename_);
-  if (extension == "") {
+  if (extension.empty()) {
     filename_.append(".mcpl");
   } else if (extension != "mcpl") {
-    warning("write_mcpl_source_point was passed a file extension differing "
-            "from .mcpl, but an mcpl file will be written.");
+    warning(fmt::format("Specified filename '{}' has an extension '.{}', but "
+                        "an MCPL file (.mcpl) will be written using this name.",
+      filename, extension));
   }
 
-#ifdef OPENMC_MCPL
-  mcpl_outfile_t file_id;
+  mcpl_outfile_t* file_id = nullptr;
 
-  std::string line;
   if (mpi::master) {
-    file_id = mcpl_create_outfile(filename_.c_str());
+    file_id = g_mcpl_api->create_outfile(filename_.c_str());
+    if (!file_id) {
+      fatal_error(fmt::format(
+        "MCPL: Failed to create output file '{}'. Check permissions and path.",
+        filename_));
+    }
+    std::string src_line;
     if (VERSION_DEV) {
-      line = fmt::format("OpenMC {0}.{1}.{2}-dev{3}", VERSION_MAJOR,
+      src_line = fmt::format("OpenMC {}.{}.{}-dev{}", VERSION_MAJOR,
         VERSION_MINOR, VERSION_RELEASE, VERSION_COMMIT_COUNT);
     } else {
-      line = fmt::format(
-        "OpenMC {0}.{1}.{2}", VERSION_MAJOR, VERSION_MINOR, VERSION_RELEASE);
+      src_line = fmt::format(
+        "OpenMC {}.{}.{}", VERSION_MAJOR, VERSION_MINOR, VERSION_RELEASE);
     }
-    mcpl_hdr_set_srcname(file_id, line.c_str());
+    g_mcpl_api->hdr_set_srcname(file_id, src_line.c_str());
   }
 
-  write_mcpl_source_bank(file_id, source_bank, bank_index);
+  write_mcpl_source_bank_internal(file_id, source_bank, bank_index);
 
   if (mpi::master) {
-    mcpl_close_outfile(file_id);
+    if (file_id) {
+      g_mcpl_api->close_outfile(file_id);
+    }
   }
-#endif
 }
 
 } // namespace openmc
diff --git a/src/settings.cpp b/src/settings.cpp
index 9afe74361..afa42a3c5 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -844,12 +844,6 @@ void read_settings_xml(pugi::xml_node root)
     }
     if (check_for_node(node_sp, "mcpl")) {
       source_mcpl_write = get_node_value_bool(node_sp, "mcpl");
-
-      // Make sure MCPL support is enabled
-      if (source_mcpl_write && !MCPL_ENABLED) {
-        fatal_error(
-          "Your build of OpenMC does not support writing MCPL source files.");
-      }
     }
     if (check_for_node(node_sp, "overwrite_latest")) {
       source_latest = get_node_value_bool(node_sp, "overwrite_latest");
@@ -902,12 +896,6 @@ void read_settings_xml(pugi::xml_node root)
 
     if (check_for_node(node_ssw, "mcpl")) {
       surf_mcpl_write = get_node_value_bool(node_ssw, "mcpl");
-
-      // Make sure MCPL support is enabled
-      if (surf_mcpl_write && !MCPL_ENABLED) {
-        fatal_error("Your build of OpenMC does not support writing MCPL "
-                    "surface source files.");
-      }
     }
     // Get cell information
     if (check_for_node(node_ssw, "cell")) {
diff --git a/tests/regression_tests/source_mcpl_file/settings.xml b/tests/regression_tests/source_mcpl_file/settings.xml
index 47b010bff..bb08e6fd7 100644
--- a/tests/regression_tests/source_mcpl_file/settings.xml
+++ b/tests/regression_tests/source_mcpl_file/settings.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0"?>
 <settings>
+  <run_mode>eigenvalue</run_mode>
   <state_point batches="10" />
   <source_point mcpl="true" separate="true" />
-  <eigenvalue>
-    <batches>10</batches>
-    <inactive>5</inactive>
-    <particles>1000</particles>
-  </eigenvalue>
+  <batches>10</batches>
+  <inactive>5</inactive>
+  <particles>1000</particles>
   <source>
     <space type="box">
       <parameters>-4 -4 -4  4  4  4</parameters>
diff --git a/tests/regression_tests/source_mcpl_file/test.py b/tests/regression_tests/source_mcpl_file/test.py
index 84ec005ae..6e668ef19 100644
--- a/tests/regression_tests/source_mcpl_file/test.py
+++ b/tests/regression_tests/source_mcpl_file/test.py
@@ -1,23 +1,23 @@
 #!/usr/bin/env python
-import openmc.lib
 import pytest
 import glob
 import os
-
+import shutil
 from tests.testing_harness import *
+
 pytestmark = pytest.mark.skipif(
-    not openmc.lib._mcpl_enabled(),
-    reason="MCPL is not enabled.")
+    shutil.which("mcpl-config") is None,
+    reason="mcpl-config command not found in PATH; MCPL is likely not available."
+)
 
 settings1="""<?xml version="1.0"?>
 <settings>
+  <run_mode>eigenvalue</run_mode>
   <state_point batches="10" />
   <source_point mcpl="true" separate="true" />
-  <eigenvalue>
-    <batches>10</batches>
-    <inactive>5</inactive>
-    <particles>1000</particles>
-  </eigenvalue>
+  <batches>10</batches>
+  <inactive>5</inactive>
+  <particles>1000</particles>
   <source>
     <space type="box">
       <parameters>-4 -4 -4  4  4  4</parameters>
@@ -28,11 +28,10 @@ settings1="""<?xml version="1.0"?>
 
 settings2 = """<?xml version="1.0"?>
 <settings>
-  <eigenvalue>
-    <batches>10</batches>
-    <inactive>5</inactive>
-    <particles>1000</particles>
-  </eigenvalue>
+  <run_mode>eigenvalue</run_mode>
+  <batches>10</batches>
+  <inactive>5</inactive>
+  <particles>1000</particles>
   <source>
     <file>source.10.{}</file>
   </source>

From bca818ced6c7c0a7fd1b331cb8057b682ecc854c Mon Sep 17 00:00:00 2001
From: Patrick Shriwise <pshriwise@gmail.com>
Date: Wed, 16 Jul 2025 22:29:41 -0500
Subject: [PATCH 079/203] Add accessor methods for LocalCoord (#3494)

Co-authored-by: Paul Romano <paul.k.romano@gmail.com>
---
 include/openmc/particle_data.h        |  54 +++++++++----
 include/openmc/plot.h                 |   2 +-
 src/cell.cpp                          |  10 +--
 src/dagmc.cpp                         |   4 +-
 src/geometry.cpp                      | 104 +++++++++++++-------------
 src/mesh.cpp                          |   6 +-
 src/output.cpp                        |  21 +++---
 src/particle.cpp                      |  36 ++++-----
 src/particle_data.cpp                 |  26 +++----
 src/plot.cpp                          |  16 ++--
 src/random_ray/flat_source_domain.cpp |   6 +-
 src/random_ray/random_ray.cpp         |  10 +--
 src/source.cpp                        |   7 +-
 src/tallies/filter_cell.cpp           |   2 +-
 src/tallies/filter_cell_instance.cpp  |   4 +-
 src/tallies/filter_distribcell.cpp    |   8 +-
 src/tallies/filter_universe.cpp       |   2 +-
 src/tallies/tally_scoring.cpp         |   6 +-
 src/universe.cpp                      |   4 +-
 src/volume_calc.cpp                   |   4 +-
 20 files changed, 179 insertions(+), 153 deletions(-)

diff --git a/include/openmc/particle_data.h b/include/openmc/particle_data.h
index be7fa7483..8dd814a29 100644
--- a/include/openmc/particle_data.h
+++ b/include/openmc/particle_data.h
@@ -88,13 +88,37 @@ public:
   //! clear data from a single coordinate level
   void reset();
 
-  Position r;  //!< particle position
-  Direction u; //!< particle direction
-  int cell {-1};
-  int universe {-1};
-  int lattice {-1};
-  array<int, 3> lattice_i {{-1, -1, -1}};
-  bool rotated {false}; //!< Is the level rotated?
+  // accessors
+  Position& r() { return r_; }
+  const Position& r() const { return r_; }
+
+  Direction& u() { return u_; }
+  const Direction& u() const { return u_; }
+
+  int& cell() { return cell_; }
+  const int& cell() const { return cell_; }
+
+  int& universe() { return universe_; }
+  const int& universe() const { return universe_; }
+
+  int& lattice() { return lattice_; }
+  int lattice() const { return lattice_; }
+
+  array<int, 3>& lattice_index() { return lattice_index_; }
+  const array<int, 3>& lattice_index() const { return lattice_index_; }
+
+  bool& rotated() { return rotated_; }
+  const bool& rotated() const { return rotated_; }
+
+private:
+  // Data members
+  Position r_;  //!< particle position
+  Direction u_; //!< particle direction
+  int cell_ {-1};
+  int universe_ {-1};
+  int lattice_ {-1};
+  array<int, 3> lattice_index_ {{-1, -1, -1}};
+  bool rotated_ {false}; //!< Is the level rotated?
 };
 
 //==============================================================================
@@ -301,20 +325,20 @@ public:
   const Position& u_last() const { return u_last_; }
 
   // Accessors for position in global coordinates
-  Position& r() { return coord_[0].r; }
-  const Position& r() const { return coord_[0].r; }
+  Position& r() { return coord_[0].r(); }
+  const Position& r() const { return coord_[0].r(); }
 
   // Accessors for position in local coordinates
-  Position& r_local() { return coord_[n_coord_ - 1].r; }
-  const Position& r_local() const { return coord_[n_coord_ - 1].r; }
+  Position& r_local() { return coord_[n_coord_ - 1].r(); }
+  const Position& r_local() const { return coord_[n_coord_ - 1].r(); }
 
   // Accessors for direction in global coordinates
-  Direction& u() { return coord_[0].u; }
-  const Direction& u() const { return coord_[0].u; }
+  Direction& u() { return coord_[0].u(); }
+  const Direction& u() const { return coord_[0].u(); }
 
   // Accessors for direction in local coordinates
-  Direction& u_local() { return coord_[n_coord_ - 1].u; }
-  const Direction& u_local() const { return coord_[n_coord_ - 1].u; }
+  Direction& u_local() { return coord_[n_coord_ - 1].u(); }
+  const Direction& u_local() const { return coord_[n_coord_ - 1].u(); }
 
   // Surface token for the surface that the particle is currently on
   int& surface() { return surface_; }
diff --git a/include/openmc/plot.h b/include/openmc/plot.h
index 69e801c5f..7e27679ea 100644
--- a/include/openmc/plot.h
+++ b/include/openmc/plot.h
@@ -223,7 +223,7 @@ T SlicePlotBase::get_map() const
     GeometryState p;
     p.r() = xyz;
     p.u() = dir;
-    p.coord(0).universe = model::root_universe;
+    p.coord(0).universe() = model::root_universe;
     int level = slice_level_;
     int j {};
 
diff --git a/src/cell.cpp b/src/cell.cpp
index 4b2699229..eb5c228bc 100644
--- a/src/cell.cpp
+++ b/src/cell.cpp
@@ -1314,10 +1314,10 @@ vector<ParentCell> Cell::find_parent_cells(
   bool cell_found = false;
   for (auto it = coords.begin(); it != coords.end(); it++) {
     const auto& coord = *it;
-    const auto& cell = model::cells[coord.cell];
+    const auto& cell = model::cells[coord.cell()];
     // if the cell at this level matches the current cell, stop adding to the
     // stack
-    if (coord.cell == model::cell_map[this->id_]) {
+    if (coord.cell() == model::cell_map[this->id_]) {
       cell_found = true;
       break;
     }
@@ -1327,10 +1327,10 @@ vector<ParentCell> Cell::find_parent_cells(
     int lattice_idx = C_NONE;
     if (cell->type_ == Fill::LATTICE) {
       const auto& next_coord = *(it + 1);
-      lattice_idx = model::lattices[next_coord.lattice]->get_flat_index(
-        next_coord.lattice_i);
+      lattice_idx = model::lattices[next_coord.lattice()]->get_flat_index(
+        next_coord.lattice_index());
     }
-    stack.push(coord.universe, {coord.cell, lattice_idx});
+    stack.push(coord.universe(), {coord.cell(), lattice_idx});
   }
 
   // if this loop finished because the cell was found and
diff --git a/src/dagmc.cpp b/src/dagmc.cpp
index 134360886..1d92d9d57 100644
--- a/src/dagmc.cpp
+++ b/src/dagmc.cpp
@@ -430,7 +430,7 @@ bool DAGUniverse::find_cell(GeometryState& p) const
   // cells, place it in the implicit complement
   bool found = Universe::find_cell(p);
   if (!found && model::universe_map[this->id_] != model::root_universe) {
-    p.lowest_coord().cell = implicit_complement_idx();
+    p.lowest_coord().cell() = implicit_complement_idx();
     found = true;
   }
   return found;
@@ -676,7 +676,7 @@ std::pair<double, int32_t> DAGCell::distance(
     p->history().reset();
   }
 
-  const auto& univ = model::universes[p->lowest_coord().universe];
+  const auto& univ = model::universes[p->lowest_coord().universe()];
 
   DAGUniverse* dag_univ = static_cast<DAGUniverse*>(univ.get());
   if (!dag_univ)
diff --git a/src/geometry.cpp b/src/geometry.cpp
index 9e975c00d..cefe7d364 100644
--- a/src/geometry.cpp
+++ b/src/geometry.cpp
@@ -38,17 +38,17 @@ bool check_cell_overlap(GeometryState& p, bool error)
 
   // Loop through each coordinate level
   for (int j = 0; j < n_coord; j++) {
-    Universe& univ = *model::universes[p.coord(j).universe];
+    Universe& univ = *model::universes[p.coord(j).universe()];
 
     // Loop through each cell on this level
     for (auto index_cell : univ.cells_) {
       Cell& c = *model::cells[index_cell];
-      if (c.contains(p.coord(j).r, p.coord(j).u, p.surface())) {
-        if (index_cell != p.coord(j).cell) {
+      if (c.contains(p.coord(j).r(), p.coord(j).u(), p.surface())) {
+        if (index_cell != p.coord(j).cell()) {
           if (error) {
             fatal_error(
               fmt::format("Overlapping cells detected: {}, {} on universe {}",
-                c.id_, model::cells[p.coord(j).cell]->id_, univ.id_));
+                c.id_, model::cells[p.coord(j).cell()]->id_, univ.id_));
           }
           return true;
         }
@@ -73,7 +73,7 @@ int cell_instance_at_level(const GeometryState& p, int level)
   }
 
   // determine the cell instance
-  Cell& c {*model::cells[p.coord(level).cell]};
+  Cell& c {*model::cells[p.coord(level).cell()]};
 
   // quick exit if this cell doesn't have distribcell instances
   if (c.distribcell_index_ == C_NONE)
@@ -82,13 +82,13 @@ int cell_instance_at_level(const GeometryState& p, int level)
   // compute the cell's instance
   int instance = 0;
   for (int i = 0; i < level; i++) {
-    const auto& c_i {*model::cells[p.coord(i).cell]};
+    const auto& c_i {*model::cells[p.coord(i).cell()]};
     if (c_i.type_ == Fill::UNIVERSE) {
       instance += c_i.offset_[c.distribcell_index_];
     } else if (c_i.type_ == Fill::LATTICE) {
       instance += c_i.offset_[c.distribcell_index_];
-      auto& lat {*model::lattices[p.coord(i + 1).lattice]};
-      const auto& i_xyz {p.coord(i + 1).lattice_i};
+      auto& lat {*model::lattices[p.coord(i + 1).lattice()]};
+      const auto& i_xyz {p.coord(i + 1).lattice_index()};
       if (lat.are_valid_indices(i_xyz)) {
         instance += lat.offset(c.distribcell_index_, i_xyz);
       }
@@ -111,7 +111,7 @@ bool find_cell_inner(
       i_cell = *it;
 
       // Make sure the search cell is in the same universe.
-      int i_universe = p.lowest_coord().universe;
+      int i_universe = p.lowest_coord().universe();
       if (model::cells[i_cell]->universe_ != i_universe)
         continue;
 
@@ -120,7 +120,7 @@ bool find_cell_inner(
       Direction u {p.u_local()};
       auto surf = p.surface();
       if (model::cells[i_cell]->contains(r, u, surf)) {
-        p.lowest_coord().cell = i_cell;
+        p.lowest_coord().cell() = i_cell;
         found = true;
         break;
       }
@@ -146,7 +146,7 @@ bool find_cell_inner(
     // code below this conditional, we set i_cell back to C_NONE to indicate
     // that.
     if (i_cell == C_NONE) {
-      int i_universe = p.lowest_coord().universe;
+      int i_universe = p.lowest_coord().universe();
       const auto& univ {model::universes[i_universe]};
       found = univ->find_cell(p);
     }
@@ -154,7 +154,7 @@ bool find_cell_inner(
     if (!found) {
       return found;
     }
-    i_cell = p.lowest_coord().cell;
+    i_cell = p.lowest_coord().cell();
 
     // Announce the cell that the particle is entering.
     if (found && verbose) {
@@ -186,14 +186,14 @@ bool find_cell_inner(
 
       // Set the lower coordinate level universe.
       auto& coord {p.coord(p.n_coord())};
-      coord.universe = c.fill_;
+      coord.universe() = c.fill_;
 
       // Set the position and direction.
-      coord.r = p.r_local();
-      coord.u = p.u_local();
+      coord.r() = p.r_local();
+      coord.u() = p.u_local();
 
       // Apply translation.
-      coord.r -= c.translation_;
+      coord.r() -= c.translation_;
 
       // Apply rotation.
       if (!c.rotation_.empty()) {
@@ -208,11 +208,11 @@ bool find_cell_inner(
 
       // Set the position and direction.
       auto& coord {p.coord(p.n_coord())};
-      coord.r = p.r_local();
-      coord.u = p.u_local();
+      coord.r() = p.r_local();
+      coord.u() = p.u_local();
 
       // Apply translation.
-      coord.r -= c.translation_;
+      coord.r() -= c.translation_;
 
       // Apply rotation.
       if (!c.rotation_.empty()) {
@@ -220,21 +220,21 @@ bool find_cell_inner(
       }
 
       // Determine lattice indices.
-      auto& i_xyz {coord.lattice_i};
-      lat.get_indices(coord.r, coord.u, i_xyz);
+      auto& i_xyz {coord.lattice_index()};
+      lat.get_indices(coord.r(), coord.u(), i_xyz);
 
       // Get local position in appropriate lattice cell
-      coord.r = lat.get_local_position(coord.r, i_xyz);
+      coord.r() = lat.get_local_position(coord.r(), i_xyz);
 
       // Set lattice indices.
-      coord.lattice = c.fill_;
+      coord.lattice() = c.fill_;
 
       // Set the lower coordinate level universe.
       if (lat.are_valid_indices(i_xyz)) {
-        coord.universe = lat[i_xyz];
+        coord.universe() = lat[i_xyz];
       } else {
         if (lat.outer_ != NO_OUTER_UNIVERSE) {
-          coord.universe = lat.outer_;
+          coord.universe() = lat.outer_;
         } else {
           p.mark_as_lost(fmt::format(
             "Particle {} left lattice {}, but it has no outer definition.",
@@ -261,7 +261,7 @@ bool neighbor_list_find_cell(GeometryState& p, bool verbose)
 
   // Get the cell this particle was in previously.
   auto coord_lvl = p.n_coord() - 1;
-  auto i_cell = p.coord(coord_lvl).cell;
+  auto i_cell = p.coord(coord_lvl).cell();
   Cell& c {*model::cells[i_cell]};
 
   // Search for the particle in that cell's neighbor list.  Return if we
@@ -275,15 +275,15 @@ bool neighbor_list_find_cell(GeometryState& p, bool verbose)
   // neighboring cell.
   found = find_cell_inner(p, nullptr, verbose);
   if (found)
-    c.neighbors_.push_back(p.coord(coord_lvl).cell);
+    c.neighbors_.push_back(p.coord(coord_lvl).cell());
   return found;
 }
 
 bool exhaustive_find_cell(GeometryState& p, bool verbose)
 {
-  int i_universe = p.lowest_coord().universe;
+  int i_universe = p.lowest_coord().universe();
   if (i_universe == C_NONE) {
-    p.coord(0).universe = model::root_universe;
+    p.coord(0).universe() = model::root_universe;
     p.n_coord() = 1;
     i_universe = model::root_universe;
   }
@@ -299,32 +299,32 @@ bool exhaustive_find_cell(GeometryState& p, bool verbose)
 void cross_lattice(GeometryState& p, const BoundaryInfo& boundary, bool verbose)
 {
   auto& coord {p.lowest_coord()};
-  auto& lat {*model::lattices[coord.lattice]};
+  auto& lat {*model::lattices[coord.lattice()]};
 
   if (verbose) {
     write_message(
       fmt::format("    Crossing lattice {}. Current position ({},{},{}). r={}",
-        lat.id_, coord.lattice_i[0], coord.lattice_i[1], coord.lattice_i[2],
-        p.r()),
+        lat.id_, coord.lattice_index()[0], coord.lattice_index()[1],
+        coord.lattice_index()[2], p.r()),
       1);
   }
 
   // Set the lattice indices.
-  coord.lattice_i[0] += boundary.lattice_translation[0];
-  coord.lattice_i[1] += boundary.lattice_translation[1];
-  coord.lattice_i[2] += boundary.lattice_translation[2];
+  coord.lattice_index()[0] += boundary.lattice_translation[0];
+  coord.lattice_index()[1] += boundary.lattice_translation[1];
+  coord.lattice_index()[2] += boundary.lattice_translation[2];
 
   // Set the new coordinate position.
   const auto& upper_coord {p.coord(p.n_coord() - 2)};
-  const auto& cell {model::cells[upper_coord.cell]};
-  Position r = upper_coord.r;
+  const auto& cell {model::cells[upper_coord.cell()]};
+  Position r = upper_coord.r();
   r -= cell->translation_;
   if (!cell->rotation_.empty()) {
     r = r.rotate(cell->rotation_);
   }
-  p.r_local() = lat.get_local_position(r, coord.lattice_i);
+  p.r_local() = lat.get_local_position(r, coord.lattice_index());
 
-  if (!lat.are_valid_indices(coord.lattice_i)) {
+  if (!lat.are_valid_indices(coord.lattice_index())) {
     // The particle is outside the lattice.  Search for it from the base coords.
     p.n_coord() = 1;
     bool found = exhaustive_find_cell(p);
@@ -337,7 +337,7 @@ void cross_lattice(GeometryState& p, const BoundaryInfo& boundary, bool verbose)
 
   } else {
     // Find cell in next lattice element.
-    p.lowest_coord().universe = lat[coord.lattice_i];
+    p.lowest_coord().universe() = lat[coord.lattice_index()];
     bool found = exhaustive_find_cell(p);
 
     if (!found) {
@@ -367,9 +367,9 @@ BoundaryInfo distance_to_boundary(GeometryState& p)
   // Loop over each coordinate level.
   for (int i = 0; i < p.n_coord(); i++) {
     const auto& coord {p.coord(i)};
-    const Position& r {coord.r};
-    const Direction& u {coord.u};
-    Cell& c {*model::cells[coord.cell]};
+    const Position& r {coord.r()};
+    const Direction& u {coord.u()};
+    Cell& c {*model::cells[coord.cell()]};
 
     // Find the oncoming surface in this cell and the distance to it.
     auto surface_distance = c.distance(r, u, p.surface(), &p);
@@ -377,24 +377,24 @@ BoundaryInfo distance_to_boundary(GeometryState& p)
     level_surf_cross = surface_distance.second;
 
     // Find the distance to the next lattice tile crossing.
-    if (coord.lattice != C_NONE) {
-      auto& lat {*model::lattices[coord.lattice]};
+    if (coord.lattice() != C_NONE) {
+      auto& lat {*model::lattices[coord.lattice()]};
       // TODO: refactor so both lattice use the same position argument (which
       // also means the lat.type attribute can be removed)
       std::pair<double, array<int, 3>> lattice_distance;
       switch (lat.type_) {
       case LatticeType::rect:
-        lattice_distance = lat.distance(r, u, coord.lattice_i);
+        lattice_distance = lat.distance(r, u, coord.lattice_index());
         break;
       case LatticeType::hex:
-        auto& cell_above {model::cells[p.coord(i - 1).cell]};
-        Position r_hex {p.coord(i - 1).r};
+        auto& cell_above {model::cells[p.coord(i - 1).cell()]};
+        Position r_hex {p.coord(i - 1).r()};
         r_hex -= cell_above->translation_;
-        if (coord.rotated) {
+        if (coord.rotated()) {
           r_hex = r_hex.rotate(cell_above->rotation_);
         }
-        r_hex.z = coord.r.z;
-        lattice_distance = lat.distance(r_hex, u, coord.lattice_i);
+        r_hex.z = coord.r().z;
+        lattice_distance = lat.distance(r_hex, u, coord.lattice_index());
         break;
       }
       d_lat = lattice_distance.first;
@@ -468,7 +468,7 @@ extern "C" int openmc_find_cell(
     return OPENMC_E_GEOMETRY;
   }
 
-  *index = geom_state.lowest_coord().cell;
+  *index = geom_state.lowest_coord().cell();
   *instance = geom_state.cell_instance();
   return 0;
 }
diff --git a/src/mesh.cpp b/src/mesh.cpp
index becbbd3fd..1b2c71eb2 100644
--- a/src/mesh.cpp
+++ b/src/mesh.cpp
@@ -368,11 +368,11 @@ void Mesh::material_volumes(int nx, int ny, int nz, int table_size,
 
           // Set birth cell attribute
           if (p.cell_born() == C_NONE)
-            p.cell_born() = p.lowest_coord().cell;
+            p.cell_born() = p.lowest_coord().cell();
 
           // Initialize last cells from current cell
           for (int j = 0; j < p.n_coord(); ++j) {
-            p.cell_last(j) = p.coord(j).cell;
+            p.cell_last(j) = p.coord(j).cell();
           }
           p.n_coord_last() = p.n_coord();
 
@@ -411,7 +411,7 @@ void Mesh::material_volumes(int nx, int ny, int nz, int table_size,
 
             // cross next geometric surface
             for (int j = 0; j < p.n_coord(); ++j) {
-              p.cell_last(j) = p.coord(j).cell;
+              p.cell_last(j) = p.coord(j).cell();
             }
             p.n_coord_last() = p.n_coord();
 
diff --git a/src/output.cpp b/src/output.cpp
index baaf682a1..0316e313e 100644
--- a/src/output.cpp
+++ b/src/output.cpp
@@ -177,25 +177,26 @@ void print_particle(Particle& p)
   for (auto i = 0; i < p.n_coord(); i++) {
     fmt::print("  Level {}\n", i);
 
-    if (p.coord(i).cell != C_NONE) {
-      const Cell& c {*model::cells[p.coord(i).cell]};
+    if (p.coord(i).cell() != C_NONE) {
+      const Cell& c {*model::cells[p.coord(i).cell()]};
       fmt::print("    Cell             = {}\n", c.id_);
     }
 
-    if (p.coord(i).universe != C_NONE) {
-      const Universe& u {*model::universes[p.coord(i).universe]};
+    if (p.coord(i).universe() != C_NONE) {
+      const Universe& u {*model::universes[p.coord(i).universe()]};
       fmt::print("    Universe         = {}\n", u.id_);
     }
 
-    if (p.coord(i).lattice != C_NONE) {
-      const Lattice& lat {*model::lattices[p.coord(i).lattice]};
+    if (p.coord(i).lattice() != C_NONE) {
+      const Lattice& lat {*model::lattices[p.coord(i).lattice()]};
       fmt::print("    Lattice          = {}\n", lat.id_);
-      fmt::print("    Lattice position = ({},{},{})\n", p.coord(i).lattice_i[0],
-        p.coord(i).lattice_i[1], p.coord(i).lattice_i[2]);
+      fmt::print("    Lattice position = ({},{},{})\n",
+        p.coord(i).lattice_index()[0], p.coord(i).lattice_index()[1],
+        p.coord(i).lattice_index()[2]);
     }
 
-    fmt::print("    r = {}\n", p.coord(i).r);
-    fmt::print("    u = {}\n", p.coord(i).u);
+    fmt::print("    r = {}\n", p.coord(i).r());
+    fmt::print("    u = {}\n", p.coord(i).u());
   }
 
   // Display miscellaneous info.
diff --git a/src/particle.cpp b/src/particle.cpp
index 6cfdf2175..4758cded5 100644
--- a/src/particle.cpp
+++ b/src/particle.cpp
@@ -176,7 +176,7 @@ void Particle::event_calculate_xs()
   // If the cell hasn't been determined based on the particle's location,
   // initiate a search for the current cell. This generally happens at the
   // beginning of the history and again for any secondary particles
-  if (lowest_coord().cell == C_NONE) {
+  if (lowest_coord().cell() == C_NONE) {
     if (!exhaustive_find_cell(*this)) {
       mark_as_lost(
         "Could not find the cell containing particle " + std::to_string(id()));
@@ -185,11 +185,11 @@ void Particle::event_calculate_xs()
 
     // Set birth cell attribute
     if (cell_born() == C_NONE)
-      cell_born() = lowest_coord().cell;
+      cell_born() = lowest_coord().cell();
 
     // Initialize last cells from current cell
     for (int j = 0; j < n_coord(); ++j) {
-      cell_last(j) = coord(j).cell;
+      cell_last(j) = coord(j).cell();
     }
     n_coord_last() = n_coord();
   }
@@ -248,7 +248,7 @@ void Particle::event_advance()
   // Short-term solution until the surface source is revised and we can use
   // this->move_distance(distance)
   for (int j = 0; j < n_coord(); ++j) {
-    coord(j).r += distance * coord(j).u;
+    coord(j).r() += distance * coord(j).u();
   }
   double dt = distance / this->speed();
   this->time() += dt;
@@ -293,7 +293,7 @@ void Particle::event_cross_surface()
 {
   // Saving previous cell data
   for (int j = 0; j < n_coord(); ++j) {
-    cell_last(j) = coord(j).cell;
+    cell_last(j) = coord(j).cell();
   }
   n_coord_last() = n_coord();
 
@@ -393,14 +393,14 @@ void Particle::event_collide()
   // Set all directions to base level -- right now, after a collision, only
   // the base level directions are changed
   for (int j = 0; j < n_coord() - 1; ++j) {
-    if (coord(j + 1).rotated) {
+    if (coord(j + 1).rotated()) {
       // If next level is rotated, apply rotation matrix
-      const auto& m {model::cells[coord(j).cell]->rotation_};
-      const auto& u {coord(j).u};
-      coord(j + 1).u = u.rotate(m);
+      const auto& m {model::cells[coord(j).cell()]->rotation_};
+      const auto& u {coord(j).u()};
+      coord(j + 1).u() = u.rotate(m);
     } else {
       // Otherwise, copy this level's direction
-      coord(j + 1).u = coord(j).u;
+      coord(j + 1).u() = coord(j).u();
     }
   }
 
@@ -445,7 +445,7 @@ void Particle::event_revive_from_secondary()
       // Since the birth cell of the particle has not been set we
       // have to determine it before the energy of the secondary particle can be
       // removed from the pulse-height of this cell.
-      if (lowest_coord().cell == C_NONE) {
+      if (lowest_coord().cell() == C_NONE) {
         bool verbose = settings::verbosity >= 10 || trace();
         if (!exhaustive_find_cell(*this, verbose)) {
           mark_as_lost("Could not find the cell containing particle " +
@@ -454,11 +454,11 @@ void Particle::event_revive_from_secondary()
         }
         // Set birth cell attribute
         if (cell_born() == C_NONE)
-          cell_born() = lowest_coord().cell;
+          cell_born() = lowest_coord().cell();
 
         // Initialize last cells from current cell
         for (int j = 0; j < n_coord(); ++j) {
-          cell_last(j) = coord(j).cell;
+          cell_last(j) = coord(j).cell();
         }
         n_coord_last() = n_coord();
       }
@@ -516,7 +516,7 @@ void Particle::pht_collision_energy()
 
   // determine index of cell in pulse_height_cells
   auto it = std::find(model::pulse_height_cells.begin(),
-    model::pulse_height_cells.end(), lowest_coord().cell);
+    model::pulse_height_cells.end(), lowest_coord().cell());
 
   if (it != model::pulse_height_cells.end()) {
     int index = std::distance(model::pulse_height_cells.begin(), it);
@@ -571,13 +571,13 @@ void Particle::cross_surface(const Surface& surf)
   // in DAGMC, we know what the next cell should be
   if (surf.geom_type() == GeometryType::DAG) {
     int32_t i_cell = next_cell(surface_index(), cell_last(n_coord() - 1),
-                       lowest_coord().universe) -
+                       lowest_coord().universe()) -
                      1;
     // save material and temp
     material_last() = material();
     sqrtkT_last() = sqrtkT();
     // set new cell value
-    lowest_coord().cell = i_cell;
+    lowest_coord().cell() = i_cell;
     auto& cell = model::cells[i_cell];
 
     cell_instance() = 0;
@@ -681,7 +681,7 @@ void Particle::cross_reflective_bc(const Surface& surf, Direction new_u)
   u() = new_u;
 
   // Reassign particle's cell and surface
-  coord(0).cell = cell_last(0);
+  coord(0).cell() = cell_last(0);
   surface() = -surface();
 
   // If a reflective surface is coincident with a lattice or universe
@@ -942,7 +942,7 @@ void add_surf_source_to_bank(Particle& p, const Surface& surf)
     // Check if the cell of interest has been entered
     bool entered = false;
     for (int i = 0; i < p.n_coord(); ++i) {
-      if (p.coord(i).cell == cell_idx) {
+      if (p.coord(i).cell() == cell_idx) {
         entered = true;
       }
     }
diff --git a/src/particle_data.cpp b/src/particle_data.cpp
index fef8359a3..aff2b68ba 100644
--- a/src/particle_data.cpp
+++ b/src/particle_data.cpp
@@ -32,20 +32,20 @@ void GeometryState::mark_as_lost(const std::stringstream& message)
 
 void LocalCoord::rotate(const vector<double>& rotation)
 {
-  r = r.rotate(rotation);
-  u = u.rotate(rotation);
-  rotated = true;
+  r_ = r_.rotate(rotation);
+  u_ = u_.rotate(rotation);
+  rotated_ = true;
 }
 
 void LocalCoord::reset()
 {
-  cell = C_NONE;
-  universe = C_NONE;
-  lattice = C_NONE;
-  lattice_i[0] = 0;
-  lattice_i[1] = 0;
-  lattice_i[2] = 0;
-  rotated = false;
+  cell_ = C_NONE;
+  universe_ = C_NONE;
+  lattice_ = C_NONE;
+  lattice_index_[0] = 0;
+  lattice_index_[1] = 0;
+  lattice_index_[2] = 0;
+  rotated_ = false;
 }
 
 GeometryState::GeometryState()
@@ -64,7 +64,7 @@ void GeometryState::advance_to_boundary_from_void()
 
   for (auto c_i : root_universe->cells_) {
     auto dist =
-      model::cells.at(c_i)->distance(root_coord.r, root_coord.u, 0, this);
+      model::cells.at(c_i)->distance(root_coord.r(), root_coord.u(), 0, this);
     if (dist.first < boundary().distance) {
       boundary().distance = dist.first;
       boundary().surface = dist.second;
@@ -86,7 +86,7 @@ void GeometryState::advance_to_boundary_from_void()
 void GeometryState::move_distance(double length)
 {
   for (int j = 0; j < n_coord(); ++j) {
-    coord(j).r += length * coord(j).u;
+    coord(j).r() += length * coord(j).u();
   }
 }
 
@@ -123,7 +123,7 @@ TrackState ParticleData::get_track_state() const
   state.E = this->E();
   state.time = this->time();
   state.wgt = this->wgt();
-  state.cell_id = model::cells[this->lowest_coord().cell]->id_;
+  state.cell_id = model::cells[this->lowest_coord().cell()]->id_;
   state.cell_instance = this->cell_instance();
   if (this->material() != MATERIAL_VOID) {
     state.material_id = model::materials[material()]->id_;
diff --git a/src/plot.cpp b/src/plot.cpp
index dbc25b21e..db10c7600 100644
--- a/src/plot.cpp
+++ b/src/plot.cpp
@@ -54,14 +54,14 @@ void IdData::set_value(size_t y, size_t x, const GeometryState& p, int level)
     data_(y, x, 0) = NOT_FOUND;
     data_(y, x, 1) = NOT_FOUND;
   } else {
-    data_(y, x, 0) = model::cells.at(p.coord(level).cell)->id_;
+    data_(y, x, 0) = model::cells.at(p.coord(level).cell())->id_;
     data_(y, x, 1) = level == p.n_coord() - 1
                        ? p.cell_instance()
                        : cell_instance_at_level(p, level);
   }
 
   // set material data
-  Cell* c = model::cells.at(p.lowest_coord().cell).get();
+  Cell* c = model::cells.at(p.lowest_coord().cell()).get();
   if (p.material() == MATERIAL_VOID) {
     data_(y, x, 2) = MATERIAL_VOID;
     return;
@@ -83,7 +83,7 @@ PropertyData::PropertyData(size_t h_res, size_t v_res)
 void PropertyData::set_value(
   size_t y, size_t x, const GeometryState& p, int level)
 {
-  Cell* c = model::cells.at(p.lowest_coord().cell).get();
+  Cell* c = model::cells.at(p.lowest_coord().cell()).get();
   data_(y, x, 0) = (p.sqrtkT() * p.sqrtkT()) / K_BOLTZMANN;
   if (c->type_ != Fill::UNIVERSE && p.material() != MATERIAL_VOID) {
     Material* m = model::materials.at(p.material()).get();
@@ -1692,7 +1692,7 @@ void Ray::trace()
 
     // Advance particle, prepare for next intersection
     for (int lev = 0; lev < n_coord(); ++lev) {
-      coord(lev).r += boundary().distance * coord(lev).u;
+      coord(lev).r() += boundary().distance * coord(lev).u();
     }
     surface() = boundary().surface;
     n_coord_last() = n_coord();
@@ -1743,7 +1743,7 @@ void ProjectionRay::on_intersection()
   line_segments_.emplace_back(
     plot_.color_by_ == PlottableInterface::PlotColorBy::mats
       ? material()
-      : lowest_coord().cell,
+      : lowest_coord().cell(),
     traversal_distance_, boundary().surface_index());
 }
 
@@ -1752,7 +1752,7 @@ void PhongRay::on_intersection()
   // Check if we hit an opaque material or cell
   int hit_id = plot_.color_by_ == PlottableInterface::PlotColorBy::mats
                  ? material()
-                 : lowest_coord().cell;
+                 : lowest_coord().cell();
 
   // If we are reflected and have advanced beyond the camera,
   // the ray is done. This is checked here because we should
@@ -1798,8 +1798,8 @@ void PhongRay::on_intersection()
     // Need to apply translations to find the normal vector in
     // the base level universe's coordinate system.
     for (int lev = n_coord() - 2; lev >= 0; --lev) {
-      if (coord(lev + 1).rotated) {
-        const Cell& c {*model::cells[coord(lev).cell]};
+      if (coord(lev + 1).rotated()) {
+        const Cell& c {*model::cells[coord(lev).cell()]};
         normal = normal.inverse_rotate(c.rotation_);
       }
     }
diff --git a/src/random_ray/flat_source_domain.cpp b/src/random_ray/flat_source_domain.cpp
index 4a5b43036..b04b72981 100644
--- a/src/random_ray/flat_source_domain.cpp
+++ b/src/random_ray/flat_source_domain.cpp
@@ -794,7 +794,7 @@ void FlatSourceDomain::output_to_vtk() const
             continue;
           }
 
-          int i_cell = p.lowest_coord().cell;
+          int i_cell = p.lowest_coord().cell();
           int64_t sr = source_region_offsets_[i_cell] + p.cell_instance();
           if (RandomRay::mesh_subdivision_enabled_) {
             int mesh_idx = base_source_regions_.mesh(sr);
@@ -1070,7 +1070,7 @@ void FlatSourceDomain::convert_external_sources()
                                 "point source at {}",
           sp->r()));
       }
-      int i_cell = gs.lowest_coord().cell;
+      int i_cell = gs.lowest_coord().cell();
       int64_t sr = source_region_offsets_[i_cell] + gs.cell_instance();
 
       if (RandomRay::mesh_subdivision_enabled_) {
@@ -1475,7 +1475,7 @@ SourceRegionHandle FlatSourceDomain::get_subdivided_source_region_handle(
   gs.r() = r + TINY_BIT * u;
   gs.u() = {1.0, 0.0, 0.0};
   exhaustive_find_cell(gs);
-  int gs_i_cell = gs.lowest_coord().cell;
+  int gs_i_cell = gs.lowest_coord().cell();
   int64_t sr_found = source_region_offsets_[gs_i_cell] + gs.cell_instance();
   if (sr_found != sr) {
     discovered_source_regions_.unlock(sr_key);
diff --git a/src/random_ray/random_ray.cpp b/src/random_ray/random_ray.cpp
index 36eab0628..2eca5b0ab 100644
--- a/src/random_ray/random_ray.cpp
+++ b/src/random_ray/random_ray.cpp
@@ -330,14 +330,14 @@ void RandomRay::event_advance_ray()
 
   // Advance particle
   for (int j = 0; j < n_coord(); ++j) {
-    coord(j).r += distance * coord(j).u;
+    coord(j).r() += distance * coord(j).u();
   }
 }
 
 void RandomRay::attenuate_flux(double distance, bool is_active, double offset)
 {
   // Determine source region index etc.
-  int i_cell = lowest_coord().cell;
+  int i_cell = lowest_coord().cell();
 
   // The base source region is the spatial region index
   int64_t sr = domain_->source_region_offsets_[i_cell] + cell_instance();
@@ -799,7 +799,7 @@ void RandomRay::initialize_ray(uint64_t ray_id, FlatSourceDomain* domain)
   this->from_source(&site);
 
   // Locate ray
-  if (lowest_coord().cell == C_NONE) {
+  if (lowest_coord().cell() == C_NONE) {
     if (!exhaustive_find_cell(*this)) {
       this->mark_as_lost(
         "Could not find the cell containing particle " + std::to_string(id()));
@@ -807,12 +807,12 @@ void RandomRay::initialize_ray(uint64_t ray_id, FlatSourceDomain* domain)
 
     // Set birth cell attribute
     if (cell_born() == C_NONE)
-      cell_born() = lowest_coord().cell;
+      cell_born() = lowest_coord().cell();
   }
 
   // Initialize ray's starting angular flux to starting location's isotropic
   // source
-  int i_cell = lowest_coord().cell;
+  int i_cell = lowest_coord().cell();
   int64_t sr = domain_->source_region_offsets_[i_cell] + cell_instance();
 
   SourceRegionHandle srh;
diff --git a/src/source.cpp b/src/source.cpp
index 65873f5a7..ae3daa404 100644
--- a/src/source.cpp
+++ b/src/source.cpp
@@ -246,9 +246,10 @@ bool Source::satisfies_spatial_constraints(Position r) const
       }
     } else {
       for (int i = 0; i < geom_state.n_coord(); i++) {
-        auto id = (domain_type_ == DomainType::CELL)
-                    ? model::cells[geom_state.coord(i).cell]->id_
-                    : model::universes[geom_state.coord(i).universe]->id_;
+        auto id =
+          (domain_type_ == DomainType::CELL)
+            ? model::cells[geom_state.coord(i).cell()].get()->id_
+            : model::universes[geom_state.coord(i).universe()].get()->id_;
         if ((accepted = contains(domain_ids_, id)))
           break;
       }
diff --git a/src/tallies/filter_cell.cpp b/src/tallies/filter_cell.cpp
index b545801ea..7a6394956 100644
--- a/src/tallies/filter_cell.cpp
+++ b/src/tallies/filter_cell.cpp
@@ -49,7 +49,7 @@ void CellFilter::get_all_bins(
   const Particle& p, TallyEstimator estimator, FilterMatch& match) const
 {
   for (int i = 0; i < p.n_coord(); i++) {
-    auto search = map_.find(p.coord(i).cell);
+    auto search = map_.find(p.coord(i).cell());
     if (search != map_.end()) {
       match.bins_.push_back(search->second);
       match.weights_.push_back(1.0);
diff --git a/src/tallies/filter_cell_instance.cpp b/src/tallies/filter_cell_instance.cpp
index 0634175dd..316a758d1 100644
--- a/src/tallies/filter_cell_instance.cpp
+++ b/src/tallies/filter_cell_instance.cpp
@@ -73,7 +73,7 @@ void CellInstanceFilter::set_cell_instances(span<CellInstance> instances)
 void CellInstanceFilter::get_all_bins(
   const Particle& p, TallyEstimator estimator, FilterMatch& match) const
 {
-  int64_t index_cell = p.lowest_coord().cell;
+  int64_t index_cell = p.lowest_coord().cell();
   int64_t instance = p.cell_instance();
 
   if (cells_.count(index_cell) > 0) {
@@ -89,7 +89,7 @@ void CellInstanceFilter::get_all_bins(
     return;
 
   for (int i = 0; i < p.n_coord() - 1; i++) {
-    int64_t index_cell = p.coord(i).cell;
+    int64_t index_cell = p.coord(i).cell();
     // if this cell isn't used on the filter, move on
     if (cells_.count(index_cell) == 0)
       continue;
diff --git a/src/tallies/filter_distribcell.cpp b/src/tallies/filter_distribcell.cpp
index 821e843da..02e88dde2 100644
--- a/src/tallies/filter_distribcell.cpp
+++ b/src/tallies/filter_distribcell.cpp
@@ -43,18 +43,18 @@ void DistribcellFilter::get_all_bins(
   int offset = 0;
   auto distribcell_index = model::cells[cell_]->distribcell_index_;
   for (int i = 0; i < p.n_coord(); i++) {
-    auto& c {*model::cells[p.coord(i).cell]};
+    auto& c {*model::cells[p.coord(i).cell()]};
     if (c.type_ == Fill::UNIVERSE) {
       offset += c.offset_[distribcell_index];
     } else if (c.type_ == Fill::LATTICE) {
-      auto& lat {*model::lattices[p.coord(i + 1).lattice]};
-      const auto& i_xyz {p.coord(i + 1).lattice_i};
+      auto& lat {*model::lattices[p.coord(i + 1).lattice()]};
+      const auto& i_xyz {p.coord(i + 1).lattice_index()};
       if (lat.are_valid_indices(i_xyz)) {
         offset +=
           lat.offset(distribcell_index, i_xyz) + c.offset_[distribcell_index];
       }
     }
-    if (cell_ == p.coord(i).cell) {
+    if (cell_ == p.coord(i).cell()) {
       match.bins_.push_back(offset);
       match.weights_.push_back(1.0);
       return;
diff --git a/src/tallies/filter_universe.cpp b/src/tallies/filter_universe.cpp
index 48114cfad..f4b22decd 100644
--- a/src/tallies/filter_universe.cpp
+++ b/src/tallies/filter_universe.cpp
@@ -48,7 +48,7 @@ void UniverseFilter::get_all_bins(
   const Particle& p, TallyEstimator estimator, FilterMatch& match) const
 {
   for (int i = 0; i < p.n_coord(); i++) {
-    auto search = map_.find(p.coord(i).universe);
+    auto search = map_.find(p.coord(i).universe());
     if (search != map_.end()) {
       match.bins_.push_back(search->second);
       match.weights_.push_back(1.0);
diff --git a/src/tallies/tally_scoring.cpp b/src/tallies/tally_scoring.cpp
index 71b103cfb..e73fb90f3 100644
--- a/src/tallies/tally_scoring.cpp
+++ b/src/tallies/tally_scoring.cpp
@@ -2615,7 +2615,7 @@ void score_pulse_height_tally(Particle& p, const vector<int>& tallies)
 
   // Save original cell/energy information
   int orig_n_coord = p.n_coord();
-  int orig_cell = p.coord(0).cell;
+  int orig_cell = p.coord(0).cell();
   double orig_E_last = p.E_last();
 
   for (auto i_tally : tallies) {
@@ -2634,7 +2634,7 @@ void score_pulse_height_tally(Particle& p, const vector<int>& tallies)
 
           // Temporarily change cell of particle
           p.n_coord() = 1;
-          p.coord(0).cell = cell_id;
+          p.coord(0).cell() = cell_id;
 
           // Determine index of cell in model::pulse_height_cells
           auto it = std::find(model::pulse_height_cells.begin(),
@@ -2674,7 +2674,7 @@ void score_pulse_height_tally(Particle& p, const vector<int>& tallies)
     }
     // Restore cell/energy
     p.n_coord() = orig_n_coord;
-    p.coord(0).cell = orig_cell;
+    p.coord(0).cell() = orig_cell;
     p.E_last() = orig_E_last;
   }
 }
diff --git a/src/universe.cpp b/src/universe.cpp
index b4ef6b4b2..78ddd54d4 100644
--- a/src/universe.cpp
+++ b/src/universe.cpp
@@ -45,14 +45,14 @@ bool Universe::find_cell(GeometryState& p) const
   Position r {p.r_local()};
   Position u {p.u_local()};
   auto surf = p.surface();
-  int32_t i_univ = p.lowest_coord().universe;
+  int32_t i_univ = p.lowest_coord().universe();
 
   for (auto i_cell : cells) {
     if (model::cells[i_cell]->universe_ != i_univ)
       continue;
     // Check if this cell contains the particle
     if (model::cells[i_cell]->contains(r, u, surf)) {
-      p.lowest_coord().cell = i_cell;
+      p.lowest_coord().cell() = i_cell;
       return true;
     }
   }
diff --git a/src/volume_calc.cpp b/src/volume_calc.cpp
index 8b5c27f14..1deffb804 100644
--- a/src/volume_calc.cpp
+++ b/src/volume_calc.cpp
@@ -179,7 +179,7 @@ vector<VolumeCalculation::Result> VolumeCalculation::execute() const
         } else if (domain_type_ == TallyDomain::CELL) {
           for (int level = 0; level < p.n_coord(); ++level) {
             for (int i_domain = 0; i_domain < n; i_domain++) {
-              if (model::cells[p.coord(level).cell]->id_ ==
+              if (model::cells[p.coord(level).cell()]->id_ ==
                   domain_ids_[i_domain]) {
                 this->check_hit(
                   p.material(), indices[i_domain], hits[i_domain]);
@@ -190,7 +190,7 @@ vector<VolumeCalculation::Result> VolumeCalculation::execute() const
         } else if (domain_type_ == TallyDomain::UNIVERSE) {
           for (int level = 0; level < p.n_coord(); ++level) {
             for (int i_domain = 0; i_domain < n; ++i_domain) {
-              if (model::universes[p.coord(level).universe]->id_ ==
+              if (model::universes[p.coord(level).universe()]->id_ ==
                   domain_ids_[i_domain]) {
                 check_hit(p.material(), indices[i_domain], hits[i_domain]);
                 break;

From 4483583dddf291e6c324399511fbbccfd582e908 Mon Sep 17 00:00:00 2001
From: Jonathan Shimwell <mail@jshimwell.com>
Date: Fri, 18 Jul 2025 08:46:13 +0200
Subject: [PATCH 080/203] automatically finding appropriate dimension when
 making regular mesh from domain (#3468)

---
 openmc/mesh.py                            | 19 +++++++++++++++---
 tests/unit_tests/test_mesh_from_domain.py | 24 +++++++++++++++++++++++
 2 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/openmc/mesh.py b/openmc/mesh.py
index 56fe2bd1c..339702884 100644
--- a/openmc/mesh.py
+++ b/openmc/mesh.py
@@ -1094,7 +1094,7 @@ class RegularMesh(StructuredMesh):
     def from_domain(
         cls,
         domain: HasBoundingBox,
-        dimension: Sequence[int] = (10, 10, 10),
+        dimension: Sequence[int] | int = 1000,
         mesh_id: int | None = None,
         name: str = ''
     ):
@@ -1106,8 +1106,11 @@ class RegularMesh(StructuredMesh):
             The object passed in will be used as a template for this mesh. The
             bounding box of the property of the object passed will be used to
             set the lower_left and upper_right and of the mesh instance
-        dimension : Iterable of int
-            The number of mesh cells in each direction (x, y, z).
+        dimension : Iterable of int | int
+            The number of mesh cells in total or number of mesh cells in each
+            direction (x, y, z). If a single integer is provided, the domain
+            will will be divided into that many mesh cells with roughly equal
+            lengths in each direction (cubes).
         mesh_id : int
             Unique identifier for the mesh
         name : str
@@ -1125,6 +1128,16 @@ class RegularMesh(StructuredMesh):
         mesh = cls(mesh_id=mesh_id, name=name)
         mesh.lower_left = domain.bounding_box[0]
         mesh.upper_right = domain.bounding_box[1]
+        if isinstance(dimension, int):
+            cv.check_greater_than("dimension", dimension, 1, equality=True)
+            # If a single integer is provided, divide the domain into that many
+            # mesh cells with roughly equal lengths in each direction
+            ideal_cube_volume = domain.bounding_box.volume / dimension
+            ideal_cube_size = ideal_cube_volume ** (1 / 3)
+            dimension = [
+                max(1, int(round(side / ideal_cube_size)))
+                for side in domain.bounding_box.width
+            ]
         mesh.dimension = dimension
 
         return mesh
diff --git a/tests/unit_tests/test_mesh_from_domain.py b/tests/unit_tests/test_mesh_from_domain.py
index 0e3858913..5b1173126 100644
--- a/tests/unit_tests/test_mesh_from_domain.py
+++ b/tests/unit_tests/test_mesh_from_domain.py
@@ -147,3 +147,27 @@ def test_reg_mesh_from_geometry():
 def test_error_from_unsupported_object():
     with pytest.raises(TypeError):
         openmc.RegularMesh.from_domain("vacuum energy")
+
+
+def test_regularmesh_from_domain_error_from_small_dimensions():
+    surface = openmc.Sphere(r=20)
+    cell = openmc.Cell(region=-surface)
+    with pytest.raises(
+        ValueError, match='Unable to set "dimension" to "-2" since it is less than "1"'
+    ):
+        openmc.RegularMesh.from_domain(domain=cell, dimension=-2)
+
+
+def test_dimensions_from_domain_dimensions_from_int():
+    region = openmc.model.RectangularParallelepiped(
+        xmin=-100,
+        xmax=150,
+        ymin=-50,
+        ymax=200,
+        zmin=300,
+        zmax=400,
+        boundary_type="vacuum",
+    )
+    cell = openmc.Cell(region=-region)
+    mesh = openmc.RegularMesh.from_domain(domain=cell, dimension=1000)
+    assert mesh.dimension == (14, 14, 5)

From 637e04a9ba9ceae8cb09eb66203e1581d465fa56 Mon Sep 17 00:00:00 2001
From: Patrick Shriwise <pshriwise@gmail.com>
Date: Fri, 18 Jul 2025 02:51:30 -0500
Subject: [PATCH 081/203] Boundary info accessors (#3496)

Co-authored-by: Paul Romano <paul.k.romano@gmail.com>
---
 include/openmc/particle_data.h | 44 ++++++++++++++++++++++++----------
 src/event.cpp                  |  2 +-
 src/geometry.cpp               | 28 +++++++++++-----------
 src/mesh.cpp                   | 12 +++++-----
 src/particle.cpp               | 12 +++++-----
 src/particle_data.cpp          | 14 +++++------
 src/plot.cpp                   | 28 +++++++++++-----------
 src/random_ray/random_ray.cpp  |  2 +-
 src/simulation.cpp             |  2 +-
 9 files changed, 81 insertions(+), 63 deletions(-)

diff --git a/include/openmc/particle_data.h b/include/openmc/particle_data.h
index 8dd814a29..1c8f1215a 100644
--- a/include/openmc/particle_data.h
+++ b/include/openmc/particle_data.h
@@ -210,23 +210,41 @@ struct CacheDataMG {
 // Information about nearest boundary crossing
 //==============================================================================
 
-struct BoundaryInfo {
-  double distance {INFINITY}; //!< distance to nearest boundary
-  int surface {
-    SURFACE_NONE}; //!< surface token, non-zero if boundary is surface
-  int coord_level; //!< coordinate level after crossing boundary
-  array<int, 3>
-    lattice_translation {}; //!< which way lattice indices will change
-
+class BoundaryInfo {
+public:
   void reset()
   {
-    distance = INFINITY;
-    surface = SURFACE_NONE;
-    coord_level = 0;
-    lattice_translation = {0, 0, 0};
+    distance_ = INFINITY;
+    surface_ = SURFACE_NONE;
+    coord_level_ = 0;
+    lattice_translation_ = {0, 0, 0};
   }
+  double& distance() { return distance_; }
+  const double& distance() const { return distance_; }
+
+  int& surface() { return surface_; }
+  const int& surface() const { return surface_; }
+
+  int coord_level() const { return coord_level_; }
+  int& coord_level() { return coord_level_; }
+
+  array<int, 3>& lattice_translation() { return lattice_translation_; }
+  const array<int, 3>& lattice_translation() const
+  {
+    return lattice_translation_;
+  }
+
   // TODO: off-by-one
-  int surface_index() const { return std::abs(surface) - 1; }
+  int surface_index() const { return std::abs(surface()) - 1; }
+
+private:
+  // Data members
+  double distance_ {INFINITY}; //!< distance to nearest boundary
+  int surface_ {
+    SURFACE_NONE};      //!< surface token, non-zero if boundary is surface
+  int coord_level_ {0}; //!< coordinate level after crossing boundary
+  array<int, 3> lattice_translation_ {
+    0, 0, 0}; //!< which way lattice indices will change
 };
 
 /*
diff --git a/src/event.cpp b/src/event.cpp
index ae914c8be..aa3987504 100644
--- a/src/event.cpp
+++ b/src/event.cpp
@@ -114,7 +114,7 @@ void process_advance_particle_events()
     p.event_advance();
     if (!p.alive())
       continue;
-    if (p.collision_distance() > p.boundary().distance) {
+    if (p.collision_distance() > p.boundary().distance()) {
       simulation::surface_crossing_queue.thread_safe_append({p, buffer_idx});
     } else {
       simulation::collision_queue.thread_safe_append({p, buffer_idx});
diff --git a/src/geometry.cpp b/src/geometry.cpp
index cefe7d364..df4850891 100644
--- a/src/geometry.cpp
+++ b/src/geometry.cpp
@@ -310,9 +310,9 @@ void cross_lattice(GeometryState& p, const BoundaryInfo& boundary, bool verbose)
   }
 
   // Set the lattice indices.
-  coord.lattice_index()[0] += boundary.lattice_translation[0];
-  coord.lattice_index()[1] += boundary.lattice_translation[1];
-  coord.lattice_index()[2] += boundary.lattice_translation[2];
+  coord.lattice_index()[0] += boundary.lattice_translation()[0];
+  coord.lattice_index()[1] += boundary.lattice_translation()[1];
+  coord.lattice_index()[2] += boundary.lattice_translation()[2];
 
   // Set the new coordinate position.
   const auto& upper_coord {p.coord(p.n_coord() - 2)};
@@ -410,7 +410,7 @@ BoundaryInfo distance_to_boundary(GeometryState& p)
     // If the boundary on this coordinate level is coincident with a boundary on
     // a higher level then we need to make sure that the higher level boundary
     // is selected.  This logic must consider floating point precision.
-    double& d = info.distance;
+    double& d = info.distance();
     if (d_surf < d_lat - FP_COINCIDENT) {
       if (d == INFINITY || (d - d_surf) / d >= FP_REL_PRECISION) {
         // Update closest distance
@@ -421,29 +421,29 @@ BoundaryInfo distance_to_boundary(GeometryState& p)
         // have to explicitly check which half-space the particle would be
         // traveling into if the surface is crossed
         if (c.is_simple() || d == INFTY) {
-          info.surface = level_surf_cross;
+          info.surface() = level_surf_cross;
         } else {
           Position r_hit = r + d_surf * u;
           Surface& surf {*model::surfaces[std::abs(level_surf_cross) - 1]};
           Direction norm = surf.normal(r_hit);
           if (u.dot(norm) > 0) {
-            info.surface = std::abs(level_surf_cross);
+            info.surface() = std::abs(level_surf_cross);
           } else {
-            info.surface = -std::abs(level_surf_cross);
+            info.surface() = -std::abs(level_surf_cross);
           }
         }
 
-        info.lattice_translation[0] = 0;
-        info.lattice_translation[1] = 0;
-        info.lattice_translation[2] = 0;
-        info.coord_level = i + 1;
+        info.lattice_translation()[0] = 0;
+        info.lattice_translation()[1] = 0;
+        info.lattice_translation()[2] = 0;
+        info.coord_level() = i + 1;
       }
     } else {
       if (d == INFINITY || (d - d_lat) / d >= FP_REL_PRECISION) {
         d = d_lat;
-        info.surface = SURFACE_NONE;
-        info.lattice_translation = level_lat_trans;
-        info.coord_level = i + 1;
+        info.surface() = SURFACE_NONE;
+        info.lattice_translation() = level_lat_trans;
+        info.coord_level() = i + 1;
       }
     }
   }
diff --git a/src/mesh.cpp b/src/mesh.cpp
index 1b2c71eb2..9147efb95 100644
--- a/src/mesh.cpp
+++ b/src/mesh.cpp
@@ -385,7 +385,7 @@ void Mesh::material_volumes(int nx, int ny, int nz, int table_size,
             BoundaryInfo boundary = distance_to_boundary(p);
 
             // Advance particle forward
-            double distance = std::min(boundary.distance, max_distance);
+            double distance = std::min(boundary.distance(), max_distance);
             p.move_distance(distance);
 
             // Determine what mesh elements were crossed by particle
@@ -416,12 +416,12 @@ void Mesh::material_volumes(int nx, int ny, int nz, int table_size,
             p.n_coord_last() = p.n_coord();
 
             // Set surface that particle is on and adjust coordinate levels
-            p.surface() = boundary.surface;
-            p.n_coord() = boundary.coord_level;
+            p.surface() = boundary.surface();
+            p.n_coord() = boundary.coord_level();
 
-            if (boundary.lattice_translation[0] != 0 ||
-                boundary.lattice_translation[1] != 0 ||
-                boundary.lattice_translation[2] != 0) {
+            if (boundary.lattice_translation()[0] != 0 ||
+                boundary.lattice_translation()[1] != 0 ||
+                boundary.lattice_translation()[2] != 0) {
               // Particle crosses lattice boundary
               cross_lattice(p, boundary);
             } else {
diff --git a/src/particle.cpp b/src/particle.cpp
index 4758cded5..f9044b2d7 100644
--- a/src/particle.cpp
+++ b/src/particle.cpp
@@ -242,7 +242,7 @@ void Particle::event_advance()
   }
 
   // Select smaller of the two distances
-  double distance = std::min(boundary().distance, collision_distance());
+  double distance = std::min(boundary().distance(), collision_distance());
 
   // Advance particle in space and time
   // Short-term solution until the surface source is revised and we can use
@@ -298,12 +298,12 @@ void Particle::event_cross_surface()
   n_coord_last() = n_coord();
 
   // Set surface that particle is on and adjust coordinate levels
-  surface() = boundary().surface;
-  n_coord() = boundary().coord_level;
+  surface() = boundary().surface();
+  n_coord() = boundary().coord_level();
 
-  if (boundary().lattice_translation[0] != 0 ||
-      boundary().lattice_translation[1] != 0 ||
-      boundary().lattice_translation[2] != 0) {
+  if (boundary().lattice_translation()[0] != 0 ||
+      boundary().lattice_translation()[1] != 0 ||
+      boundary().lattice_translation()[2] != 0) {
     // Particle crosses lattice boundary
 
     bool verbose = settings::verbosity >= 10 || trace();
diff --git a/src/particle_data.cpp b/src/particle_data.cpp
index aff2b68ba..370ca12e4 100644
--- a/src/particle_data.cpp
+++ b/src/particle_data.cpp
@@ -65,22 +65,22 @@ void GeometryState::advance_to_boundary_from_void()
   for (auto c_i : root_universe->cells_) {
     auto dist =
       model::cells.at(c_i)->distance(root_coord.r(), root_coord.u(), 0, this);
-    if (dist.first < boundary().distance) {
-      boundary().distance = dist.first;
-      boundary().surface = dist.second;
+    if (dist.first < boundary().distance()) {
+      boundary().distance() = dist.first;
+      boundary().surface() = dist.second;
     }
   }
 
   // if no intersection or near-infinite intersection, reset
   // boundary information
-  if (boundary().distance > 1e300) {
-    boundary().distance = INFTY;
-    boundary().surface = SURFACE_NONE;
+  if (boundary().distance() > 1e300) {
+    boundary().distance() = INFTY;
+    boundary().surface() = SURFACE_NONE;
     return;
   }
 
   // move the particle up to (and just past) the boundary
-  move_distance(boundary().distance + TINY_BIT);
+  move_distance(boundary().distance() + TINY_BIT);
 }
 
 void GeometryState::move_distance(double length)
diff --git a/src/plot.cpp b/src/plot.cpp
index db10c7600..2cadc48ce 100644
--- a/src/plot.cpp
+++ b/src/plot.cpp
@@ -1634,7 +1634,7 @@ void Ray::trace()
       break;
 
     // if there is no intersection with the model, we're done
-    if (boundary().surface == SURFACE_NONE)
+    if (boundary().surface() == SURFACE_NONE)
       return;
 
     event_counter_++;
@@ -1646,10 +1646,10 @@ void Ray::trace()
 
   // Call the specialized logic for this type of ray. This is for the
   // intersection for the first intersection if we had one.
-  if (boundary().surface != SURFACE_NONE) {
+  if (boundary().surface() != SURFACE_NONE) {
     // set the geometry state's surface attribute to be used for
     // surface normal computation
-    surface() = boundary().surface;
+    surface() = boundary().surface();
     on_intersection();
     if (stop_)
       return;
@@ -1674,37 +1674,37 @@ void Ray::trace()
     // if we hit the edge of the model, so stop
     // the particle in that case. Also, just exit
     // if a negative distance was somehow computed.
-    if (boundary().distance == INFTY || boundary().distance == INFINITY ||
-        boundary().distance < 0) {
+    if (boundary().distance() == INFTY || boundary().distance() == INFINITY ||
+        boundary().distance() < 0) {
       return;
     }
 
     // See below comment where call_on_intersection is checked in an
     // if statement for an explanation of this.
     bool call_on_intersection {true};
-    if (boundary().distance < 10 * TINY_BIT) {
+    if (boundary().distance() < 10 * TINY_BIT) {
       call_on_intersection = false;
     }
 
     // DAGMC surfaces expect us to go a little bit further than the advance
     // distance to properly check cell inclusion.
-    boundary().distance += TINY_BIT;
+    boundary().distance() += TINY_BIT;
 
     // Advance particle, prepare for next intersection
     for (int lev = 0; lev < n_coord(); ++lev) {
-      coord(lev).r() += boundary().distance * coord(lev).u();
+      coord(lev).r() += boundary().distance() * coord(lev).u();
     }
-    surface() = boundary().surface;
+    surface() = boundary().surface();
     n_coord_last() = n_coord();
-    n_coord() = boundary().coord_level;
-    if (boundary().lattice_translation[0] != 0 ||
-        boundary().lattice_translation[1] != 0 ||
-        boundary().lattice_translation[2] != 0) {
+    n_coord() = boundary().coord_level();
+    if (boundary().lattice_translation()[0] != 0 ||
+        boundary().lattice_translation()[1] != 0 ||
+        boundary().lattice_translation()[2] != 0) {
       cross_lattice(*this, boundary(), settings::verbosity >= 10);
     }
 
     // Record how far the ray has traveled
-    traversal_distance_ += boundary().distance;
+    traversal_distance_ += boundary().distance();
     inside_cell = neighbor_list_find_cell(*this, settings::verbosity >= 10);
 
     // Call the specialized logic for this type of ray. Note that we do not
diff --git a/src/random_ray/random_ray.cpp b/src/random_ray/random_ray.cpp
index 2eca5b0ab..27f674c42 100644
--- a/src/random_ray/random_ray.cpp
+++ b/src/random_ray/random_ray.cpp
@@ -281,7 +281,7 @@ void RandomRay::event_advance_ray()
 {
   // Find the distance to the nearest boundary
   boundary() = distance_to_boundary(*this);
-  double distance = boundary().distance;
+  double distance = boundary().distance();
 
   if (distance < 0.0) {
     mark_as_lost("Negative transport distance detected for particle " +
diff --git a/src/simulation.cpp b/src/simulation.cpp
index d9a4fd131..b9986f473 100644
--- a/src/simulation.cpp
+++ b/src/simulation.cpp
@@ -790,7 +790,7 @@ void transport_history_based_single_particle(Particle& p)
       p.event_advance();
     }
     if (p.alive()) {
-      if (p.collision_distance() > p.boundary().distance) {
+      if (p.collision_distance() > p.boundary().distance()) {
         p.event_cross_surface();
       } else if (p.alive()) {
         p.event_collide();

From 659e43af7de9030ef3fbfef32f0992c39a00820d Mon Sep 17 00:00:00 2001
From: Joffrey Dorville <54550047+JoffreyDorville@users.noreply.github.com>
Date: Fri, 18 Jul 2025 03:47:08 -0500
Subject: [PATCH 082/203] Enabling MCPL source files to be read when using
 surf_source_read (#3472)

Co-authored-by: Paul Romano <paul.k.romano@gmail.com>
---
 include/openmc/source.h                       |   2 +-
 src/source.cpp                                |  55 ++++-----
 ..._true_read.dat => inputs_true_read_h5.dat} |   0
 .../surface_source/inputs_true_read_mcpl.dat  |  33 +++++
 ...rue_write.dat => inputs_true_write_h5.dat} |   0
 .../surface_source/inputs_true_write_mcpl.dat |  40 ++++++
 .../surface_source/surface_source_true.h5     | Bin 106144 -> 106144 bytes
 .../surface_source/surface_source_true.mcpl   | Bin 0 -> 36071 bytes
 tests/regression_tests/surface_source/test.py | 116 +++++++++++++-----
 9 files changed, 187 insertions(+), 59 deletions(-)
 rename tests/regression_tests/surface_source/{inputs_true_read.dat => inputs_true_read_h5.dat} (100%)
 create mode 100644 tests/regression_tests/surface_source/inputs_true_read_mcpl.dat
 rename tests/regression_tests/surface_source/{inputs_true_write.dat => inputs_true_write_h5.dat} (100%)
 create mode 100644 tests/regression_tests/surface_source/inputs_true_write_mcpl.dat
 create mode 100644 tests/regression_tests/surface_source/surface_source_true.mcpl

diff --git a/include/openmc/source.h b/include/openmc/source.h
index d58195f10..1fbd31904 100644
--- a/include/openmc/source.h
+++ b/include/openmc/source.h
@@ -173,7 +173,7 @@ protected:
   SourceSite sample(uint64_t* seed) const override;
 
 private:
-  vector<SourceSite> sites_; //!< Source sites from a file
+  vector<SourceSite> sites_; //!< Source sites
 };
 
 //==============================================================================
diff --git a/src/source.cpp b/src/source.cpp
index ae3daa404..12323f7bd 100644
--- a/src/source.cpp
+++ b/src/source.cpp
@@ -417,11 +417,7 @@ SourceSite IndependentSource::sample(uint64_t* seed) const
 FileSource::FileSource(pugi::xml_node node) : Source(node)
 {
   auto path = get_node_value(node, "file", false, true);
-  if (ends_with(path, ".mcpl") || ends_with(path, ".mcpl.gz")) {
-    sites_ = mcpl_source_sites(path);
-  } else {
-    this->load_sites_from_file(path);
-  }
+  load_sites_from_file(path);
 }
 
 FileSource::FileSource(const std::string& path)
@@ -431,30 +427,33 @@ FileSource::FileSource(const std::string& path)
 
 void FileSource::load_sites_from_file(const std::string& path)
 {
-  // Check if source file exists
-  if (!file_exists(path)) {
-    fatal_error(fmt::format("Source file '{}' does not exist.", path));
+  // If MCPL file, use the dedicated file reader
+  if (ends_with(path, ".mcpl") || ends_with(path, ".mcpl.gz")) {
+    sites_ = mcpl_source_sites(path);
+  } else {
+    // Check if source file exists
+    if (!file_exists(path)) {
+      fatal_error(fmt::format("Source file '{}' does not exist.", path));
+    }
+
+    write_message(6, "Reading source file from {}...", path);
+
+    // Open the binary file
+    hid_t file_id = file_open(path, 'r', true);
+
+    // Check to make sure this is a source file
+    std::string filetype;
+    read_attribute(file_id, "filetype", filetype);
+    if (filetype != "source" && filetype != "statepoint") {
+      fatal_error("Specified starting source file not a source file type.");
+    }
+
+    // Read in the source particles
+    read_source_bank(file_id, sites_, false);
+
+    // Close file
+    file_close(file_id);
   }
-
-  // Read the source from a binary file instead of sampling from some
-  // assumed source distribution
-  write_message(6, "Reading source file from {}...", path);
-
-  // Open the binary file
-  hid_t file_id = file_open(path, 'r', true);
-
-  // Check to make sure this is a source file
-  std::string filetype;
-  read_attribute(file_id, "filetype", filetype);
-  if (filetype != "source" && filetype != "statepoint") {
-    fatal_error("Specified starting source file not a source file type.");
-  }
-
-  // Read in the source particles
-  read_source_bank(file_id, sites_, false);
-
-  // Close file
-  file_close(file_id);
 }
 
 SourceSite FileSource::sample(uint64_t* seed) const
diff --git a/tests/regression_tests/surface_source/inputs_true_read.dat b/tests/regression_tests/surface_source/inputs_true_read_h5.dat
similarity index 100%
rename from tests/regression_tests/surface_source/inputs_true_read.dat
rename to tests/regression_tests/surface_source/inputs_true_read_h5.dat
diff --git a/tests/regression_tests/surface_source/inputs_true_read_mcpl.dat b/tests/regression_tests/surface_source/inputs_true_read_mcpl.dat
new file mode 100644
index 000000000..b8d8c575a
--- /dev/null
+++ b/tests/regression_tests/surface_source/inputs_true_read_mcpl.dat
@@ -0,0 +1,33 @@
+<?xml version='1.0' encoding='utf-8'?>
+<model>
+  <materials>
+  </materials>
+  <geometry>
+    <cell id="1" material="void" region="-1" universe="1"/>
+    <cell id="2" material="void" region="1 -2" universe="1"/>
+    <cell id="3" material="void" region="2 -3" universe="1"/>
+    <cell id="4" material="void" region="3 -4" universe="1"/>
+    <surface coeffs="0.0 0.0 0.0 1.0" id="1" type="sphere"/>
+    <surface coeffs="0.0 0.0 0.0 2.0" id="2" type="sphere"/>
+    <surface coeffs="0.0 0.0 0.0 2.5" id="3" type="sphere"/>
+    <surface boundary="vacuum" coeffs="0.0 0.0 0.0 4.0" id="4" type="sphere"/>
+  </geometry>
+  <settings>
+    <run_mode>fixed source</run_mode>
+    <particles>1000</particles>
+    <batches>10</batches>
+    <surf_source_read>
+      <path>surface_source_true.mcpl</path>
+    </surf_source_read>
+    <seed>1</seed>
+  </settings>
+  <tallies>
+    <filter id="1" type="cell">
+      <bins>3</bins>
+    </filter>
+    <tally id="1">
+      <filters>1</filters>
+      <scores>flux</scores>
+    </tally>
+  </tallies>
+</model>
diff --git a/tests/regression_tests/surface_source/inputs_true_write.dat b/tests/regression_tests/surface_source/inputs_true_write_h5.dat
similarity index 100%
rename from tests/regression_tests/surface_source/inputs_true_write.dat
rename to tests/regression_tests/surface_source/inputs_true_write_h5.dat
diff --git a/tests/regression_tests/surface_source/inputs_true_write_mcpl.dat b/tests/regression_tests/surface_source/inputs_true_write_mcpl.dat
new file mode 100644
index 000000000..c55223324
--- /dev/null
+++ b/tests/regression_tests/surface_source/inputs_true_write_mcpl.dat
@@ -0,0 +1,40 @@
+<?xml version='1.0' encoding='utf-8'?>
+<model>
+  <materials>
+  </materials>
+  <geometry>
+    <cell id="1" material="void" region="-1" universe="1"/>
+    <cell id="2" material="void" region="1 -2" universe="1"/>
+    <cell id="3" material="void" region="2 -3" universe="1"/>
+    <cell id="4" material="void" region="3 -4" universe="1"/>
+    <surface coeffs="0.0 0.0 0.0 1.0" id="1" type="sphere"/>
+    <surface coeffs="0.0 0.0 0.0 2.0" id="2" type="sphere"/>
+    <surface coeffs="0.0 0.0 0.0 2.5" id="3" type="sphere"/>
+    <surface boundary="vacuum" coeffs="0.0 0.0 0.0 4.0" id="4" type="sphere"/>
+  </geometry>
+  <settings>
+    <run_mode>fixed source</run_mode>
+    <particles>1000</particles>
+    <batches>10</batches>
+    <source particle="neutron" strength="1.0" type="independent">
+      <space type="point">
+        <parameters>0 0 0</parameters>
+      </space>
+    </source>
+    <surf_source_write>
+      <surface_ids>1</surface_ids>
+      <mcpl>true</mcpl>
+      <max_particles>1000</max_particles>
+    </surf_source_write>
+    <seed>1</seed>
+  </settings>
+  <tallies>
+    <filter id="1" type="cell">
+      <bins>3</bins>
+    </filter>
+    <tally id="1">
+      <filters>1</filters>
+      <scores>flux</scores>
+    </tally>
+  </tallies>
+</model>
diff --git a/tests/regression_tests/surface_source/surface_source_true.h5 b/tests/regression_tests/surface_source/surface_source_true.h5
index f2055d09dc3b668cc2fe85057cd999779788e9d7..d056d7328405bedf704f8690fd3b8056ec8aa101 100644
GIT binary patch
delta 11203
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
Tp?G>Jq2B)<!Z%&(|NZ?RBxn6;

delta 11202
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
Kuety4@BaY3q<sDW

diff --git a/tests/regression_tests/surface_source/surface_source_true.mcpl b/tests/regression_tests/surface_source/surface_source_true.mcpl
new file mode 100644
index 0000000000000000000000000000000000000000..7c819ac9bd02179ed93a1cd94b6fd8237a7b0893
GIT binary patch
literal 36071
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
NZmvQvPV5ll`9IHZo-P0Y

literal 0
HcmV?d00001

diff --git a/tests/regression_tests/surface_source/test.py b/tests/regression_tests/surface_source/test.py
index 83b78e61d..13966b26d 100644
--- a/tests/regression_tests/surface_source/test.py
+++ b/tests/regression_tests/surface_source/test.py
@@ -10,6 +10,25 @@ from tests.testing_harness import PyAPITestHarness
 from tests.regression_tests import config
 
 
+def mcpl_to_array(filepath):
+    import mcpl
+
+    source = []
+    with mcpl.MCPLFile(filepath) as f:
+        for p in f.particles:
+            source.append(
+                [
+                    *tuple(p.position),
+                    *tuple(p.direction),
+                    1.0e6 * p.ekin,
+                    1.0e-3 * p.time,
+                    p.weight,
+                    p.pdgcode,
+                ]
+            )
+    return np.sort(np.array(source), axis=0)
+
+
 def assert_structured_arrays_close(arr1, arr2, rtol=1e-5, atol=1e-8):
     assert arr1.dtype == arr2.dtype
 
@@ -24,8 +43,7 @@ def assert_structured_arrays_close(arr1, arr2, rtol=1e-5, atol=1e-8):
 @pytest.fixture
 def model(request):
     openmc.reset_auto_ids()
-    marker = request.node.get_closest_marker("surf_source_op")
-    surf_source_op = marker.args[0]
+    operation, file_format = request.node.get_closest_marker("params").args
 
     openmc_model = openmc.model.Model()
 
@@ -54,15 +72,19 @@ def model(request):
     openmc_model.settings.batches = 10
     openmc_model.settings.seed = 1
 
-    if surf_source_op == 'write':
+    if operation == 'write':
         point = openmc.stats.Point((0, 0, 0))
         pt_src = openmc.IndependentSource(space=point)
         openmc_model.settings.source = pt_src
 
-        openmc_model.settings.surf_source_write = {'surface_ids': [1],
-                                                   'max_particles': 1000}
-    elif surf_source_op == 'read':
-        openmc_model.settings.surf_source_read = {'path': 'surface_source_true.h5'}
+        surf_source_write_settings = {'surface_ids': [1],
+                                      'max_particles': 1000}
+        if file_format == "mcpl":
+            surf_source_write_settings["mcpl"] = True
+
+        openmc_model.settings.surf_source_write = surf_source_write_settings
+    elif operation == 'read':
+        openmc_model.settings.surf_source_read = {'path': f"surface_source_true.{file_format}"}
 
     # Tallies
     tal = openmc.Tally()
@@ -75,22 +97,30 @@ def model(request):
 
 
 class SurfaceSourceTestHarness(PyAPITestHarness):
+    def __init__(self, statepoint_name, model=None, inputs_true=None, file_format="h5"):
+        super().__init__(statepoint_name, model, inputs_true)
+        self.file_format = file_format
+
     def _test_output_created(self):
-        """Make sure surface_source.h5 has also been created."""
+        """Make sure the surface_source file has also been created."""
         super()._test_output_created()
-        # Check if 'surface_source.h5' has been created.
         if self._model.settings.surf_source_write:
-            assert os.path.exists('surface_source.h5'), \
+            assert os.path.exists(f"surface_source.{self.file_format}"), \
                 'Surface source file does not exist.'
 
     def _compare_output(self):
         """Make sure the current surface_source.h5 agree with the reference."""
         if self._model.settings.surf_source_write:
-            with h5py.File("surface_source_true.h5", 'r') as f:
-                source_true = np.sort(f['source_bank'][()])
-            with h5py.File("surface_source.h5", 'r') as f:
-                source_test = np.sort(f['source_bank'][()])
-            assert_structured_arrays_close(source_true, source_test, atol=1e-07)
+            if self.file_format == "h5":
+                with h5py.File("surface_source_true.h5", 'r') as f:
+                    source_true = np.sort(f['source_bank'][()])
+                with h5py.File("surface_source.h5", 'r') as f:
+                    source_test = np.sort(f['source_bank'][()])
+                assert_structured_arrays_close(source_true, source_test, atol=1e-07)
+            elif self.file_format == "mcpl":
+                source_true = mcpl_to_array("surface_source_true.mcpl")
+                source_test = mcpl_to_array("surface_source.mcpl")
+                np.testing.assert_allclose(source_true, source_test, rtol=1e-5, atol=1e-7)
 
     def execute_test(self):
         """Build input XMLs, run OpenMC, check output and results."""
@@ -111,30 +141,56 @@ class SurfaceSourceTestHarness(PyAPITestHarness):
     def _overwrite_results(self):
         """Overwrite the results_true with the results_test."""
         shutil.copyfile('results_test.dat', 'results_true.dat')
-        if os.path.exists('surface_source.h5'):
-            shutil.copyfile('surface_source.h5', 'surface_source_true.h5')
+        if os.path.exists(f"surface_source.{self.file_format}"):
+            shutil.copyfile(f"surface_source.{self.file_format}", f"surface_source_true.{self.file_format}")
 
     def _cleanup(self):
         """Delete statepoints, tally, and test files."""
         super()._cleanup()
-        fs = 'surface_source.h5'
+        fs = f"surface_source.{self.file_format}"
         if os.path.exists(fs):
             os.remove(fs)
 
 
-@pytest.mark.surf_source_op('write')
-def test_surface_source_write(model, monkeypatch):
-    # Test result is based on 1 MPI process
-    monkeypatch.setitem(config, "mpi_np", "1")
-    harness = SurfaceSourceTestHarness('statepoint.10.h5',
-                                       model,
-                                       'inputs_true_write.dat')
+@pytest.mark.params('write', 'h5')
+def test_surface_source_write(model, monkeypatch, request):
+    monkeypatch.setitem(config, "mpi_np", "1")  # Results generated with 1 MPI process
+    operation, file_format = request.node.get_closest_marker("params").args
+    harness = SurfaceSourceTestHarness(
+        "statepoint.10.h5", model, f"inputs_true_{operation}_{file_format}.dat",
+        file_format=file_format
+    )
     harness.main()
 
 
-@pytest.mark.surf_source_op('read')
-def test_surface_source_read(model):
-    harness = SurfaceSourceTestHarness('statepoint.10.h5',
-                                       model,
-                                       'inputs_true_read.dat')
+@pytest.mark.params('read', 'h5')
+def test_surface_source_read(model, request):
+    operation, file_format = request.node.get_closest_marker("params").args
+    harness = SurfaceSourceTestHarness(
+        "statepoint.10.h5", model, f"inputs_true_{operation}_{file_format}.dat",
+        file_format=file_format
+    )
+    harness.main()
+
+
+@pytest.mark.skipif(shutil.which("mcpl-config") is None, reason="MCPL is not available.")
+@pytest.mark.params('write', 'mcpl')
+def test_surface_source_write_mcpl(model, monkeypatch, request):
+    monkeypatch.setitem(config, "mpi_np", "1")  # Results generated with 1 MPI process
+    operation, file_format = request.node.get_closest_marker("params").args
+    harness = SurfaceSourceTestHarness(
+        "statepoint.10.h5", model, f"inputs_true_{operation}_{file_format}.dat",
+        file_format=file_format
+    )
+    harness.main()
+
+
+@pytest.mark.skipif(shutil.which("mcpl-config") is None, reason="MCPL is not available.")
+@pytest.mark.params('read', 'mcpl')
+def test_surface_source_read_mcpl(model, request):
+    operation, file_format = request.node.get_closest_marker("params").args
+    harness = SurfaceSourceTestHarness(
+        "statepoint.10.h5", model, f"inputs_true_{operation}_{file_format}.dat",
+        file_format=file_format
+    )
     harness.main()

From 8be65513b77c08e79e1dc5f4ef921d411ff990a9 Mon Sep 17 00:00:00 2001
From: Jonathan Shimwell <mail@jshimwell.com>
Date: Fri, 18 Jul 2025 16:37:57 +0200
Subject: [PATCH 083/203] Adding material depletion function (#3420)

Co-authored-by: Jon Shimwell <jon@proximafusion.com>
Co-authored-by: Micah Gale <mgale@fastmail.com>
Co-authored-by: Paul Romano <paul.k.romano@gmail.com>
---
 openmc/deplete/independent_operator.py |   2 +-
 openmc/material.py                     | 174 +++++++++++++++++++++++++
 tests/unit_tests/test_material.py      |  43 ++++++
 tests/unit_tests/test_materials.py     |  63 +++++++++
 4 files changed, 281 insertions(+), 1 deletion(-)
 create mode 100644 tests/unit_tests/test_materials.py

diff --git a/openmc/deplete/independent_operator.py b/openmc/deplete/independent_operator.py
index 3eb50b05e..c192907cf 100644
--- a/openmc/deplete/independent_operator.py
+++ b/openmc/deplete/independent_operator.py
@@ -273,7 +273,7 @@ class IndependentOperator(OpenMCOperator):
         Returns
         -------
         nuclides : set of str
-            Set of nuclide names that have cross secton data
+            Set of nuclide names that have cross section data
 
         """
         return set(cross_sections[0].nuclides)
diff --git a/openmc/material.py b/openmc/material.py
index c6765178e..cec74af62 100644
--- a/openmc/material.py
+++ b/openmc/material.py
@@ -6,6 +6,8 @@ from numbers import Real
 from pathlib import Path
 import re
 import sys
+import tempfile
+from typing import Sequence, Dict
 import warnings
 
 import lxml.etree as ET
@@ -1717,6 +1719,67 @@ class Material(IDManagerMixin):
 
         return mat
 
+    def deplete(
+        self,
+        multigroup_flux: Sequence[float],
+        energy_group_structure: Sequence[float] | str,
+        timesteps: Sequence[float] | Sequence[tuple[float, str]],
+        source_rates: float | Sequence[float],
+        timestep_units: str = 's',
+        chain_file: cv.PathLike | "openmc.deplete.Chain" | None = None,
+        reactions: Sequence[str] | None = None,
+    ) -> list[openmc.Material]:
+        """Depletes that material, evolving the nuclide densities
+
+        .. versionadded:: 0.15.3
+
+        Parameters
+        ----------
+        multigroup_flux: Sequence[float]
+            Energy-dependent multigroup flux values, where each sublist corresponds
+            to a specific material. Will be normalized so that it sums to 1.
+        energy_group_structure : Sequence[float] | str
+            Energy group boundaries in [eV] or the name of the group structure.
+        timesteps : iterable of float or iterable of tuple
+            Array of timesteps. Note that values are not cumulative. The units are
+            specified by the `timestep_units` argument when `timesteps` is an
+            iterable of float. Alternatively, units can be specified for each step
+            by passing an iterable of (value, unit) tuples.
+        source_rates : float or iterable of float, optional
+            Source rate in [neutron/sec] or neutron flux in [neutron/s-cm^2] for
+            each interval in :attr:`timesteps`
+        timestep_units : {'s', 'min', 'h', 'd', 'a', 'MWd/kg'}
+            Units for values specified in the `timesteps` argument. 's' means
+            seconds, 'min' means minutes, 'h' means hours, 'a' means Julian years
+            and 'MWd/kg' indicates that the values are given in burnup (MW-d of
+            energy deposited per kilogram of initial heavy metal).
+        chain_file : PathLike or Chain
+            Path to the depletion chain XML file or instance of openmc.deplete.Chain.
+            Defaults to ``openmc.config['chain_file']``.
+        reactions : list of str, optional
+            Reactions to get cross sections for. If not specified, all neutron
+            reactions listed in the depletion chain file are used.
+
+        Returns
+        -------
+        list of openmc.Material, one for each timestep
+
+        """
+
+        materials = openmc.Materials([self])
+
+        depleted_materials_dict = materials.deplete(
+            multigroup_fluxes=[multigroup_flux],
+            energy_group_structures=[energy_group_structure],
+            timesteps=timesteps,
+            source_rates=source_rates,
+            timestep_units=timestep_units,
+            chain_file=chain_file,
+            reactions=reactions,
+        )
+
+        return depleted_materials_dict[self.id]
+
 
     def mean_free_path(self, energy: float) -> float:
         """Calculate the mean free path of neutrons in the material at a given
@@ -1947,3 +2010,114 @@ class Materials(cv.CheckedList):
         root = tree.getroot()
 
         return cls.from_xml_element(root)
+
+
+    def deplete(
+        self,
+        multigroup_fluxes: Sequence[Sequence[float]],
+        energy_group_structures: Sequence[Sequence[float] | str],
+        timesteps: Sequence[float] | Sequence[tuple[float, str]],
+        source_rates: float | Sequence[float],
+        timestep_units: str = 's',
+        chain_file: cv.PathLike | "openmc.deplete.Chain" | None = None,
+        reactions: Sequence[str] | None = None,
+    ) -> Dict[int, list[openmc.Material]]:
+        """Depletes that material, evolving the nuclide densities
+
+        .. versionadded:: 0.15.3
+
+        Parameters
+        ----------
+        multigroup_fluxes: Sequence[Sequence[float]]
+            Energy-dependent multigroup flux values, where each sublist corresponds
+            to a specific material. Will be normalized so that it sums to 1.
+        energy_group_structures': Sequence[Sequence[float] | str]
+            Energy group boundaries in [eV] or the name of the group structure.
+        timesteps : iterable of float or iterable of tuple
+            Array of timesteps. Note that values are not cumulative. The units are
+            specified by the `timestep_units` argument when `timesteps` is an
+            iterable of float. Alternatively, units can be specified for each step
+            by passing an iterable of (value, unit) tuples.
+        source_rates : float or iterable of float, optional
+            Source rate in [neutron/sec] or neutron flux in [neutron/s-cm^2] for
+            each interval in :attr:`timesteps`
+        timestep_units : {'s', 'min', 'h', 'd', 'a', 'MWd/kg'}
+            Units for values specified in the `timesteps` argument. 's' means
+            seconds, 'min' means minutes, 'h' means hours, 'a' means Julian years
+            and 'MWd/kg' indicates that the values are given in burnup (MW-d of
+            energy deposited per kilogram of initial heavy metal).
+        chain_file : PathLike or Chain
+            Path to the depletion chain XML file or instance of openmc.deplete.Chain.
+            Defaults to ``openmc.config['chain_file']``.
+        reactions : list of str, optional
+            Reactions to get cross sections for. If not specified, all neutron
+            reactions listed in the depletion chain file are used.
+
+        Returns
+        -------
+        list of openmc.Material, one for each timestep
+
+        """
+
+        import openmc.deplete
+        from .deplete.chain import _get_chain
+
+        # setting all materials to be depletable
+        for mat in self:
+            mat.depletable = True
+
+        chain = _get_chain(chain_file)
+
+        # Create MicroXS objects for all materials
+        micros = []
+        fluxes = []
+
+        with openmc.lib.TemporarySession():
+            for material, flux, energy in zip(
+                self, multigroup_fluxes, energy_group_structures
+            ):
+                temperature = material.temperature or 293.6
+                micro_xs = openmc.deplete.MicroXS.from_multigroup_flux(
+                    energies=energy,
+                    multigroup_flux=flux,
+                    chain_file=chain,
+                    temperature=temperature,
+                    reactions=reactions,
+                )
+                micros.append(micro_xs)
+                fluxes.append(material.volume)
+
+        # Create a single operator for all materials
+        operator = openmc.deplete.IndependentOperator(
+            materials=self,
+            fluxes=fluxes,
+            micros=micros,
+            normalization_mode="source-rate",
+            chain_file=chain,
+        )
+
+        integrator = openmc.deplete.PredictorIntegrator(
+            operator=operator,
+            timesteps=timesteps,
+            source_rates=source_rates,
+            timestep_units=timestep_units,
+        )
+
+        with tempfile.TemporaryDirectory() as tmpdir:
+            # Run integrator
+            results_path = Path(tmpdir) / "depletion_results.h5"
+            integrator.integrate(path=results_path)
+
+            # Load depletion results
+            results = openmc.deplete.Results(results_path)
+
+            # For each material, get activated composition at each timestep
+            all_depleted_materials = {
+                material.id: [
+                    result.get_material(str(material.id))
+                    for result in results
+                ]
+                for material in self
+            }
+
+        return all_depleted_materials
diff --git a/tests/unit_tests/test_material.py b/tests/unit_tests/test_material.py
index db5f4ce32..eae814a75 100644
--- a/tests/unit_tests/test_material.py
+++ b/tests/unit_tests/test_material.py
@@ -3,8 +3,11 @@ from pathlib import Path
 
 import pytest
 
+import numpy as np
+
 import openmc
 from openmc.data import decay_photon_energy
+from openmc.deplete import Chain
 import openmc.examples
 import openmc.model
 import openmc.stats
@@ -712,6 +715,46 @@ def test_avoid_subnormal(run_in_tmpdir):
     assert mats[0].get_nuclide_atom_densities()['H2'] == 0.0
 
 
+def test_material_deplete():
+    pristine_material = openmc.Material()
+    pristine_material.add_nuclide("Ni58", 1.0)
+    pristine_material.set_density("g/cm3", 7.87)
+    pristine_material.depletable = True
+    pristine_material.temperature = 293.6
+    pristine_material.volume = 1.
+
+    mg_flux = [0.5e11] * 42
+
+    chain = Chain.from_xml(
+        Path(__file__).parents[1] / "chain_ni.xml"
+    )
+
+    depleted_material = pristine_material.deplete(
+        multigroup_flux=mg_flux,
+        energy_group_structure="VITAMIN-J-42",
+        timesteps=[10, 70.86],
+        source_rates=[1e19, 0.0],
+        timestep_units="d",
+        chain_file=chain,
+    )
+
+    for material in depleted_material:
+        assert isinstance(material, openmc.Material)
+        assert len(material.get_nuclides()) > len(pristine_material.get_nuclides())
+
+    Co58_mat_1_step_0 = depleted_material[0].get_nuclide_atom_densities("Co58")["Co58"]
+    Co58_mat_1_step_1 = depleted_material[1].get_nuclide_atom_densities("Co58")["Co58"]
+    Co58_mat_1_step_2 = depleted_material[2].get_nuclide_atom_densities("Co58")["Co58"]
+
+    assert Co58_mat_1_step_0 == 0.0
+
+    # Check that Co58 is produced in the first step
+    assert Co58_mat_1_step_1 > 0.0
+
+    # Check that Co58 is halved in the second step which is one halflife later
+    assert np.allclose(Co58_mat_1_step_1 * 0.5, Co58_mat_1_step_2)
+
+
 def test_mean_free_path():
 
     mat1 = openmc.Material()
diff --git a/tests/unit_tests/test_materials.py b/tests/unit_tests/test_materials.py
new file mode 100644
index 000000000..6c8c59fc9
--- /dev/null
+++ b/tests/unit_tests/test_materials.py
@@ -0,0 +1,63 @@
+from pathlib import Path
+
+import openmc
+from openmc.deplete import Chain
+
+
+def test_materials_deplete():
+    pristine_material_1 = openmc.Material()
+    pristine_material_1.add_nuclide("Ni58", 1.)
+    pristine_material_1.set_density("g/cm3", 7.87)
+    pristine_material_1.depletable = True
+    pristine_material_1.temperature = 293.6
+    pristine_material_1.volume = 1.
+
+    pristine_material_2 = openmc.Material()
+    pristine_material_2.add_nuclide("Ni60", 1.)
+    pristine_material_2.set_density("g/cm3", 7.87)
+    pristine_material_2.depletable = True
+    pristine_material_2.temperature = 293.6
+    pristine_material_2.volume = 1.
+
+    pristine_materials = openmc.Materials([pristine_material_1, pristine_material_2])
+
+    mg_flux = [0.5e11] * 42
+
+    chain = Chain.from_xml(
+        Path(__file__).parents[1] / "chain_ni.xml"
+    )
+
+    depleted_material = pristine_materials.deplete(
+        multigroup_fluxes=[mg_flux, mg_flux],
+        energy_group_structures=["VITAMIN-J-42", "VITAMIN-J-42"],
+        timesteps=[100, 100],
+        source_rates=[1e19, 0.0],
+        timestep_units="d",
+        chain_file=chain,
+    )
+
+    assert list(depleted_material.keys()) == [pristine_material_1.id, pristine_material_2.id]
+    for mat_id, materials in depleted_material.items():
+        for material in materials:
+            assert isinstance(material, openmc.Material)
+            assert len(material.get_nuclides()) > 1
+            assert mat_id == material.id
+
+    mats = depleted_material[pristine_material_1.id]
+    Co58_mat_1_step_0 = mats[0].get_nuclide_atom_densities("Co58")["Co58"]
+    Co58_mat_1_step_1 = mats[1].get_nuclide_atom_densities("Co58")["Co58"]
+    Co58_mat_1_step_2 = mats[2].get_nuclide_atom_densities("Co58")["Co58"]
+
+    assert Co58_mat_1_step_0 == 0.0
+    # Co58 is the main activation product of Ni58 in the first irradiation step.
+    # It then decays in the second cooling step (flux = 0)
+    assert Co58_mat_1_step_1 > 0.0 and Co58_mat_1_step_1 > Co58_mat_1_step_2
+
+    Ni59_mat_1_step_0 = mats[0].get_nuclide_atom_densities("Ni59")["Ni59"]
+    Ni59_mat_1_step_1 = mats[1].get_nuclide_atom_densities("Ni59")["Ni59"]
+    Ni59_mat_1_step_2 = mats[2].get_nuclide_atom_densities("Ni59")["Ni59"]
+
+    assert Ni59_mat_1_step_0 == 0.0
+    # Ni59 is one of the main activation product of Ni60 in the first irradiation
+    # step. It then decays in the second cooling step (flux = 0)
+    assert Ni59_mat_1_step_1 > 0.0 and Ni59_mat_1_step_1 > Ni59_mat_1_step_2

From a649d7bc69c47d5f04dbca50b106b605598ffcf7 Mon Sep 17 00:00:00 2001
From: Jonathan Shimwell <mail@jshimwell.com>
Date: Fri, 18 Jul 2025 18:23:02 +0200
Subject: [PATCH 084/203] Avoid adding ParentNuclideFilter twice when calling
 prepare_tallies (#3506)

Co-authored-by: Paul Romano <paul.k.romano@gmail.com>
---
 openmc/deplete/d1s.py        | 4 ++--
 tests/unit_tests/test_d1s.py | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/openmc/deplete/d1s.py b/openmc/deplete/d1s.py
index e9f8bfe79..311bc2d69 100644
--- a/openmc/deplete/d1s.py
+++ b/openmc/deplete/d1s.py
@@ -243,7 +243,7 @@ def prepare_tallies(
         for f in tally.filters:
             if isinstance(f, openmc.ParticleFilter):
                 if list(f.bins) == ['photon']:
-                    tally.filters.append(filter)
+                    if not tally.contains_filter(openmc.ParentNuclideFilter):
+                        tally.filters.append(filter)
                     break
-
     return nuclides
diff --git a/tests/unit_tests/test_d1s.py b/tests/unit_tests/test_d1s.py
index 115759489..9410f2da2 100644
--- a/tests/unit_tests/test_d1s.py
+++ b/tests/unit_tests/test_d1s.py
@@ -84,6 +84,11 @@ def test_prepare_tallies(model):
     assert tally.contains_filter(openmc.ParentNuclideFilter)
     assert sorted(tally.filters[-1].bins) == sorted(radionuclides)
 
+    assert len(tally.filters) == 2
+    # calling prepare_tallies twice should not add another ParentNuclideFilter
+    d1s.prepare_tallies(model, chain_file=CHAIN_PATH)
+    assert len(tally.filters) == 2
+
 
 def test_apply_time_correction(run_in_tmpdir):
     # Make simple sphere model with elemental Ni

From 9d9dcc26c5a6f7b8e06335cfe7a88d296db48710 Mon Sep 17 00:00:00 2001
From: Patrick Shriwise <pshriwise@gmail.com>
Date: Mon, 21 Jul 2025 23:10:08 -0500
Subject: [PATCH 085/203] Update DAGMC and libMesh precompiler definitions
 (#3510)

---
 CMakeLists.txt                                |  6 ++--
 include/openmc/dagmc.h                        |  4 +--
 include/openmc/mesh.h                         | 10 +++---
 include/openmc/particle_data.h                |  6 ++--
 include/openmc/universe.h                     |  2 +-
 src/cell.cpp                                  |  2 +-
 src/dagmc.cpp                                 | 32 +++++++++----------
 src/finalize.cpp                              |  2 +-
 src/initialize.cpp                            |  4 +--
 src/mesh.cpp                                  | 22 ++++++-------
 src/output.cpp                                |  6 ++--
 src/particle.cpp                              | 10 +++---
 src/state_point.cpp                           |  2 +-
 src/tallies/tally.cpp                         |  2 +-
 tests/regression_tests/dagmc/external/test.py |  2 +-
 tests/regression_tests/external_moab/test.py  |  2 +-
 16 files changed, 57 insertions(+), 57 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2b863eb08..474451c8a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -503,11 +503,11 @@ else()
 endif()
 
 if(OPENMC_USE_DAGMC)
-  target_compile_definitions(libopenmc PRIVATE DAGMC)
+  target_compile_definitions(libopenmc PRIVATE OPENMC_DAGMC_ENABLED)
   target_link_libraries(libopenmc dagmc-shared)
 
   if(OPENMC_USE_UWUW)
-    target_compile_definitions(libopenmc PRIVATE OPENMC_UWUW)
+    target_compile_definitions(libopenmc PRIVATE OPENMC_UWUW_ENABLED)
     target_link_libraries(libopenmc uwuw-shared)
   endif()
 elseif(OPENMC_USE_UWUW)
@@ -516,7 +516,7 @@ elseif(OPENMC_USE_UWUW)
 endif()
 
 if(OPENMC_USE_LIBMESH)
-  target_compile_definitions(libopenmc PRIVATE LIBMESH)
+  target_compile_definitions(libopenmc PRIVATE OPENMC_LIBMESH_ENABLED)
   target_link_libraries(libopenmc PkgConfig::LIBMESH)
 endif()
 
diff --git a/include/openmc/dagmc.h b/include/openmc/dagmc.h
index 82ef1b644..0e27402a1 100644
--- a/include/openmc/dagmc.h
+++ b/include/openmc/dagmc.h
@@ -20,7 +20,7 @@ void check_dagmc_root_univ();
 
 } // namespace openmc
 
-#ifdef DAGMC
+#ifdef OPENMC_DAGMC_ENABLED
 
 #include "DagMC.hpp"
 #include "dagmcmetadata.hpp"
@@ -216,6 +216,6 @@ int32_t next_cell(int32_t surf, int32_t curr_cell, int32_t univ);
 
 } // namespace openmc
 
-#endif // DAGMC
+#endif // OPENMC_DAGMC_ENABLED
 
 #endif // OPENMC_DAGMC_H
diff --git a/include/openmc/mesh.h b/include/openmc/mesh.h
index 5a727c2b6..c15e25697 100644
--- a/include/openmc/mesh.h
+++ b/include/openmc/mesh.h
@@ -19,14 +19,14 @@
 #include "openmc/vector.h"
 #include "openmc/xml_interface.h"
 
-#ifdef DAGMC
+#ifdef OPENMC_DAGMC_ENABLED
 #include "moab/AdaptiveKDTree.hpp"
 #include "moab/Core.hpp"
 #include "moab/GeomUtil.hpp"
 #include "moab/Matrix3.hpp"
 #endif
 
-#ifdef LIBMESH
+#ifdef OPENMC_LIBMESH_ENABLED
 #include "libmesh/bounding_box.h"
 #include "libmesh/dof_map.h"
 #include "libmesh/elem.h"
@@ -61,7 +61,7 @@ extern vector<unique_ptr<Mesh>> meshes;
 
 } // namespace model
 
-#ifdef LIBMESH
+#ifdef OPENMC_LIBMESH_ENABLED
 namespace settings {
 // used when creating new libMesh::MeshBase instances
 extern unique_ptr<libMesh::LibMeshInit> libmesh_init;
@@ -768,7 +768,7 @@ private:
   virtual void initialize() = 0;
 };
 
-#ifdef DAGMC
+#ifdef OPENMC_DAGMC_ENABLED
 
 class MOABMesh : public UnstructuredMesh {
 public:
@@ -938,7 +938,7 @@ private:
 
 #endif
 
-#ifdef LIBMESH
+#ifdef OPENMC_LIBMESH_ENABLED
 
 class LibMesh : public UnstructuredMesh {
 public:
diff --git a/include/openmc/particle_data.h b/include/openmc/particle_data.h
index 1c8f1215a..ec393845f 100644
--- a/include/openmc/particle_data.h
+++ b/include/openmc/particle_data.h
@@ -8,7 +8,7 @@
 #include "openmc/tallies/filter_match.h"
 #include "openmc/vector.h"
 
-#ifdef DAGMC
+#ifdef OPENMC_DAGMC_ENABLED
 #include "DagMC.hpp"
 #endif
 
@@ -372,7 +372,7 @@ public:
   // Boundary information
   BoundaryInfo& boundary() { return boundary_; }
 
-#ifdef DAGMC
+#ifdef OPENMC_DAGMC_ENABLED
   // DagMC state variables
   moab::DagMC::RayHistory& history() { return history_; }
   Direction& last_dir() { return last_dir_; }
@@ -417,7 +417,7 @@ private:
   double sqrtkT_ {-1.0};     //!< sqrt(k_Boltzmann * temperature) in eV
   double sqrtkT_last_ {0.0}; //!< last temperature
 
-#ifdef DAGMC
+#ifdef OPENMC_DAGMC_ENABLED
   moab::DagMC::RayHistory history_;
   Direction last_dir_;
 #endif
diff --git a/include/openmc/universe.h b/include/openmc/universe.h
index e8fbacfdc..52df432b8 100644
--- a/include/openmc/universe.h
+++ b/include/openmc/universe.h
@@ -6,7 +6,7 @@
 
 namespace openmc {
 
-#ifdef DAGMC
+#ifdef OPENMC_DAGMC_ENABLED
 class DAGUniverse;
 #endif
 
diff --git a/src/cell.cpp b/src/cell.cpp
index eb5c228bc..b6862ba17 100644
--- a/src/cell.cpp
+++ b/src/cell.cpp
@@ -1025,7 +1025,7 @@ void populate_universes()
       model::universes.back()->cells_.push_back(index_cell);
       model::universe_map[uid] = model::universes.size() - 1;
     } else {
-#ifdef DAGMC
+#ifdef OPENMC_DAGMC_ENABLED
       // Skip implicit complement cells for now
       Universe* univ = model::universes[it->second].get();
       DAGUniverse* dag_univ = dynamic_cast<DAGUniverse*>(univ);
diff --git a/src/dagmc.cpp b/src/dagmc.cpp
index 1d92d9d57..8c81952a7 100644
--- a/src/dagmc.cpp
+++ b/src/dagmc.cpp
@@ -13,7 +13,7 @@
 #include "openmc/settings.h"
 #include "openmc/string_utils.h"
 
-#ifdef OPENMC_UWUW
+#ifdef OPENMC_UWUW_ENABLED
 #include "uwuw.hpp"
 #endif
 #include <fmt/core.h>
@@ -26,13 +26,13 @@
 
 namespace openmc {
 
-#ifdef DAGMC
+#ifdef OPENMC_DAGMC_ENABLED
 const bool DAGMC_ENABLED = true;
 #else
 const bool DAGMC_ENABLED = false;
 #endif
 
-#ifdef OPENMC_UWUW
+#ifdef OPENMC_UWUW_ENABLED
 const bool UWUW_ENABLED = true;
 #else
 const bool UWUW_ENABLED = false;
@@ -40,7 +40,7 @@ const bool UWUW_ENABLED = false;
 
 } // namespace openmc
 
-#ifdef DAGMC
+#ifdef OPENMC_DAGMC_ENABLED
 
 namespace openmc {
 
@@ -131,7 +131,7 @@ void DAGUniverse::set_id()
 
 void DAGUniverse::initialize()
 {
-#ifdef OPENMC_UWUW
+#ifdef OPENMC_UWUW_ENABLED
   // read uwuw materials from the .h5m file if present
   read_uwuw_materials();
 #endif
@@ -456,16 +456,16 @@ void DAGUniverse::to_hdf5(hid_t universes_group) const
 
 bool DAGUniverse::uses_uwuw() const
 {
-#ifdef OPENMC_UWUW
+#ifdef OPENMC_UWUW_ENABLED
   return uwuw_ && !uwuw_->material_library.empty();
 #else
   return false;
-#endif // OPENMC_UWUW
+#endif // OPENMC_UWUW_ENABLED
 }
 
 std::string DAGUniverse::get_uwuw_materials_xml() const
 {
-#ifdef OPENMC_UWUW
+#ifdef OPENMC_UWUW_ENABLED
   if (!uses_uwuw()) {
     throw std::runtime_error("This DAGMC Universe does not use UWUW materials");
   }
@@ -485,12 +485,12 @@ std::string DAGUniverse::get_uwuw_materials_xml() const
   return ss.str();
 #else
   fatal_error("DAGMC was not configured with UWUW.");
-#endif // OPENMC_UWUW
+#endif // OPENMC_UWUW_ENABLED
 }
 
 void DAGUniverse::write_uwuw_materials_xml(const std::string& outfile) const
 {
-#ifdef OPENMC_UWUW
+#ifdef OPENMC_UWUW_ENABLED
   if (!uses_uwuw()) {
     throw std::runtime_error(
       "This DAGMC universe does not use UWUW materials.");
@@ -503,7 +503,7 @@ void DAGUniverse::write_uwuw_materials_xml(const std::string& outfile) const
   mats_xml.close();
 #else
   fatal_error("DAGMC was not configured with UWUW.");
-#endif // OPENMC_UWUW
+#endif // OPENMC_UWUW_ENABLED
 }
 
 void DAGUniverse::legacy_assign_material(
@@ -565,7 +565,7 @@ void DAGUniverse::legacy_assign_material(
 
 void DAGUniverse::read_uwuw_materials()
 {
-#ifdef OPENMC_UWUW
+#ifdef OPENMC_UWUW_ENABLED
   // If no filename was provided, don't read UWUW materials
   if (filename_ == "")
     return;
@@ -605,13 +605,13 @@ void DAGUniverse::read_uwuw_materials()
   }
 #else
   fatal_error("DAGMC was not configured with UWUW.");
-#endif // OPENMC_UWUW
+#endif // OPENMC_UWUW_ENABLED
 }
 
 void DAGUniverse::uwuw_assign_material(
   moab::EntityHandle vol_handle, std::unique_ptr<DAGCell>& c) const
 {
-#ifdef OPENMC_UWUW
+#ifdef OPENMC_UWUW_ENABLED
   // lookup material in uwuw if present
   std::string uwuw_mat = dmd_ptr->volume_material_property_data_eh[vol_handle];
   if (uwuw_->material_library.count(uwuw_mat) != 0) {
@@ -627,7 +627,7 @@ void DAGUniverse::uwuw_assign_material(
   }
 #else
   fatal_error("DAGMC was not configured with UWUW.");
-#endif // OPENMC_UWUW
+#endif // OPENMC_UWUW_ENABLED
 }
 
 void DAGUniverse::override_assign_material(std::unique_ptr<DAGCell>& c) const
@@ -926,4 +926,4 @@ int32_t next_cell(int32_t surf, int32_t curr_cell, int32_t univ);
 
 } // namespace openmc
 
-#endif // DAGMC
+#endif // OPENMC_DAGMC_ENABLED
diff --git a/src/finalize.cpp b/src/finalize.cpp
index 9cbebc878..2d14cdec8 100644
--- a/src/finalize.cpp
+++ b/src/finalize.cpp
@@ -166,7 +166,7 @@ int openmc_finalize()
   // Deallocate arrays
   free_memory();
 
-#ifdef LIBMESH
+#ifdef OPENMC_LIBMESH_ENABLED
   settings::libmesh_init.reset();
 #endif
 
diff --git a/src/initialize.cpp b/src/initialize.cpp
index c5803976b..2da78137d 100644
--- a/src/initialize.cpp
+++ b/src/initialize.cpp
@@ -38,7 +38,7 @@
 #include "openmc/vector.h"
 #include "openmc/weight_windows.h"
 
-#ifdef LIBMESH
+#ifdef OPENMC_LIBMESH_ENABLED
 #include "libmesh/libmesh.h"
 #endif
 
@@ -64,7 +64,7 @@ int openmc_init(int argc, char* argv[], const void* intracomm)
   if (err)
     return err;
 
-#ifdef LIBMESH
+#ifdef OPENMC_LIBMESH_ENABLED
   const int n_threads = num_threads();
   // initialize libMesh if it hasn't been initialized already
   // (if initialized externally, the libmesh_init object needs to be provided
diff --git a/src/mesh.cpp b/src/mesh.cpp
index 9147efb95..3e4ff1a3e 100644
--- a/src/mesh.cpp
+++ b/src/mesh.cpp
@@ -47,13 +47,13 @@
 #include "openmc/volume_calc.h"
 #include "openmc/xml_interface.h"
 
-#ifdef LIBMESH
+#ifdef OPENMC_LIBMESH_ENABLED
 #include "libmesh/mesh_modification.h"
 #include "libmesh/mesh_tools.h"
 #include "libmesh/numeric_vector.h"
 #endif
 
-#ifdef DAGMC
+#ifdef OPENMC_DAGMC_ENABLED
 #include "moab/FileOptions.hpp"
 #endif
 
@@ -63,7 +63,7 @@ namespace openmc {
 // Global variables
 //==============================================================================
 
-#ifdef LIBMESH
+#ifdef OPENMC_LIBMESH_ENABLED
 const bool LIBMESH_ENABLED = true;
 #else
 const bool LIBMESH_ENABLED = false;
@@ -80,7 +80,7 @@ vector<unique_ptr<Mesh>> meshes;
 
 } // namespace model
 
-#ifdef LIBMESH
+#ifdef OPENMC_LIBMESH_ENABLED
 namespace settings {
 unique_ptr<libMesh::LibMeshInit> libmesh_init;
 const libMesh::Parallel::Communicator* libmesh_comm {nullptr};
@@ -2134,14 +2134,14 @@ extern "C" int openmc_add_unstructured_mesh(
   std::string mesh_file(filename);
   bool valid_lib = false;
 
-#ifdef DAGMC
+#ifdef OPENMC_DAGMC_ENABLED
   if (lib_name == MOABMesh::mesh_lib_type) {
     model::meshes.push_back(std::move(make_unique<MOABMesh>(mesh_file)));
     valid_lib = true;
   }
 #endif
 
-#ifdef LIBMESH
+#ifdef OPENMC_LIBMESH_ENABLED
   if (lib_name == LibMesh::mesh_lib_type) {
     model::meshes.push_back(std::move(make_unique<LibMesh>(mesh_file)));
     valid_lib = true;
@@ -2509,7 +2509,7 @@ extern "C" int openmc_spherical_mesh_set_grid(int32_t index,
     index, grid_x, nx, grid_y, ny, grid_z, nz);
 }
 
-#ifdef DAGMC
+#ifdef OPENMC_DAGMC_ENABLED
 
 const std::string MOABMesh::mesh_lib_type = "moab";
 
@@ -3211,7 +3211,7 @@ void MOABMesh::write(const std::string& base_filename) const
 
 #endif
 
-#ifdef LIBMESH
+#ifdef OPENMC_LIBMESH_ENABLED
 
 const std::string LibMesh::mesh_lib_type = "libmesh";
 
@@ -3556,7 +3556,7 @@ double LibMesh::volume(int bin) const
   return this->get_element_from_bin(bin).volume();
 }
 
-#endif // LIBMESH
+#endif // OPENMC_LIBMESH_ENABLED
 
 //==============================================================================
 // Non-member functions
@@ -3605,12 +3605,12 @@ void read_meshes(pugi::xml_node root)
       model::meshes.push_back(make_unique<CylindricalMesh>(node));
     } else if (mesh_type == SphericalMesh::mesh_type) {
       model::meshes.push_back(make_unique<SphericalMesh>(node));
-#ifdef DAGMC
+#ifdef OPENMC_DAGMC_ENABLED
     } else if (mesh_type == UnstructuredMesh::mesh_type &&
                mesh_lib == MOABMesh::mesh_lib_type) {
       model::meshes.push_back(make_unique<MOABMesh>(node));
 #endif
-#ifdef LIBMESH
+#ifdef OPENMC_LIBMESH_ENABLED
     } else if (mesh_type == UnstructuredMesh::mesh_type &&
                mesh_lib == LibMesh::mesh_lib_type) {
       model::meshes.push_back(make_unique<LibMesh>(node));
diff --git a/src/output.cpp b/src/output.cpp
index 0316e313e..0a14e8843 100644
--- a/src/output.cpp
+++ b/src/output.cpp
@@ -323,10 +323,10 @@ void print_build_info()
 #ifdef OPENMC_MPI
   mpi = y;
 #endif
-#ifdef DAGMC
+#ifdef OPENMC_DAGMC_ENABLED
   dagmc = y;
 #endif
-#ifdef LIBMESH
+#ifdef OPENMC_LIBMESH_ENABLED
   libmesh = y;
 #endif
 #ifdef OPENMC_MCPL
@@ -341,7 +341,7 @@ void print_build_info()
 #ifdef COVERAGEBUILD
   coverage = y;
 #endif
-#ifdef OPENMC_UWUW
+#ifdef OPENMC_UWUW_ENABLED
   uwuw = y;
 #endif
 
diff --git a/src/particle.cpp b/src/particle.cpp
index f9044b2d7..118b084b0 100644
--- a/src/particle.cpp
+++ b/src/particle.cpp
@@ -32,7 +32,7 @@
 #include "openmc/track_output.h"
 #include "openmc/weight_windows.h"
 
-#ifdef DAGMC
+#ifdef OPENMC_DAGMC_ENABLED
 #include "DagMC.hpp"
 #endif
 
@@ -408,7 +408,7 @@ void Particle::event_collide()
   if (!model::active_tallies.empty())
     score_collision_derivative(*this);
 
-#ifdef DAGMC
+#ifdef OPENMC_DAGMC_ENABLED
   history().reset();
 #endif
 }
@@ -473,7 +473,7 @@ void Particle::event_revive_from_secondary()
 
 void Particle::event_death()
 {
-#ifdef DAGMC
+#ifdef OPENMC_DAGMC_ENABLED
   history().reset();
 #endif
 
@@ -553,7 +553,7 @@ void Particle::cross_surface(const Surface& surf)
   }
 
 // if we're crossing a CSG surface, make sure the DAG history is reset
-#ifdef DAGMC
+#ifdef OPENMC_DAGMC_ENABLED
   if (surf.geom_type() == GeometryType::CSG)
     history().reset();
 #endif
@@ -567,7 +567,7 @@ void Particle::cross_surface(const Surface& surf)
   // ==========================================================================
   // SEARCH NEIGHBOR LISTS FOR NEXT CELL
 
-#ifdef DAGMC
+#ifdef OPENMC_DAGMC_ENABLED
   // in DAGMC, we know what the next cell should be
   if (surf.geom_type() == GeometryType::DAG) {
     int32_t i_cell = next_cell(surface_index(), cell_last(n_coord() - 1),
diff --git a/src/state_point.cpp b/src/state_point.cpp
index 12dfeb82a..8195c4865 100644
--- a/src/state_point.cpp
+++ b/src/state_point.cpp
@@ -340,7 +340,7 @@ extern "C" int openmc_statepoint_write(const char* filename, bool* write_source)
       file_close(file_id);
   }
 
-#if defined(LIBMESH) || defined(DAGMC)
+#if defined(OPENMC_LIBMESH_ENABLED) || defined(OPENMC_DAGMC_ENABLED)
   // write unstructured mesh tally files
   write_unstructured_mesh_results();
 #endif
diff --git a/src/tallies/tally.cpp b/src/tallies/tally.cpp
index 54840b518..e737f79d3 100644
--- a/src/tallies/tally.cpp
+++ b/src/tallies/tally.cpp
@@ -376,7 +376,7 @@ Tally::Tally(pugi::xml_node node)
     }
   }
 
-#ifdef LIBMESH
+#ifdef OPENMC_LIBMESH_ENABLED
   // ensure a tracklength tally isn't used with a libMesh filter
   for (auto i : this->filters_) {
     auto df = dynamic_cast<MeshFilter*>(model::tally_filters[i].get());
diff --git a/tests/regression_tests/dagmc/external/test.py b/tests/regression_tests/dagmc/external/test.py
index 57bc9ea7f..3580bfa11 100644
--- a/tests/regression_tests/dagmc/external/test.py
+++ b/tests/regression_tests/dagmc/external/test.py
@@ -32,7 +32,7 @@ def cpp_driver(request):
             target_link_libraries(main OpenMC::libopenmc)
             target_compile_features(main PUBLIC cxx_std_14)
             set(CMAKE_CXX_FLAGS "-pedantic-errors")
-            add_compile_definitions(DAGMC=1)
+            add_compile_definitions(OPENMC_DAGMC_ENABLED=1)
             """.format(openmc_dir)))
 
     # Create temporary build directory and change to there
diff --git a/tests/regression_tests/external_moab/test.py b/tests/regression_tests/external_moab/test.py
index ce4e78a2c..2d64eb14b 100644
--- a/tests/regression_tests/external_moab/test.py
+++ b/tests/regression_tests/external_moab/test.py
@@ -39,7 +39,7 @@ def cpp_driver(request):
             target_link_libraries(main OpenMC::libopenmc)
             target_compile_features(main PUBLIC cxx_std_14)
             set(CMAKE_CXX_FLAGS "-pedantic-errors")
-            add_compile_definitions(DAGMC=1)
+            add_compile_definitions(OPENMC_DAGMC_ENABLED=1)
             """.format(openmc_dir)))
 
     # Create temporary build directory and change to there

From 6b672f772f34c804cb729eb84aedb0a1b93576ea Mon Sep 17 00:00:00 2001
From: Paul Romano <paul.k.romano@gmail.com>
Date: Sun, 27 Jul 2025 04:42:33 +0700
Subject: [PATCH 086/203] Allow already-initialized openmc.lib in
 TemporarySession (#3505)

---
 openmc/deplete/microxs.py | 10 ++--------
 openmc/lib/core.py        | 12 ++++++++----
 openmc/model/model.py     | 32 ++++++++++++--------------------
 3 files changed, 22 insertions(+), 32 deletions(-)

diff --git a/openmc/deplete/microxs.py b/openmc/deplete/microxs.py
index df78f8a26..4ce199f0c 100644
--- a/openmc/deplete/microxs.py
+++ b/openmc/deplete/microxs.py
@@ -352,7 +352,8 @@ class MicroXS:
         # Create 3D array for microscopic cross sections
         microxs_arr = np.zeros((len(nuclides), len(mts), 1))
 
-        def compute_microxs():
+        # Compute microscopic cross sections within a temporary session
+        with openmc.lib.TemporarySession(**init_kwargs):
             # For each nuclide and reaction, compute the flux-averaged xs
             for nuc_index, nuc in enumerate(nuclides):
                 if nuc not in nuclides_with_data:
@@ -363,13 +364,6 @@ class MicroXS:
                         mt, temperature, energies, multigroup_flux
                     )
 
-        # Compute microscopic cross sections within a temporary session
-        if not openmc.lib.is_initialized:
-            with openmc.lib.TemporarySession(**init_kwargs):
-                compute_microxs()
-        else:
-            compute_microxs()
-
         return cls(microxs_arr, nuclides, reactions)
 
     @classmethod
diff --git a/openmc/lib/core.py b/openmc/lib/core.py
index eac0e1784..9f8db69d5 100644
--- a/openmc/lib/core.py
+++ b/openmc/lib/core.py
@@ -654,9 +654,10 @@ class TemporarySession:
 
     def __enter__(self):
         """Initialize the OpenMC library in a temporary directory."""
-        # Make sure OpenMC is not already initialized
-        if openmc.lib.is_initialized:
-            raise RuntimeError("openmc.lib is already initialized.")
+        # If already initialized, the context manager is a no-op
+        self.already_initialized = openmc.lib.is_initialized
+        if self.already_initialized:
+            return self
 
         # Store original working directory
         self.orig_dir = Path.cwd()
@@ -675,8 +676,11 @@ class TemporarySession:
 
     def __exit__(self, exc_type, exc_value, traceback):
         """Finalize the OpenMC library and clean up temporary directory."""
+        if self.already_initialized:
+            return
+
         try:
-            openmc.lib.finalize()
+            finalize()
         finally:
             os.chdir(self.orig_dir)
             self.tmp_dir.cleanup()
diff --git a/openmc/model/model.py b/openmc/model/model.py
index 93e029a33..b1eff5b7c 100644
--- a/openmc/model/model.py
+++ b/openmc/model/model.py
@@ -996,16 +996,13 @@ class Model:
         plot_obj.v_res = pixels[1]
         plot_obj.basis = basis
 
-        if self.is_initialized:
-            return openmc.lib.id_map(plot_obj)
-        else:
-            # Silence output by default. Also set arguments to start in volume
-            # calculation mode to avoid loading cross sections
-            init_kwargs.setdefault('output', False)
-            init_kwargs.setdefault('args', ['-c'])
+        # Silence output by default. Also set arguments to start in volume
+        # calculation mode to avoid loading cross sections
+        init_kwargs.setdefault('output', False)
+        init_kwargs.setdefault('args', ['-c'])
 
-            with openmc.lib.TemporarySession(self, **init_kwargs):
-                return openmc.lib.id_map(plot_obj)
+        with openmc.lib.TemporarySession(self, **init_kwargs):
+            return openmc.lib.id_map(plot_obj)
 
     @add_plot_params
     def plot(
@@ -1229,20 +1226,15 @@ class Model:
         """
         import openmc.lib
 
-        if self.is_initialized:
+        # Silence output by default. Also set arguments to start in volume
+        # calculation mode to avoid loading cross sections
+        init_kwargs.setdefault('output', False)
+        init_kwargs.setdefault('args', ['-c'])
+
+        with openmc.lib.TemporarySession(self, **init_kwargs):
             return openmc.lib.sample_external_source(
                 n_samples=n_samples, prn_seed=prn_seed
             )
-        else:
-            # Silence output by default. Also set arguments to start in volume
-            # calculation mode to avoid loading cross sections
-            init_kwargs.setdefault('output', False)
-            init_kwargs.setdefault('args', ['-c'])
-
-            with openmc.lib.TemporarySession(self, **init_kwargs):
-                return openmc.lib.sample_external_source(
-                    n_samples=n_samples, prn_seed=prn_seed
-                )
 
     def apply_tally_results(self, statepoint: PathLike | openmc.StatePoint):
         """Apply results from a statepoint to tally objects on the Model

From 836bc487cf13e69a9d2d9ef3f79d3828609df4e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Delaporte-Mathurin?=
 <40028739+RemDelaporteMathurin@users.noreply.github.com>
Date: Tue, 29 Jul 2025 05:34:03 -0400
Subject: [PATCH 087/203] Fix: `materials`, `plots`, and `tallies` cannot be
 passed as lists (#3513)

Co-authored-by: Paul Romano <paul.k.romano@gmail.com>
---
 openmc/model/model.py          | 18 ++++++++++++------
 tests/unit_tests/test_model.py | 13 +++++++++++++
 2 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/openmc/model/model.py b/openmc/model/model.py
index b1eff5b7c..03fdcda1f 100644
--- a/openmc/model/model.py
+++ b/openmc/model/model.py
@@ -70,7 +70,7 @@ class Model:
     def __init__(
         self,
         geometry: openmc.Geometry | None = None,
-        materials: openmc.Materials = None,
+        materials: openmc.Materials | None = None,
         settings: openmc.Settings | None = None,
         tallies: openmc.Tallies | None = None,
         plots: openmc.Plots | None = None,
@@ -82,7 +82,7 @@ class Model:
         self.plots = openmc.Plots() if plots is None else plots
 
     @property
-    def geometry(self) -> openmc.Geometry | None:
+    def geometry(self) -> openmc.Geometry:
         return self._geometry
 
     @geometry.setter
@@ -91,7 +91,7 @@ class Model:
         self._geometry = geometry
 
     @property
-    def materials(self) -> openmc.Materials | None:
+    def materials(self) -> openmc.Materials:
         return self._materials
 
     @materials.setter
@@ -100,12 +100,14 @@ class Model:
         if isinstance(materials, openmc.Materials):
             self._materials = materials
         else:
+            if not hasattr(self, '_materials'):
+                self._materials = openmc.Materials()
             del self._materials[:]
             for mat in materials:
                 self._materials.append(mat)
 
     @property
-    def settings(self) -> openmc.Settings | None:
+    def settings(self) -> openmc.Settings:
         return self._settings
 
     @settings.setter
@@ -114,7 +116,7 @@ class Model:
         self._settings = settings
 
     @property
-    def tallies(self) -> openmc.Tallies | None:
+    def tallies(self) -> openmc.Tallies:
         return self._tallies
 
     @tallies.setter
@@ -123,12 +125,14 @@ class Model:
         if isinstance(tallies, openmc.Tallies):
             self._tallies = tallies
         else:
+            if not hasattr(self, '_tallies'):
+                self._tallies = openmc.Tallies()
             del self._tallies[:]
             for tally in tallies:
                 self._tallies.append(tally)
 
     @property
-    def plots(self) -> openmc.Plots | None:
+    def plots(self) -> openmc.Plots:
         return self._plots
 
     @plots.setter
@@ -137,6 +141,8 @@ class Model:
         if isinstance(plots, openmc.Plots):
             self._plots = plots
         else:
+            if not hasattr(self, '_plots'):
+                self._plots = openmc.Plots()
             del self._plots[:]
             for plot in plots:
                 self._plots.append(plot)
diff --git a/tests/unit_tests/test_model.py b/tests/unit_tests/test_model.py
index 3797188ba..6e4dec00f 100644
--- a/tests/unit_tests/test_model.py
+++ b/tests/unit_tests/test_model.py
@@ -892,3 +892,16 @@ def test_id_map_aligned_model():
     assert tr_cell == 20, f"Expected cell ID 20 at top-right corner, got {tr_cell}"
     assert tr_instance == 3, f"Expected cell instance 3 at top-right corner, got {tr_instance}"
     assert tr_material == 5, f"Expected material ID 5 at top-right corner, got {tr_material}"
+
+def test_setter_from_list():
+    mat = openmc.Material()
+    model = openmc.Model(materials=[mat])
+    assert isinstance(model.materials, openmc.Materials)
+
+    tally = openmc.Tally()
+    model = openmc.Model(tallies=[tally])
+    assert isinstance(model.tallies, openmc.Tallies)
+
+    plot = openmc.Plot()
+    model = openmc.Model(plots=[plot])
+    assert isinstance(model.plots, openmc.Plots)

From 4cce6ee6c05c3070bb5f256324f064570b2869bc Mon Sep 17 00:00:00 2001
From: John Tramm <john.tramm@gmail.com>
Date: Tue, 29 Jul 2025 05:15:40 -0500
Subject: [PATCH 088/203] Fix for Weight Window Scaling Bug (#3511)

Co-authored-by: Paul Romano <paul.k.romano@gmail.com>
---
 include/openmc/weight_windows.h                         | 1 +
 tests/regression_tests/weightwindows/generators/test.py | 4 ++--
 tests/regression_tests/weightwindows/results_true.dat   | 2 +-
 tests/regression_tests/weightwindows/test.py            | 6 +++---
 tests/testing_harness.py                                | 2 +-
 tests/unit_tests/weightwindows/test_ww_gen.py           | 2 +-
 tests/unit_tests/weightwindows/test_wwinp_reader.py     | 2 +-
 7 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/include/openmc/weight_windows.h b/include/openmc/weight_windows.h
index 6f2ef0707..763815522 100644
--- a/include/openmc/weight_windows.h
+++ b/include/openmc/weight_windows.h
@@ -71,6 +71,7 @@ struct WeightWindow {
   {
     lower_weight *= factor;
     upper_weight *= factor;
+    survival_weight *= factor;
   }
 };
 
diff --git a/tests/regression_tests/weightwindows/generators/test.py b/tests/regression_tests/weightwindows/generators/test.py
index d6a40b44f..4dc0ab80d 100644
--- a/tests/regression_tests/weightwindows/generators/test.py
+++ b/tests/regression_tests/weightwindows/generators/test.py
@@ -46,14 +46,14 @@ def test_ww_generator(run_in_tmpdir):
     # just test that the generation happens successfully here
     assert os.path.exists('weight_windows.h5')
 
-    wws_mean = openmc.hdf5_to_wws()
+    wws_mean = openmc.WeightWindowsList.from_hdf5()
     assert len(wws_mean) == 1
 
     # check that generation using the relative error works too
     wwg.update_parameters['value'] = 'rel_err'
     model.run()
 
-    wws_rel_err = openmc.hdf5_to_wws()
+    wws_rel_err = openmc.WeightWindowsList.from_hdf5()
     assert len(wws_rel_err) == 1
 
     # we should not get the same set of weight windows when switching to use of
diff --git a/tests/regression_tests/weightwindows/results_true.dat b/tests/regression_tests/weightwindows/results_true.dat
index 671be1d7b..122c5d890 100644
--- a/tests/regression_tests/weightwindows/results_true.dat
+++ b/tests/regression_tests/weightwindows/results_true.dat
@@ -1 +1 @@
-a5880ad9262e8aba90801783891ee74618144101401f06fb46e954e851a3c517ab28d5f0d6e1b2b364844f08d363cba35ab23b63fc81012ea8a6a328755d56c4
\ No newline at end of file
+5df0c08573ccee3fd3495c877c7dc0c4b69c245faf8473b848c89fb837dea7fd437936ffebeb6455c793e66046c46eb0ad6941cc5ef1699fc5fc8a7fcb9b5a0c
\ No newline at end of file
diff --git a/tests/regression_tests/weightwindows/test.py b/tests/regression_tests/weightwindows/test.py
index 864f4f062..cfb651338 100644
--- a/tests/regression_tests/weightwindows/test.py
+++ b/tests/regression_tests/weightwindows/test.py
@@ -1,4 +1,3 @@
-from copy import deepcopy
 import pytest
 import numpy as np
 
@@ -8,6 +7,7 @@ from openmc.stats import Discrete, Point
 from tests.testing_harness import HashedPyAPITestHarness
 
 
+
 @pytest.fixture
 def model():
     model = openmc.Model()
@@ -114,7 +114,7 @@ def test_weightwindows(model):
 
 def test_wwinp_cylindrical():
 
-    ww = openmc.wwinp_to_wws('ww_n_cyl.txt')[0]
+    ww = openmc.WeightWindowsList.from_wwinp('ww_n_cyl.txt')[0]
 
     mesh = ww.mesh
 
@@ -144,7 +144,7 @@ def test_wwinp_cylindrical():
 
 def test_wwinp_spherical():
 
-    ww = openmc.wwinp_to_wws('ww_n_sph.txt')[0]
+    ww = openmc.WeightWindowsList.from_wwinp('ww_n_sph.txt')[0]
 
     mesh = ww.mesh
 
diff --git a/tests/testing_harness.py b/tests/testing_harness.py
index 6de475e6e..11ced5b38 100644
--- a/tests/testing_harness.py
+++ b/tests/testing_harness.py
@@ -443,7 +443,7 @@ class TolerantPyAPITestHarness(PyAPITestHarness):
 class WeightWindowPyAPITestHarness(PyAPITestHarness):
     def _get_results(self):
         """Digest info in the weight window file and return as a string."""
-        ww = openmc.hdf5_to_wws()[0]
+        ww = openmc.WeightWindowsList.from_hdf5()[0]
 
         # Access the weight window bounds
         lower_bound = ww.lower_ww_bounds
diff --git a/tests/unit_tests/weightwindows/test_ww_gen.py b/tests/unit_tests/weightwindows/test_ww_gen.py
index 555421461..7ee03f55c 100644
--- a/tests/unit_tests/weightwindows/test_ww_gen.py
+++ b/tests/unit_tests/weightwindows/test_ww_gen.py
@@ -303,7 +303,7 @@ def test_python_hdf5_roundtrip(run_in_tmpdir, model):
 
     openmc.lib.finalize()
 
-    wws_hdf5 = openmc.hdf5_to_wws()[0]
+    wws_hdf5 = openmc.WeightWindowsList.from_hdf5()[0]
 
     # ensure
     assert all(wws.energy_bounds == wws_hdf5.energy_bounds)
diff --git a/tests/unit_tests/weightwindows/test_wwinp_reader.py b/tests/unit_tests/weightwindows/test_wwinp_reader.py
index 434a36753..28548a448 100644
--- a/tests/unit_tests/weightwindows/test_wwinp_reader.py
+++ b/tests/unit_tests/weightwindows/test_wwinp_reader.py
@@ -96,7 +96,7 @@ def id_fn(params):
 def test_wwinp_reader(wwinp_data, request):
     wwinp_file, mesh, particle_types, energy_bounds = wwinp_data
 
-    wws = openmc.wwinp_to_wws(request.node.path.parent / wwinp_file)
+    wws = openmc.WeightWindowsList.from_wwinp(request.node.path.parent / wwinp_file)
 
     for i, ww in enumerate(wws):
         e_bounds = energy_bounds[i]

From 6f5e1347d4bed2af88060c6644b20a6949c7a192 Mon Sep 17 00:00:00 2001
From: Jonathan Shimwell <mail@jshimwell.com>
Date: Tue, 29 Jul 2025 12:17:51 +0100
Subject: [PATCH 089/203] Add test for FW-CADIS based WW generation on a DAGMC
 model (#3504)

Co-authored-by: Jon Shimwell <jon@proximafusion.com>
Co-authored-by: Patrick Shriwise <pshriwise@gmail.com>
Co-authored-by: Paul Romano <paul.k.romano@gmail.com>
---
 src/dagmc.cpp                                 |   2 +-
 .../dagmc/dagmc_tetrahedral_no_graveyard.h5m  | Bin 0 -> 31448 bytes
 tests/unit_tests/weightwindows/test_ww_gen.py |  70 ++++++++++++++++++
 3 files changed, 71 insertions(+), 1 deletion(-)
 create mode 100644 tests/unit_tests/dagmc/dagmc_tetrahedral_no_graveyard.h5m

diff --git a/src/dagmc.cpp b/src/dagmc.cpp
index 8c81952a7..b2ebe89c0 100644
--- a/src/dagmc.cpp
+++ b/src/dagmc.cpp
@@ -672,7 +672,7 @@ std::pair<double, int32_t> DAGCell::distance(
     p->last_dir() = u;
     p->history().reset();
   }
-  if (on_surface == 0) {
+  if (on_surface == SURFACE_NONE) {
     p->history().reset();
   }
 
diff --git a/tests/unit_tests/dagmc/dagmc_tetrahedral_no_graveyard.h5m b/tests/unit_tests/dagmc/dagmc_tetrahedral_no_graveyard.h5m
new file mode 100644
index 0000000000000000000000000000000000000000..2aa72956b812354bbf64350252e8d04ca160ad4d
GIT binary patch
literal 31448
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

literal 0
HcmV?d00001

diff --git a/tests/unit_tests/weightwindows/test_ww_gen.py b/tests/unit_tests/weightwindows/test_ww_gen.py
index 7ee03f55c..a4456e680 100644
--- a/tests/unit_tests/weightwindows/test_ww_gen.py
+++ b/tests/unit_tests/weightwindows/test_ww_gen.py
@@ -1,3 +1,4 @@
+import copy
 from itertools import permutations
 from pathlib import Path
 
@@ -332,3 +333,72 @@ def test_ww_bounds_set_in_memory(run_in_tmpdir, model):
     wws.bounds = (bounds, bounds)
 
     openmc.lib.finalize()
+
+
+@pytest.mark.skipif(not openmc.lib._dagmc_enabled(), reason="DAGMC CAD geometry is not enabled.")
+def test_ww_generation_with_dagmc(run_in_tmpdir):
+    mat1 = openmc.Material(name="1")
+    mat1.add_nuclide("H1", 1, percent_type="ao")
+    mat1.set_density("g/cm3", 0.001)
+
+    materials = openmc.Materials([mat1])
+    dag_univ = openmc.DAGMCUniverse(
+        Path(__file__).parent.parent / "dagmc" / "dagmc_tetrahedral_no_graveyard.h5m")
+    bound_dag_univ = dag_univ.bounded_universe(padding_distance=1)
+    geometry = openmc.Geometry(bound_dag_univ)
+
+    settings = openmc.Settings()
+    settings.batches = 6
+    settings.particles = 30
+    settings.run_mode = "fixed source"
+
+    # Create a point source which are supported by random ray mode
+    my_source = openmc.IndependentSource()
+    my_source.space = openmc.stats.Point((0.25, 0.25, 0.25))
+    my_source.energy = openmc.stats.delta_function(14e6)
+    settings.source = my_source
+
+    model = openmc.Model(geometry, materials, settings)
+
+    rr_model = copy.deepcopy(model)
+    rr_model.settings.inactive = 3
+
+    rr_model.convert_to_multigroup(
+        method="stochastic_slab",
+        overwrite_mgxs_library=True,
+        nparticles=10,
+        groups="CASMO-2"
+    )
+
+    rr_model.convert_to_random_ray()
+
+    mesh = openmc.RegularMesh.from_domain(rr_model, dimension=(4, 4, 4))
+
+    # avoid writing files we don't make use of
+    rr_model.settings.output = {"summary": False, "tallies": False}
+
+    # Subdivide random ray source regions
+    rr_model.settings.random_ray["source_region_meshes"] = [
+        (mesh, [rr_model.geometry.root_universe])
+    ]
+
+    # less likely to get negative values in the weight window
+    rr_model.settings.random_ray["volume_estimator"] = "naive"
+
+    # Add a weight window generator to the model
+    rr_model.settings.weight_window_generators = openmc.WeightWindowGenerator(
+        method="fw_cadis",
+        mesh=mesh,
+        max_realizations=42,
+        particle_type='neutron',
+        energy_bounds=[0.0, 100e6]
+    )
+
+    rr_model.run()
+
+    model.settings.weight_windows_on = True
+    model.settings.weight_window_checkpoints = {"collision": True, "surface": True}
+    model.settings.survival_biasing = False
+    model.settings.weight_windows = openmc.WeightWindowsList.from_hdf5()
+
+    model.run()

From a64cc96ed5acfd063598cc8fc57f4ff0c9285eed Mon Sep 17 00:00:00 2001
From: GuySten <62616591+GuySten@users.noreply.github.com>
Date: Wed, 30 Jul 2025 20:10:34 +0300
Subject: [PATCH 090/203] Fixed a bug in distribcell offsets logic (#3424)

---
 include/openmc/cell.h                         |  13 ++-
 include/openmc/geometry_aux.h                 |  12 +-
 include/openmc/lattice.h                      |   2 +-
 include/openmc/universe.h                     |   1 +
 src/cell.cpp                                  |  13 ++-
 src/finalize.cpp                              |   1 -
 src/geometry_aux.cpp                          |  85 +++++---------
 src/lattice.cpp                               |   5 +-
 src/random_ray/flat_source_domain.cpp         |  10 +-
 src/tallies/filter_distribcell.cpp            |   2 +-
 .../lattice_distribmat/False/inputs_true.dat  |  74 ++++++++++++
 .../lattice_distribmat/False/results_true.dat |   2 +
 .../lattice_distribmat/True/inputs_true.dat   | 107 ++++++++++++++++++
 .../lattice_distribmat/True/results_true.dat  |   2 +
 .../lattice_distribmat/__init__.py            |   0
 .../lattice_distribmat/test.py                |  83 ++++++++++++++
 16 files changed, 325 insertions(+), 87 deletions(-)
 create mode 100644 tests/regression_tests/lattice_distribmat/False/inputs_true.dat
 create mode 100644 tests/regression_tests/lattice_distribmat/False/results_true.dat
 create mode 100644 tests/regression_tests/lattice_distribmat/True/inputs_true.dat
 create mode 100644 tests/regression_tests/lattice_distribmat/True/results_true.dat
 create mode 100644 tests/regression_tests/lattice_distribmat/__init__.py
 create mode 100644 tests/regression_tests/lattice_distribmat/test.py

diff --git a/include/openmc/cell.h b/include/openmc/cell.h
index 98709fb33..e9fcfe391 100644
--- a/include/openmc/cell.h
+++ b/include/openmc/cell.h
@@ -226,6 +226,8 @@ public:
   void set_temperature(
     double T, int32_t instance = -1, bool set_contained = false);
 
+  int32_t n_instances() const;
+
   //! Set the rotation matrix of a cell instance
   //! \param[in] rot The rotation matrix of length 3 or 9
   void set_rotation(const vector<double>& rot);
@@ -312,12 +314,11 @@ public:
   //----------------------------------------------------------------------------
   // Data members
 
-  int32_t id_;              //!< Unique ID
-  std::string name_;        //!< User-defined name
-  Fill type_;               //!< Material, universe, or lattice
-  int32_t universe_;        //!< Universe # this cell is in
-  int32_t fill_;            //!< Universe # filling this cell
-  int32_t n_instances_ {0}; //!< Number of instances of this cell
+  int32_t id_;       //!< Unique ID
+  std::string name_; //!< User-defined name
+  Fill type_;        //!< Material, universe, or lattice
+  int32_t universe_; //!< Universe # this cell is in
+  int32_t fill_;     //!< Universe # filling this cell
 
   //! \brief Index corresponding to this cell in distribcell arrays
   int distribcell_index_ {C_NONE};
diff --git a/include/openmc/geometry_aux.h b/include/openmc/geometry_aux.h
index 0c870c9fb..f60f2d649 100644
--- a/include/openmc/geometry_aux.h
+++ b/include/openmc/geometry_aux.h
@@ -15,8 +15,6 @@
 namespace openmc {
 
 namespace model {
-extern std::unordered_map<int32_t, std::unordered_map<int32_t, int32_t>>
-  universe_cell_counts;
 extern std::unordered_map<int32_t, int32_t> universe_level_counts;
 } // namespace model
 
@@ -80,15 +78,13 @@ void prepare_distribcell(
   const std::vector<int32_t>* user_distribcells = nullptr);
 
 //==============================================================================
-//! Recursively search through the geometry and count cell instances.
+//! Recursively search through the geometry and count universe instances.
 //!
-//! This function will update the Cell::n_instances value for each cell in the
-//! geometry.
-//! \param univ_indx The index of the universe to begin searching from (probably
-//!   the root universe).
+//! This function will update Universe.n_instances_ for each
+//! universe in the geometry.
 //==============================================================================
 
-void count_cell_instances(int32_t univ_indx);
+void count_universe_instances();
 
 //==============================================================================
 //! Recursively search through universes and count universe instances.
diff --git a/include/openmc/lattice.h b/include/openmc/lattice.h
index fb374ab75..f87d28b21 100644
--- a/include/openmc/lattice.h
+++ b/include/openmc/lattice.h
@@ -76,7 +76,7 @@ public:
   }
 
   //! Populate the distribcell offset tables.
-  int32_t fill_offset_table(int32_t offset, int32_t target_univ_id, int map,
+  int32_t fill_offset_table(int32_t target_univ_id, int map,
     std::unordered_map<int32_t, int32_t>& univ_count_memo);
 
   //! \brief Check lattice indices.
diff --git a/include/openmc/universe.h b/include/openmc/universe.h
index 52df432b8..b7450224f 100644
--- a/include/openmc/universe.h
+++ b/include/openmc/universe.h
@@ -29,6 +29,7 @@ class Universe {
 public:
   int32_t id_;            //!< Unique ID
   vector<int32_t> cells_; //!< Cells within this universe
+  int32_t n_instances_;   //!< Number of instances of this universe
 
   //! \brief Write universe information to an HDF5 group.
   //! \param group_id An HDF5 group id.
diff --git a/src/cell.cpp b/src/cell.cpp
index b6862ba17..d838bfbb4 100644
--- a/src/cell.cpp
+++ b/src/cell.cpp
@@ -40,6 +40,11 @@ vector<unique_ptr<Cell>> cells;
 // Cell implementation
 //==============================================================================
 
+int32_t Cell::n_instances() const
+{
+  return model::universes[universe_]->n_instances_;
+}
+
 void Cell::set_rotation(const vector<double>& rot)
 {
   if (fill_ == C_NONE) {
@@ -115,8 +120,8 @@ void Cell::set_temperature(double T, int32_t instance, bool set_contained)
   if (type_ == Fill::MATERIAL) {
     if (instance >= 0) {
       // If temperature vector is not big enough, resize it first
-      if (sqrtkT_.size() != n_instances_)
-        sqrtkT_.resize(n_instances_, sqrtkT_[0]);
+      if (sqrtkT_.size() != n_instances())
+        sqrtkT_.resize(n_instances(), sqrtkT_[0]);
 
       // Set temperature for the corresponding instance
       sqrtkT_.at(instance) = std::sqrt(K_BOLTZMANN * T);
@@ -170,7 +175,7 @@ void Cell::import_properties_hdf5(hid_t group)
 
   // Ensure number of temperatures makes sense
   auto n_temps = temps.size();
-  if (n_temps > 1 && n_temps != n_instances_) {
+  if (n_temps > 1 && n_temps != n_instances()) {
     throw std::runtime_error(fmt::format(
       "Number of temperatures for cell {} doesn't match number of instances",
       id_));
@@ -1618,7 +1623,7 @@ extern "C" int openmc_cell_get_num_instances(
     set_errmsg("Index in cells array is out of bounds.");
     return OPENMC_E_OUT_OF_BOUNDS;
   }
-  *num_instances = model::cells[index]->n_instances_;
+  *num_instances = model::cells[index]->n_instances();
   return 0;
 }
 
diff --git a/src/finalize.cpp b/src/finalize.cpp
index 2d14cdec8..e38b0b251 100644
--- a/src/finalize.cpp
+++ b/src/finalize.cpp
@@ -185,7 +185,6 @@ int openmc_finalize()
 int openmc_reset()
 {
 
-  model::universe_cell_counts.clear();
   model::universe_level_counts.clear();
 
   for (auto& t : model::tallies) {
diff --git a/src/geometry_aux.cpp b/src/geometry_aux.cpp
index 2f8a55743..51732cf8b 100644
--- a/src/geometry_aux.cpp
+++ b/src/geometry_aux.cpp
@@ -25,21 +25,9 @@
 namespace openmc {
 
 namespace model {
-std::unordered_map<int32_t, std::unordered_map<int32_t, int32_t>>
-  universe_cell_counts;
 std::unordered_map<int32_t, int32_t> universe_level_counts;
 } // namespace model
 
-// adds the cell counts of universe b to universe a
-void update_universe_cell_count(int32_t a, int32_t b)
-{
-  auto& universe_a_counts = model::universe_cell_counts[a];
-  const auto& universe_b_counts = model::universe_cell_counts[b];
-  for (const auto& it : universe_b_counts) {
-    universe_a_counts[it.first] += it.second;
-  }
-}
-
 void read_geometry_xml()
 {
   // Display output message
@@ -263,7 +251,7 @@ void finalize_geometry()
 {
   // Perform some final operations to set up the geometry
   adjust_indices();
-  count_cell_instances(model::root_universe);
+  count_universe_instances();
   partition_universes();
 
   // Assign temperatures to cells that don't have temperatures already assigned
@@ -356,35 +344,38 @@ void prepare_distribcell(const std::vector<int32_t>* user_distribcells)
     Cell& c {*model::cells[i]};
 
     if (c.material_.size() > 1) {
-      if (c.material_.size() != c.n_instances_) {
+      if (c.material_.size() != c.n_instances()) {
         fatal_error(fmt::format(
           "Cell {} was specified with {} materials but has {} distributed "
           "instances. The number of materials must equal one or the number "
           "of instances.",
-          c.id_, c.material_.size(), c.n_instances_));
+          c.id_, c.material_.size(), c.n_instances()));
       }
     }
 
     if (c.sqrtkT_.size() > 1) {
-      if (c.sqrtkT_.size() != c.n_instances_) {
+      if (c.sqrtkT_.size() != c.n_instances()) {
         fatal_error(fmt::format(
           "Cell {} was specified with {} temperatures but has {} distributed "
           "instances. The number of temperatures must equal one or the number "
           "of instances.",
-          c.id_, c.sqrtkT_.size(), c.n_instances_));
+          c.id_, c.sqrtkT_.size(), c.n_instances()));
       }
     }
   }
 
   // Search through universes for material cells and assign each one a
-  // unique distribcell array index.
-  int distribcell_index = 0;
+  // distribcell array index according to the containing universe.
   vector<int32_t> target_univ_ids;
   for (const auto& u : model::universes) {
     for (auto idx : u->cells_) {
       if (distribcells.find(idx) != distribcells.end()) {
-        model::cells[idx]->distribcell_index_ = distribcell_index++;
-        target_univ_ids.push_back(u->id_);
+        if (!contains(target_univ_ids, u->id_)) {
+          target_univ_ids.push_back(u->id_);
+        }
+        model::cells[idx]->distribcell_index_ =
+          std::find(target_univ_ids.begin(), target_univ_ids.end(), u->id_) -
+          target_univ_ids.begin();
       }
     }
   }
@@ -419,8 +410,7 @@ void prepare_distribcell(const std::vector<int32_t>* user_distribcells)
         } else if (c.type_ == Fill::LATTICE) {
           c.offset_[map] = offset;
           Lattice& lat = *model::lattices[c.fill_];
-          offset +=
-            lat.fill_offset_table(offset, target_univ_id, map, univ_count_memo);
+          offset += lat.fill_offset_table(target_univ_id, map, univ_count_memo);
         }
       }
     }
@@ -429,32 +419,12 @@ void prepare_distribcell(const std::vector<int32_t>* user_distribcells)
 
 //==============================================================================
 
-void count_cell_instances(int32_t univ_indx)
+void count_universe_instances()
 {
-  const auto univ_counts = model::universe_cell_counts.find(univ_indx);
-  if (univ_counts != model::universe_cell_counts.end()) {
-    for (const auto& it : univ_counts->second) {
-      model::cells[it.first]->n_instances_ += it.second;
-    }
-  } else {
-    for (int32_t cell_indx : model::universes[univ_indx]->cells_) {
-      Cell& c = *model::cells[cell_indx];
-      ++c.n_instances_;
-      model::universe_cell_counts[univ_indx][cell_indx] += 1;
-
-      if (c.type_ == Fill::UNIVERSE) {
-        // This cell contains another universe.  Recurse into that universe.
-        count_cell_instances(c.fill_);
-        update_universe_cell_count(univ_indx, c.fill_);
-      } else if (c.type_ == Fill::LATTICE) {
-        // This cell contains a lattice.  Recurse into the lattice universes.
-        Lattice& lat = *model::lattices[c.fill_];
-        for (auto it = lat.begin(); it != lat.end(); ++it) {
-          count_cell_instances(*it);
-          update_universe_cell_count(univ_indx, *it);
-        }
-      }
-    }
+  for (auto& univ : model::universes) {
+    std::unordered_map<int32_t, int32_t> univ_count_memo;
+    univ->n_instances_ = count_universe_instances(
+      model::root_universe, univ->id_, univ_count_memo);
   }
 }
 
@@ -528,19 +498,16 @@ std::string distribcell_path_inner(int32_t target_cell, int32_t map,
 
     // Material cells don't contain other cells so ignore them.
     if (c.type_ != Fill::MATERIAL) {
-      int32_t temp_offset;
-      if (c.type_ == Fill::UNIVERSE) {
-        temp_offset =
-          offset + c.offset_[map]; // TODO: should also apply to lattice fills?
-      } else {
+      int32_t temp_offset = offset + c.offset_[map];
+      if (c.type_ == Fill::LATTICE) {
         Lattice& lat = *model::lattices[c.fill_];
         int32_t indx = lat.universes_.size() * map + lat.begin().indx_;
-        temp_offset = offset + lat.offsets_[indx];
+        temp_offset += lat.offsets_[indx];
       }
 
       // The desired cell is the first cell that gives an offset smaller or
       // equal to the target offset.
-      if (temp_offset <= target_offset - c.offset_[map])
+      if (temp_offset <= target_offset)
         break;
     }
   }
@@ -570,12 +537,12 @@ std::string distribcell_path_inner(int32_t target_cell, int32_t map,
     path << "l" << lat.id_;
     for (ReverseLatticeIter it = lat.rbegin(); it != lat.rend(); ++it) {
       int32_t indx = lat.universes_.size() * map + it.indx_;
-      int32_t temp_offset = offset + lat.offsets_[indx];
-      if (temp_offset <= target_offset - c.offset_[map]) {
+      int32_t temp_offset = offset + lat.offsets_[indx] + c.offset_[map];
+      if (temp_offset <= target_offset) {
         offset = temp_offset;
         path << "(" << lat.index_to_string(it.indx_) << ")->";
-        path << distribcell_path_inner(target_cell, map, target_offset,
-          *model::universes[*it], offset + c.offset_[map]);
+        path << distribcell_path_inner(
+          target_cell, map, target_offset, *model::universes[*it], offset);
         return path.str();
       }
     }
diff --git a/src/lattice.cpp b/src/lattice.cpp
index 73005ad09..efbfcb216 100644
--- a/src/lattice.cpp
+++ b/src/lattice.cpp
@@ -103,8 +103,8 @@ void Lattice::adjust_indices()
 
 //==============================================================================
 
-int32_t Lattice::fill_offset_table(int32_t offset, int32_t target_univ_id,
-  int map, std::unordered_map<int32_t, int32_t>& univ_count_memo)
+int32_t Lattice::fill_offset_table(int32_t target_univ_id, int map,
+  std::unordered_map<int32_t, int32_t>& univ_count_memo)
 {
   // If the offsets have already been determined for this "map", don't bother
   // recalculating all of them and just return the total offset. Note that the
@@ -119,6 +119,7 @@ int32_t Lattice::fill_offset_table(int32_t offset, int32_t target_univ_id,
            count_universe_instances(last_univ, target_univ_id, univ_count_memo);
   }
 
+  int32_t offset = 0;
   for (LatticeIter it = begin(); it != end(); ++it) {
     offsets_[map * universes_.size() + it.indx_] = offset;
     offset += count_universe_instances(*it, target_univ_id, univ_count_memo);
diff --git a/src/random_ray/flat_source_domain.cpp b/src/random_ray/flat_source_domain.cpp
index b04b72981..409238830 100644
--- a/src/random_ray/flat_source_domain.cpp
+++ b/src/random_ray/flat_source_domain.cpp
@@ -46,7 +46,7 @@ FlatSourceDomain::FlatSourceDomain() : negroups_(data::mg.num_energy_groups_)
       source_region_offsets_.push_back(-1);
     } else {
       source_region_offsets_.push_back(base_source_regions);
-      base_source_regions += c->n_instances_;
+      base_source_regions += c->n_instances();
     }
   }
 
@@ -61,7 +61,7 @@ FlatSourceDomain::FlatSourceDomain() : negroups_(data::mg.num_energy_groups_)
   for (int i = 0; i < model::cells.size(); i++) {
     Cell& cell = *model::cells[i];
     if (cell.type_ == Fill::MATERIAL) {
-      for (int j = 0; j < cell.n_instances_; j++) {
+      for (int j = 0; j < cell.n_instances(); j++) {
         source_regions_.material(source_region_id++) = cell.material(j);
       }
     }
@@ -1014,7 +1014,7 @@ void FlatSourceDomain::apply_external_source_to_cell_and_children(
   Cell& cell = *model::cells[i_cell];
 
   if (cell.type_ == Fill::MATERIAL) {
-    vector<int> instances(cell.n_instances_);
+    vector<int> instances(cell.n_instances());
     std::iota(instances.begin(), instances.end(), 0);
     apply_external_source_to_cell_instances(
       i_cell, discrete, strength_factor, target_material_id, instances);
@@ -1343,12 +1343,12 @@ void FlatSourceDomain::apply_mesh_to_cell_and_children(int32_t i_cell,
   Cell& cell = *model::cells[i_cell];
 
   if (cell.type_ == Fill::MATERIAL) {
-    vector<int> instances(cell.n_instances_);
+    vector<int> instances(cell.n_instances());
     std::iota(instances.begin(), instances.end(), 0);
     apply_mesh_to_cell_instances(
       i_cell, mesh_idx, target_material_id, instances, is_target_void);
   } else if (target_material_id == C_NONE && !is_target_void) {
-    for (int j = 0; j < cell.n_instances_; j++) {
+    for (int j = 0; j < cell.n_instances(); j++) {
       std::unordered_map<int32_t, vector<int32_t>> cell_instance_list =
         cell.get_contained_cells(j, nullptr);
       for (const auto& pair : cell_instance_list) {
diff --git a/src/tallies/filter_distribcell.cpp b/src/tallies/filter_distribcell.cpp
index 02e88dde2..f511a6816 100644
--- a/src/tallies/filter_distribcell.cpp
+++ b/src/tallies/filter_distribcell.cpp
@@ -34,7 +34,7 @@ void DistribcellFilter::set_cell(int32_t cell)
   assert(cell >= 0);
   assert(cell < model::cells.size());
   cell_ = cell;
-  n_bins_ = model::cells[cell]->n_instances_;
+  n_bins_ = model::cells[cell]->n_instances();
 }
 
 void DistribcellFilter::get_all_bins(
diff --git a/tests/regression_tests/lattice_distribmat/False/inputs_true.dat b/tests/regression_tests/lattice_distribmat/False/inputs_true.dat
new file mode 100644
index 000000000..d39a10369
--- /dev/null
+++ b/tests/regression_tests/lattice_distribmat/False/inputs_true.dat
@@ -0,0 +1,74 @@
+<?xml version='1.0' encoding='utf-8'?>
+<model>
+  <materials>
+    <material depletable="true" id="1" name="UO2">
+      <density units="g/cm3" value="10.0"/>
+      <nuclide ao="1.0" name="U235"/>
+      <nuclide ao="2.0" name="O16"/>
+    </material>
+    <material id="2" name="light water">
+      <density units="g/cm3" value="1.0"/>
+      <nuclide ao="2.0" name="H1"/>
+      <nuclide ao="1.0" name="O16"/>
+      <sab name="c_H_in_H2O"/>
+    </material>
+  </materials>
+  <geometry>
+    <cell id="1" material="1" region="-1" universe="1"/>
+    <cell id="2" material="2" region="1" universe="1"/>
+    <cell fill="2" id="3" region="2 -3 4 -5" universe="6"/>
+    <cell fill="3" id="4" region="2 -3 5 -9" universe="6"/>
+    <cell fill="4" id="5" region="3 -11 4 -5" universe="6"/>
+    <cell fill="5" id="6" region="3 -11 5 -9" universe="6"/>
+    <cell fill="6" id="7" region="18 -19 20 -21" universe="7"/>
+    <lattice id="2">
+      <pitch>1.0 1.0</pitch>
+      <outer>1</outer>
+      <dimension>1 1</dimension>
+      <lower_left>-1.0 -1.0</lower_left>
+      <universes>
+1 </universes>
+    </lattice>
+    <lattice id="3">
+      <pitch>1.0 1.0</pitch>
+      <outer>1</outer>
+      <dimension>1 1</dimension>
+      <lower_left>-1.0 0</lower_left>
+      <universes>
+1 </universes>
+    </lattice>
+    <lattice id="4">
+      <pitch>1.0 1.0</pitch>
+      <outer>1</outer>
+      <dimension>1 1</dimension>
+      <lower_left>0 -1.0</lower_left>
+      <universes>
+1 </universes>
+    </lattice>
+    <lattice id="5">
+      <pitch>1.0 1.0</pitch>
+      <outer>1</outer>
+      <dimension>1 1</dimension>
+      <lower_left>0 0</lower_left>
+      <universes>
+1 </universes>
+    </lattice>
+    <surface coeffs="0.0 0.0 0.4" id="1" type="z-cylinder"/>
+    <surface coeffs="-1.0" id="2" name="minimum x" type="x-plane"/>
+    <surface coeffs="0.0" id="3" name="maximum x" type="x-plane"/>
+    <surface coeffs="-1.0" id="4" name="minimum y" type="y-plane"/>
+    <surface coeffs="0.0" id="5" name="maximum y" type="y-plane"/>
+    <surface coeffs="1.0" id="9" name="maximum y" type="y-plane"/>
+    <surface coeffs="1.0" id="11" name="maximum x" type="x-plane"/>
+    <surface boundary="reflective" coeffs="-1.0" id="18" name="minimum x" type="x-plane"/>
+    <surface boundary="reflective" coeffs="1.0" id="19" name="maximum x" type="x-plane"/>
+    <surface boundary="reflective" coeffs="-1.0" id="20" name="minimum y" type="y-plane"/>
+    <surface boundary="reflective" coeffs="1.0" id="21" name="maximum y" type="y-plane"/>
+  </geometry>
+  <settings>
+    <run_mode>eigenvalue</run_mode>
+    <particles>1000</particles>
+    <batches>10</batches>
+    <inactive>5</inactive>
+  </settings>
+  </model>
diff --git a/tests/regression_tests/lattice_distribmat/False/results_true.dat b/tests/regression_tests/lattice_distribmat/False/results_true.dat
new file mode 100644
index 000000000..45a9ddb0a
--- /dev/null
+++ b/tests/regression_tests/lattice_distribmat/False/results_true.dat
@@ -0,0 +1,2 @@
+k-combined:
+1.863277E+00 1.289821E-02
diff --git a/tests/regression_tests/lattice_distribmat/True/inputs_true.dat b/tests/regression_tests/lattice_distribmat/True/inputs_true.dat
new file mode 100644
index 000000000..450306a0c
--- /dev/null
+++ b/tests/regression_tests/lattice_distribmat/True/inputs_true.dat
@@ -0,0 +1,107 @@
+<?xml version='1.0' encoding='utf-8'?>
+<model>
+  <materials>
+    <material depletable="true" id="1" name="UO2">
+      <density units="g/cm3" value="10.0"/>
+      <nuclide ao="1.0" name="U235"/>
+      <nuclide ao="2.0" name="O16"/>
+    </material>
+    <material depletable="true" id="2" name="UO2">
+      <density units="g/cm3" value="10.0"/>
+      <nuclide ao="1.0" name="U235"/>
+      <nuclide ao="2.0" name="O16"/>
+    </material>
+    <material depletable="true" id="3" name="UO2">
+      <density units="g/cm3" value="10.0"/>
+      <nuclide ao="1.0" name="U235"/>
+      <nuclide ao="2.0" name="O16"/>
+    </material>
+    <material depletable="true" id="4" name="UO2">
+      <density units="g/cm3" value="10.0"/>
+      <nuclide ao="1.0" name="U235"/>
+      <nuclide ao="2.0" name="O16"/>
+    </material>
+    <material id="5" name="light water">
+      <density units="g/cm3" value="1.0"/>
+      <nuclide ao="2.0" name="H1"/>
+      <nuclide ao="1.0" name="O16"/>
+      <sab name="c_H_in_H2O"/>
+    </material>
+    <material id="6" name="light water">
+      <density units="g/cm3" value="1.0"/>
+      <nuclide ao="2.0" name="H1"/>
+      <nuclide ao="1.0" name="O16"/>
+      <sab name="c_H_in_H2O"/>
+    </material>
+    <material id="7" name="light water">
+      <density units="g/cm3" value="1.0"/>
+      <nuclide ao="2.0" name="H1"/>
+      <nuclide ao="1.0" name="O16"/>
+      <sab name="c_H_in_H2O"/>
+    </material>
+    <material id="8" name="light water">
+      <density units="g/cm3" value="1.0"/>
+      <nuclide ao="2.0" name="H1"/>
+      <nuclide ao="1.0" name="O16"/>
+      <sab name="c_H_in_H2O"/>
+    </material>
+  </materials>
+  <geometry>
+    <cell id="8" material="1 2 3 4" region="-6" universe="8"/>
+    <cell id="9" material="5 6 7 8" region="6" universe="8"/>
+    <cell fill="9" id="10" region="7 -8 10 -12" universe="13"/>
+    <cell fill="10" id="11" region="7 -8 12 -16" universe="13"/>
+    <cell fill="11" id="12" region="8 -22 10 -12" universe="13"/>
+    <cell fill="12" id="13" region="8 -22 12 -16" universe="13"/>
+    <cell fill="13" id="14" region="29 -30 31 -32" universe="14"/>
+    <lattice id="9">
+      <pitch>1.0 1.0</pitch>
+      <outer>8</outer>
+      <dimension>1 1</dimension>
+      <lower_left>-1.0 -1.0</lower_left>
+      <universes>
+8 </universes>
+    </lattice>
+    <lattice id="10">
+      <pitch>1.0 1.0</pitch>
+      <outer>8</outer>
+      <dimension>1 1</dimension>
+      <lower_left>-1.0 0</lower_left>
+      <universes>
+8 </universes>
+    </lattice>
+    <lattice id="11">
+      <pitch>1.0 1.0</pitch>
+      <outer>8</outer>
+      <dimension>1 1</dimension>
+      <lower_left>0 -1.0</lower_left>
+      <universes>
+8 </universes>
+    </lattice>
+    <lattice id="12">
+      <pitch>1.0 1.0</pitch>
+      <outer>8</outer>
+      <dimension>1 1</dimension>
+      <lower_left>0 0</lower_left>
+      <universes>
+8 </universes>
+    </lattice>
+    <surface coeffs="0.0 0.0 0.4" id="6" type="z-cylinder"/>
+    <surface coeffs="-1.0" id="7" name="minimum x" type="x-plane"/>
+    <surface coeffs="0.0" id="8" name="maximum x" type="x-plane"/>
+    <surface coeffs="-1.0" id="10" name="minimum y" type="y-plane"/>
+    <surface coeffs="0.0" id="12" name="maximum y" type="y-plane"/>
+    <surface coeffs="1.0" id="16" name="maximum y" type="y-plane"/>
+    <surface coeffs="1.0" id="22" name="maximum x" type="x-plane"/>
+    <surface boundary="reflective" coeffs="-1.0" id="29" name="minimum x" type="x-plane"/>
+    <surface boundary="reflective" coeffs="1.0" id="30" name="maximum x" type="x-plane"/>
+    <surface boundary="reflective" coeffs="-1.0" id="31" name="minimum y" type="y-plane"/>
+    <surface boundary="reflective" coeffs="1.0" id="32" name="maximum y" type="y-plane"/>
+  </geometry>
+  <settings>
+    <run_mode>eigenvalue</run_mode>
+    <particles>1000</particles>
+    <batches>10</batches>
+    <inactive>5</inactive>
+  </settings>
+  </model>
diff --git a/tests/regression_tests/lattice_distribmat/True/results_true.dat b/tests/regression_tests/lattice_distribmat/True/results_true.dat
new file mode 100644
index 000000000..45a9ddb0a
--- /dev/null
+++ b/tests/regression_tests/lattice_distribmat/True/results_true.dat
@@ -0,0 +1,2 @@
+k-combined:
+1.863277E+00 1.289821E-02
diff --git a/tests/regression_tests/lattice_distribmat/__init__.py b/tests/regression_tests/lattice_distribmat/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/regression_tests/lattice_distribmat/test.py b/tests/regression_tests/lattice_distribmat/test.py
new file mode 100644
index 000000000..4d0b6e156
--- /dev/null
+++ b/tests/regression_tests/lattice_distribmat/test.py
@@ -0,0 +1,83 @@
+import numpy as np
+import openmc
+from openmc.utility_funcs import change_directory
+import pytest
+
+from tests.testing_harness import PyAPITestHarness
+
+
+@pytest.fixture
+def model():
+    model = openmc.model.Model()
+
+    uo2 = openmc.Material(name='UO2')
+    uo2.set_density('g/cm3', 10.0)
+    uo2.add_nuclide('U235', 1.0)
+    uo2.add_nuclide('O16', 2.0)
+    water = openmc.Material(name='light water')
+    water.add_nuclide('H1', 2.0)
+    water.add_nuclide('O16', 1.0)
+    water.set_density('g/cm3', 1.0)
+    water.add_s_alpha_beta('c_H_in_H2O')
+    model.materials.extend([uo2, water])
+
+    cyl = openmc.ZCylinder(r=0.4)
+    pin = openmc.model.pin([cyl], [uo2, water])
+    d = 1.0
+    
+    lattice00 = openmc.RectLattice()
+    lattice00.lower_left = (-d, -d)
+    lattice00.pitch = (d, d)
+    lattice00.outer = pin
+    lattice00.universes = [[pin]]
+    box00 = openmc.model.RectangularPrism(d, d, origin=(-d/2,-d/2))
+    
+    lattice01 = openmc.RectLattice()
+    lattice01.lower_left = (-d, 0)
+    lattice01.pitch = (d, d)
+    lattice01.outer = pin
+    lattice01.universes = [[pin]]
+    box01 = openmc.model.RectangularPrism(d, d, origin=(-d/2,d/2))
+    
+    lattice10 = openmc.RectLattice()
+    lattice10.lower_left = (0, -d)
+    lattice10.pitch = (d, d)
+    lattice10.outer = pin
+    lattice10.universes = [[pin]]
+    box10 = openmc.model.RectangularPrism(d, d, origin=(d/2,-d/2))
+    
+    lattice11 = openmc.RectLattice()
+    lattice11.lower_left = (0, 0)
+    lattice11.pitch = (d, d)
+    lattice11.outer = pin
+    lattice11.universes = [[pin]]
+    box11 = openmc.model.RectangularPrism(d, d, origin=(d/2,d/2))
+    
+    
+    cell00 = openmc.Cell(fill=lattice00, region = -box00)
+    cell01 = openmc.Cell(fill=lattice01, region = -box01)
+    cell10 = openmc.Cell(fill=lattice10, region = -box10)
+    cell11 = openmc.Cell(fill=lattice11, region = -box11)
+    
+    univ = openmc.Universe(cells=[cell00, cell01, cell10, cell11])
+    
+    box = openmc.model.RectangularPrism(2*d, 2*d, boundary_type='reflective')
+
+    main_cell = openmc.Cell(fill=univ, region=-box)
+    model.geometry = openmc.Geometry([main_cell])
+    model.geometry.merge_surfaces = True
+   
+    model.settings.batches = 10
+    model.settings.inactive = 5
+    model.settings.particles = 1000
+    
+    return model
+
+@pytest.mark.parametrize("distribmat", [False, True])
+def test_lattice(model, distribmat):
+    with change_directory(str(distribmat)):
+        openmc.reset_auto_ids()
+        if distribmat:
+            model.differentiate_mats(depletable_only=False)
+        harness = PyAPITestHarness('statepoint.10.h5', model)
+        harness.main()

From 4fabed542da3d2e37eeba31872987e090b6ffc4b Mon Sep 17 00:00:00 2001
From: GuySten <62616591+GuySten@users.noreply.github.com>
Date: Fri, 8 Aug 2025 03:53:33 +0300
Subject: [PATCH 091/203] fixed a bug in MeshMaterialFilter.from_volumes
 (#3520)

Co-authored-by: Paul Romano <paul.k.romano@gmail.com>
---
 openmc/filter.py                             | 7 ++++++-
 tests/unit_tests/test_filter_meshmaterial.py | 3 ++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/openmc/filter.py b/openmc/filter.py
index f29c54085..53fec898f 100644
--- a/openmc/filter.py
+++ b/openmc/filter.py
@@ -1082,7 +1082,12 @@ class MeshMaterialFilter(MeshFilter):
             A new MeshMaterialFilter instance
 
         """
-        bins = list(zip(*np.where(volumes._materials > -1)))
+        # Get flat arrays of material IDs and element indices
+        mat_ids = volumes._materials[volumes._materials > -1]
+        elems, _ = np.where(volumes._materials > -1)
+
+        # Stack them into a 2D array of (element, material) pairs
+        bins = np.column_stack((elems, mat_ids))
         return cls(mesh, bins)
 
     def __hash__(self):
diff --git a/tests/unit_tests/test_filter_meshmaterial.py b/tests/unit_tests/test_filter_meshmaterial.py
index 120533209..a05ed5a12 100644
--- a/tests/unit_tests/test_filter_meshmaterial.py
+++ b/tests/unit_tests/test_filter_meshmaterial.py
@@ -9,6 +9,7 @@ def test_filter_mesh_material(run_in_tmpdir):
     materials = []
     for i in range(4):
         mat = openmc.Material()
+        mat.id = 10*(i+1)
         mat.add_nuclide('Fe56', 1.0)
         materials.append(mat)
 
@@ -35,7 +36,7 @@ def test_filter_mesh_material(run_in_tmpdir):
     # MeshMaterialFilter with corresponding bins
     vols = mesh.material_volumes(model)
     mmf = openmc.MeshMaterialFilter.from_volumes(mesh, vols)
-    expected_bins = [(0, 1), (1, 1), (1, 2), (2, 2), (2, 3), (3, 3), (3, 4), (4, 4)]
+    expected_bins = [(0, 10), (1, 10), (1, 20), (2, 20), (2, 30), (3, 40), (3, 30), (4, 40)]
     np.testing.assert_equal(mmf.bins, expected_bins)
 
     # Create two tallies, one with a mesh filter and one with mesh-material

From 4500f07b44daec71f38d0d9b73736e41f9d23815 Mon Sep 17 00:00:00 2001
From: GuySten <62616591+GuySten@users.noreply.github.com>
Date: Fri, 8 Aug 2025 12:59:22 +0300
Subject: [PATCH 092/203] Remove reorder_attributes from openmc._xml (#3519)

---
 openmc/_xml.py                                |   17 -
 openmc/data/library.py                        |    3 +-
 openmc/geometry.py                            |    1 -
 openmc/material.py                            |    4 +-
 openmc/plots.py                               |    4 +-
 openmc/settings.py                            |    3 +-
 openmc/tallies.py                             |    3 +-
 .../adj_cell_rotation/inputs_true.dat         |   32 +-
 .../asymmetric_lattice/inputs_true.dat        |   92 +-
 .../cpp_driver/inputs_true.dat                |   32 +-
 .../create_fission_neutrons/inputs_true.dat   |   26 +-
 .../dagmc/external/inputs_true.dat            |   16 +-
 .../dagmc/legacy/inputs_true.dat              |   16 +-
 .../dagmc/refl/inputs_true.dat                |    4 +-
 .../dagmc/universes/inputs_true.dat           |   50 +-
 .../dagmc/uwuw/inputs_true.dat                |    4 +-
 .../last_step_reference_materials.xml         | 2082 ++++++++---------
 .../diff_tally/inputs_true.dat                |  116 +-
 .../distribmat/inputs_true.dat                |   36 +-
 .../eigenvalue_genperbatch/inputs_true.dat    |   10 +-
 .../energy_cutoff/inputs_true.dat             |   22 +-
 .../energy_laws/inputs_true.dat               |   16 +-
 .../external_moab/inputs_true.dat             |   72 +-
 .../filter_cellfrom/inputs_true.dat           |   64 +-
 .../filter_cellinstance/inputs_true.dat       |   28 +-
 .../filter_energyfun/inputs_true.dat          |    8 +-
 .../filter_mesh/inputs_true.dat               |   30 +-
 .../filter_meshborn/inputs_true.dat           |    8 +-
 .../filter_musurface/inputs_true.dat          |   14 +-
 .../filter_translations/inputs_true.dat       |   34 +-
 .../fixed_source/inputs_true.dat              |   12 +-
 tests/regression_tests/ifp/inputs_true.dat    |   10 +-
 .../iso_in_lab/inputs_true.dat                |  106 +-
 .../lattice_distribmat/False/inputs_true.dat  |   46 +-
 .../lattice_distribmat/True/inputs_true.dat   |   88 +-
 .../lattice_hex_coincident/inputs_true.dat    |   70 +-
 .../lattice_hex_x/inputs_true.dat             |   70 +-
 .../lattice_multiple/inputs_true.dat          |   30 +-
 .../lattice_rotated/inputs_true.dat           |   34 +-
 .../regression_tests/mg_basic/inputs_true.dat |   30 +-
 .../mg_basic_delayed/inputs_true.dat          |   28 +-
 .../mg_convert/inputs_true.dat                |   14 +-
 .../mg_legendre/inputs_true.dat               |    8 +-
 .../mg_max_order/inputs_true.dat              |    8 +-
 .../mg_survival_biasing/inputs_true.dat       |    8 +-
 .../mg_tallies/inputs_true.dat                |    8 +-
 .../mg_temperature_multi/inputs_true.dat      |   24 +-
 .../mgxs_library_ce_to_mg/inputs_true.dat     |   54 +-
 .../inputs_true.dat                           |   54 +-
 .../mgxs_library_condense/inputs_true.dat     |   54 +-
 .../mgxs_library_correction/inputs_true.dat   |   54 +-
 .../mgxs_library_distribcell/inputs_true.dat  |   62 +-
 .../mgxs_library_hdf5/inputs_true.dat         |   54 +-
 .../mgxs_library_histogram/inputs_true.dat    |   54 +-
 .../mgxs_library_mesh/inputs_true.dat         |   30 +-
 .../mgxs_library_no_nuclides/inputs_true.dat  |   54 +-
 .../mgxs_library_nuclides/inputs_true.dat     |   54 +-
 .../inputs_true.dat                           |   54 +-
 .../adj_cell_rotation_inputs_true.dat         |   32 +-
 .../model_xml/energy_laws_inputs_true.dat     |   16 +-
 .../lattice_multiple_inputs_true.dat          |   30 +-
 .../photon_production_inputs_true.dat         |   16 +-
 .../multipole/inputs_true.dat                 |   26 +-
 .../regression_tests/ncrystal/inputs_true.dat |   14 +-
 .../regression_tests/periodic/inputs_true.dat |   28 +-
 .../periodic_6fold/inputs_true.dat            |   22 +-
 .../periodic_hex/inputs_true.dat              |   18 +-
 .../photon_production/inputs_true.dat         |   16 +-
 .../photon_production_fission/inputs_true.dat |   10 +-
 .../photon_source/inputs_true.dat             |   14 +-
 .../pulse_height/inputs_true.dat              |   16 +-
 .../inputs_true.dat                           |   32 +-
 .../random_ray_adjoint_k_eff/inputs_true.dat  |   74 +-
 .../infinite_medium/inputs_true.dat           |   30 +-
 .../material_wise/inputs_true.dat             |   30 +-
 .../stochastic_slab/inputs_true.dat           |   30 +-
 .../inputs_true.dat                           |   30 +-
 .../cell/inputs_true.dat                      |   32 +-
 .../material/inputs_true.dat                  |   32 +-
 .../universe/inputs_true.dat                  |   32 +-
 .../linear/inputs_true.dat                    |   32 +-
 .../linear_xy/inputs_true.dat                 |   32 +-
 .../flat/inputs_true.dat                      |   32 +-
 .../linear/inputs_true.dat                    |   32 +-
 .../False/inputs_true.dat                     |   32 +-
 .../True/inputs_true.dat                      |   32 +-
 .../flat/inputs_true.dat                      |   80 +-
 .../linear_xy/inputs_true.dat                 |   80 +-
 .../random_ray_halton_samples/inputs_true.dat |   74 +-
 .../random_ray_k_eff/inputs_true.dat          |   74 +-
 .../random_ray_k_eff_mesh/inputs_true.dat     |   74 +-
 .../random_ray_linear/linear/inputs_true.dat  |   74 +-
 .../linear_xy/inputs_true.dat                 |   74 +-
 .../inputs_true.dat                           |   32 +-
 .../random_ray_void/flat/inputs_true.dat      |   32 +-
 .../random_ray_void/linear/inputs_true.dat    |   32 +-
 .../hybrid/inputs_true.dat                    |   32 +-
 .../naive/inputs_true.dat                     |   32 +-
 .../simulation_averaged/inputs_true.dat       |   32 +-
 .../hybrid/inputs_true.dat                    |   32 +-
 .../naive/inputs_true.dat                     |   32 +-
 .../simulation_averaged/inputs_true.dat       |   32 +-
 .../resonance_scattering/inputs_true.dat      |   16 +-
 .../salphabeta/inputs_true.dat                |   60 +-
 .../score_current/inputs_true.dat             |   30 +-
 tests/regression_tests/source/inputs_true.dat |  102 +-
 .../source_dlopen/inputs_true.dat             |   14 +-
 .../inputs_true.dat                           |   14 +-
 tests/regression_tests/stride/inputs_true.dat |   10 +-
 .../surface_source/inputs_true_read_h5.dat    |    8 +-
 .../surface_source/inputs_true_read_mcpl.dat  |    8 +-
 .../surface_source/inputs_true_write_h5.dat   |   10 +-
 .../surface_source/inputs_true_write_mcpl.dat |   10 +-
 .../case-01/inputs_true.dat                   |   54 +-
 .../case-02/inputs_true.dat                   |   54 +-
 .../case-03/inputs_true.dat                   |   54 +-
 .../case-04/inputs_true.dat                   |   54 +-
 .../case-05/inputs_true.dat                   |   54 +-
 .../case-06/inputs_true.dat                   |   54 +-
 .../case-07/inputs_true.dat                   |   54 +-
 .../case-08/inputs_true.dat                   |   54 +-
 .../case-09/inputs_true.dat                   |   54 +-
 .../case-10/inputs_true.dat                   |   54 +-
 .../case-11/inputs_true.dat                   |   54 +-
 .../case-12/inputs_true.dat                   |   42 +-
 .../case-13/inputs_true.dat                   |   42 +-
 .../case-14/inputs_true.dat                   |   42 +-
 .../case-15/inputs_true.dat                   |   42 +-
 .../case-16/inputs_true.dat                   |   42 +-
 .../case-17/inputs_true.dat                   |   42 +-
 .../case-18/inputs_true.dat                   |   42 +-
 .../case-19/inputs_true.dat                   |   42 +-
 .../case-20/inputs_true.dat                   |   42 +-
 .../case-21/inputs_true.dat                   |   42 +-
 .../case-a01/inputs_true.dat                  |   54 +-
 .../case-d01/inputs_true.dat                  |   16 +-
 .../case-d02/inputs_true.dat                  |   16 +-
 .../case-d03/inputs_true.dat                  |   16 +-
 .../case-d04/inputs_true.dat                  |   16 +-
 .../case-d05/inputs_true.dat                  |   16 +-
 .../case-d06/inputs_true.dat                  |   16 +-
 .../case-d07/inputs_true.dat                  |   42 +-
 .../case-d08/inputs_true.dat                  |   42 +-
 .../case-e01/inputs_true.dat                  |   54 +-
 .../case-e02/inputs_true.dat                  |   54 +-
 .../case-e03/inputs_true.dat                  |   42 +-
 .../surface_tally/inputs_true.dat             |   36 +-
 .../regression_tests/tallies/inputs_true.dat  |  108 +-
 .../tally_aggregation/inputs_true.dat         |   30 +-
 .../tally_arithmetic/inputs_true.dat          |   20 +-
 .../tally_slice_merge/inputs_true.dat         |  106 +-
 .../time_cutoff/inputs_true.dat               |    4 +-
 tests/regression_tests/torus/inputs_true.dat  |   28 +-
 .../torus/large_major/inputs_true.dat         |   16 +-
 .../inputs_true.dat                           |    8 +-
 tests/regression_tests/triso/inputs_true.dat  |  718 +++---
 .../unstructured_mesh/inputs_true.dat         |   74 +-
 .../unstructured_mesh/inputs_true0.dat        |   74 +-
 .../unstructured_mesh/inputs_true1.dat        |   74 +-
 .../unstructured_mesh/inputs_true10.dat       |   74 +-
 .../unstructured_mesh/inputs_true11.dat       |   74 +-
 .../unstructured_mesh/inputs_true12.dat       |   74 +-
 .../unstructured_mesh/inputs_true13.dat       |   74 +-
 .../unstructured_mesh/inputs_true14.dat       |   74 +-
 .../unstructured_mesh/inputs_true15.dat       |   74 +-
 .../unstructured_mesh/inputs_true2.dat        |   74 +-
 .../unstructured_mesh/inputs_true3.dat        |   74 +-
 .../unstructured_mesh/inputs_true4.dat        |  101 +-
 .../unstructured_mesh/inputs_true5.dat        |  101 +-
 .../unstructured_mesh/inputs_true6.dat        |  101 +-
 .../unstructured_mesh/inputs_true7.dat        |  101 +-
 .../unstructured_mesh/inputs_true8.dat        |   74 +-
 .../unstructured_mesh/inputs_true9.dat        |   74 +-
 tests/regression_tests/void/inputs_true.dat   |  106 +-
 .../volume_calc/inputs_true.dat               |   32 +-
 .../volume_calc/inputs_true_mg.dat            |   32 +-
 .../weightwindows/inputs_true.dat             |   46 +-
 .../weightwindows_fw_cadis/inputs_true.dat    |   32 +-
 .../flat/inputs_true.dat                      |   32 +-
 .../linear/inputs_true.dat                    |   32 +-
 180 files changed, 5006 insertions(+), 5035 deletions(-)

diff --git a/openmc/_xml.py b/openmc/_xml.py
index 17389a82f..05412128d 100644
--- a/openmc/_xml.py
+++ b/openmc/_xml.py
@@ -63,23 +63,6 @@ def get_text(elem, name, default=None):
         return child.text if child is not None else default
 
 
-def reorder_attributes(root):
-    """Sort attributes in XML to preserve pre-Python 3.8 behavior
-
-    Parameters
-    ----------
-    root : lxml.etree._Element
-        Root element
-
-    """
-    for el in root.iter():
-        attrib = el.attrib
-        if len(attrib) > 1:
-            # adjust attribute order, e.g. by sorting
-            attribs = sorted(attrib.items())
-            attrib.clear()
-            attrib.update(attribs)
-
 
 def get_elem_tuple(elem, name, dtype=int):
     """Helper function to get a tuple of values from an elem
diff --git a/openmc/data/library.py b/openmc/data/library.py
index a6ce1bbd3..bec538c06 100644
--- a/openmc/data/library.py
+++ b/openmc/data/library.py
@@ -5,7 +5,7 @@ import h5py
 import lxml.etree as ET
 
 import openmc
-from openmc._xml import clean_indentation, reorder_attributes
+from openmc._xml import clean_indentation
 
 
 class DataLibrary(list):
@@ -132,7 +132,6 @@ class DataLibrary(list):
         clean_indentation(root)
 
         # Write XML file
-        reorder_attributes(root)  # TODO: Remove when support is Python 3.8+
         tree = ET.ElementTree(root)
         tree.write(str(path), xml_declaration=True, encoding='utf-8',
                    method='xml')
diff --git a/openmc/geometry.py b/openmc/geometry.py
index f56b9b6fe..8496fb23a 100644
--- a/openmc/geometry.py
+++ b/openmc/geometry.py
@@ -140,7 +140,6 @@ class Geometry:
 
         # Clean the indentation in the file to be user-readable
         xml.clean_indentation(element)
-        xml.reorder_attributes(element)  # TODO: Remove when support is Python 3.8+
 
         return element
 
diff --git a/openmc/material.py b/openmc/material.py
index cec74af62..db67b709c 100644
--- a/openmc/material.py
+++ b/openmc/material.py
@@ -17,7 +17,7 @@ import h5py
 import openmc
 import openmc.data
 import openmc.checkvalue as cv
-from ._xml import clean_indentation, reorder_attributes
+from ._xml import clean_indentation
 from .mixin import IDManagerMixin
 from .utility_funcs import input_path
 from . import waste
@@ -1919,7 +1919,6 @@ class Materials(cv.CheckedList):
             clean_indentation(element, level=level+1)
             element.tail = element.tail.strip(' ')
             file.write((level+1)*spaces_per_level*' ')
-            reorder_attributes(element)  # TODO: Remove when support is Python 3.8+
             file.write(ET.tostring(element, encoding="unicode"))
 
         # Write the <material> elements.
@@ -1928,7 +1927,6 @@ class Materials(cv.CheckedList):
             clean_indentation(element, level=level+1)
             element.tail = element.tail.strip(' ')
             file.write((level+1)*spaces_per_level*' ')
-            reorder_attributes(element)  # TODO: Remove when support is Python 3.8+
             file.write(ET.tostring(element, encoding="unicode"))
 
         # Write the closing tag for the root element.
diff --git a/openmc/plots.py b/openmc/plots.py
index 9e097e2b9..34dde84e4 100644
--- a/openmc/plots.py
+++ b/openmc/plots.py
@@ -10,7 +10,7 @@ import openmc
 import openmc.checkvalue as cv
 from openmc.checkvalue import PathLike
 
-from ._xml import clean_indentation, get_elem_tuple, reorder_attributes, get_text
+from ._xml import clean_indentation, get_elem_tuple, get_text
 from .mixin import IDManagerMixin
 
 _BASES = {'xy', 'xz', 'yz'}
@@ -1857,8 +1857,6 @@ class Plots(cv.CheckedList):
 
         # Clean the indentation in the file to be user-readable
         clean_indentation(self._plots_file)
-        # TODO: Remove when support is Python 3.8+
-        reorder_attributes(self._plots_file)
 
         return self._plots_file
 
diff --git a/openmc/settings.py b/openmc/settings.py
index 36eaec6cb..327faf544 100644
--- a/openmc/settings.py
+++ b/openmc/settings.py
@@ -11,7 +11,7 @@ import openmc
 import openmc.checkvalue as cv
 from openmc.checkvalue import PathLike
 from openmc.stats.multivariate import MeshSpatial
-from ._xml import clean_indentation, get_text, reorder_attributes
+from ._xml import clean_indentation, get_text
 from .mesh import _read_meshes, RegularMesh, MeshBase
 from .source import SourceBase, MeshSource, IndependentSource
 from .utility_funcs import input_path
@@ -2201,7 +2201,6 @@ class Settings:
 
         # Clean the indentation in the file to be user-readable
         clean_indentation(element)
-        reorder_attributes(element)  # TODO: Remove when support is Python 3.8+
 
         return element
 
diff --git a/openmc/tallies.py b/openmc/tallies.py
index 06de0205c..3a5b42519 100644
--- a/openmc/tallies.py
+++ b/openmc/tallies.py
@@ -15,7 +15,7 @@ import scipy.sparse as sps
 
 import openmc
 import openmc.checkvalue as cv
-from ._xml import clean_indentation, reorder_attributes, get_text
+from ._xml import clean_indentation, get_text
 from .mixin import IDManagerMixin
 from .mesh import MeshBase
 
@@ -3329,7 +3329,6 @@ class Tallies(cv.CheckedList):
 
         # Clean the indentation in the file to be user-readable
         clean_indentation(element)
-        reorder_attributes(element)  # TODO: Remove when support is Python 3.8+
 
         return element
 
diff --git a/tests/regression_tests/adj_cell_rotation/inputs_true.dat b/tests/regression_tests/adj_cell_rotation/inputs_true.dat
index 7e2a0cf62..18c0552ce 100644
--- a/tests/regression_tests/adj_cell_rotation/inputs_true.dat
+++ b/tests/regression_tests/adj_cell_rotation/inputs_true.dat
@@ -1,35 +1,35 @@
 <?xml version='1.0' encoding='utf-8'?>
 <model>
   <materials>
-    <material depletable="true" id="1">
-      <density units="g/cc" value="10.0"/>
-      <nuclide ao="1.0" name="U235"/>
+    <material id="1" depletable="true">
+      <density value="10.0" units="g/cc"/>
+      <nuclide name="U235" ao="1.0"/>
     </material>
     <material id="2">
-      <density units="g/cc" value="0.1"/>
-      <nuclide ao="0.1" name="H1"/>
+      <density value="0.1" units="g/cc"/>
+      <nuclide name="H1" ao="0.1"/>
     </material>
   </materials>
   <geometry>
     <cell id="1" material="1" region="-1" universe="1"/>
     <cell id="2" material="2" region="1" universe="1"/>
-    <cell fill="1" id="3" region="2 -3 4 -5 6 -8" rotation="10 20 30" universe="2"/>
-    <cell fill="1" id="4" region="2 -3 4 -5 8 -7" translation="0 0 15" universe="2"/>
-    <surface coeffs="1.0 0.0 0.0 5.0" id="1" type="sphere"/>
-    <surface boundary="vacuum" coeffs="-7.5" id="2" name="minimum x" type="x-plane"/>
-    <surface boundary="vacuum" coeffs="7.5" id="3" name="maximum x" type="x-plane"/>
-    <surface boundary="vacuum" coeffs="-7.5" id="4" name="minimum y" type="y-plane"/>
-    <surface boundary="vacuum" coeffs="7.5" id="5" name="maximum y" type="y-plane"/>
-    <surface boundary="vacuum" coeffs="-7.5" id="6" type="z-plane"/>
-    <surface boundary="vacuum" coeffs="22.5" id="7" type="z-plane"/>
-    <surface coeffs="7.5" id="8" type="z-plane"/>
+    <cell id="3" fill="1" region="2 -3 4 -5 6 -8" rotation="10 20 30" universe="2"/>
+    <cell id="4" fill="1" region="2 -3 4 -5 8 -7" translation="0 0 15" universe="2"/>
+    <surface id="1" type="sphere" coeffs="1.0 0.0 0.0 5.0"/>
+    <surface id="2" name="minimum x" type="x-plane" boundary="vacuum" coeffs="-7.5"/>
+    <surface id="3" name="maximum x" type="x-plane" boundary="vacuum" coeffs="7.5"/>
+    <surface id="4" name="minimum y" type="y-plane" boundary="vacuum" coeffs="-7.5"/>
+    <surface id="5" name="maximum y" type="y-plane" boundary="vacuum" coeffs="7.5"/>
+    <surface id="6" type="z-plane" boundary="vacuum" coeffs="-7.5"/>
+    <surface id="7" type="z-plane" boundary="vacuum" coeffs="22.5"/>
+    <surface id="8" type="z-plane" coeffs="7.5"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
     <particles>10000</particles>
     <batches>10</batches>
     <inactive>5</inactive>
-    <source particle="neutron" strength="1.0" type="independent">
+    <source type="independent" strength="1.0" particle="neutron">
       <space type="box">
         <parameters>-4.0 -4.0 -4.0 4.0 4.0 4.0</parameters>
       </space>
diff --git a/tests/regression_tests/asymmetric_lattice/inputs_true.dat b/tests/regression_tests/asymmetric_lattice/inputs_true.dat
index 302ef24c2..ee3d68907 100644
--- a/tests/regression_tests/asymmetric_lattice/inputs_true.dat
+++ b/tests/regression_tests/asymmetric_lattice/inputs_true.dat
@@ -1,40 +1,40 @@
 <?xml version='1.0' encoding='utf-8'?>
 <model>
   <materials>
-    <material depletable="true" id="1" name="UOX fuel">
-      <density units="g/cm3" value="10.062"/>
-      <nuclide ao="4.9476e-06" name="U234"/>
-      <nuclide ao="0.00048218" name="U235"/>
-      <nuclide ao="0.021504" name="U238"/>
-      <nuclide ao="1.0801e-08" name="Xe135"/>
-      <nuclide ao="0.045737" name="O16"/>
+    <material id="1" name="UOX fuel" depletable="true">
+      <density value="10.062" units="g/cm3"/>
+      <nuclide name="U234" ao="4.9476e-06"/>
+      <nuclide name="U235" ao="0.00048218"/>
+      <nuclide name="U238" ao="0.021504"/>
+      <nuclide name="Xe135" ao="1.0801e-08"/>
+      <nuclide name="O16" ao="0.045737"/>
     </material>
     <material id="2" name="Zircaloy">
-      <density units="g/cm3" value="5.77"/>
-      <nuclide ao="0.5145" name="Zr90"/>
-      <nuclide ao="0.1122" name="Zr91"/>
-      <nuclide ao="0.1715" name="Zr92"/>
-      <nuclide ao="0.1738" name="Zr94"/>
-      <nuclide ao="0.028" name="Zr96"/>
+      <density value="5.77" units="g/cm3"/>
+      <nuclide name="Zr90" ao="0.5145"/>
+      <nuclide name="Zr91" ao="0.1122"/>
+      <nuclide name="Zr92" ao="0.1715"/>
+      <nuclide name="Zr94" ao="0.1738"/>
+      <nuclide name="Zr96" ao="0.028"/>
     </material>
     <material id="3" name="Cold borated water">
-      <density units="atom/b-cm" value="0.07416"/>
-      <nuclide ao="2.0" name="H1"/>
-      <nuclide ao="1.0" name="O16"/>
-      <nuclide ao="0.000649" name="B10"/>
-      <nuclide ao="0.002689" name="B11"/>
+      <density value="0.07416" units="atom/b-cm"/>
+      <nuclide name="H1" ao="2.0"/>
+      <nuclide name="O16" ao="1.0"/>
+      <nuclide name="B10" ao="0.000649"/>
+      <nuclide name="B11" ao="0.002689"/>
       <sab name="c_H_in_H2O"/>
     </material>
     <material id="4" name="Hot borated water">
-      <density units="atom/b-cm" value="0.06614"/>
-      <nuclide ao="2.0" name="H1"/>
-      <nuclide ao="1.0" name="O16"/>
-      <nuclide ao="0.000649" name="B10"/>
-      <nuclide ao="0.002689" name="B11"/>
+      <density value="0.06614" units="atom/b-cm"/>
+      <nuclide name="H1" ao="2.0"/>
+      <nuclide name="O16" ao="1.0"/>
+      <nuclide name="B10" ao="0.000649"/>
+      <nuclide name="B11" ao="0.002689"/>
       <sab name="c_H_in_H2O"/>
     </material>
     <material id="5" name="Reactor pressure vessel steel">
-      <density units="g/cm3" value="7.9"/>
+      <density value="7.9" units="g/cm3"/>
       <nuclide name="Fe54" wo="0.05437098"/>
       <nuclide name="Fe56" wo="0.88500663"/>
       <nuclide name="Fe57" wo="0.0208008"/>
@@ -47,7 +47,7 @@
       <nuclide name="Cu63" wo="0.0013696"/>
     </material>
     <material id="6" name="Lower radial reflector">
-      <density units="g/cm3" value="4.32"/>
+      <density value="4.32" units="g/cm3"/>
       <nuclide name="H1" wo="0.0095661"/>
       <nuclide name="O16" wo="0.0759107"/>
       <nuclide name="B10" wo="3.08409e-05"/>
@@ -62,7 +62,7 @@
       <sab name="c_H_in_H2O"/>
     </material>
     <material id="7" name="Upper radial reflector / Top plate region">
-      <density units="g/cm3" value="4.28"/>
+      <density value="4.28" units="g/cm3"/>
       <nuclide name="H1" wo="0.0086117"/>
       <nuclide name="O16" wo="0.0683369"/>
       <nuclide name="B10" wo="2.77638e-05"/>
@@ -77,7 +77,7 @@
       <sab name="c_H_in_H2O"/>
     </material>
     <material id="8" name="Bottom plate region">
-      <density units="g/cm3" value="7.184"/>
+      <density value="7.184" units="g/cm3"/>
       <nuclide name="H1" wo="0.0011505"/>
       <nuclide name="O16" wo="0.0091296"/>
       <nuclide name="B10" wo="3.70915e-06"/>
@@ -92,7 +92,7 @@
       <sab name="c_H_in_H2O"/>
     </material>
     <material id="9" name="Bottom nozzle region">
-      <density units="g/cm3" value="2.53"/>
+      <density value="2.53" units="g/cm3"/>
       <nuclide name="H1" wo="0.0245014"/>
       <nuclide name="O16" wo="0.1944274"/>
       <nuclide name="B10" wo="7.89917e-05"/>
@@ -107,7 +107,7 @@
       <sab name="c_H_in_H2O"/>
     </material>
     <material id="10" name="Top nozzle region">
-      <density units="g/cm3" value="1.746"/>
+      <density value="1.746" units="g/cm3"/>
       <nuclide name="H1" wo="0.035887"/>
       <nuclide name="O16" wo="0.2847761"/>
       <nuclide name="B10" wo="0.000115699"/>
@@ -122,7 +122,7 @@
       <sab name="c_H_in_H2O"/>
     </material>
     <material id="11" name="Top of fuel assemblies">
-      <density units="g/cm3" value="3.044"/>
+      <density value="3.044" units="g/cm3"/>
       <nuclide name="H1" wo="0.0162913"/>
       <nuclide name="O16" wo="0.1292776"/>
       <nuclide name="B10" wo="5.25228e-05"/>
@@ -135,7 +135,7 @@
       <sab name="c_H_in_H2O"/>
     </material>
     <material id="12" name="Bottom of fuel assemblies">
-      <density units="g/cm3" value="1.762"/>
+      <density value="1.762" units="g/cm3"/>
       <nuclide name="H1" wo="0.0292856"/>
       <nuclide name="O16" wo="0.2323919"/>
       <nuclide name="B10" wo="9.44159e-05"/>
@@ -149,7 +149,7 @@
     </material>
   </materials>
   <geometry>
-    <cell fill="202" id="1" region="9 -10 11 -12 13 -14" universe="0"/>
+    <cell id="1" fill="202" region="9 -10 11 -12 13 -14" universe="0"/>
     <cell id="27" material="1" region="-1" universe="3"/>
     <cell id="28" material="2" region="1 -2" universe="3"/>
     <cell id="29" material="4" region="2" universe="3"/>
@@ -157,7 +157,7 @@
     <cell id="31" material="2" region="3 -4" universe="4"/>
     <cell id="32" material="4" region="4" universe="4"/>
     <cell id="70" material="4" region="35 -36" universe="7"/>
-    <cell fill="101" id="80" region="35 -36" universe="8"/>
+    <cell id="80" fill="101" region="35 -36" universe="8"/>
     <lattice id="101" name="Fuel assembly (upper half)">
       <pitch>1.26 1.26</pitch>
       <dimension>17 17</dimension>
@@ -190,25 +190,25 @@
 8 8 8 
 7 7 7 </universes>
     </lattice>
-    <surface coeffs="0.0 0.0 0.41" id="1" type="z-cylinder"/>
-    <surface coeffs="0.0 0.0 0.475" id="2" type="z-cylinder"/>
-    <surface coeffs="0.0 0.0 0.56" id="3" type="z-cylinder"/>
-    <surface coeffs="0.0 0.0 0.62" id="4" type="z-cylinder"/>
-    <surface boundary="reflective" coeffs="-32.13" id="9" type="x-plane"/>
-    <surface boundary="reflective" coeffs="32.13" id="10" type="x-plane"/>
-    <surface boundary="reflective" coeffs="-32.13" id="11" type="y-plane"/>
-    <surface boundary="reflective" coeffs="32.13" id="12" type="y-plane"/>
-    <surface boundary="reflective" coeffs="0" id="13" type="z-plane"/>
-    <surface boundary="reflective" coeffs="32.13" id="14" type="z-plane"/>
-    <surface coeffs="0.0" id="35" type="z-plane"/>
-    <surface coeffs="183.0" id="36" type="z-plane"/>
+    <surface id="1" type="z-cylinder" coeffs="0.0 0.0 0.41"/>
+    <surface id="2" type="z-cylinder" coeffs="0.0 0.0 0.475"/>
+    <surface id="3" type="z-cylinder" coeffs="0.0 0.0 0.56"/>
+    <surface id="4" type="z-cylinder" coeffs="0.0 0.0 0.62"/>
+    <surface id="9" type="x-plane" boundary="reflective" coeffs="-32.13"/>
+    <surface id="10" type="x-plane" boundary="reflective" coeffs="32.13"/>
+    <surface id="11" type="y-plane" boundary="reflective" coeffs="-32.13"/>
+    <surface id="12" type="y-plane" boundary="reflective" coeffs="32.13"/>
+    <surface id="13" type="z-plane" boundary="reflective" coeffs="0"/>
+    <surface id="14" type="z-plane" boundary="reflective" coeffs="32.13"/>
+    <surface id="35" type="z-plane" coeffs="0.0"/>
+    <surface id="36" type="z-plane" coeffs="183.0"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
     <particles>100</particles>
     <batches>10</batches>
     <inactive>5</inactive>
-    <source particle="neutron" strength="1.0" type="independent">
+    <source type="independent" strength="1.0" particle="neutron">
       <space type="box">
         <parameters>-32 -32 0 32 32 32</parameters>
       </space>
diff --git a/tests/regression_tests/cpp_driver/inputs_true.dat b/tests/regression_tests/cpp_driver/inputs_true.dat
index 5d067cb68..fd450428a 100644
--- a/tests/regression_tests/cpp_driver/inputs_true.dat
+++ b/tests/regression_tests/cpp_driver/inputs_true.dat
@@ -1,26 +1,26 @@
 <?xml version='1.0' encoding='utf-8'?>
 <model>
   <materials>
-    <material depletable="true" id="1" name="fuel">
-      <density units="g/cc" value="11"/>
-      <nuclide ao="1.0" name="U235"/>
+    <material id="1" name="fuel" depletable="true">
+      <density value="11" units="g/cc"/>
+      <nuclide name="U235" ao="1.0"/>
     </material>
     <material id="2" name="cladding">
-      <density units="g/cc" value="6.44"/>
-      <nuclide ao="1.0" name="Zr90"/>
+      <density value="6.44" units="g/cc"/>
+      <nuclide name="Zr90" ao="1.0"/>
     </material>
     <material id="3" name="water">
-      <density units="g/cc" value="1.0"/>
-      <nuclide ao="2.0" name="H1"/>
-      <nuclide ao="1.0" name="O16"/>
+      <density value="1.0" units="g/cc"/>
+      <nuclide name="H1" ao="2.0"/>
+      <nuclide name="O16" ao="1.0"/>
     </material>
   </materials>
   <geometry>
     <cell id="1" material="1" region="-1" universe="1"/>
     <cell id="2" material="2" region="1 -2" universe="1"/>
     <cell id="3" material="3" region="2" universe="1"/>
-    <cell fill="1" id="4" universe="2"/>
-    <cell fill="3" id="5" region="3 -4 5 -6" universe="4"/>
+    <cell id="4" fill="1" universe="2"/>
+    <cell id="5" fill="3" region="3 -4 5 -6" universe="4"/>
     <lattice id="3">
       <pitch>4.0 4.0</pitch>
       <dimension>2 2</dimension>
@@ -29,12 +29,12 @@
 2 2 
 2 2 </universes>
     </lattice>
-    <surface coeffs="0.0 0.0 1.5" id="1" type="z-cylinder"/>
-    <surface coeffs="0.0 0.0 1.7" id="2" type="z-cylinder"/>
-    <surface boundary="reflective" coeffs="-4.0" id="3" name="minimum x" type="x-plane"/>
-    <surface boundary="reflective" coeffs="4.0" id="4" name="maximum x" type="x-plane"/>
-    <surface boundary="reflective" coeffs="-4.0" id="5" name="minimum y" type="y-plane"/>
-    <surface boundary="reflective" coeffs="4.0" id="6" name="maximum y" type="y-plane"/>
+    <surface id="1" type="z-cylinder" coeffs="0.0 0.0 1.5"/>
+    <surface id="2" type="z-cylinder" coeffs="0.0 0.0 1.7"/>
+    <surface id="3" name="minimum x" type="x-plane" boundary="reflective" coeffs="-4.0"/>
+    <surface id="4" name="maximum x" type="x-plane" boundary="reflective" coeffs="4.0"/>
+    <surface id="5" name="minimum y" type="y-plane" boundary="reflective" coeffs="-4.0"/>
+    <surface id="6" name="maximum y" type="y-plane" boundary="reflective" coeffs="4.0"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
diff --git a/tests/regression_tests/create_fission_neutrons/inputs_true.dat b/tests/regression_tests/create_fission_neutrons/inputs_true.dat
index 9e44a0224..47e8c3830 100644
--- a/tests/regression_tests/create_fission_neutrons/inputs_true.dat
+++ b/tests/regression_tests/create_fission_neutrons/inputs_true.dat
@@ -1,30 +1,30 @@
 <?xml version='1.0' encoding='utf-8'?>
 <model>
   <materials>
-    <material depletable="true" id="1" name="mat">
-      <density units="atom/b-cm" value="0.069335"/>
-      <nuclide ao="40.0" name="H1"/>
-      <nuclide ao="1.0" name="U235"/>
+    <material id="1" name="mat" depletable="true">
+      <density value="0.069335" units="atom/b-cm"/>
+      <nuclide name="H1" ao="40.0"/>
+      <nuclide name="U235" ao="1.0"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="1" name="box" region="1 -2 3 -4 5 -6" universe="0"/>
-    <surface boundary="reflective" coeffs="-1" id="1" type="x-plane"/>
-    <surface boundary="reflective" coeffs="1" id="2" type="x-plane"/>
-    <surface boundary="reflective" coeffs="-1" id="3" type="y-plane"/>
-    <surface boundary="reflective" coeffs="1" id="4" type="y-plane"/>
-    <surface boundary="reflective" coeffs="-1" id="5" type="z-plane"/>
-    <surface boundary="reflective" coeffs="1" id="6" type="z-plane"/>
+    <cell id="1" name="box" material="1" region="1 -2 3 -4 5 -6" universe="0"/>
+    <surface id="1" type="x-plane" boundary="reflective" coeffs="-1"/>
+    <surface id="2" type="x-plane" boundary="reflective" coeffs="1"/>
+    <surface id="3" type="y-plane" boundary="reflective" coeffs="-1"/>
+    <surface id="4" type="y-plane" boundary="reflective" coeffs="1"/>
+    <surface id="5" type="z-plane" boundary="reflective" coeffs="-1"/>
+    <surface id="6" type="z-plane" boundary="reflective" coeffs="1"/>
   </geometry>
   <settings>
     <run_mode>fixed source</run_mode>
     <particles>100</particles>
     <batches>10</batches>
-    <source particle="neutron" strength="1.0" type="independent">
+    <source type="independent" strength="1.0" particle="neutron">
       <space type="box">
         <parameters>-1 -1 -1 1 1 1</parameters>
       </space>
-      <energy parameters="988000.0 2.249e-06" type="watt"/>
+      <energy type="watt" parameters="988000.0 2.249e-06"/>
     </source>
     <create_fission_neutrons>false</create_fission_neutrons>
   </settings>
diff --git a/tests/regression_tests/dagmc/external/inputs_true.dat b/tests/regression_tests/dagmc/external/inputs_true.dat
index 31f4c1f88..8a6c6fe74 100644
--- a/tests/regression_tests/dagmc/external/inputs_true.dat
+++ b/tests/regression_tests/dagmc/external/inputs_true.dat
@@ -1,26 +1,26 @@
 <?xml version='1.0' encoding='utf-8'?>
 <model>
   <materials>
-    <material depletable="true" id="40" name="no-void fuel">
-      <density units="g/cc" value="11"/>
-      <nuclide ao="1.0" name="U235"/>
+    <material id="40" name="no-void fuel" depletable="true">
+      <density value="11" units="g/cc"/>
+      <nuclide name="U235" ao="1.0"/>
     </material>
     <material id="41" name="water">
-      <density units="g/cc" value="1.0"/>
-      <nuclide ao="2.0" name="H1"/>
-      <nuclide ao="1.0" name="O16"/>
+      <density value="1.0" units="g/cc"/>
+      <nuclide name="H1" ao="2.0"/>
+      <nuclide name="O16" ao="1.0"/>
       <sab name="c_H_in_H2O"/>
     </material>
   </materials>
   <geometry>
-    <dagmc_universe filename="dagmc.h5m" id="1"/>
+    <dagmc_universe id="1" filename="dagmc.h5m"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
     <particles>100</particles>
     <batches>5</batches>
     <inactive>0</inactive>
-    <source particle="neutron" strength="1.0" type="independent">
+    <source type="independent" strength="1.0" particle="neutron">
       <space type="box">
         <parameters>-4 -4 -4 4 4 4</parameters>
       </space>
diff --git a/tests/regression_tests/dagmc/legacy/inputs_true.dat b/tests/regression_tests/dagmc/legacy/inputs_true.dat
index b06516cb1..ad2f8e54d 100644
--- a/tests/regression_tests/dagmc/legacy/inputs_true.dat
+++ b/tests/regression_tests/dagmc/legacy/inputs_true.dat
@@ -1,26 +1,26 @@
 <?xml version='1.0' encoding='utf-8'?>
 <model>
   <materials>
-    <material depletable="true" id="40" name="no-void fuel">
-      <density units="g/cc" value="11"/>
-      <nuclide ao="1.0" name="U235"/>
+    <material id="40" name="no-void fuel" depletable="true">
+      <density value="11" units="g/cc"/>
+      <nuclide name="U235" ao="1.0"/>
     </material>
     <material id="41" name="water">
-      <density units="g/cc" value="1.0"/>
-      <nuclide ao="2.0" name="H1"/>
-      <nuclide ao="1.0" name="O16"/>
+      <density value="1.0" units="g/cc"/>
+      <nuclide name="H1" ao="2.0"/>
+      <nuclide name="O16" ao="1.0"/>
       <sab name="c_H_in_H2O"/>
     </material>
   </materials>
   <geometry>
-    <dagmc_universe filename="dagmc.h5m" id="1"/>
+    <dagmc_universe id="1" filename="dagmc.h5m"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
     <particles>100</particles>
     <batches>5</batches>
     <inactive>0</inactive>
-    <source particle="neutron" strength="1.0" type="independent">
+    <source type="independent" strength="1.0" particle="neutron">
       <space type="box">
         <parameters>-4 -4 -4 4 4 4</parameters>
       </space>
diff --git a/tests/regression_tests/dagmc/refl/inputs_true.dat b/tests/regression_tests/dagmc/refl/inputs_true.dat
index 979eeb492..58cb9e66f 100644
--- a/tests/regression_tests/dagmc/refl/inputs_true.dat
+++ b/tests/regression_tests/dagmc/refl/inputs_true.dat
@@ -3,14 +3,14 @@
   <materials>
   </materials>
   <geometry>
-    <dagmc_universe auto_geom_ids="true" filename="dagmc.h5m" id="1"/>
+    <dagmc_universe id="1" auto_geom_ids="true" filename="dagmc.h5m"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
     <particles>100</particles>
     <batches>5</batches>
     <inactive>0</inactive>
-    <source particle="neutron" strength="1.0" type="independent">
+    <source type="independent" strength="1.0" particle="neutron">
       <space type="box">
         <parameters>-4 -4 -4 4 4 4</parameters>
       </space>
diff --git a/tests/regression_tests/dagmc/universes/inputs_true.dat b/tests/regression_tests/dagmc/universes/inputs_true.dat
index 4b5be3612..2fa79d831 100644
--- a/tests/regression_tests/dagmc/universes/inputs_true.dat
+++ b/tests/regression_tests/dagmc/universes/inputs_true.dat
@@ -1,33 +1,33 @@
 <?xml version='1.0' encoding='utf-8'?>
 <model>
   <materials>
-    <material depletable="true" id="1" name="no-void fuel">
-      <density units="g/cc" value="10.29769"/>
-      <nuclide ao="0.93120485" name="U234"/>
-      <nuclide ao="0.00055815" name="U235"/>
-      <nuclide ao="0.022408" name="U238"/>
-      <nuclide ao="0.045829" name="O16"/>
+    <material id="1" name="no-void fuel" depletable="true">
+      <density value="10.29769" units="g/cc"/>
+      <nuclide name="U234" ao="0.93120485"/>
+      <nuclide name="U235" ao="0.00055815"/>
+      <nuclide name="U238" ao="0.022408"/>
+      <nuclide name="O16" ao="0.045829"/>
     </material>
     <material id="2" name="clad">
-      <density units="g/cc" value="6.55"/>
-      <nuclide ao="0.021827" name="Zr90"/>
-      <nuclide ao="0.00476" name="Zr91"/>
-      <nuclide ao="0.0072758" name="Zr92"/>
-      <nuclide ao="0.0073734" name="Zr94"/>
-      <nuclide ao="0.0011879" name="Zr96"/>
+      <density value="6.55" units="g/cc"/>
+      <nuclide name="Zr90" ao="0.021827"/>
+      <nuclide name="Zr91" ao="0.00476"/>
+      <nuclide name="Zr92" ao="0.0072758"/>
+      <nuclide name="Zr94" ao="0.0073734"/>
+      <nuclide name="Zr96" ao="0.0011879"/>
     </material>
     <material id="3" name="water">
-      <density units="g/cc" value="0.740582"/>
-      <nuclide ao="0.049457" name="H1"/>
-      <nuclide ao="0.024672" name="O16"/>
-      <nuclide ao="8.0042e-06" name="B10"/>
-      <nuclide ao="3.2218e-05" name="B11"/>
+      <density value="0.740582" units="g/cc"/>
+      <nuclide name="H1" ao="0.049457"/>
+      <nuclide name="O16" ao="0.024672"/>
+      <nuclide name="B10" ao="8.0042e-06"/>
+      <nuclide name="B11" ao="3.2218e-05"/>
       <sab name="c_H_in_H2O"/>
     </material>
   </materials>
   <geometry>
-    <cell fill="4" id="1" region="1 -2 3 -4 5 -6" universe="5"/>
-    <dagmc_universe auto_geom_ids="true" filename="dagmc.h5m" id="1"/>
+    <cell id="1" fill="4" region="1 -2 3 -4 5 -6" universe="5"/>
+    <dagmc_universe id="1" auto_geom_ids="true" filename="dagmc.h5m"/>
     <lattice id="4">
       <pitch>24.0 24.0</pitch>
       <dimension>2 2</dimension>
@@ -36,12 +36,12 @@
 1 1 
 1 1 </universes>
     </lattice>
-    <surface boundary="reflective" coeffs="-24.0" id="1" name="left" type="x-plane"/>
-    <surface boundary="reflective" coeffs="24.0" id="2" name="right" type="x-plane"/>
-    <surface boundary="reflective" coeffs="-24.0" id="3" name="front" type="y-plane"/>
-    <surface boundary="reflective" coeffs="24.0" id="4" name="back" type="y-plane"/>
-    <surface boundary="reflective" coeffs="-10.0" id="5" name="bottom" type="z-plane"/>
-    <surface boundary="reflective" coeffs="10.0" id="6" name="top" type="z-plane"/>
+    <surface id="1" name="left" type="x-plane" boundary="reflective" coeffs="-24.0"/>
+    <surface id="2" name="right" type="x-plane" boundary="reflective" coeffs="24.0"/>
+    <surface id="3" name="front" type="y-plane" boundary="reflective" coeffs="-24.0"/>
+    <surface id="4" name="back" type="y-plane" boundary="reflective" coeffs="24.0"/>
+    <surface id="5" name="bottom" type="z-plane" boundary="reflective" coeffs="-10.0"/>
+    <surface id="6" name="top" type="z-plane" boundary="reflective" coeffs="10.0"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
diff --git a/tests/regression_tests/dagmc/uwuw/inputs_true.dat b/tests/regression_tests/dagmc/uwuw/inputs_true.dat
index d7e4a12aa..01082cb23 100644
--- a/tests/regression_tests/dagmc/uwuw/inputs_true.dat
+++ b/tests/regression_tests/dagmc/uwuw/inputs_true.dat
@@ -3,14 +3,14 @@
   <materials>
   </materials>
   <geometry>
-    <dagmc_universe filename="dagmc.h5m" id="1"/>
+    <dagmc_universe id="1" filename="dagmc.h5m"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
     <particles>100</particles>
     <batches>5</batches>
     <inactive>0</inactive>
-    <source particle="neutron" strength="1.0" type="independent">
+    <source type="independent" strength="1.0" particle="neutron">
       <space type="box">
         <parameters>-4 -4 -4 4 4 4</parameters>
       </space>
diff --git a/tests/regression_tests/deplete_with_transport/last_step_reference_materials.xml b/tests/regression_tests/deplete_with_transport/last_step_reference_materials.xml
index f61595dd9..242e2e7db 100644
--- a/tests/regression_tests/deplete_with_transport/last_step_reference_materials.xml
+++ b/tests/regression_tests/deplete_with_transport/last_step_reference_materials.xml
@@ -1,1049 +1,1049 @@
 <?xml version='1.0' encoding='utf-8'?>
 <materials>
-  <material depletable="true" id="1" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum"/>
-    <nuclide ao="0.046295399999999994" name="O16"/>
-    <nuclide ao="0.00011276839999999999" name="O17"/>
-    <nuclide ao="4.4180489845847837e-07" name="Cs135"/>
-    <nuclide ao="7.2549793284842195e-09" name="Gd156"/>
-    <nuclide ao="4.6150717465438587e-10" name="Gd157"/>
-    <nuclide ao="8.610759149890541e-09" name="I135"/>
-    <nuclide ao="1.00447595096247e-05" name="U234"/>
-    <nuclide ao="0.001021319968105753" name="U235"/>
-    <nuclide ao="0.022134492490415457" name="U238"/>
-    <nuclide ao="4.898883540853392e-09" name="Xe135"/>
-    <nuclide ao="1.5016036288896978e-06" name="Xe136"/>
-  </material>
-  <material depletable="true" id="2" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum"/>
-    <nuclide ao="0.046295399999999994" name="O16"/>
-    <nuclide ao="0.00011276839999999999" name="O17"/>
-    <nuclide ao="4.7109992046231964e-07" name="Cs135"/>
-    <nuclide ao="7.042063874024541e-09" name="Gd156"/>
-    <nuclide ao="6.027071887061818e-10" name="Gd157"/>
-    <nuclide ao="7.95412956238769e-09" name="I135"/>
-    <nuclide ao="1.0044351820098593e-05" name="U234"/>
-    <nuclide ao="0.00102408632740032" name="U235"/>
-    <nuclide ao="0.02213423274784442" name="U238"/>
-    <nuclide ao="4.973037106302515e-09" name="Xe135"/>
-    <nuclide ao="1.3283930174680673e-06" name="Xe136"/>
-  </material>
-  <material depletable="true" id="3" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum"/>
-    <nuclide ao="0.046295399999999994" name="O16"/>
-    <nuclide ao="0.00011276839999999999" name="O17"/>
-    <nuclide ao="4.5196882278137964e-07" name="Cs135"/>
-    <nuclide ao="7.390520641508283e-09" name="Gd156"/>
-    <nuclide ao="6.1139624340991e-10" name="Gd157"/>
-    <nuclide ao="7.339426249127244e-09" name="I135"/>
-    <nuclide ao="1.0044458911815349e-05" name="U234"/>
-    <nuclide ao="0.0010213846058415266" name="U235"/>
-    <nuclide ao="0.02213428321817386" name="U238"/>
-    <nuclide ao="5.052047240880656e-09" name="Xe135"/>
-    <nuclide ao="1.492502282115296e-06" name="Xe136"/>
-  </material>
-  <material depletable="true" id="4" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum"/>
-    <nuclide ao="0.046295399999999994" name="O16"/>
-    <nuclide ao="0.00011276839999999999" name="O17"/>
-    <nuclide ao="4.610385562797368e-07" name="Cs135"/>
-    <nuclide ao="7.2542350999039044e-09" name="Gd156"/>
-    <nuclide ao="4.694384504892065e-10" name="Gd157"/>
-    <nuclide ao="8.99963252548058e-09" name="I135"/>
-    <nuclide ao="1.0044557857503748e-05" name="U234"/>
-    <nuclide ao="0.0010213889405514816" name="U235"/>
-    <nuclide ao="0.022134477440110358" name="U238"/>
-    <nuclide ao="5.198618342135029e-09" name="Xe135"/>
-    <nuclide ao="1.4782292628750817e-06" name="Xe136"/>
-  </material>
-  <material depletable="true" id="5" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum"/>
-    <nuclide ao="0.0464035" name="O16"/>
-    <nuclide ao="4.6068906575995227e-07" name="Cs135"/>
-    <nuclide ao="4.45301183633431e-09" name="Gd156"/>
-    <nuclide ao="6.452882105032804e-05" name="Gd157"/>
-    <nuclide ao="5.350905347436304e-09" name="I135"/>
-    <nuclide ao="0.0010186933910628446" name="U235"/>
-    <nuclide ao="0.02169176973824294" name="U238"/>
-    <nuclide ao="6.032753962430652e-09" name="Xe135"/>
-    <nuclide ao="4.88334256170519e-07" name="Xe136"/>
-  </material>
-  <material depletable="true" id="6" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum"/>
-    <nuclide ao="0.046295399999999994" name="O16"/>
-    <nuclide ao="0.00011276839999999999" name="O17"/>
-    <nuclide ao="4.5448917916965475e-07" name="Cs135"/>
-    <nuclide ao="7.987183377412963e-09" name="Gd156"/>
-    <nuclide ao="4.865379817976642e-10" name="Gd157"/>
-    <nuclide ao="8.523326262987082e-09" name="I135"/>
-    <nuclide ao="1.004449677662597e-05" name="U234"/>
-    <nuclide ao="0.0010175799065569445" name="U235"/>
-    <nuclide ao="0.02213426568393913" name="U238"/>
-    <nuclide ao="4.86982078246298e-09" name="Xe135"/>
-    <nuclide ao="1.6938385702297322e-06" name="Xe136"/>
-  </material>
-  <material depletable="true" id="7" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum"/>
-    <nuclide ao="0.046295399999999994" name="O16"/>
-    <nuclide ao="0.00011276839999999999" name="O17"/>
-    <nuclide ao="4.365851597102055e-07" name="Cs135"/>
-    <nuclide ao="7.885461639644807e-09" name="Gd156"/>
-    <nuclide ao="3.6063871000919685e-10" name="Gd157"/>
-    <nuclide ao="1.136967239656431e-08" name="I135"/>
-    <nuclide ao="1.004435753347176e-05" name="U234"/>
-    <nuclide ao="0.0010176281979544044" name="U235"/>
-    <nuclide ao="0.02213438660359147" name="U238"/>
-    <nuclide ao="5.3728946653715295e-09" name="Xe135"/>
-    <nuclide ao="1.7038388316063246e-06" name="Xe136"/>
-  </material>
-  <material depletable="true" id="8" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum"/>
-    <nuclide ao="0.046295399999999994" name="O16"/>
-    <nuclide ao="0.00011276839999999999" name="O17"/>
-    <nuclide ao="4.5625540310461215e-07" name="Cs135"/>
-    <nuclide ao="7.771490180621292e-09" name="Gd156"/>
-    <nuclide ao="4.146823023983641e-10" name="Gd157"/>
-    <nuclide ao="9.209488335030714e-09" name="I135"/>
-    <nuclide ao="1.0044402337263812e-05" name="U234"/>
-    <nuclide ao="0.0010186458655452861" name="U235"/>
-    <nuclide ao="0.022134339049317633" name="U238"/>
-    <nuclide ao="5.497659457987619e-09" name="Xe135"/>
-    <nuclide ao="1.6322553919462217e-06" name="Xe136"/>
-  </material>
-  <material depletable="true" id="9" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum"/>
-    <nuclide ao="0.046295399999999994" name="O16"/>
-    <nuclide ao="0.00011276839999999999" name="O17"/>
-    <nuclide ao="4.4849047261874304e-07" name="Cs135"/>
-    <nuclide ao="7.046983082489661e-09" name="Gd156"/>
-    <nuclide ao="4.957093622147675e-10" name="Gd157"/>
-    <nuclide ao="1.0283911483340312e-08" name="I135"/>
-    <nuclide ao="1.0044263707893839e-05" name="U234"/>
-    <nuclide ao="0.0010240145184075352" name="U235"/>
-    <nuclide ao="0.02213424387109948" name="U238"/>
-    <nuclide ao="5.102740934580265e-09" name="Xe135"/>
-    <nuclide ao="1.3522284050998152e-06" name="Xe136"/>
-  </material>
-  <material depletable="true" id="10" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum"/>
-    <nuclide ao="0.046295399999999994" name="O16"/>
-    <nuclide ao="0.00011276839999999999" name="O17"/>
-    <nuclide ao="4.54649330746641e-07" name="Cs135"/>
-    <nuclide ao="8.140359772312664e-09" name="Gd156"/>
-    <nuclide ao="5.697645603089687e-10" name="Gd157"/>
-    <nuclide ao="7.546282979584689e-09" name="I135"/>
-    <nuclide ao="1.0044621491322387e-05" name="U234"/>
-    <nuclide ao="0.0010168499066742598" name="U235"/>
-    <nuclide ao="0.022134202939750564" name="U238"/>
-    <nuclide ao="5.110958338411566e-09" name="Xe135"/>
-    <nuclide ao="1.7346785903470948e-06" name="Xe136"/>
-  </material>
-  <material depletable="true" id="11" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum"/>
-    <nuclide ao="0.046295399999999994" name="O16"/>
-    <nuclide ao="0.00011276839999999999" name="O17"/>
-    <nuclide ao="4.356328087111304e-07" name="Cs135"/>
-    <nuclide ao="7.482536561844464e-09" name="Gd156"/>
-    <nuclide ao="4.256220744995123e-10" name="Gd157"/>
-    <nuclide ao="9.633889473449001e-09" name="I135"/>
-    <nuclide ao="1.0044260492856067e-05" name="U234"/>
-    <nuclide ao="0.0010215775522793961" name="U235"/>
-    <nuclide ao="0.022134138392005908" name="U238"/>
-    <nuclide ao="4.875694297039386e-09" name="Xe135"/>
-    <nuclide ao="1.4987118043030461e-06" name="Xe136"/>
-  </material>
-  <material depletable="true" id="12" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum"/>
-    <nuclide ao="0.046295399999999994" name="O16"/>
-    <nuclide ao="0.00011276839999999999" name="O17"/>
-    <nuclide ao="4.5499172002525965e-07" name="Cs135"/>
-    <nuclide ao="7.90039271767826e-09" name="Gd156"/>
-    <nuclide ao="5.043357296023378e-10" name="Gd157"/>
-    <nuclide ao="9.717794257343092e-09" name="I135"/>
-    <nuclide ao="1.0044246640051479e-05" name="U234"/>
-    <nuclide ao="0.001018955480032775" name="U235"/>
-    <nuclide ao="0.022134093110617634" name="U238"/>
-    <nuclide ao="5.099520096684825e-09" name="Xe135"/>
-    <nuclide ao="1.6207687623132563e-06" name="Xe136"/>
-  </material>
-  <material depletable="true" id="13" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum"/>
-    <nuclide ao="0.046295399999999994" name="O16"/>
-    <nuclide ao="0.00011276839999999999" name="O17"/>
-    <nuclide ao="4.2085912253520763e-07" name="Cs135"/>
-    <nuclide ao="7.387032997276892e-09" name="Gd156"/>
-    <nuclide ao="4.536377596093003e-10" name="Gd157"/>
-    <nuclide ao="9.623102601466089e-09" name="I135"/>
-    <nuclide ao="1.0044648049703634e-05" name="U234"/>
-    <nuclide ao="0.0010212601078170274" name="U235"/>
-    <nuclide ao="0.022134335203923612" name="U238"/>
-    <nuclide ao="4.8698368764839335e-09" name="Xe135"/>
-    <nuclide ao="1.5273484191647258e-06" name="Xe136"/>
-  </material>
-  <material depletable="true" id="14" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum"/>
-    <nuclide ao="0.0464035" name="O16"/>
-    <nuclide ao="4.2242275017886855e-07" name="Cs135"/>
-    <nuclide ao="4.046777209581165e-09" name="Gd156"/>
-    <nuclide ao="7.77190237760579e-05" name="Gd157"/>
-    <nuclide ao="4.244203293759763e-09" name="I135"/>
-    <nuclide ao="0.0010210841866332414" name="U235"/>
-    <nuclide ao="0.02169184057611082" name="U238"/>
-    <nuclide ao="5.204749875515762e-09" name="Xe135"/>
-    <nuclide ao="3.9883254526072304e-07" name="Xe136"/>
-  </material>
-  <material depletable="true" id="15" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum"/>
-    <nuclide ao="0.046295399999999994" name="O16"/>
-    <nuclide ao="0.00011276839999999999" name="O17"/>
-    <nuclide ao="4.6297695279308207e-07" name="Cs135"/>
-    <nuclide ao="8.043395705978296e-09" name="Gd156"/>
-    <nuclide ao="4.5962909889223416e-10" name="Gd157"/>
-    <nuclide ao="9.79459763465254e-09" name="I135"/>
-    <nuclide ao="1.0044275982599374e-05" name="U234"/>
-    <nuclide ao="0.0010173553197709228" name="U235"/>
-    <nuclide ao="0.022134228674554737" name="U238"/>
-    <nuclide ao="5.337501828657589e-09" name="Xe135"/>
-    <nuclide ao="1.69630230513062e-06" name="Xe136"/>
-  </material>
-  <material depletable="true" id="16" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum"/>
-    <nuclide ao="0.046295399999999994" name="O16"/>
-    <nuclide ao="0.00011276839999999999" name="O17"/>
-    <nuclide ao="4.2439923646596987e-07" name="Cs135"/>
-    <nuclide ao="7.51993097842057e-09" name="Gd156"/>
-    <nuclide ao="3.8006059505546623e-10" name="Gd157"/>
-    <nuclide ao="1.0767865102277833e-08" name="I135"/>
-    <nuclide ao="1.0044208116408632e-05" name="U234"/>
-    <nuclide ao="0.0010205777538804912" name="U235"/>
-    <nuclide ao="0.022134290624025953" name="U238"/>
-    <nuclide ao="5.118002643684298e-09" name="Xe135"/>
-    <nuclide ao="1.5598554985375204e-06" name="Xe136"/>
-  </material>
-  <material depletable="true" id="17" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum"/>
-    <nuclide ao="0.046295399999999994" name="O16"/>
-    <nuclide ao="0.00011276839999999999" name="O17"/>
-    <nuclide ao="4.712249224999332e-07" name="Cs135"/>
-    <nuclide ao="8.12439225407168e-09" name="Gd156"/>
-    <nuclide ao="3.918401546635954e-10" name="Gd157"/>
-    <nuclide ao="1.110080811911908e-08" name="I135"/>
-    <nuclide ao="1.004444860785254e-05" name="U234"/>
-    <nuclide ao="0.001015325533738875" name="U235"/>
-    <nuclide ao="0.022134518675913453" name="U238"/>
-    <nuclide ao="6.162820906594628e-09" name="Xe135"/>
-    <nuclide ao="1.7903377642474933e-06" name="Xe136"/>
-  </material>
-  <material depletable="true" id="18" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum"/>
-    <nuclide ao="0.046295399999999994" name="O16"/>
-    <nuclide ao="0.00011276839999999999" name="O17"/>
-    <nuclide ao="4.531153595367313e-07" name="Cs135"/>
-    <nuclide ao="7.502808414768136e-09" name="Gd156"/>
-    <nuclide ao="3.8778800535383123e-10" name="Gd157"/>
-    <nuclide ao="1.0507636646210905e-08" name="I135"/>
-    <nuclide ao="1.0044253708465351e-05" name="U234"/>
-    <nuclide ao="0.0010201327804558217" name="U235"/>
-    <nuclide ao="0.02213439545238702" name="U238"/>
-    <nuclide ao="5.3962772783966446e-09" name="Xe135"/>
-    <nuclide ao="1.5533402153334209e-06" name="Xe136"/>
-  </material>
-  <material depletable="true" id="19" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum"/>
-    <nuclide ao="0.046295399999999994" name="O16"/>
-    <nuclide ao="0.00011276839999999999" name="O17"/>
-    <nuclide ao="4.2805824385921033e-07" name="Cs135"/>
-    <nuclide ao="6.895063372358365e-09" name="Gd156"/>
-    <nuclide ao="4.725046335047864e-10" name="Gd157"/>
-    <nuclide ao="8.97107842759746e-09" name="I135"/>
-    <nuclide ao="1.0044434844325525e-05" name="U234"/>
-    <nuclide ao="0.0010246197579365402" name="U235"/>
-    <nuclide ao="0.022134292112283606" name="U238"/>
-    <nuclide ao="4.989035402383652e-09" name="Xe135"/>
-    <nuclide ao="1.3407496363522234e-06" name="Xe136"/>
-  </material>
-  <material depletable="true" id="20" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum"/>
-    <nuclide ao="0.046295399999999994" name="O16"/>
-    <nuclide ao="0.00011276839999999999" name="O17"/>
-    <nuclide ao="4.572319631300454e-07" name="Cs135"/>
-    <nuclide ao="7.169872287546151e-09" name="Gd156"/>
-    <nuclide ao="4.5318180282038245e-10" name="Gd157"/>
-    <nuclide ao="9.303299219244154e-09" name="I135"/>
-    <nuclide ao="1.0044424717868887e-05" name="U234"/>
-    <nuclide ao="0.001023039411729011" name="U235"/>
-    <nuclide ao="0.022134264483889672" name="U238"/>
-    <nuclide ao="5.090119271586464e-09" name="Xe135"/>
-    <nuclide ao="1.3965662648477194e-06" name="Xe136"/>
-  </material>
-  <material depletable="true" id="21" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum"/>
-    <nuclide ao="0.046295399999999994" name="O16"/>
-    <nuclide ao="0.00011276839999999999" name="O17"/>
-    <nuclide ao="4.450648347516283e-07" name="Cs135"/>
-    <nuclide ao="7.79123186528617e-09" name="Gd156"/>
-    <nuclide ao="4.801783348351781e-10" name="Gd157"/>
-    <nuclide ao="1.0146797229298853e-08" name="I135"/>
-    <nuclide ao="1.004438612044785e-05" name="U234"/>
-    <nuclide ao="0.0010197543471808291" name="U235"/>
-    <nuclide ao="0.02213407924687299" name="U238"/>
-    <nuclide ao="5.115335215214215e-09" name="Xe135"/>
-    <nuclide ao="1.587513649367174e-06" name="Xe136"/>
-  </material>
-  <material depletable="true" id="22" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum"/>
-    <nuclide ao="0.046295399999999994" name="O16"/>
-    <nuclide ao="0.00011276839999999999" name="O17"/>
-    <nuclide ao="4.445115368004072e-07" name="Cs135"/>
-    <nuclide ao="7.610438516335627e-09" name="Gd156"/>
-    <nuclide ao="5.481423369261682e-10" name="Gd157"/>
-    <nuclide ao="7.563161653056015e-09" name="I135"/>
-    <nuclide ao="1.0044714261323595e-05" name="U234"/>
-    <nuclide ao="0.0010191890430702683" name="U235"/>
-    <nuclide ao="0.022134442627520262" name="U238"/>
-    <nuclide ao="5.049292264895614e-09" name="Xe135"/>
-    <nuclide ao="1.6151855322977993e-06" name="Xe136"/>
-  </material>
-  <material depletable="true" id="23" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum"/>
-    <nuclide ao="0.0464035" name="O16"/>
-    <nuclide ao="4.007687837996293e-07" name="Cs135"/>
-    <nuclide ao="4.15563926329356e-09" name="Gd156"/>
-    <nuclide ao="6.084196393046683e-05" name="Gd157"/>
-    <nuclide ao="4.565764370958123e-09" name="I135"/>
-    <nuclide ao="0.001020914637247464" name="U235"/>
-    <nuclide ao="0.021691729016809345" name="U238"/>
-    <nuclide ao="4.9812486691849115e-09" name="Xe135"/>
-    <nuclide ao="4.313187001180846e-07" name="Xe136"/>
-  </material>
-  <material depletable="true" id="24" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum"/>
-    <nuclide ao="0.046295399999999994" name="O16"/>
-    <nuclide ao="0.00011276839999999999" name="O17"/>
-    <nuclide ao="4.672347214537883e-07" name="Cs135"/>
-    <nuclide ao="7.510614517842352e-09" name="Gd156"/>
-    <nuclide ao="3.8800984116567243e-10" name="Gd157"/>
-    <nuclide ao="1.0221972095676418e-08" name="I135"/>
-    <nuclide ao="1.0044436788944246e-05" name="U234"/>
-    <nuclide ao="0.001020189192511756" name="U235"/>
-    <nuclide ao="0.022134340717921346" name="U238"/>
-    <nuclide ao="5.448196054594672e-09" name="Xe135"/>
-    <nuclide ao="1.5373005222115101e-06" name="Xe136"/>
-  </material>
-  <material depletable="true" id="25" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum"/>
-    <nuclide ao="0.046295399999999994" name="O16"/>
-    <nuclide ao="0.00011276839999999999" name="O17"/>
-    <nuclide ao="4.211443960749324e-07" name="Cs135"/>
-    <nuclide ao="7.581311246517837e-09" name="Gd156"/>
-    <nuclide ao="4.035443346440247e-10" name="Gd157"/>
-    <nuclide ao="1.0963506656542743e-08" name="I135"/>
-    <nuclide ao="1.0044361025775531e-05" name="U234"/>
-    <nuclide ao="0.0010200126803834853" name="U235"/>
-    <nuclide ao="0.022134322371965366" name="U238"/>
-    <nuclide ao="4.9316754226086145e-09" name="Xe135"/>
-    <nuclide ao="1.5929594432571348e-06" name="Xe136"/>
-  </material>
-  <material depletable="true" id="26" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum"/>
-    <nuclide ao="0.046295399999999994" name="O16"/>
-    <nuclide ao="0.00011276839999999999" name="O17"/>
-    <nuclide ao="4.6367556413001594e-07" name="Cs135"/>
-    <nuclide ao="8.098562238364125e-09" name="Gd156"/>
-    <nuclide ao="4.2570401128256144e-10" name="Gd157"/>
-    <nuclide ao="1.1873408939235887e-08" name="I135"/>
-    <nuclide ao="1.0044164596280645e-05" name="U234"/>
-    <nuclide ao="0.001016466422386754" name="U235"/>
-    <nuclide ao="0.02213432992062079" name="U238"/>
-    <nuclide ao="6.092134003743775e-09" name="Xe135"/>
-    <nuclide ao="1.7389259816658934e-06" name="Xe136"/>
-  </material>
-  <material depletable="true" id="27" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum"/>
-    <nuclide ao="0.046295399999999994" name="O16"/>
-    <nuclide ao="0.00011276839999999999" name="O17"/>
-    <nuclide ao="4.523424314106055e-07" name="Cs135"/>
-    <nuclide ao="6.7483826383441804e-09" name="Gd156"/>
-    <nuclide ao="4.1066179871436127e-10" name="Gd157"/>
-    <nuclide ao="9.692240087722253e-09" name="I135"/>
-    <nuclide ao="1.0044564874269356e-05" name="U234"/>
-    <nuclide ao="0.0010247727656697873" name="U235"/>
-    <nuclide ao="0.02213446365544743" name="U238"/>
-    <nuclide ao="5.465219842757615e-09" name="Xe135"/>
-    <nuclide ao="1.3042444615190524e-06" name="Xe136"/>
-  </material>
-  <material depletable="true" id="28" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum"/>
-    <nuclide ao="0.046295399999999994" name="O16"/>
-    <nuclide ao="0.00011276839999999999" name="O17"/>
-    <nuclide ao="4.466675187113592e-07" name="Cs135"/>
-    <nuclide ao="7.191858535557372e-09" name="Gd156"/>
-    <nuclide ao="4.638430627464777e-10" name="Gd157"/>
-    <nuclide ao="8.708423441592281e-09" name="I135"/>
-    <nuclide ao="1.004436720894081e-05" name="U234"/>
-    <nuclide ao="0.0010227318971276944" name="U235"/>
-    <nuclide ao="0.02213430292852833" name="U238"/>
-    <nuclide ao="5.1906248659837924e-09" name="Xe135"/>
-    <nuclide ao="1.4235382163510006e-06" name="Xe136"/>
-  </material>
-  <material depletable="true" id="29" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum"/>
-    <nuclide ao="0.046295399999999994" name="O16"/>
-    <nuclide ao="0.00011276839999999999" name="O17"/>
-    <nuclide ao="4.564848163546606e-07" name="Cs135"/>
-    <nuclide ao="7.046950146855969e-09" name="Gd156"/>
-    <nuclide ao="5.361052662717774e-10" name="Gd157"/>
-    <nuclide ao="8.542724931158602e-09" name="I135"/>
-    <nuclide ao="1.004459756695043e-05" name="U234"/>
-    <nuclide ao="0.0010231530917557043" name="U235"/>
-    <nuclide ao="0.0221344016807911" name="U238"/>
-    <nuclide ao="4.758669320515469e-09" name="Xe135"/>
-    <nuclide ao="1.3900523043059956e-06" name="Xe136"/>
-  </material>
-  <material depletable="true" id="30" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum"/>
-    <nuclide ao="0.046295399999999994" name="O16"/>
-    <nuclide ao="0.00011276839999999999" name="O17"/>
-    <nuclide ao="4.437067605151325e-07" name="Cs135"/>
-    <nuclide ao="7.1363891343374635e-09" name="Gd156"/>
-    <nuclide ao="5.566402231094469e-10" name="Gd157"/>
-    <nuclide ao="8.587230430892402e-09" name="I135"/>
-    <nuclide ao="1.0044808841280893e-05" name="U234"/>
-    <nuclide ao="0.0010226876654417763" name="U235"/>
-    <nuclide ao="0.022134380741743336" name="U238"/>
-    <nuclide ao="5.468326095113349e-09" name="Xe135"/>
-    <nuclide ao="1.4274298357254412e-06" name="Xe136"/>
-  </material>
-  <material depletable="true" id="31" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum"/>
-    <nuclide ao="0.046295399999999994" name="O16"/>
-    <nuclide ao="0.00011276839999999999" name="O17"/>
-    <nuclide ao="4.663927579774932e-07" name="Cs135"/>
-    <nuclide ao="7.445447078931686e-09" name="Gd156"/>
-    <nuclide ao="3.884396962343153e-10" name="Gd157"/>
-    <nuclide ao="9.880795035286334e-09" name="I135"/>
-    <nuclide ao="1.0045110543061514e-05" name="U234"/>
-    <nuclide ao="0.0010185051659907308" name="U235"/>
-    <nuclide ao="0.022134793050126972" name="U238"/>
-    <nuclide ao="5.628930766753173e-09" name="Xe135"/>
-    <nuclide ao="1.621458196093815e-06" name="Xe136"/>
-  </material>
-  <material depletable="true" id="32" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum"/>
-    <nuclide ao="0.0464035" name="O16"/>
-    <nuclide ao="4.1246893900095064e-07" name="Cs135"/>
-    <nuclide ao="4.235600198363761e-09" name="Gd156"/>
-    <nuclide ao="6.270357333732124e-05" name="Gd157"/>
-    <nuclide ao="4.48554996862083e-09" name="I135"/>
-    <nuclide ao="0.0010204963418181184" name="U235"/>
-    <nuclide ao="0.02169170592871774" name="U238"/>
-    <nuclide ao="5.171435873222667e-09" name="Xe135"/>
-    <nuclide ao="4.423753279029928e-07" name="Xe136"/>
-  </material>
-  <material depletable="true" id="33" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum"/>
-    <nuclide ao="0.046295399999999994" name="O16"/>
-    <nuclide ao="0.00011276839999999999" name="O17"/>
-    <nuclide ao="4.639536407807289e-07" name="Cs135"/>
-    <nuclide ao="8.26599161641998e-09" name="Gd156"/>
-    <nuclide ao="4.4443900400932014e-10" name="Gd157"/>
-    <nuclide ao="1.0063162224638636e-08" name="I135"/>
-    <nuclide ao="1.004414762804115e-05" name="U234"/>
-    <nuclide ao="0.0010163626915249942" name="U235"/>
-    <nuclide ao="0.022134124263495966" name="U238"/>
-    <nuclide ao="5.381577718295668e-09" name="Xe135"/>
-    <nuclide ao="1.750090777225144e-06" name="Xe136"/>
-  </material>
-  <material depletable="true" id="34" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum"/>
-    <nuclide ao="0.046295399999999994" name="O16"/>
-    <nuclide ao="0.00011276839999999999" name="O17"/>
-    <nuclide ao="4.559453986372942e-07" name="Cs135"/>
-    <nuclide ao="8.064845626388968e-09" name="Gd156"/>
-    <nuclide ao="4.2591362725932075e-10" name="Gd157"/>
-    <nuclide ao="1.108912103471219e-08" name="I135"/>
-    <nuclide ao="1.0043946351139754e-05" name="U234"/>
-    <nuclide ao="0.0010171808520812423" name="U235"/>
-    <nuclide ao="0.022134239348941525" name="U238"/>
-    <nuclide ao="5.356605996248169e-09" name="Xe135"/>
-    <nuclide ao="1.7112469634330484e-06" name="Xe136"/>
-  </material>
-  <material depletable="true" id="35" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum"/>
-    <nuclide ao="0.046295399999999994" name="O16"/>
-    <nuclide ao="0.00011276839999999999" name="O17"/>
-    <nuclide ao="4.783500137415771e-07" name="Cs135"/>
-    <nuclide ao="8.278905204746407e-09" name="Gd156"/>
-    <nuclide ao="4.327862005463805e-10" name="Gd157"/>
-    <nuclide ao="1.0123582674276158e-08" name="I135"/>
-    <nuclide ao="1.0044298863412104e-05" name="U234"/>
-    <nuclide ao="0.0010159230256745024" name="U235"/>
-    <nuclide ao="0.022134198514068757" name="U238"/>
-    <nuclide ao="5.871093706243336e-09" name="Xe135"/>
-    <nuclide ao="1.7575689172957885e-06" name="Xe136"/>
-  </material>
-  <material depletable="true" id="36" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum"/>
-    <nuclide ao="0.046295399999999994" name="O16"/>
-    <nuclide ao="0.00011276839999999999" name="O17"/>
-    <nuclide ao="4.7585244231920927e-07" name="Cs135"/>
-    <nuclide ao="7.047102473389166e-09" name="Gd156"/>
-    <nuclide ao="4.290077716150245e-10" name="Gd157"/>
-    <nuclide ao="9.106329272893031e-09" name="I135"/>
-    <nuclide ao="1.004490745184468e-05" name="U234"/>
-    <nuclide ao="0.001022123397932415" name="U235"/>
-    <nuclide ao="0.02213459705977757" name="U238"/>
-    <nuclide ao="4.972382302373317e-09" name="Xe135"/>
-    <nuclide ao="1.4220785344272175e-06" name="Xe136"/>
-  </material>
-  <material depletable="true" id="37" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum"/>
-    <nuclide ao="0.046295399999999994" name="O16"/>
-    <nuclide ao="0.00011276839999999999" name="O17"/>
-    <nuclide ao="4.674688590714476e-07" name="Cs135"/>
-    <nuclide ao="7.970289841354939e-09" name="Gd156"/>
-    <nuclide ao="5.153997431956395e-10" name="Gd157"/>
-    <nuclide ao="8.539123281213609e-09" name="I135"/>
-    <nuclide ao="1.0044902591761455e-05" name="U234"/>
-    <nuclide ao="0.0010166972454515616" name="U235"/>
-    <nuclide ao="0.02213444858676572" name="U238"/>
-    <nuclide ao="5.164533017665062e-09" name="Xe135"/>
-    <nuclide ao="1.7250109506134995e-06" name="Xe136"/>
-  </material>
-  <material depletable="true" id="38" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum"/>
-    <nuclide ao="0.046295399999999994" name="O16"/>
-    <nuclide ao="0.00011276839999999999" name="O17"/>
-    <nuclide ao="4.62023315208809e-07" name="Cs135"/>
-    <nuclide ao="7.290331357418475e-09" name="Gd156"/>
-    <nuclide ao="5.153301253293083e-10" name="Gd157"/>
-    <nuclide ao="7.966294229889969e-09" name="I135"/>
-    <nuclide ao="1.0044264900655818e-05" name="U234"/>
-    <nuclide ao="0.0010228069220581829" name="U235"/>
-    <nuclide ao="0.022134157888979544" name="U238"/>
-    <nuclide ao="5.177831769145713e-09" name="Xe135"/>
-    <nuclide ao="1.407267343687865e-06" name="Xe136"/>
-  </material>
-  <material depletable="true" id="39" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum"/>
-    <nuclide ao="0.046295399999999994" name="O16"/>
-    <nuclide ao="0.00011276839999999999" name="O17"/>
-    <nuclide ao="4.3174845937654533e-07" name="Cs135"/>
-    <nuclide ao="7.496333189305309e-09" name="Gd156"/>
-    <nuclide ao="5.231502669312121e-10" name="Gd157"/>
-    <nuclide ao="7.935273960925948e-09" name="I135"/>
-    <nuclide ao="1.004438265081768e-05" name="U234"/>
-    <nuclide ao="0.0010216587449263061" name="U235"/>
-    <nuclide ao="0.022134102890114152" name="U238"/>
-    <nuclide ao="4.985811384270827e-09" name="Xe135"/>
-    <nuclide ao="1.5003890282364684e-06" name="Xe136"/>
-  </material>
-  <material depletable="true" id="40" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum"/>
-    <nuclide ao="0.046295399999999994" name="O16"/>
-    <nuclide ao="0.00011276839999999999" name="O17"/>
-    <nuclide ao="4.550660196109939e-07" name="Cs135"/>
-    <nuclide ao="7.934623609364992e-09" name="Gd156"/>
-    <nuclide ao="4.037668757136327e-10" name="Gd157"/>
-    <nuclide ao="1.0501733366702875e-08" name="I135"/>
-    <nuclide ao="1.0044738839596202e-05" name="U234"/>
-    <nuclide ao="0.0010172584673257196" name="U235"/>
-    <nuclide ao="0.022134388757146573" name="U238"/>
-    <nuclide ao="5.426068046034702e-09" name="Xe135"/>
-    <nuclide ao="1.7059955089306178e-06" name="Xe136"/>
-  </material>
-  <material depletable="true" id="41" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum"/>
-    <nuclide ao="0.0464035" name="O16"/>
-    <nuclide ao="4.7373311464679697e-07" name="Cs135"/>
-    <nuclide ao="5.5215753216139325e-09" name="Gd156"/>
-    <nuclide ao="1.4494880135466953e-05" name="Gd157"/>
-    <nuclide ao="7.152901553393514e-09" name="I135"/>
-    <nuclide ao="0.001012425534201963" name="U235"/>
-    <nuclide ao="0.02169158720273659" name="U238"/>
-    <nuclide ao="6.145213330919855e-09" name="Xe135"/>
-    <nuclide ao="8.133607629171309e-07" name="Xe136"/>
-  </material>
-  <material depletable="true" id="42" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum"/>
-    <nuclide ao="0.046295399999999994" name="O16"/>
-    <nuclide ao="0.00011276839999999999" name="O17"/>
-    <nuclide ao="4.552489408257274e-07" name="Cs135"/>
-    <nuclide ao="8.417844454382996e-09" name="Gd156"/>
-    <nuclide ao="3.298239390088616e-10" name="Gd157"/>
-    <nuclide ao="1.1627214840198228e-08" name="I135"/>
-    <nuclide ao="1.0044467618118171e-05" name="U234"/>
-    <nuclide ao="0.0010132122009064637" name="U235"/>
-    <nuclide ao="0.022134533704800487" name="U238"/>
-    <nuclide ao="5.2441194996454685e-09" name="Xe135"/>
-    <nuclide ao="1.9200927095463644e-06" name="Xe136"/>
-  </material>
-  <material depletable="true" id="43" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum"/>
-    <nuclide ao="0.046295399999999994" name="O16"/>
-    <nuclide ao="0.00011276839999999999" name="O17"/>
-    <nuclide ao="4.6621088555426265e-07" name="Cs135"/>
-    <nuclide ao="8.403287883759693e-09" name="Gd156"/>
-    <nuclide ao="3.669166752999124e-10" name="Gd157"/>
-    <nuclide ao="1.0403690981836015e-08" name="I135"/>
-    <nuclide ao="1.0044333944166113e-05" name="U234"/>
-    <nuclide ao="0.0010143215164151278" name="U235"/>
-    <nuclide ao="0.02213434952981268" name="U238"/>
-    <nuclide ao="5.451035317592364e-09" name="Xe135"/>
-    <nuclide ao="1.8535025407324627e-06" name="Xe136"/>
-  </material>
-  <material depletable="true" id="44" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum"/>
-    <nuclide ao="0.046295399999999994" name="O16"/>
-    <nuclide ao="0.00011276839999999999" name="O17"/>
-    <nuclide ao="4.7386490418530295e-07" name="Cs135"/>
-    <nuclide ao="8.2685227302447e-09" name="Gd156"/>
-    <nuclide ao="3.776944576757155e-10" name="Gd157"/>
-    <nuclide ao="1.0842502886868061e-08" name="I135"/>
-    <nuclide ao="1.0044550501199754e-05" name="U234"/>
-    <nuclide ao="0.0010150062559977334" name="U235"/>
-    <nuclide ao="0.022134385320256817" name="U238"/>
-    <nuclide ao="5.7229967592843554e-09" name="Xe135"/>
-    <nuclide ao="1.8077253263384327e-06" name="Xe136"/>
-  </material>
-  <material depletable="true" id="45" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum"/>
-    <nuclide ao="0.046295399999999994" name="O16"/>
-    <nuclide ao="0.00011276839999999999" name="O17"/>
-    <nuclide ao="4.407652401199493e-07" name="Cs135"/>
-    <nuclide ao="7.327810416041793e-09" name="Gd156"/>
-    <nuclide ao="3.7455808995871114e-10" name="Gd157"/>
-    <nuclide ao="1.17295932855595e-08" name="I135"/>
-    <nuclide ao="1.0044575831769265e-05" name="U234"/>
-    <nuclide ao="0.001020781061160739" name="U235"/>
-    <nuclide ao="0.022134501621275452" name="U238"/>
-    <nuclide ao="5.314959906762633e-09" name="Xe135"/>
-    <nuclide ao="1.5279472503684031e-06" name="Xe136"/>
-  </material>
-  <material depletable="true" id="46" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum"/>
-    <nuclide ao="0.046295399999999994" name="O16"/>
-    <nuclide ao="0.00011276839999999999" name="O17"/>
-    <nuclide ao="4.7039361271991246e-07" name="Cs135"/>
-    <nuclide ao="7.55749566950451e-09" name="Gd156"/>
-    <nuclide ao="4.707485798456035e-10" name="Gd157"/>
-    <nuclide ao="1.0634554158124267e-08" name="I135"/>
-    <nuclide ao="1.0044530555935427e-05" name="U234"/>
-    <nuclide ao="0.0010209326507167006" name="U235"/>
-    <nuclide ao="0.02213417530217058" name="U238"/>
-    <nuclide ao="6.353270400959161e-09" name="Xe135"/>
-    <nuclide ao="1.4955326812707174e-06" name="Xe136"/>
-  </material>
-  <material depletable="true" id="47" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum"/>
-    <nuclide ao="0.046295399999999994" name="O16"/>
-    <nuclide ao="0.00011276839999999999" name="O17"/>
-    <nuclide ao="4.636034601798797e-07" name="Cs135"/>
-    <nuclide ao="7.495433091678523e-09" name="Gd156"/>
-    <nuclide ao="4.36374537601735e-10" name="Gd157"/>
-    <nuclide ao="8.674778390989408e-09" name="I135"/>
-    <nuclide ao="1.0044596524270627e-05" name="U234"/>
-    <nuclide ao="0.0010204096991334123" name="U235"/>
-    <nuclide ao="0.0221343532758111" name="U238"/>
-    <nuclide ao="4.62877874149118e-09" name="Xe135"/>
-    <nuclide ao="1.5312284248009385e-06" name="Xe136"/>
-  </material>
-  <material depletable="true" id="48" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum"/>
-    <nuclide ao="0.046295399999999994" name="O16"/>
-    <nuclide ao="0.00011276839999999999" name="O17"/>
-    <nuclide ao="4.4387693534608117e-07" name="Cs135"/>
-    <nuclide ao="7.97630803398477e-09" name="Gd156"/>
-    <nuclide ao="3.969215102824579e-10" name="Gd157"/>
-    <nuclide ao="9.776870256795282e-09" name="I135"/>
-    <nuclide ao="1.0044607832822283e-05" name="U234"/>
-    <nuclide ao="0.0010166668071861533" name="U235"/>
-    <nuclide ao="0.02213444463686793" name="U238"/>
-    <nuclide ao="4.95812790098165e-09" name="Xe135"/>
-    <nuclide ao="1.7492896428784499e-06" name="Xe136"/>
-  </material>
-  <material depletable="true" id="49" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum"/>
-    <nuclide ao="0.046295399999999994" name="O16"/>
-    <nuclide ao="0.00011276839999999999" name="O17"/>
-    <nuclide ao="4.455185803084232e-07" name="Cs135"/>
-    <nuclide ao="7.337855344976119e-09" name="Gd156"/>
-    <nuclide ao="5.288107893183848e-10" name="Gd157"/>
-    <nuclide ao="8.95876232200072e-09" name="I135"/>
-    <nuclide ao="1.0044618229856552e-05" name="U234"/>
-    <nuclide ao="0.0010217889366581374" name="U235"/>
-    <nuclide ao="0.022134293599384607" name="U238"/>
-    <nuclide ao="5.4164245821971194e-09" name="Xe135"/>
-    <nuclide ao="1.4750501825751544e-06" name="Xe136"/>
-  </material>
-  <material depletable="true" id="50" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum"/>
-    <nuclide ao="0.0464035" name="O16"/>
-    <nuclide ao="4.517900944075939e-07" name="Cs135"/>
-    <nuclide ao="5.045016111938287e-09" name="Gd156"/>
-    <nuclide ao="1.8134984977801202e-05" name="Gd157"/>
-    <nuclide ao="6.482226189748327e-09" name="I135"/>
-    <nuclide ao="0.0010147629176538704" name="U235"/>
-    <nuclide ao="0.021691761128726353" name="U238"/>
-    <nuclide ao="5.763098998610832e-09" name="Xe135"/>
-    <nuclide ao="7.078497671706068e-07" name="Xe136"/>
-  </material>
-  <material depletable="true" id="51" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum"/>
-    <nuclide ao="0.046295399999999994" name="O16"/>
-    <nuclide ao="0.00011276839999999999" name="O17"/>
-    <nuclide ao="4.659699944335705e-07" name="Cs135"/>
-    <nuclide ao="8.025074976583637e-09" name="Gd156"/>
-    <nuclide ao="4.09445695785748e-10" name="Gd157"/>
-    <nuclide ao="1.0945335150467282e-08" name="I135"/>
-    <nuclide ao="1.0044581154205115e-05" name="U234"/>
-    <nuclide ao="0.0010164858220320235" name="U235"/>
-    <nuclide ao="0.022134422188635136" name="U238"/>
-    <nuclide ao="5.551411019664158e-09" name="Xe135"/>
-    <nuclide ao="1.7355327775146165e-06" name="Xe136"/>
-  </material>
-  <material depletable="true" id="52" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum"/>
-    <nuclide ao="0.046295399999999994" name="O16"/>
-    <nuclide ao="0.00011276839999999999" name="O17"/>
-    <nuclide ao="4.681457035455898e-07" name="Cs135"/>
-    <nuclide ao="8.71361864735632e-09" name="Gd156"/>
-    <nuclide ao="3.174701733038042e-10" name="Gd157"/>
-    <nuclide ao="1.4020730679274332e-08" name="I135"/>
-    <nuclide ao="1.0044099278017894e-05" name="U234"/>
-    <nuclide ao="0.0010126690056941115" name="U235"/>
-    <nuclide ao="0.022134261447381454" name="U238"/>
-    <nuclide ao="5.6399359283499295e-09" name="Xe135"/>
-    <nuclide ao="1.9380616593817735e-06" name="Xe136"/>
-  </material>
-  <material depletable="true" id="53" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum"/>
-    <nuclide ao="0.046295399999999994" name="O16"/>
-    <nuclide ao="0.00011276839999999999" name="O17"/>
-    <nuclide ao="4.544946942071967e-07" name="Cs135"/>
-    <nuclide ao="8.336100255413542e-09" name="Gd156"/>
-    <nuclide ao="3.349693677637064e-10" name="Gd157"/>
-    <nuclide ao="1.300729943471215e-08" name="I135"/>
-    <nuclide ao="1.0044366612084531e-05" name="U234"/>
-    <nuclide ao="0.0010141681490291126" name="U235"/>
-    <nuclide ao="0.022134460848195252" name="U238"/>
-    <nuclide ao="5.834616975029099e-09" name="Xe135"/>
-    <nuclide ao="1.8686662601249285e-06" name="Xe136"/>
-  </material>
-  <material depletable="true" id="54" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum"/>
-    <nuclide ao="0.046295399999999994" name="O16"/>
-    <nuclide ao="0.00011276839999999999" name="O17"/>
-    <nuclide ao="4.5766121557221316e-07" name="Cs135"/>
-    <nuclide ao="8.656426219093345e-09" name="Gd156"/>
-    <nuclide ao="3.5094506543349145e-10" name="Gd157"/>
-    <nuclide ao="1.3877107412830242e-08" name="I135"/>
-    <nuclide ao="1.004416295609268e-05" name="U234"/>
-    <nuclide ao="0.0010140243853248815" name="U235"/>
-    <nuclide ao="0.022134042904509686" name="U238"/>
-    <nuclide ao="5.594497813916764e-09" name="Xe135"/>
-    <nuclide ao="1.8794069149000725e-06" name="Xe136"/>
-  </material>
-  <material depletable="true" id="55" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum"/>
-    <nuclide ao="0.046295399999999994" name="O16"/>
-    <nuclide ao="0.00011276839999999999" name="O17"/>
-    <nuclide ao="4.5070044982225826e-07" name="Cs135"/>
-    <nuclide ao="8.307166786809273e-09" name="Gd156"/>
-    <nuclide ao="4.852995067853279e-10" name="Gd157"/>
-    <nuclide ao="8.43006813520517e-09" name="I135"/>
-    <nuclide ao="1.0044124057308204e-05" name="U234"/>
-    <nuclide ao="0.0010154726348555639" name="U235"/>
-    <nuclide ao="0.02213418651112704" name="U238"/>
-    <nuclide ao="4.949152601376445e-09" name="Xe135"/>
-    <nuclide ao="1.8122564453895658e-06" name="Xe136"/>
-  </material>
-  <material depletable="true" id="56" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum"/>
-    <nuclide ao="0.046295399999999994" name="O16"/>
-    <nuclide ao="0.00011276839999999999" name="O17"/>
-    <nuclide ao="4.836978536882764e-07" name="Cs135"/>
-    <nuclide ao="7.537362091239518e-09" name="Gd156"/>
-    <nuclide ao="4.5126076517149186e-10" name="Gd157"/>
-    <nuclide ao="9.60199687518672e-09" name="I135"/>
-    <nuclide ao="1.0044685059092674e-05" name="U234"/>
-    <nuclide ao="0.0010196381990756533" name="U235"/>
-    <nuclide ao="0.02213445285182628" name="U238"/>
-    <nuclide ao="5.494845522710317e-09" name="Xe135"/>
-    <nuclide ao="1.5491995716680678e-06" name="Xe136"/>
-  </material>
-  <material depletable="true" id="57" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum"/>
-    <nuclide ao="0.046295399999999994" name="O16"/>
-    <nuclide ao="0.00011276839999999999" name="O17"/>
-    <nuclide ao="4.4186301588556743e-07" name="Cs135"/>
-    <nuclide ao="7.826608358738061e-09" name="Gd156"/>
-    <nuclide ao="4.0312953112338433e-10" name="Gd157"/>
-    <nuclide ao="1.0758074378707132e-08" name="I135"/>
-    <nuclide ao="1.0044350307434386e-05" name="U234"/>
-    <nuclide ao="0.001018512023981224" name="U235"/>
-    <nuclide ao="0.022134272283106108" name="U238"/>
-    <nuclide ao="5.184367150914981e-09" name="Xe135"/>
-    <nuclide ao="1.653697557847264e-06" name="Xe136"/>
-  </material>
-  <material depletable="true" id="58" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum"/>
-    <nuclide ao="0.046295399999999994" name="O16"/>
-    <nuclide ao="0.00011276839999999999" name="O17"/>
-    <nuclide ao="4.5107547790946403e-07" name="Cs135"/>
-    <nuclide ao="7.582888624484162e-09" name="Gd156"/>
-    <nuclide ao="4.1641609325302373e-10" name="Gd157"/>
-    <nuclide ao="9.359811673300804e-09" name="I135"/>
-    <nuclide ao="1.0044946416861597e-05" name="U234"/>
-    <nuclide ao="0.0010186483802527863" name="U235"/>
-    <nuclide ao="0.02213458421313534" name="U238"/>
-    <nuclide ao="5.298991310558835e-09" name="Xe135"/>
-    <nuclide ao="1.6333307494049164e-06" name="Xe136"/>
-  </material>
-  <material depletable="true" id="59" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum"/>
-    <nuclide ao="0.0464035" name="O16"/>
-    <nuclide ao="4.530550449840411e-07" name="Cs135"/>
-    <nuclide ao="5.152211037545898e-09" name="Gd156"/>
-    <nuclide ao="1.7414078116507776e-05" name="Gd157"/>
-    <nuclide ao="5.798373035811935e-09" name="I135"/>
-    <nuclide ao="0.0010142210013264637" name="U235"/>
-    <nuclide ao="0.021691726637340612" name="U238"/>
-    <nuclide ao="5.2661388117821805e-09" name="Xe135"/>
-    <nuclide ao="7.374647706571651e-07" name="Xe136"/>
-  </material>
-  <material depletable="true" id="60" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum"/>
-    <nuclide ao="0.046295399999999994" name="O16"/>
-    <nuclide ao="0.00011276839999999999" name="O17"/>
-    <nuclide ao="4.822049134818106e-07" name="Cs135"/>
-    <nuclide ao="8.452589488490197e-09" name="Gd156"/>
-    <nuclide ao="3.1306244235949564e-10" name="Gd157"/>
-    <nuclide ao="1.3923826246996677e-08" name="I135"/>
-    <nuclide ao="1.0044676382235605e-05" name="U234"/>
-    <nuclide ao="0.001013658455830591" name="U235"/>
-    <nuclide ao="0.022134405975477205" name="U238"/>
-    <nuclide ao="6.044142076870048e-09" name="Xe135"/>
-    <nuclide ao="1.8681097449626251e-06" name="Xe136"/>
-  </material>
-  <material depletable="true" id="61" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum"/>
-    <nuclide ao="0.046295399999999994" name="O16"/>
-    <nuclide ao="0.00011276839999999999" name="O17"/>
-    <nuclide ao="4.4691043293275517e-07" name="Cs135"/>
-    <nuclide ao="8.012731861896239e-09" name="Gd156"/>
-    <nuclide ao="3.687262378894955e-10" name="Gd157"/>
-    <nuclide ao="1.1428305598450469e-08" name="I135"/>
-    <nuclide ao="1.0044405456893536e-05" name="U234"/>
-    <nuclide ao="0.0010164498453403522" name="U235"/>
-    <nuclide ao="0.022134450527739345" name="U238"/>
-    <nuclide ao="5.061575530060914e-09" name="Xe135"/>
-    <nuclide ao="1.7560831900418087e-06" name="Xe136"/>
-  </material>
-  <material depletable="true" id="62" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum"/>
-    <nuclide ao="0.046295399999999994" name="O16"/>
-    <nuclide ao="0.00011276839999999999" name="O17"/>
-    <nuclide ao="4.7251741651739154e-07" name="Cs135"/>
-    <nuclide ao="8.233538582389422e-09" name="Gd156"/>
-    <nuclide ao="4.3498877022171187e-10" name="Gd157"/>
-    <nuclide ao="1.1406240478828367e-08" name="I135"/>
-    <nuclide ao="1.0044307557051272e-05" name="U234"/>
-    <nuclide ao="0.0010151392434079533" name="U235"/>
-    <nuclide ao="0.02213440855685908" name="U238"/>
-    <nuclide ao="6.026621375913049e-09" name="Xe135"/>
-    <nuclide ao="1.8006912731212633e-06" name="Xe136"/>
-  </material>
-  <material depletable="true" id="63" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum"/>
-    <nuclide ao="0.046295399999999994" name="O16"/>
-    <nuclide ao="0.00011276839999999999" name="O17"/>
-    <nuclide ao="4.79794958069132e-07" name="Cs135"/>
-    <nuclide ao="7.497400822054367e-09" name="Gd156"/>
-    <nuclide ao="4.088535129059029e-10" name="Gd157"/>
-    <nuclide ao="1.020646791660957e-08" name="I135"/>
-    <nuclide ao="1.0044358428004462e-05" name="U234"/>
-    <nuclide ao="0.0010202817074345758" name="U235"/>
-    <nuclide ao="0.022134363783915374" name="U238"/>
-    <nuclide ao="5.5919103510501745e-09" name="Xe135"/>
-    <nuclide ao="1.5192672082067856e-06" name="Xe136"/>
-  </material>
-  <material depletable="true" id="64" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum"/>
-    <nuclide ao="0.046295399999999994" name="O16"/>
-    <nuclide ao="0.00011276839999999999" name="O17"/>
-    <nuclide ao="4.46173095422033e-07" name="Cs135"/>
-    <nuclide ao="7.776020869306452e-09" name="Gd156"/>
-    <nuclide ao="4.4071869092604184e-10" name="Gd157"/>
-    <nuclide ao="9.58881052529061e-09" name="I135"/>
-    <nuclide ao="1.0044875744723067e-05" name="U234"/>
-    <nuclide ao="0.001017463364101478" name="U235"/>
-    <nuclide ao="0.022134564631230084" name="U238"/>
-    <nuclide ao="5.074476802123941e-09" name="Xe135"/>
-    <nuclide ao="1.7022684619273444e-06" name="Xe136"/>
-  </material>
-  <material depletable="true" id="65" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum"/>
-    <nuclide ao="0.046295399999999994" name="O16"/>
-    <nuclide ao="0.00011276839999999999" name="O17"/>
-    <nuclide ao="4.5021506681118494e-07" name="Cs135"/>
-    <nuclide ao="7.941170517826359e-09" name="Gd156"/>
-    <nuclide ao="4.87901009317699e-10" name="Gd157"/>
-    <nuclide ao="8.335158330979799e-09" name="I135"/>
-    <nuclide ao="1.004446486176024e-05" name="U234"/>
-    <nuclide ao="0.0010174211105253887" name="U235"/>
-    <nuclide ao="0.0221343469639183" name="U238"/>
-    <nuclide ao="5.045134946055872e-09" name="Xe135"/>
-    <nuclide ao="1.7053442901899206e-06" name="Xe136"/>
-  </material>
-  <material depletable="true" id="66" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum"/>
-    <nuclide ao="0.046295399999999994" name="O16"/>
-    <nuclide ao="0.00011276839999999999" name="O17"/>
-    <nuclide ao="4.300530779935639e-07" name="Cs135"/>
-    <nuclide ao="8.093213725235949e-09" name="Gd156"/>
-    <nuclide ao="5.14605341601871e-10" name="Gd157"/>
-    <nuclide ao="9.193679363006245e-09" name="I135"/>
-    <nuclide ao="1.0044529408433637e-05" name="U234"/>
-    <nuclide ao="0.0010168399945276177" name="U235"/>
-    <nuclide ao="0.0221342600989091" name="U238"/>
-    <nuclide ao="5.0545078365203945e-09" name="Xe135"/>
-    <nuclide ao="1.7572929664610167e-06" name="Xe136"/>
-  </material>
-  <material depletable="true" id="67" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum"/>
-    <nuclide ao="0.046295399999999994" name="O16"/>
-    <nuclide ao="0.00011276839999999999" name="O17"/>
-    <nuclide ao="4.6387578662097733e-07" name="Cs135"/>
-    <nuclide ao="7.904303216061177e-09" name="Gd156"/>
-    <nuclide ao="3.535144094848107e-10" name="Gd157"/>
-    <nuclide ao="1.0913558729134318e-08" name="I135"/>
-    <nuclide ao="1.0045224868160921e-05" name="U234"/>
-    <nuclide ao="0.001015358496886946" name="U235"/>
-    <nuclide ao="0.02213479706012655" name="U238"/>
-    <nuclide ao="5.161066202726614e-09" name="Xe135"/>
-    <nuclide ao="1.7925321199970005e-06" name="Xe136"/>
-  </material>
-  <material depletable="true" id="68" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum"/>
-    <nuclide ao="0.0464035" name="O16"/>
-    <nuclide ao="4.4639816193101677e-07" name="Cs135"/>
-    <nuclide ao="5.473484807673252e-09" name="Gd156"/>
-    <nuclide ao="7.873961737997135e-06" name="Gd157"/>
-    <nuclide ao="7.047514529599939e-09" name="I135"/>
-    <nuclide ao="0.0010125885884101112" name="U235"/>
-    <nuclide ao="0.02169162150365341" name="U238"/>
-    <nuclide ao="5.5888114325423076e-09" name="Xe135"/>
-    <nuclide ao="8.320325563583469e-07" name="Xe136"/>
-  </material>
-  <material depletable="true" id="69" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum"/>
-    <nuclide ao="0.046295399999999994" name="O16"/>
-    <nuclide ao="0.00011276839999999999" name="O17"/>
-    <nuclide ao="4.6223836650122475e-07" name="Cs135"/>
-    <nuclide ao="7.953476976385664e-09" name="Gd156"/>
-    <nuclide ao="4.1027175087519965e-10" name="Gd157"/>
-    <nuclide ao="9.796423506518835e-09" name="I135"/>
-    <nuclide ao="1.0044187649341062e-05" name="U234"/>
-    <nuclide ao="0.0010170353834242176" name="U235"/>
-    <nuclide ao="0.022134372559487282" name="U238"/>
-    <nuclide ao="5.0991030899242805e-09" name="Xe135"/>
-    <nuclide ao="1.7121460733075797e-06" name="Xe136"/>
-  </material>
-  <material depletable="true" id="70" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum"/>
-    <nuclide ao="0.046295399999999994" name="O16"/>
-    <nuclide ao="0.00011276839999999999" name="O17"/>
-    <nuclide ao="4.664997159187979e-07" name="Cs135"/>
-    <nuclide ao="9.025781278455481e-09" name="Gd156"/>
-    <nuclide ao="3.190701703279217e-10" name="Gd157"/>
-    <nuclide ao="1.4711477916054572e-08" name="I135"/>
-    <nuclide ao="1.0043737061563706e-05" name="U234"/>
-    <nuclide ao="0.0010106766373031348" name="U235"/>
-    <nuclide ao="0.02213424099107004" name="U238"/>
-    <nuclide ao="5.458886745013372e-09" name="Xe135"/>
-    <nuclide ao="2.0466796921687864e-06" name="Xe136"/>
-  </material>
-  <material depletable="true" id="71" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum"/>
-    <nuclide ao="0.046295399999999994" name="O16"/>
-    <nuclide ao="0.00011276839999999999" name="O17"/>
-    <nuclide ao="4.6163611872342463e-07" name="Cs135"/>
-    <nuclide ao="8.092676337515914e-09" name="Gd156"/>
-    <nuclide ao="4.0155978871991965e-10" name="Gd157"/>
-    <nuclide ao="1.1255710201354816e-08" name="I135"/>
-    <nuclide ao="1.0044080156464483e-05" name="U234"/>
-    <nuclide ao="0.0010160767932805275" name="U235"/>
-    <nuclide ao="0.022134404858133214" name="U238"/>
-    <nuclide ao="6.1065455616234985e-09" name="Xe135"/>
-    <nuclide ao="1.7613053571588805e-06" name="Xe136"/>
-  </material>
-  <material depletable="true" id="72" temperature="293.6" volume="0.06674732823364922">
-    <density units="sum"/>
-    <nuclide ao="0.046295399999999994" name="O16"/>
-    <nuclide ao="0.00011276839999999999" name="O17"/>
-    <nuclide ao="4.5571123718376045e-07" name="Cs135"/>
-    <nuclide ao="6.928887839072172e-09" name="Gd156"/>
-    <nuclide ao="4.3753171369940084e-10" name="Gd157"/>
-    <nuclide ao="8.934890686722866e-09" name="I135"/>
-    <nuclide ao="1.0044610174441688e-05" name="U234"/>
-    <nuclide ao="0.0010236806448679259" name="U235"/>
-    <nuclide ao="0.022134444472317126" name="U238"/>
-    <nuclide ao="5.225774688291077e-09" name="Xe135"/>
-    <nuclide ao="1.3609040886582337e-06" name="Xe136"/>
-  </material>
-  <material id="73" temperature="293.6" volume="0.017528298008244847">
-    <density units="sum"/>
-    <nuclide ao="3.3864599999999994e-05" name="N14"/>
-    <nuclide ao="1.23717e-07" name="N15"/>
-    <nuclide ao="7.86548e-06" name="O16"/>
-    <nuclide ao="2.9954799999999997e-09" name="O17"/>
-  </material>
-  <material id="74" temperature="293.6" volume="0.16066450553933276">
-    <density units="sum"/>
-    <nuclide ao="3.2962e-06" name="Cr50"/>
-    <nuclide ao="6.35639e-05" name="Cr52"/>
-    <nuclide ao="7.20763e-06" name="Cr53"/>
-    <nuclide ao="1.7941299999999999e-06" name="Cr54"/>
-    <nuclide ao="5.573499999999999e-06" name="Fe54"/>
-    <nuclide ao="8.749209999999999e-05" name="Fe56"/>
-    <nuclide ao="2.0205699999999998e-06" name="Fe57"/>
-    <nuclide ao="2.6890099999999995e-07" name="Fe58"/>
-    <nuclide ao="2.51631e-05" name="Ni58"/>
-    <nuclide ao="9.69278e-06" name="Ni60"/>
-    <nuclide ao="4.21338e-07" name="Ni61"/>
-    <nuclide ao="1.34341e-06" name="Ni62"/>
-    <nuclide ao="3.43127e-07" name="Ni64"/>
-    <nuclide ao="0.000307427" name="O16"/>
-    <nuclide ao="7.488679999999999e-07" name="O17"/>
-    <nuclide ao="4.67352e-06" name="Sn112"/>
-    <nuclide ao="3.17992e-06" name="Sn114"/>
-    <nuclide ao="1.6381399999999999e-06" name="Sn115"/>
-    <nuclide ao="7.005459999999999e-05" name="Sn116"/>
-    <nuclide ao="3.70027e-05" name="Sn117"/>
-    <nuclide ao="0.00011669399999999999" name="Sn118"/>
-    <nuclide ao="4.1387199999999996e-05" name="Sn119"/>
-    <nuclide ao="0.00015697299999999998" name="Sn120"/>
-    <nuclide ao="2.23076e-05" name="Sn122"/>
-    <nuclide ao="2.7896599999999996e-05" name="Sn124"/>
-    <nuclide ao="0.021831999999999997" name="Zr90"/>
-    <nuclide ao="0.004761039999999999" name="Zr91"/>
-    <nuclide ao="0.007277339999999999" name="Zr92"/>
-    <nuclide ao="0.007374939999999999" name="Zr94"/>
-    <nuclide ao="0.00118814" name="Zr96"/>
-  </material>
-  <material id="75" temperature="293.6" volume="0.8803968514832288">
-    <density units="sum"/>
-    <nuclide ao="0.046806299999999995" name="H1"/>
-    <nuclide ao="0.023342699999999997" name="O16"/>
-    <nuclide ao="8.890859999999999e-06" name="O17"/>
+  <material id="1" depletable="true" volume="0.06674732823364922" temperature="293.6">
+    <density units="sum"/>
+    <nuclide name="O16" ao="0.046295399999999994"/>
+    <nuclide name="O17" ao="0.00011276839999999999"/>
+    <nuclide name="Cs135" ao="4.4180489845847837e-07"/>
+    <nuclide name="Gd156" ao="7.2549793284842195e-09"/>
+    <nuclide name="Gd157" ao="4.6150717465438587e-10"/>
+    <nuclide name="I135" ao="8.610759149890541e-09"/>
+    <nuclide name="U234" ao="1.00447595096247e-05"/>
+    <nuclide name="U235" ao="0.001021319968105753"/>
+    <nuclide name="U238" ao="0.022134492490415457"/>
+    <nuclide name="Xe135" ao="4.898883540853392e-09"/>
+    <nuclide name="Xe136" ao="1.5016036288896978e-06"/>
+  </material>
+  <material id="2" depletable="true" volume="0.06674732823364922" temperature="293.6">
+    <density units="sum"/>
+    <nuclide name="O16" ao="0.046295399999999994"/>
+    <nuclide name="O17" ao="0.00011276839999999999"/>
+    <nuclide name="Cs135" ao="4.7109992046231964e-07"/>
+    <nuclide name="Gd156" ao="7.042063874024541e-09"/>
+    <nuclide name="Gd157" ao="6.027071887061818e-10"/>
+    <nuclide name="I135" ao="7.95412956238769e-09"/>
+    <nuclide name="U234" ao="1.0044351820098593e-05"/>
+    <nuclide name="U235" ao="0.00102408632740032"/>
+    <nuclide name="U238" ao="0.02213423274784442"/>
+    <nuclide name="Xe135" ao="4.973037106302515e-09"/>
+    <nuclide name="Xe136" ao="1.3283930174680673e-06"/>
+  </material>
+  <material id="3" depletable="true" volume="0.06674732823364922" temperature="293.6">
+    <density units="sum"/>
+    <nuclide name="O16" ao="0.046295399999999994"/>
+    <nuclide name="O17" ao="0.00011276839999999999"/>
+    <nuclide name="Cs135" ao="4.5196882278137964e-07"/>
+    <nuclide name="Gd156" ao="7.390520641508283e-09"/>
+    <nuclide name="Gd157" ao="6.1139624340991e-10"/>
+    <nuclide name="I135" ao="7.339426249127244e-09"/>
+    <nuclide name="U234" ao="1.0044458911815349e-05"/>
+    <nuclide name="U235" ao="0.0010213846058415266"/>
+    <nuclide name="U238" ao="0.02213428321817386"/>
+    <nuclide name="Xe135" ao="5.052047240880656e-09"/>
+    <nuclide name="Xe136" ao="1.492502282115296e-06"/>
+  </material>
+  <material id="4" depletable="true" volume="0.06674732823364922" temperature="293.6">
+    <density units="sum"/>
+    <nuclide name="O16" ao="0.046295399999999994"/>
+    <nuclide name="O17" ao="0.00011276839999999999"/>
+    <nuclide name="Cs135" ao="4.610385562797368e-07"/>
+    <nuclide name="Gd156" ao="7.2542350999039044e-09"/>
+    <nuclide name="Gd157" ao="4.694384504892065e-10"/>
+    <nuclide name="I135" ao="8.99963252548058e-09"/>
+    <nuclide name="U234" ao="1.0044557857503748e-05"/>
+    <nuclide name="U235" ao="0.0010213889405514816"/>
+    <nuclide name="U238" ao="0.022134477440110358"/>
+    <nuclide name="Xe135" ao="5.198618342135029e-09"/>
+    <nuclide name="Xe136" ao="1.4782292628750817e-06"/>
+  </material>
+  <material id="5" depletable="true" volume="0.06674732823364922" temperature="293.6">
+    <density units="sum"/>
+    <nuclide name="O16" ao="0.0464035"/>
+    <nuclide name="Cs135" ao="4.6068906575995227e-07"/>
+    <nuclide name="Gd156" ao="4.45301183633431e-09"/>
+    <nuclide name="Gd157" ao="6.452882105032804e-05"/>
+    <nuclide name="I135" ao="5.350905347436304e-09"/>
+    <nuclide name="U235" ao="0.0010186933910628446"/>
+    <nuclide name="U238" ao="0.02169176973824294"/>
+    <nuclide name="Xe135" ao="6.032753962430652e-09"/>
+    <nuclide name="Xe136" ao="4.88334256170519e-07"/>
+  </material>
+  <material id="6" depletable="true" volume="0.06674732823364922" temperature="293.6">
+    <density units="sum"/>
+    <nuclide name="O16" ao="0.046295399999999994"/>
+    <nuclide name="O17" ao="0.00011276839999999999"/>
+    <nuclide name="Cs135" ao="4.5448917916965475e-07"/>
+    <nuclide name="Gd156" ao="7.987183377412963e-09"/>
+    <nuclide name="Gd157" ao="4.865379817976642e-10"/>
+    <nuclide name="I135" ao="8.523326262987082e-09"/>
+    <nuclide name="U234" ao="1.004449677662597e-05"/>
+    <nuclide name="U235" ao="0.0010175799065569445"/>
+    <nuclide name="U238" ao="0.02213426568393913"/>
+    <nuclide name="Xe135" ao="4.86982078246298e-09"/>
+    <nuclide name="Xe136" ao="1.6938385702297322e-06"/>
+  </material>
+  <material id="7" depletable="true" volume="0.06674732823364922" temperature="293.6">
+    <density units="sum"/>
+    <nuclide name="O16" ao="0.046295399999999994"/>
+    <nuclide name="O17" ao="0.00011276839999999999"/>
+    <nuclide name="Cs135" ao="4.365851597102055e-07"/>
+    <nuclide name="Gd156" ao="7.885461639644807e-09"/>
+    <nuclide name="Gd157" ao="3.6063871000919685e-10"/>
+    <nuclide name="I135" ao="1.136967239656431e-08"/>
+    <nuclide name="U234" ao="1.004435753347176e-05"/>
+    <nuclide name="U235" ao="0.0010176281979544044"/>
+    <nuclide name="U238" ao="0.02213438660359147"/>
+    <nuclide name="Xe135" ao="5.3728946653715295e-09"/>
+    <nuclide name="Xe136" ao="1.7038388316063246e-06"/>
+  </material>
+  <material id="8" depletable="true" volume="0.06674732823364922" temperature="293.6">
+    <density units="sum"/>
+    <nuclide name="O16" ao="0.046295399999999994"/>
+    <nuclide name="O17" ao="0.00011276839999999999"/>
+    <nuclide name="Cs135" ao="4.5625540310461215e-07"/>
+    <nuclide name="Gd156" ao="7.771490180621292e-09"/>
+    <nuclide name="Gd157" ao="4.146823023983641e-10"/>
+    <nuclide name="I135" ao="9.209488335030714e-09"/>
+    <nuclide name="U234" ao="1.0044402337263812e-05"/>
+    <nuclide name="U235" ao="0.0010186458655452861"/>
+    <nuclide name="U238" ao="0.022134339049317633"/>
+    <nuclide name="Xe135" ao="5.497659457987619e-09"/>
+    <nuclide name="Xe136" ao="1.6322553919462217e-06"/>
+  </material>
+  <material id="9" depletable="true" volume="0.06674732823364922" temperature="293.6">
+    <density units="sum"/>
+    <nuclide name="O16" ao="0.046295399999999994"/>
+    <nuclide name="O17" ao="0.00011276839999999999"/>
+    <nuclide name="Cs135" ao="4.4849047261874304e-07"/>
+    <nuclide name="Gd156" ao="7.046983082489661e-09"/>
+    <nuclide name="Gd157" ao="4.957093622147675e-10"/>
+    <nuclide name="I135" ao="1.0283911483340312e-08"/>
+    <nuclide name="U234" ao="1.0044263707893839e-05"/>
+    <nuclide name="U235" ao="0.0010240145184075352"/>
+    <nuclide name="U238" ao="0.02213424387109948"/>
+    <nuclide name="Xe135" ao="5.102740934580265e-09"/>
+    <nuclide name="Xe136" ao="1.3522284050998152e-06"/>
+  </material>
+  <material id="10" depletable="true" volume="0.06674732823364922" temperature="293.6">
+    <density units="sum"/>
+    <nuclide name="O16" ao="0.046295399999999994"/>
+    <nuclide name="O17" ao="0.00011276839999999999"/>
+    <nuclide name="Cs135" ao="4.54649330746641e-07"/>
+    <nuclide name="Gd156" ao="8.140359772312664e-09"/>
+    <nuclide name="Gd157" ao="5.697645603089687e-10"/>
+    <nuclide name="I135" ao="7.546282979584689e-09"/>
+    <nuclide name="U234" ao="1.0044621491322387e-05"/>
+    <nuclide name="U235" ao="0.0010168499066742598"/>
+    <nuclide name="U238" ao="0.022134202939750564"/>
+    <nuclide name="Xe135" ao="5.110958338411566e-09"/>
+    <nuclide name="Xe136" ao="1.7346785903470948e-06"/>
+  </material>
+  <material id="11" depletable="true" volume="0.06674732823364922" temperature="293.6">
+    <density units="sum"/>
+    <nuclide name="O16" ao="0.046295399999999994"/>
+    <nuclide name="O17" ao="0.00011276839999999999"/>
+    <nuclide name="Cs135" ao="4.356328087111304e-07"/>
+    <nuclide name="Gd156" ao="7.482536561844464e-09"/>
+    <nuclide name="Gd157" ao="4.256220744995123e-10"/>
+    <nuclide name="I135" ao="9.633889473449001e-09"/>
+    <nuclide name="U234" ao="1.0044260492856067e-05"/>
+    <nuclide name="U235" ao="0.0010215775522793961"/>
+    <nuclide name="U238" ao="0.022134138392005908"/>
+    <nuclide name="Xe135" ao="4.875694297039386e-09"/>
+    <nuclide name="Xe136" ao="1.4987118043030461e-06"/>
+  </material>
+  <material id="12" depletable="true" volume="0.06674732823364922" temperature="293.6">
+    <density units="sum"/>
+    <nuclide name="O16" ao="0.046295399999999994"/>
+    <nuclide name="O17" ao="0.00011276839999999999"/>
+    <nuclide name="Cs135" ao="4.5499172002525965e-07"/>
+    <nuclide name="Gd156" ao="7.90039271767826e-09"/>
+    <nuclide name="Gd157" ao="5.043357296023378e-10"/>
+    <nuclide name="I135" ao="9.717794257343092e-09"/>
+    <nuclide name="U234" ao="1.0044246640051479e-05"/>
+    <nuclide name="U235" ao="0.001018955480032775"/>
+    <nuclide name="U238" ao="0.022134093110617634"/>
+    <nuclide name="Xe135" ao="5.099520096684825e-09"/>
+    <nuclide name="Xe136" ao="1.6207687623132563e-06"/>
+  </material>
+  <material id="13" depletable="true" volume="0.06674732823364922" temperature="293.6">
+    <density units="sum"/>
+    <nuclide name="O16" ao="0.046295399999999994"/>
+    <nuclide name="O17" ao="0.00011276839999999999"/>
+    <nuclide name="Cs135" ao="4.2085912253520763e-07"/>
+    <nuclide name="Gd156" ao="7.387032997276892e-09"/>
+    <nuclide name="Gd157" ao="4.536377596093003e-10"/>
+    <nuclide name="I135" ao="9.623102601466089e-09"/>
+    <nuclide name="U234" ao="1.0044648049703634e-05"/>
+    <nuclide name="U235" ao="0.0010212601078170274"/>
+    <nuclide name="U238" ao="0.022134335203923612"/>
+    <nuclide name="Xe135" ao="4.8698368764839335e-09"/>
+    <nuclide name="Xe136" ao="1.5273484191647258e-06"/>
+  </material>
+  <material id="14" depletable="true" volume="0.06674732823364922" temperature="293.6">
+    <density units="sum"/>
+    <nuclide name="O16" ao="0.0464035"/>
+    <nuclide name="Cs135" ao="4.2242275017886855e-07"/>
+    <nuclide name="Gd156" ao="4.046777209581165e-09"/>
+    <nuclide name="Gd157" ao="7.77190237760579e-05"/>
+    <nuclide name="I135" ao="4.244203293759763e-09"/>
+    <nuclide name="U235" ao="0.0010210841866332414"/>
+    <nuclide name="U238" ao="0.02169184057611082"/>
+    <nuclide name="Xe135" ao="5.204749875515762e-09"/>
+    <nuclide name="Xe136" ao="3.9883254526072304e-07"/>
+  </material>
+  <material id="15" depletable="true" volume="0.06674732823364922" temperature="293.6">
+    <density units="sum"/>
+    <nuclide name="O16" ao="0.046295399999999994"/>
+    <nuclide name="O17" ao="0.00011276839999999999"/>
+    <nuclide name="Cs135" ao="4.6297695279308207e-07"/>
+    <nuclide name="Gd156" ao="8.043395705978296e-09"/>
+    <nuclide name="Gd157" ao="4.5962909889223416e-10"/>
+    <nuclide name="I135" ao="9.79459763465254e-09"/>
+    <nuclide name="U234" ao="1.0044275982599374e-05"/>
+    <nuclide name="U235" ao="0.0010173553197709228"/>
+    <nuclide name="U238" ao="0.022134228674554737"/>
+    <nuclide name="Xe135" ao="5.337501828657589e-09"/>
+    <nuclide name="Xe136" ao="1.69630230513062e-06"/>
+  </material>
+  <material id="16" depletable="true" volume="0.06674732823364922" temperature="293.6">
+    <density units="sum"/>
+    <nuclide name="O16" ao="0.046295399999999994"/>
+    <nuclide name="O17" ao="0.00011276839999999999"/>
+    <nuclide name="Cs135" ao="4.2439923646596987e-07"/>
+    <nuclide name="Gd156" ao="7.51993097842057e-09"/>
+    <nuclide name="Gd157" ao="3.8006059505546623e-10"/>
+    <nuclide name="I135" ao="1.0767865102277833e-08"/>
+    <nuclide name="U234" ao="1.0044208116408632e-05"/>
+    <nuclide name="U235" ao="0.0010205777538804912"/>
+    <nuclide name="U238" ao="0.022134290624025953"/>
+    <nuclide name="Xe135" ao="5.118002643684298e-09"/>
+    <nuclide name="Xe136" ao="1.5598554985375204e-06"/>
+  </material>
+  <material id="17" depletable="true" volume="0.06674732823364922" temperature="293.6">
+    <density units="sum"/>
+    <nuclide name="O16" ao="0.046295399999999994"/>
+    <nuclide name="O17" ao="0.00011276839999999999"/>
+    <nuclide name="Cs135" ao="4.712249224999332e-07"/>
+    <nuclide name="Gd156" ao="8.12439225407168e-09"/>
+    <nuclide name="Gd157" ao="3.918401546635954e-10"/>
+    <nuclide name="I135" ao="1.110080811911908e-08"/>
+    <nuclide name="U234" ao="1.004444860785254e-05"/>
+    <nuclide name="U235" ao="0.001015325533738875"/>
+    <nuclide name="U238" ao="0.022134518675913453"/>
+    <nuclide name="Xe135" ao="6.162820906594628e-09"/>
+    <nuclide name="Xe136" ao="1.7903377642474933e-06"/>
+  </material>
+  <material id="18" depletable="true" volume="0.06674732823364922" temperature="293.6">
+    <density units="sum"/>
+    <nuclide name="O16" ao="0.046295399999999994"/>
+    <nuclide name="O17" ao="0.00011276839999999999"/>
+    <nuclide name="Cs135" ao="4.531153595367313e-07"/>
+    <nuclide name="Gd156" ao="7.502808414768136e-09"/>
+    <nuclide name="Gd157" ao="3.8778800535383123e-10"/>
+    <nuclide name="I135" ao="1.0507636646210905e-08"/>
+    <nuclide name="U234" ao="1.0044253708465351e-05"/>
+    <nuclide name="U235" ao="0.0010201327804558217"/>
+    <nuclide name="U238" ao="0.02213439545238702"/>
+    <nuclide name="Xe135" ao="5.3962772783966446e-09"/>
+    <nuclide name="Xe136" ao="1.5533402153334209e-06"/>
+  </material>
+  <material id="19" depletable="true" volume="0.06674732823364922" temperature="293.6">
+    <density units="sum"/>
+    <nuclide name="O16" ao="0.046295399999999994"/>
+    <nuclide name="O17" ao="0.00011276839999999999"/>
+    <nuclide name="Cs135" ao="4.2805824385921033e-07"/>
+    <nuclide name="Gd156" ao="6.895063372358365e-09"/>
+    <nuclide name="Gd157" ao="4.725046335047864e-10"/>
+    <nuclide name="I135" ao="8.97107842759746e-09"/>
+    <nuclide name="U234" ao="1.0044434844325525e-05"/>
+    <nuclide name="U235" ao="0.0010246197579365402"/>
+    <nuclide name="U238" ao="0.022134292112283606"/>
+    <nuclide name="Xe135" ao="4.989035402383652e-09"/>
+    <nuclide name="Xe136" ao="1.3407496363522234e-06"/>
+  </material>
+  <material id="20" depletable="true" volume="0.06674732823364922" temperature="293.6">
+    <density units="sum"/>
+    <nuclide name="O16" ao="0.046295399999999994"/>
+    <nuclide name="O17" ao="0.00011276839999999999"/>
+    <nuclide name="Cs135" ao="4.572319631300454e-07"/>
+    <nuclide name="Gd156" ao="7.169872287546151e-09"/>
+    <nuclide name="Gd157" ao="4.5318180282038245e-10"/>
+    <nuclide name="I135" ao="9.303299219244154e-09"/>
+    <nuclide name="U234" ao="1.0044424717868887e-05"/>
+    <nuclide name="U235" ao="0.001023039411729011"/>
+    <nuclide name="U238" ao="0.022134264483889672"/>
+    <nuclide name="Xe135" ao="5.090119271586464e-09"/>
+    <nuclide name="Xe136" ao="1.3965662648477194e-06"/>
+  </material>
+  <material id="21" depletable="true" volume="0.06674732823364922" temperature="293.6">
+    <density units="sum"/>
+    <nuclide name="O16" ao="0.046295399999999994"/>
+    <nuclide name="O17" ao="0.00011276839999999999"/>
+    <nuclide name="Cs135" ao="4.450648347516283e-07"/>
+    <nuclide name="Gd156" ao="7.79123186528617e-09"/>
+    <nuclide name="Gd157" ao="4.801783348351781e-10"/>
+    <nuclide name="I135" ao="1.0146797229298853e-08"/>
+    <nuclide name="U234" ao="1.004438612044785e-05"/>
+    <nuclide name="U235" ao="0.0010197543471808291"/>
+    <nuclide name="U238" ao="0.02213407924687299"/>
+    <nuclide name="Xe135" ao="5.115335215214215e-09"/>
+    <nuclide name="Xe136" ao="1.587513649367174e-06"/>
+  </material>
+  <material id="22" depletable="true" volume="0.06674732823364922" temperature="293.6">
+    <density units="sum"/>
+    <nuclide name="O16" ao="0.046295399999999994"/>
+    <nuclide name="O17" ao="0.00011276839999999999"/>
+    <nuclide name="Cs135" ao="4.445115368004072e-07"/>
+    <nuclide name="Gd156" ao="7.610438516335627e-09"/>
+    <nuclide name="Gd157" ao="5.481423369261682e-10"/>
+    <nuclide name="I135" ao="7.563161653056015e-09"/>
+    <nuclide name="U234" ao="1.0044714261323595e-05"/>
+    <nuclide name="U235" ao="0.0010191890430702683"/>
+    <nuclide name="U238" ao="0.022134442627520262"/>
+    <nuclide name="Xe135" ao="5.049292264895614e-09"/>
+    <nuclide name="Xe136" ao="1.6151855322977993e-06"/>
+  </material>
+  <material id="23" depletable="true" volume="0.06674732823364922" temperature="293.6">
+    <density units="sum"/>
+    <nuclide name="O16" ao="0.0464035"/>
+    <nuclide name="Cs135" ao="4.007687837996293e-07"/>
+    <nuclide name="Gd156" ao="4.15563926329356e-09"/>
+    <nuclide name="Gd157" ao="6.084196393046683e-05"/>
+    <nuclide name="I135" ao="4.565764370958123e-09"/>
+    <nuclide name="U235" ao="0.001020914637247464"/>
+    <nuclide name="U238" ao="0.021691729016809345"/>
+    <nuclide name="Xe135" ao="4.9812486691849115e-09"/>
+    <nuclide name="Xe136" ao="4.313187001180846e-07"/>
+  </material>
+  <material id="24" depletable="true" volume="0.06674732823364922" temperature="293.6">
+    <density units="sum"/>
+    <nuclide name="O16" ao="0.046295399999999994"/>
+    <nuclide name="O17" ao="0.00011276839999999999"/>
+    <nuclide name="Cs135" ao="4.672347214537883e-07"/>
+    <nuclide name="Gd156" ao="7.510614517842352e-09"/>
+    <nuclide name="Gd157" ao="3.8800984116567243e-10"/>
+    <nuclide name="I135" ao="1.0221972095676418e-08"/>
+    <nuclide name="U234" ao="1.0044436788944246e-05"/>
+    <nuclide name="U235" ao="0.001020189192511756"/>
+    <nuclide name="U238" ao="0.022134340717921346"/>
+    <nuclide name="Xe135" ao="5.448196054594672e-09"/>
+    <nuclide name="Xe136" ao="1.5373005222115101e-06"/>
+  </material>
+  <material id="25" depletable="true" volume="0.06674732823364922" temperature="293.6">
+    <density units="sum"/>
+    <nuclide name="O16" ao="0.046295399999999994"/>
+    <nuclide name="O17" ao="0.00011276839999999999"/>
+    <nuclide name="Cs135" ao="4.211443960749324e-07"/>
+    <nuclide name="Gd156" ao="7.581311246517837e-09"/>
+    <nuclide name="Gd157" ao="4.035443346440247e-10"/>
+    <nuclide name="I135" ao="1.0963506656542743e-08"/>
+    <nuclide name="U234" ao="1.0044361025775531e-05"/>
+    <nuclide name="U235" ao="0.0010200126803834853"/>
+    <nuclide name="U238" ao="0.022134322371965366"/>
+    <nuclide name="Xe135" ao="4.9316754226086145e-09"/>
+    <nuclide name="Xe136" ao="1.5929594432571348e-06"/>
+  </material>
+  <material id="26" depletable="true" volume="0.06674732823364922" temperature="293.6">
+    <density units="sum"/>
+    <nuclide name="O16" ao="0.046295399999999994"/>
+    <nuclide name="O17" ao="0.00011276839999999999"/>
+    <nuclide name="Cs135" ao="4.6367556413001594e-07"/>
+    <nuclide name="Gd156" ao="8.098562238364125e-09"/>
+    <nuclide name="Gd157" ao="4.2570401128256144e-10"/>
+    <nuclide name="I135" ao="1.1873408939235887e-08"/>
+    <nuclide name="U234" ao="1.0044164596280645e-05"/>
+    <nuclide name="U235" ao="0.001016466422386754"/>
+    <nuclide name="U238" ao="0.02213432992062079"/>
+    <nuclide name="Xe135" ao="6.092134003743775e-09"/>
+    <nuclide name="Xe136" ao="1.7389259816658934e-06"/>
+  </material>
+  <material id="27" depletable="true" volume="0.06674732823364922" temperature="293.6">
+    <density units="sum"/>
+    <nuclide name="O16" ao="0.046295399999999994"/>
+    <nuclide name="O17" ao="0.00011276839999999999"/>
+    <nuclide name="Cs135" ao="4.523424314106055e-07"/>
+    <nuclide name="Gd156" ao="6.7483826383441804e-09"/>
+    <nuclide name="Gd157" ao="4.1066179871436127e-10"/>
+    <nuclide name="I135" ao="9.692240087722253e-09"/>
+    <nuclide name="U234" ao="1.0044564874269356e-05"/>
+    <nuclide name="U235" ao="0.0010247727656697873"/>
+    <nuclide name="U238" ao="0.02213446365544743"/>
+    <nuclide name="Xe135" ao="5.465219842757615e-09"/>
+    <nuclide name="Xe136" ao="1.3042444615190524e-06"/>
+  </material>
+  <material id="28" depletable="true" volume="0.06674732823364922" temperature="293.6">
+    <density units="sum"/>
+    <nuclide name="O16" ao="0.046295399999999994"/>
+    <nuclide name="O17" ao="0.00011276839999999999"/>
+    <nuclide name="Cs135" ao="4.466675187113592e-07"/>
+    <nuclide name="Gd156" ao="7.191858535557372e-09"/>
+    <nuclide name="Gd157" ao="4.638430627464777e-10"/>
+    <nuclide name="I135" ao="8.708423441592281e-09"/>
+    <nuclide name="U234" ao="1.004436720894081e-05"/>
+    <nuclide name="U235" ao="0.0010227318971276944"/>
+    <nuclide name="U238" ao="0.02213430292852833"/>
+    <nuclide name="Xe135" ao="5.1906248659837924e-09"/>
+    <nuclide name="Xe136" ao="1.4235382163510006e-06"/>
+  </material>
+  <material id="29" depletable="true" volume="0.06674732823364922" temperature="293.6">
+    <density units="sum"/>
+    <nuclide name="O16" ao="0.046295399999999994"/>
+    <nuclide name="O17" ao="0.00011276839999999999"/>
+    <nuclide name="Cs135" ao="4.564848163546606e-07"/>
+    <nuclide name="Gd156" ao="7.046950146855969e-09"/>
+    <nuclide name="Gd157" ao="5.361052662717774e-10"/>
+    <nuclide name="I135" ao="8.542724931158602e-09"/>
+    <nuclide name="U234" ao="1.004459756695043e-05"/>
+    <nuclide name="U235" ao="0.0010231530917557043"/>
+    <nuclide name="U238" ao="0.0221344016807911"/>
+    <nuclide name="Xe135" ao="4.758669320515469e-09"/>
+    <nuclide name="Xe136" ao="1.3900523043059956e-06"/>
+  </material>
+  <material id="30" depletable="true" volume="0.06674732823364922" temperature="293.6">
+    <density units="sum"/>
+    <nuclide name="O16" ao="0.046295399999999994"/>
+    <nuclide name="O17" ao="0.00011276839999999999"/>
+    <nuclide name="Cs135" ao="4.437067605151325e-07"/>
+    <nuclide name="Gd156" ao="7.1363891343374635e-09"/>
+    <nuclide name="Gd157" ao="5.566402231094469e-10"/>
+    <nuclide name="I135" ao="8.587230430892402e-09"/>
+    <nuclide name="U234" ao="1.0044808841280893e-05"/>
+    <nuclide name="U235" ao="0.0010226876654417763"/>
+    <nuclide name="U238" ao="0.022134380741743336"/>
+    <nuclide name="Xe135" ao="5.468326095113349e-09"/>
+    <nuclide name="Xe136" ao="1.4274298357254412e-06"/>
+  </material>
+  <material id="31" depletable="true" volume="0.06674732823364922" temperature="293.6">
+    <density units="sum"/>
+    <nuclide name="O16" ao="0.046295399999999994"/>
+    <nuclide name="O17" ao="0.00011276839999999999"/>
+    <nuclide name="Cs135" ao="4.663927579774932e-07"/>
+    <nuclide name="Gd156" ao="7.445447078931686e-09"/>
+    <nuclide name="Gd157" ao="3.884396962343153e-10"/>
+    <nuclide name="I135" ao="9.880795035286334e-09"/>
+    <nuclide name="U234" ao="1.0045110543061514e-05"/>
+    <nuclide name="U235" ao="0.0010185051659907308"/>
+    <nuclide name="U238" ao="0.022134793050126972"/>
+    <nuclide name="Xe135" ao="5.628930766753173e-09"/>
+    <nuclide name="Xe136" ao="1.621458196093815e-06"/>
+  </material>
+  <material id="32" depletable="true" volume="0.06674732823364922" temperature="293.6">
+    <density units="sum"/>
+    <nuclide name="O16" ao="0.0464035"/>
+    <nuclide name="Cs135" ao="4.1246893900095064e-07"/>
+    <nuclide name="Gd156" ao="4.235600198363761e-09"/>
+    <nuclide name="Gd157" ao="6.270357333732124e-05"/>
+    <nuclide name="I135" ao="4.48554996862083e-09"/>
+    <nuclide name="U235" ao="0.0010204963418181184"/>
+    <nuclide name="U238" ao="0.02169170592871774"/>
+    <nuclide name="Xe135" ao="5.171435873222667e-09"/>
+    <nuclide name="Xe136" ao="4.423753279029928e-07"/>
+  </material>
+  <material id="33" depletable="true" volume="0.06674732823364922" temperature="293.6">
+    <density units="sum"/>
+    <nuclide name="O16" ao="0.046295399999999994"/>
+    <nuclide name="O17" ao="0.00011276839999999999"/>
+    <nuclide name="Cs135" ao="4.639536407807289e-07"/>
+    <nuclide name="Gd156" ao="8.26599161641998e-09"/>
+    <nuclide name="Gd157" ao="4.4443900400932014e-10"/>
+    <nuclide name="I135" ao="1.0063162224638636e-08"/>
+    <nuclide name="U234" ao="1.004414762804115e-05"/>
+    <nuclide name="U235" ao="0.0010163626915249942"/>
+    <nuclide name="U238" ao="0.022134124263495966"/>
+    <nuclide name="Xe135" ao="5.381577718295668e-09"/>
+    <nuclide name="Xe136" ao="1.750090777225144e-06"/>
+  </material>
+  <material id="34" depletable="true" volume="0.06674732823364922" temperature="293.6">
+    <density units="sum"/>
+    <nuclide name="O16" ao="0.046295399999999994"/>
+    <nuclide name="O17" ao="0.00011276839999999999"/>
+    <nuclide name="Cs135" ao="4.559453986372942e-07"/>
+    <nuclide name="Gd156" ao="8.064845626388968e-09"/>
+    <nuclide name="Gd157" ao="4.2591362725932075e-10"/>
+    <nuclide name="I135" ao="1.108912103471219e-08"/>
+    <nuclide name="U234" ao="1.0043946351139754e-05"/>
+    <nuclide name="U235" ao="0.0010171808520812423"/>
+    <nuclide name="U238" ao="0.022134239348941525"/>
+    <nuclide name="Xe135" ao="5.356605996248169e-09"/>
+    <nuclide name="Xe136" ao="1.7112469634330484e-06"/>
+  </material>
+  <material id="35" depletable="true" volume="0.06674732823364922" temperature="293.6">
+    <density units="sum"/>
+    <nuclide name="O16" ao="0.046295399999999994"/>
+    <nuclide name="O17" ao="0.00011276839999999999"/>
+    <nuclide name="Cs135" ao="4.783500137415771e-07"/>
+    <nuclide name="Gd156" ao="8.278905204746407e-09"/>
+    <nuclide name="Gd157" ao="4.327862005463805e-10"/>
+    <nuclide name="I135" ao="1.0123582674276158e-08"/>
+    <nuclide name="U234" ao="1.0044298863412104e-05"/>
+    <nuclide name="U235" ao="0.0010159230256745024"/>
+    <nuclide name="U238" ao="0.022134198514068757"/>
+    <nuclide name="Xe135" ao="5.871093706243336e-09"/>
+    <nuclide name="Xe136" ao="1.7575689172957885e-06"/>
+  </material>
+  <material id="36" depletable="true" volume="0.06674732823364922" temperature="293.6">
+    <density units="sum"/>
+    <nuclide name="O16" ao="0.046295399999999994"/>
+    <nuclide name="O17" ao="0.00011276839999999999"/>
+    <nuclide name="Cs135" ao="4.7585244231920927e-07"/>
+    <nuclide name="Gd156" ao="7.047102473389166e-09"/>
+    <nuclide name="Gd157" ao="4.290077716150245e-10"/>
+    <nuclide name="I135" ao="9.106329272893031e-09"/>
+    <nuclide name="U234" ao="1.004490745184468e-05"/>
+    <nuclide name="U235" ao="0.001022123397932415"/>
+    <nuclide name="U238" ao="0.02213459705977757"/>
+    <nuclide name="Xe135" ao="4.972382302373317e-09"/>
+    <nuclide name="Xe136" ao="1.4220785344272175e-06"/>
+  </material>
+  <material id="37" depletable="true" volume="0.06674732823364922" temperature="293.6">
+    <density units="sum"/>
+    <nuclide name="O16" ao="0.046295399999999994"/>
+    <nuclide name="O17" ao="0.00011276839999999999"/>
+    <nuclide name="Cs135" ao="4.674688590714476e-07"/>
+    <nuclide name="Gd156" ao="7.970289841354939e-09"/>
+    <nuclide name="Gd157" ao="5.153997431956395e-10"/>
+    <nuclide name="I135" ao="8.539123281213609e-09"/>
+    <nuclide name="U234" ao="1.0044902591761455e-05"/>
+    <nuclide name="U235" ao="0.0010166972454515616"/>
+    <nuclide name="U238" ao="0.02213444858676572"/>
+    <nuclide name="Xe135" ao="5.164533017665062e-09"/>
+    <nuclide name="Xe136" ao="1.7250109506134995e-06"/>
+  </material>
+  <material id="38" depletable="true" volume="0.06674732823364922" temperature="293.6">
+    <density units="sum"/>
+    <nuclide name="O16" ao="0.046295399999999994"/>
+    <nuclide name="O17" ao="0.00011276839999999999"/>
+    <nuclide name="Cs135" ao="4.62023315208809e-07"/>
+    <nuclide name="Gd156" ao="7.290331357418475e-09"/>
+    <nuclide name="Gd157" ao="5.153301253293083e-10"/>
+    <nuclide name="I135" ao="7.966294229889969e-09"/>
+    <nuclide name="U234" ao="1.0044264900655818e-05"/>
+    <nuclide name="U235" ao="0.0010228069220581829"/>
+    <nuclide name="U238" ao="0.022134157888979544"/>
+    <nuclide name="Xe135" ao="5.177831769145713e-09"/>
+    <nuclide name="Xe136" ao="1.407267343687865e-06"/>
+  </material>
+  <material id="39" depletable="true" volume="0.06674732823364922" temperature="293.6">
+    <density units="sum"/>
+    <nuclide name="O16" ao="0.046295399999999994"/>
+    <nuclide name="O17" ao="0.00011276839999999999"/>
+    <nuclide name="Cs135" ao="4.3174845937654533e-07"/>
+    <nuclide name="Gd156" ao="7.496333189305309e-09"/>
+    <nuclide name="Gd157" ao="5.231502669312121e-10"/>
+    <nuclide name="I135" ao="7.935273960925948e-09"/>
+    <nuclide name="U234" ao="1.004438265081768e-05"/>
+    <nuclide name="U235" ao="0.0010216587449263061"/>
+    <nuclide name="U238" ao="0.022134102890114152"/>
+    <nuclide name="Xe135" ao="4.985811384270827e-09"/>
+    <nuclide name="Xe136" ao="1.5003890282364684e-06"/>
+  </material>
+  <material id="40" depletable="true" volume="0.06674732823364922" temperature="293.6">
+    <density units="sum"/>
+    <nuclide name="O16" ao="0.046295399999999994"/>
+    <nuclide name="O17" ao="0.00011276839999999999"/>
+    <nuclide name="Cs135" ao="4.550660196109939e-07"/>
+    <nuclide name="Gd156" ao="7.934623609364992e-09"/>
+    <nuclide name="Gd157" ao="4.037668757136327e-10"/>
+    <nuclide name="I135" ao="1.0501733366702875e-08"/>
+    <nuclide name="U234" ao="1.0044738839596202e-05"/>
+    <nuclide name="U235" ao="0.0010172584673257196"/>
+    <nuclide name="U238" ao="0.022134388757146573"/>
+    <nuclide name="Xe135" ao="5.426068046034702e-09"/>
+    <nuclide name="Xe136" ao="1.7059955089306178e-06"/>
+  </material>
+  <material id="41" depletable="true" volume="0.06674732823364922" temperature="293.6">
+    <density units="sum"/>
+    <nuclide name="O16" ao="0.0464035"/>
+    <nuclide name="Cs135" ao="4.7373311464679697e-07"/>
+    <nuclide name="Gd156" ao="5.5215753216139325e-09"/>
+    <nuclide name="Gd157" ao="1.4494880135466953e-05"/>
+    <nuclide name="I135" ao="7.152901553393514e-09"/>
+    <nuclide name="U235" ao="0.001012425534201963"/>
+    <nuclide name="U238" ao="0.02169158720273659"/>
+    <nuclide name="Xe135" ao="6.145213330919855e-09"/>
+    <nuclide name="Xe136" ao="8.133607629171309e-07"/>
+  </material>
+  <material id="42" depletable="true" volume="0.06674732823364922" temperature="293.6">
+    <density units="sum"/>
+    <nuclide name="O16" ao="0.046295399999999994"/>
+    <nuclide name="O17" ao="0.00011276839999999999"/>
+    <nuclide name="Cs135" ao="4.552489408257274e-07"/>
+    <nuclide name="Gd156" ao="8.417844454382996e-09"/>
+    <nuclide name="Gd157" ao="3.298239390088616e-10"/>
+    <nuclide name="I135" ao="1.1627214840198228e-08"/>
+    <nuclide name="U234" ao="1.0044467618118171e-05"/>
+    <nuclide name="U235" ao="0.0010132122009064637"/>
+    <nuclide name="U238" ao="0.022134533704800487"/>
+    <nuclide name="Xe135" ao="5.2441194996454685e-09"/>
+    <nuclide name="Xe136" ao="1.9200927095463644e-06"/>
+  </material>
+  <material id="43" depletable="true" volume="0.06674732823364922" temperature="293.6">
+    <density units="sum"/>
+    <nuclide name="O16" ao="0.046295399999999994"/>
+    <nuclide name="O17" ao="0.00011276839999999999"/>
+    <nuclide name="Cs135" ao="4.6621088555426265e-07"/>
+    <nuclide name="Gd156" ao="8.403287883759693e-09"/>
+    <nuclide name="Gd157" ao="3.669166752999124e-10"/>
+    <nuclide name="I135" ao="1.0403690981836015e-08"/>
+    <nuclide name="U234" ao="1.0044333944166113e-05"/>
+    <nuclide name="U235" ao="0.0010143215164151278"/>
+    <nuclide name="U238" ao="0.02213434952981268"/>
+    <nuclide name="Xe135" ao="5.451035317592364e-09"/>
+    <nuclide name="Xe136" ao="1.8535025407324627e-06"/>
+  </material>
+  <material id="44" depletable="true" volume="0.06674732823364922" temperature="293.6">
+    <density units="sum"/>
+    <nuclide name="O16" ao="0.046295399999999994"/>
+    <nuclide name="O17" ao="0.00011276839999999999"/>
+    <nuclide name="Cs135" ao="4.7386490418530295e-07"/>
+    <nuclide name="Gd156" ao="8.2685227302447e-09"/>
+    <nuclide name="Gd157" ao="3.776944576757155e-10"/>
+    <nuclide name="I135" ao="1.0842502886868061e-08"/>
+    <nuclide name="U234" ao="1.0044550501199754e-05"/>
+    <nuclide name="U235" ao="0.0010150062559977334"/>
+    <nuclide name="U238" ao="0.022134385320256817"/>
+    <nuclide name="Xe135" ao="5.7229967592843554e-09"/>
+    <nuclide name="Xe136" ao="1.8077253263384327e-06"/>
+  </material>
+  <material id="45" depletable="true" volume="0.06674732823364922" temperature="293.6">
+    <density units="sum"/>
+    <nuclide name="O16" ao="0.046295399999999994"/>
+    <nuclide name="O17" ao="0.00011276839999999999"/>
+    <nuclide name="Cs135" ao="4.407652401199493e-07"/>
+    <nuclide name="Gd156" ao="7.327810416041793e-09"/>
+    <nuclide name="Gd157" ao="3.7455808995871114e-10"/>
+    <nuclide name="I135" ao="1.17295932855595e-08"/>
+    <nuclide name="U234" ao="1.0044575831769265e-05"/>
+    <nuclide name="U235" ao="0.001020781061160739"/>
+    <nuclide name="U238" ao="0.022134501621275452"/>
+    <nuclide name="Xe135" ao="5.314959906762633e-09"/>
+    <nuclide name="Xe136" ao="1.5279472503684031e-06"/>
+  </material>
+  <material id="46" depletable="true" volume="0.06674732823364922" temperature="293.6">
+    <density units="sum"/>
+    <nuclide name="O16" ao="0.046295399999999994"/>
+    <nuclide name="O17" ao="0.00011276839999999999"/>
+    <nuclide name="Cs135" ao="4.7039361271991246e-07"/>
+    <nuclide name="Gd156" ao="7.55749566950451e-09"/>
+    <nuclide name="Gd157" ao="4.707485798456035e-10"/>
+    <nuclide name="I135" ao="1.0634554158124267e-08"/>
+    <nuclide name="U234" ao="1.0044530555935427e-05"/>
+    <nuclide name="U235" ao="0.0010209326507167006"/>
+    <nuclide name="U238" ao="0.02213417530217058"/>
+    <nuclide name="Xe135" ao="6.353270400959161e-09"/>
+    <nuclide name="Xe136" ao="1.4955326812707174e-06"/>
+  </material>
+  <material id="47" depletable="true" volume="0.06674732823364922" temperature="293.6">
+    <density units="sum"/>
+    <nuclide name="O16" ao="0.046295399999999994"/>
+    <nuclide name="O17" ao="0.00011276839999999999"/>
+    <nuclide name="Cs135" ao="4.636034601798797e-07"/>
+    <nuclide name="Gd156" ao="7.495433091678523e-09"/>
+    <nuclide name="Gd157" ao="4.36374537601735e-10"/>
+    <nuclide name="I135" ao="8.674778390989408e-09"/>
+    <nuclide name="U234" ao="1.0044596524270627e-05"/>
+    <nuclide name="U235" ao="0.0010204096991334123"/>
+    <nuclide name="U238" ao="0.0221343532758111"/>
+    <nuclide name="Xe135" ao="4.62877874149118e-09"/>
+    <nuclide name="Xe136" ao="1.5312284248009385e-06"/>
+  </material>
+  <material id="48" depletable="true" volume="0.06674732823364922" temperature="293.6">
+    <density units="sum"/>
+    <nuclide name="O16" ao="0.046295399999999994"/>
+    <nuclide name="O17" ao="0.00011276839999999999"/>
+    <nuclide name="Cs135" ao="4.4387693534608117e-07"/>
+    <nuclide name="Gd156" ao="7.97630803398477e-09"/>
+    <nuclide name="Gd157" ao="3.969215102824579e-10"/>
+    <nuclide name="I135" ao="9.776870256795282e-09"/>
+    <nuclide name="U234" ao="1.0044607832822283e-05"/>
+    <nuclide name="U235" ao="0.0010166668071861533"/>
+    <nuclide name="U238" ao="0.02213444463686793"/>
+    <nuclide name="Xe135" ao="4.95812790098165e-09"/>
+    <nuclide name="Xe136" ao="1.7492896428784499e-06"/>
+  </material>
+  <material id="49" depletable="true" volume="0.06674732823364922" temperature="293.6">
+    <density units="sum"/>
+    <nuclide name="O16" ao="0.046295399999999994"/>
+    <nuclide name="O17" ao="0.00011276839999999999"/>
+    <nuclide name="Cs135" ao="4.455185803084232e-07"/>
+    <nuclide name="Gd156" ao="7.337855344976119e-09"/>
+    <nuclide name="Gd157" ao="5.288107893183848e-10"/>
+    <nuclide name="I135" ao="8.95876232200072e-09"/>
+    <nuclide name="U234" ao="1.0044618229856552e-05"/>
+    <nuclide name="U235" ao="0.0010217889366581374"/>
+    <nuclide name="U238" ao="0.022134293599384607"/>
+    <nuclide name="Xe135" ao="5.4164245821971194e-09"/>
+    <nuclide name="Xe136" ao="1.4750501825751544e-06"/>
+  </material>
+  <material id="50" depletable="true" volume="0.06674732823364922" temperature="293.6">
+    <density units="sum"/>
+    <nuclide name="O16" ao="0.0464035"/>
+    <nuclide name="Cs135" ao="4.517900944075939e-07"/>
+    <nuclide name="Gd156" ao="5.045016111938287e-09"/>
+    <nuclide name="Gd157" ao="1.8134984977801202e-05"/>
+    <nuclide name="I135" ao="6.482226189748327e-09"/>
+    <nuclide name="U235" ao="0.0010147629176538704"/>
+    <nuclide name="U238" ao="0.021691761128726353"/>
+    <nuclide name="Xe135" ao="5.763098998610832e-09"/>
+    <nuclide name="Xe136" ao="7.078497671706068e-07"/>
+  </material>
+  <material id="51" depletable="true" volume="0.06674732823364922" temperature="293.6">
+    <density units="sum"/>
+    <nuclide name="O16" ao="0.046295399999999994"/>
+    <nuclide name="O17" ao="0.00011276839999999999"/>
+    <nuclide name="Cs135" ao="4.659699944335705e-07"/>
+    <nuclide name="Gd156" ao="8.025074976583637e-09"/>
+    <nuclide name="Gd157" ao="4.09445695785748e-10"/>
+    <nuclide name="I135" ao="1.0945335150467282e-08"/>
+    <nuclide name="U234" ao="1.0044581154205115e-05"/>
+    <nuclide name="U235" ao="0.0010164858220320235"/>
+    <nuclide name="U238" ao="0.022134422188635136"/>
+    <nuclide name="Xe135" ao="5.551411019664158e-09"/>
+    <nuclide name="Xe136" ao="1.7355327775146165e-06"/>
+  </material>
+  <material id="52" depletable="true" volume="0.06674732823364922" temperature="293.6">
+    <density units="sum"/>
+    <nuclide name="O16" ao="0.046295399999999994"/>
+    <nuclide name="O17" ao="0.00011276839999999999"/>
+    <nuclide name="Cs135" ao="4.681457035455898e-07"/>
+    <nuclide name="Gd156" ao="8.71361864735632e-09"/>
+    <nuclide name="Gd157" ao="3.174701733038042e-10"/>
+    <nuclide name="I135" ao="1.4020730679274332e-08"/>
+    <nuclide name="U234" ao="1.0044099278017894e-05"/>
+    <nuclide name="U235" ao="0.0010126690056941115"/>
+    <nuclide name="U238" ao="0.022134261447381454"/>
+    <nuclide name="Xe135" ao="5.6399359283499295e-09"/>
+    <nuclide name="Xe136" ao="1.9380616593817735e-06"/>
+  </material>
+  <material id="53" depletable="true" volume="0.06674732823364922" temperature="293.6">
+    <density units="sum"/>
+    <nuclide name="O16" ao="0.046295399999999994"/>
+    <nuclide name="O17" ao="0.00011276839999999999"/>
+    <nuclide name="Cs135" ao="4.544946942071967e-07"/>
+    <nuclide name="Gd156" ao="8.336100255413542e-09"/>
+    <nuclide name="Gd157" ao="3.349693677637064e-10"/>
+    <nuclide name="I135" ao="1.300729943471215e-08"/>
+    <nuclide name="U234" ao="1.0044366612084531e-05"/>
+    <nuclide name="U235" ao="0.0010141681490291126"/>
+    <nuclide name="U238" ao="0.022134460848195252"/>
+    <nuclide name="Xe135" ao="5.834616975029099e-09"/>
+    <nuclide name="Xe136" ao="1.8686662601249285e-06"/>
+  </material>
+  <material id="54" depletable="true" volume="0.06674732823364922" temperature="293.6">
+    <density units="sum"/>
+    <nuclide name="O16" ao="0.046295399999999994"/>
+    <nuclide name="O17" ao="0.00011276839999999999"/>
+    <nuclide name="Cs135" ao="4.5766121557221316e-07"/>
+    <nuclide name="Gd156" ao="8.656426219093345e-09"/>
+    <nuclide name="Gd157" ao="3.5094506543349145e-10"/>
+    <nuclide name="I135" ao="1.3877107412830242e-08"/>
+    <nuclide name="U234" ao="1.004416295609268e-05"/>
+    <nuclide name="U235" ao="0.0010140243853248815"/>
+    <nuclide name="U238" ao="0.022134042904509686"/>
+    <nuclide name="Xe135" ao="5.594497813916764e-09"/>
+    <nuclide name="Xe136" ao="1.8794069149000725e-06"/>
+  </material>
+  <material id="55" depletable="true" volume="0.06674732823364922" temperature="293.6">
+    <density units="sum"/>
+    <nuclide name="O16" ao="0.046295399999999994"/>
+    <nuclide name="O17" ao="0.00011276839999999999"/>
+    <nuclide name="Cs135" ao="4.5070044982225826e-07"/>
+    <nuclide name="Gd156" ao="8.307166786809273e-09"/>
+    <nuclide name="Gd157" ao="4.852995067853279e-10"/>
+    <nuclide name="I135" ao="8.43006813520517e-09"/>
+    <nuclide name="U234" ao="1.0044124057308204e-05"/>
+    <nuclide name="U235" ao="0.0010154726348555639"/>
+    <nuclide name="U238" ao="0.02213418651112704"/>
+    <nuclide name="Xe135" ao="4.949152601376445e-09"/>
+    <nuclide name="Xe136" ao="1.8122564453895658e-06"/>
+  </material>
+  <material id="56" depletable="true" volume="0.06674732823364922" temperature="293.6">
+    <density units="sum"/>
+    <nuclide name="O16" ao="0.046295399999999994"/>
+    <nuclide name="O17" ao="0.00011276839999999999"/>
+    <nuclide name="Cs135" ao="4.836978536882764e-07"/>
+    <nuclide name="Gd156" ao="7.537362091239518e-09"/>
+    <nuclide name="Gd157" ao="4.5126076517149186e-10"/>
+    <nuclide name="I135" ao="9.60199687518672e-09"/>
+    <nuclide name="U234" ao="1.0044685059092674e-05"/>
+    <nuclide name="U235" ao="0.0010196381990756533"/>
+    <nuclide name="U238" ao="0.02213445285182628"/>
+    <nuclide name="Xe135" ao="5.494845522710317e-09"/>
+    <nuclide name="Xe136" ao="1.5491995716680678e-06"/>
+  </material>
+  <material id="57" depletable="true" volume="0.06674732823364922" temperature="293.6">
+    <density units="sum"/>
+    <nuclide name="O16" ao="0.046295399999999994"/>
+    <nuclide name="O17" ao="0.00011276839999999999"/>
+    <nuclide name="Cs135" ao="4.4186301588556743e-07"/>
+    <nuclide name="Gd156" ao="7.826608358738061e-09"/>
+    <nuclide name="Gd157" ao="4.0312953112338433e-10"/>
+    <nuclide name="I135" ao="1.0758074378707132e-08"/>
+    <nuclide name="U234" ao="1.0044350307434386e-05"/>
+    <nuclide name="U235" ao="0.001018512023981224"/>
+    <nuclide name="U238" ao="0.022134272283106108"/>
+    <nuclide name="Xe135" ao="5.184367150914981e-09"/>
+    <nuclide name="Xe136" ao="1.653697557847264e-06"/>
+  </material>
+  <material id="58" depletable="true" volume="0.06674732823364922" temperature="293.6">
+    <density units="sum"/>
+    <nuclide name="O16" ao="0.046295399999999994"/>
+    <nuclide name="O17" ao="0.00011276839999999999"/>
+    <nuclide name="Cs135" ao="4.5107547790946403e-07"/>
+    <nuclide name="Gd156" ao="7.582888624484162e-09"/>
+    <nuclide name="Gd157" ao="4.1641609325302373e-10"/>
+    <nuclide name="I135" ao="9.359811673300804e-09"/>
+    <nuclide name="U234" ao="1.0044946416861597e-05"/>
+    <nuclide name="U235" ao="0.0010186483802527863"/>
+    <nuclide name="U238" ao="0.02213458421313534"/>
+    <nuclide name="Xe135" ao="5.298991310558835e-09"/>
+    <nuclide name="Xe136" ao="1.6333307494049164e-06"/>
+  </material>
+  <material id="59" depletable="true" volume="0.06674732823364922" temperature="293.6">
+    <density units="sum"/>
+    <nuclide name="O16" ao="0.0464035"/>
+    <nuclide name="Cs135" ao="4.530550449840411e-07"/>
+    <nuclide name="Gd156" ao="5.152211037545898e-09"/>
+    <nuclide name="Gd157" ao="1.7414078116507776e-05"/>
+    <nuclide name="I135" ao="5.798373035811935e-09"/>
+    <nuclide name="U235" ao="0.0010142210013264637"/>
+    <nuclide name="U238" ao="0.021691726637340612"/>
+    <nuclide name="Xe135" ao="5.2661388117821805e-09"/>
+    <nuclide name="Xe136" ao="7.374647706571651e-07"/>
+  </material>
+  <material id="60" depletable="true" volume="0.06674732823364922" temperature="293.6">
+    <density units="sum"/>
+    <nuclide name="O16" ao="0.046295399999999994"/>
+    <nuclide name="O17" ao="0.00011276839999999999"/>
+    <nuclide name="Cs135" ao="4.822049134818106e-07"/>
+    <nuclide name="Gd156" ao="8.452589488490197e-09"/>
+    <nuclide name="Gd157" ao="3.1306244235949564e-10"/>
+    <nuclide name="I135" ao="1.3923826246996677e-08"/>
+    <nuclide name="U234" ao="1.0044676382235605e-05"/>
+    <nuclide name="U235" ao="0.001013658455830591"/>
+    <nuclide name="U238" ao="0.022134405975477205"/>
+    <nuclide name="Xe135" ao="6.044142076870048e-09"/>
+    <nuclide name="Xe136" ao="1.8681097449626251e-06"/>
+  </material>
+  <material id="61" depletable="true" volume="0.06674732823364922" temperature="293.6">
+    <density units="sum"/>
+    <nuclide name="O16" ao="0.046295399999999994"/>
+    <nuclide name="O17" ao="0.00011276839999999999"/>
+    <nuclide name="Cs135" ao="4.4691043293275517e-07"/>
+    <nuclide name="Gd156" ao="8.012731861896239e-09"/>
+    <nuclide name="Gd157" ao="3.687262378894955e-10"/>
+    <nuclide name="I135" ao="1.1428305598450469e-08"/>
+    <nuclide name="U234" ao="1.0044405456893536e-05"/>
+    <nuclide name="U235" ao="0.0010164498453403522"/>
+    <nuclide name="U238" ao="0.022134450527739345"/>
+    <nuclide name="Xe135" ao="5.061575530060914e-09"/>
+    <nuclide name="Xe136" ao="1.7560831900418087e-06"/>
+  </material>
+  <material id="62" depletable="true" volume="0.06674732823364922" temperature="293.6">
+    <density units="sum"/>
+    <nuclide name="O16" ao="0.046295399999999994"/>
+    <nuclide name="O17" ao="0.00011276839999999999"/>
+    <nuclide name="Cs135" ao="4.7251741651739154e-07"/>
+    <nuclide name="Gd156" ao="8.233538582389422e-09"/>
+    <nuclide name="Gd157" ao="4.3498877022171187e-10"/>
+    <nuclide name="I135" ao="1.1406240478828367e-08"/>
+    <nuclide name="U234" ao="1.0044307557051272e-05"/>
+    <nuclide name="U235" ao="0.0010151392434079533"/>
+    <nuclide name="U238" ao="0.02213440855685908"/>
+    <nuclide name="Xe135" ao="6.026621375913049e-09"/>
+    <nuclide name="Xe136" ao="1.8006912731212633e-06"/>
+  </material>
+  <material id="63" depletable="true" volume="0.06674732823364922" temperature="293.6">
+    <density units="sum"/>
+    <nuclide name="O16" ao="0.046295399999999994"/>
+    <nuclide name="O17" ao="0.00011276839999999999"/>
+    <nuclide name="Cs135" ao="4.79794958069132e-07"/>
+    <nuclide name="Gd156" ao="7.497400822054367e-09"/>
+    <nuclide name="Gd157" ao="4.088535129059029e-10"/>
+    <nuclide name="I135" ao="1.020646791660957e-08"/>
+    <nuclide name="U234" ao="1.0044358428004462e-05"/>
+    <nuclide name="U235" ao="0.0010202817074345758"/>
+    <nuclide name="U238" ao="0.022134363783915374"/>
+    <nuclide name="Xe135" ao="5.5919103510501745e-09"/>
+    <nuclide name="Xe136" ao="1.5192672082067856e-06"/>
+  </material>
+  <material id="64" depletable="true" volume="0.06674732823364922" temperature="293.6">
+    <density units="sum"/>
+    <nuclide name="O16" ao="0.046295399999999994"/>
+    <nuclide name="O17" ao="0.00011276839999999999"/>
+    <nuclide name="Cs135" ao="4.46173095422033e-07"/>
+    <nuclide name="Gd156" ao="7.776020869306452e-09"/>
+    <nuclide name="Gd157" ao="4.4071869092604184e-10"/>
+    <nuclide name="I135" ao="9.58881052529061e-09"/>
+    <nuclide name="U234" ao="1.0044875744723067e-05"/>
+    <nuclide name="U235" ao="0.001017463364101478"/>
+    <nuclide name="U238" ao="0.022134564631230084"/>
+    <nuclide name="Xe135" ao="5.074476802123941e-09"/>
+    <nuclide name="Xe136" ao="1.7022684619273444e-06"/>
+  </material>
+  <material id="65" depletable="true" volume="0.06674732823364922" temperature="293.6">
+    <density units="sum"/>
+    <nuclide name="O16" ao="0.046295399999999994"/>
+    <nuclide name="O17" ao="0.00011276839999999999"/>
+    <nuclide name="Cs135" ao="4.5021506681118494e-07"/>
+    <nuclide name="Gd156" ao="7.941170517826359e-09"/>
+    <nuclide name="Gd157" ao="4.87901009317699e-10"/>
+    <nuclide name="I135" ao="8.335158330979799e-09"/>
+    <nuclide name="U234" ao="1.004446486176024e-05"/>
+    <nuclide name="U235" ao="0.0010174211105253887"/>
+    <nuclide name="U238" ao="0.0221343469639183"/>
+    <nuclide name="Xe135" ao="5.045134946055872e-09"/>
+    <nuclide name="Xe136" ao="1.7053442901899206e-06"/>
+  </material>
+  <material id="66" depletable="true" volume="0.06674732823364922" temperature="293.6">
+    <density units="sum"/>
+    <nuclide name="O16" ao="0.046295399999999994"/>
+    <nuclide name="O17" ao="0.00011276839999999999"/>
+    <nuclide name="Cs135" ao="4.300530779935639e-07"/>
+    <nuclide name="Gd156" ao="8.093213725235949e-09"/>
+    <nuclide name="Gd157" ao="5.14605341601871e-10"/>
+    <nuclide name="I135" ao="9.193679363006245e-09"/>
+    <nuclide name="U234" ao="1.0044529408433637e-05"/>
+    <nuclide name="U235" ao="0.0010168399945276177"/>
+    <nuclide name="U238" ao="0.0221342600989091"/>
+    <nuclide name="Xe135" ao="5.0545078365203945e-09"/>
+    <nuclide name="Xe136" ao="1.7572929664610167e-06"/>
+  </material>
+  <material id="67" depletable="true" volume="0.06674732823364922" temperature="293.6">
+    <density units="sum"/>
+    <nuclide name="O16" ao="0.046295399999999994"/>
+    <nuclide name="O17" ao="0.00011276839999999999"/>
+    <nuclide name="Cs135" ao="4.6387578662097733e-07"/>
+    <nuclide name="Gd156" ao="7.904303216061177e-09"/>
+    <nuclide name="Gd157" ao="3.535144094848107e-10"/>
+    <nuclide name="I135" ao="1.0913558729134318e-08"/>
+    <nuclide name="U234" ao="1.0045224868160921e-05"/>
+    <nuclide name="U235" ao="0.001015358496886946"/>
+    <nuclide name="U238" ao="0.02213479706012655"/>
+    <nuclide name="Xe135" ao="5.161066202726614e-09"/>
+    <nuclide name="Xe136" ao="1.7925321199970005e-06"/>
+  </material>
+  <material id="68" depletable="true" volume="0.06674732823364922" temperature="293.6">
+    <density units="sum"/>
+    <nuclide name="O16" ao="0.0464035"/>
+    <nuclide name="Cs135" ao="4.4639816193101677e-07"/>
+    <nuclide name="Gd156" ao="5.473484807673252e-09"/>
+    <nuclide name="Gd157" ao="7.873961737997135e-06"/>
+    <nuclide name="I135" ao="7.047514529599939e-09"/>
+    <nuclide name="U235" ao="0.0010125885884101112"/>
+    <nuclide name="U238" ao="0.02169162150365341"/>
+    <nuclide name="Xe135" ao="5.5888114325423076e-09"/>
+    <nuclide name="Xe136" ao="8.320325563583469e-07"/>
+  </material>
+  <material id="69" depletable="true" volume="0.06674732823364922" temperature="293.6">
+    <density units="sum"/>
+    <nuclide name="O16" ao="0.046295399999999994"/>
+    <nuclide name="O17" ao="0.00011276839999999999"/>
+    <nuclide name="Cs135" ao="4.6223836650122475e-07"/>
+    <nuclide name="Gd156" ao="7.953476976385664e-09"/>
+    <nuclide name="Gd157" ao="4.1027175087519965e-10"/>
+    <nuclide name="I135" ao="9.796423506518835e-09"/>
+    <nuclide name="U234" ao="1.0044187649341062e-05"/>
+    <nuclide name="U235" ao="0.0010170353834242176"/>
+    <nuclide name="U238" ao="0.022134372559487282"/>
+    <nuclide name="Xe135" ao="5.0991030899242805e-09"/>
+    <nuclide name="Xe136" ao="1.7121460733075797e-06"/>
+  </material>
+  <material id="70" depletable="true" volume="0.06674732823364922" temperature="293.6">
+    <density units="sum"/>
+    <nuclide name="O16" ao="0.046295399999999994"/>
+    <nuclide name="O17" ao="0.00011276839999999999"/>
+    <nuclide name="Cs135" ao="4.664997159187979e-07"/>
+    <nuclide name="Gd156" ao="9.025781278455481e-09"/>
+    <nuclide name="Gd157" ao="3.190701703279217e-10"/>
+    <nuclide name="I135" ao="1.4711477916054572e-08"/>
+    <nuclide name="U234" ao="1.0043737061563706e-05"/>
+    <nuclide name="U235" ao="0.0010106766373031348"/>
+    <nuclide name="U238" ao="0.02213424099107004"/>
+    <nuclide name="Xe135" ao="5.458886745013372e-09"/>
+    <nuclide name="Xe136" ao="2.0466796921687864e-06"/>
+  </material>
+  <material id="71" depletable="true" volume="0.06674732823364922" temperature="293.6">
+    <density units="sum"/>
+    <nuclide name="O16" ao="0.046295399999999994"/>
+    <nuclide name="O17" ao="0.00011276839999999999"/>
+    <nuclide name="Cs135" ao="4.6163611872342463e-07"/>
+    <nuclide name="Gd156" ao="8.092676337515914e-09"/>
+    <nuclide name="Gd157" ao="4.0155978871991965e-10"/>
+    <nuclide name="I135" ao="1.1255710201354816e-08"/>
+    <nuclide name="U234" ao="1.0044080156464483e-05"/>
+    <nuclide name="U235" ao="0.0010160767932805275"/>
+    <nuclide name="U238" ao="0.022134404858133214"/>
+    <nuclide name="Xe135" ao="6.1065455616234985e-09"/>
+    <nuclide name="Xe136" ao="1.7613053571588805e-06"/>
+  </material>
+  <material id="72" depletable="true" volume="0.06674732823364922" temperature="293.6">
+    <density units="sum"/>
+    <nuclide name="O16" ao="0.046295399999999994"/>
+    <nuclide name="O17" ao="0.00011276839999999999"/>
+    <nuclide name="Cs135" ao="4.5571123718376045e-07"/>
+    <nuclide name="Gd156" ao="6.928887839072172e-09"/>
+    <nuclide name="Gd157" ao="4.3753171369940084e-10"/>
+    <nuclide name="I135" ao="8.934890686722866e-09"/>
+    <nuclide name="U234" ao="1.0044610174441688e-05"/>
+    <nuclide name="U235" ao="0.0010236806448679259"/>
+    <nuclide name="U238" ao="0.022134444472317126"/>
+    <nuclide name="Xe135" ao="5.225774688291077e-09"/>
+    <nuclide name="Xe136" ao="1.3609040886582337e-06"/>
+  </material>
+  <material id="73" volume="0.017528298008244847" temperature="293.6">
+    <density units="sum"/>
+    <nuclide name="N14" ao="3.3864599999999994e-05"/>
+    <nuclide name="N15" ao="1.23717e-07"/>
+    <nuclide name="O16" ao="7.86548e-06"/>
+    <nuclide name="O17" ao="2.9954799999999997e-09"/>
+  </material>
+  <material id="74" volume="0.16066450553933276" temperature="293.6">
+    <density units="sum"/>
+    <nuclide name="Cr50" ao="3.2962e-06"/>
+    <nuclide name="Cr52" ao="6.35639e-05"/>
+    <nuclide name="Cr53" ao="7.20763e-06"/>
+    <nuclide name="Cr54" ao="1.7941299999999999e-06"/>
+    <nuclide name="Fe54" ao="5.573499999999999e-06"/>
+    <nuclide name="Fe56" ao="8.749209999999999e-05"/>
+    <nuclide name="Fe57" ao="2.0205699999999998e-06"/>
+    <nuclide name="Fe58" ao="2.6890099999999995e-07"/>
+    <nuclide name="Ni58" ao="2.51631e-05"/>
+    <nuclide name="Ni60" ao="9.69278e-06"/>
+    <nuclide name="Ni61" ao="4.21338e-07"/>
+    <nuclide name="Ni62" ao="1.34341e-06"/>
+    <nuclide name="Ni64" ao="3.43127e-07"/>
+    <nuclide name="O16" ao="0.000307427"/>
+    <nuclide name="O17" ao="7.488679999999999e-07"/>
+    <nuclide name="Sn112" ao="4.67352e-06"/>
+    <nuclide name="Sn114" ao="3.17992e-06"/>
+    <nuclide name="Sn115" ao="1.6381399999999999e-06"/>
+    <nuclide name="Sn116" ao="7.005459999999999e-05"/>
+    <nuclide name="Sn117" ao="3.70027e-05"/>
+    <nuclide name="Sn118" ao="0.00011669399999999999"/>
+    <nuclide name="Sn119" ao="4.1387199999999996e-05"/>
+    <nuclide name="Sn120" ao="0.00015697299999999998"/>
+    <nuclide name="Sn122" ao="2.23076e-05"/>
+    <nuclide name="Sn124" ao="2.7896599999999996e-05"/>
+    <nuclide name="Zr90" ao="0.021831999999999997"/>
+    <nuclide name="Zr91" ao="0.004761039999999999"/>
+    <nuclide name="Zr92" ao="0.007277339999999999"/>
+    <nuclide name="Zr94" ao="0.007374939999999999"/>
+    <nuclide name="Zr96" ao="0.00118814"/>
+  </material>
+  <material id="75" volume="0.8803968514832288" temperature="293.6">
+    <density units="sum"/>
+    <nuclide name="H1" ao="0.046806299999999995"/>
+    <nuclide name="O16" ao="0.023342699999999997"/>
+    <nuclide name="O17" ao="8.890859999999999e-06"/>
     <sab name="c_H_in_H2O"/>
   </material>
-  <material id="76" temperature="293.6" volume="0.8803968514832288">
+  <material id="76" volume="0.8803968514832288" temperature="293.6">
     <density units="sum"/>
-    <nuclide ao="0.046806299999999995" name="H1"/>
-    <nuclide ao="0.023342699999999997" name="O16"/>
-    <nuclide ao="8.890859999999999e-06" name="O17"/>
+    <nuclide name="H1" ao="0.046806299999999995"/>
+    <nuclide name="O16" ao="0.023342699999999997"/>
+    <nuclide name="O17" ao="8.890859999999999e-06"/>
     <sab name="c_H_in_H2O"/>
   </material>
 </materials>
diff --git a/tests/regression_tests/diff_tally/inputs_true.dat b/tests/regression_tests/diff_tally/inputs_true.dat
index 3ec4154e8..19356b64a 100644
--- a/tests/regression_tests/diff_tally/inputs_true.dat
+++ b/tests/regression_tests/diff_tally/inputs_true.dat
@@ -1,40 +1,40 @@
 <?xml version='1.0' encoding='utf-8'?>
 <model>
   <materials>
-    <material depletable="true" id="1" name="UOX fuel">
-      <density units="g/cm3" value="10.062"/>
-      <nuclide ao="4.9476e-06" name="U234"/>
-      <nuclide ao="0.00048218" name="U235"/>
-      <nuclide ao="0.021504" name="U238"/>
-      <nuclide ao="1.0801e-08" name="Xe135"/>
-      <nuclide ao="0.045737" name="O16"/>
+    <material id="1" name="UOX fuel" depletable="true">
+      <density value="10.062" units="g/cm3"/>
+      <nuclide name="U234" ao="4.9476e-06"/>
+      <nuclide name="U235" ao="0.00048218"/>
+      <nuclide name="U238" ao="0.021504"/>
+      <nuclide name="Xe135" ao="1.0801e-08"/>
+      <nuclide name="O16" ao="0.045737"/>
     </material>
     <material id="2" name="Zircaloy">
-      <density units="g/cm3" value="5.77"/>
-      <nuclide ao="0.5145" name="Zr90"/>
-      <nuclide ao="0.1122" name="Zr91"/>
-      <nuclide ao="0.1715" name="Zr92"/>
-      <nuclide ao="0.1738" name="Zr94"/>
-      <nuclide ao="0.028" name="Zr96"/>
+      <density value="5.77" units="g/cm3"/>
+      <nuclide name="Zr90" ao="0.5145"/>
+      <nuclide name="Zr91" ao="0.1122"/>
+      <nuclide name="Zr92" ao="0.1715"/>
+      <nuclide name="Zr94" ao="0.1738"/>
+      <nuclide name="Zr96" ao="0.028"/>
     </material>
     <material id="3" name="Cold borated water">
-      <density units="atom/b-cm" value="0.07416"/>
-      <nuclide ao="2.0" name="H1"/>
-      <nuclide ao="1.0" name="O16"/>
-      <nuclide ao="0.000649" name="B10"/>
-      <nuclide ao="0.002689" name="B11"/>
+      <density value="0.07416" units="atom/b-cm"/>
+      <nuclide name="H1" ao="2.0"/>
+      <nuclide name="O16" ao="1.0"/>
+      <nuclide name="B10" ao="0.000649"/>
+      <nuclide name="B11" ao="0.002689"/>
       <sab name="c_H_in_H2O"/>
     </material>
     <material id="4" name="Hot borated water">
-      <density units="atom/b-cm" value="0.06614"/>
-      <nuclide ao="2.0" name="H1"/>
-      <nuclide ao="1.0" name="O16"/>
-      <nuclide ao="0.000649" name="B10"/>
-      <nuclide ao="0.002689" name="B11"/>
+      <density value="0.06614" units="atom/b-cm"/>
+      <nuclide name="H1" ao="2.0"/>
+      <nuclide name="O16" ao="1.0"/>
+      <nuclide name="B10" ao="0.000649"/>
+      <nuclide name="B11" ao="0.002689"/>
       <sab name="c_H_in_H2O"/>
     </material>
     <material id="5" name="Reactor pressure vessel steel">
-      <density units="g/cm3" value="7.9"/>
+      <density value="7.9" units="g/cm3"/>
       <nuclide name="Fe54" wo="0.05437098"/>
       <nuclide name="Fe56" wo="0.88500663"/>
       <nuclide name="Fe57" wo="0.0208008"/>
@@ -47,7 +47,7 @@
       <nuclide name="Cu63" wo="0.0013696"/>
     </material>
     <material id="6" name="Lower radial reflector">
-      <density units="g/cm3" value="4.32"/>
+      <density value="4.32" units="g/cm3"/>
       <nuclide name="H1" wo="0.0095661"/>
       <nuclide name="O16" wo="0.0759107"/>
       <nuclide name="B10" wo="3.08409e-05"/>
@@ -62,7 +62,7 @@
       <sab name="c_H_in_H2O"/>
     </material>
     <material id="7" name="Upper radial reflector / Top plate region">
-      <density units="g/cm3" value="4.28"/>
+      <density value="4.28" units="g/cm3"/>
       <nuclide name="H1" wo="0.0086117"/>
       <nuclide name="O16" wo="0.0683369"/>
       <nuclide name="B10" wo="2.77638e-05"/>
@@ -77,7 +77,7 @@
       <sab name="c_H_in_H2O"/>
     </material>
     <material id="8" name="Bottom plate region">
-      <density units="g/cm3" value="7.184"/>
+      <density value="7.184" units="g/cm3"/>
       <nuclide name="H1" wo="0.0011505"/>
       <nuclide name="O16" wo="0.0091296"/>
       <nuclide name="B10" wo="3.70915e-06"/>
@@ -92,7 +92,7 @@
       <sab name="c_H_in_H2O"/>
     </material>
     <material id="9" name="Bottom nozzle region">
-      <density units="g/cm3" value="2.53"/>
+      <density value="2.53" units="g/cm3"/>
       <nuclide name="H1" wo="0.0245014"/>
       <nuclide name="O16" wo="0.1944274"/>
       <nuclide name="B10" wo="7.89917e-05"/>
@@ -107,7 +107,7 @@
       <sab name="c_H_in_H2O"/>
     </material>
     <material id="10" name="Top nozzle region">
-      <density units="g/cm3" value="1.746"/>
+      <density value="1.746" units="g/cm3"/>
       <nuclide name="H1" wo="0.035887"/>
       <nuclide name="O16" wo="0.2847761"/>
       <nuclide name="B10" wo="0.000115699"/>
@@ -122,7 +122,7 @@
       <sab name="c_H_in_H2O"/>
     </material>
     <material id="11" name="Top of fuel assemblies">
-      <density units="g/cm3" value="3.044"/>
+      <density value="3.044" units="g/cm3"/>
       <nuclide name="H1" wo="0.0162913"/>
       <nuclide name="O16" wo="0.1292776"/>
       <nuclide name="B10" wo="5.25228e-05"/>
@@ -135,7 +135,7 @@
       <sab name="c_H_in_H2O"/>
     </material>
     <material id="12" name="Bottom of fuel assemblies">
-      <density units="g/cm3" value="1.762"/>
+      <density value="1.762" units="g/cm3"/>
       <nuclide name="H1" wo="0.0292856"/>
       <nuclide name="O16" wo="0.2323919"/>
       <nuclide name="B10" wo="9.44159e-05"/>
@@ -149,8 +149,8 @@
     </material>
   </materials>
   <geometry>
-    <cell fill="200" id="1" region="-6 34 -35" universe="0"/>
-    <cell fill="201" id="2" region="-6 35 -36" universe="0"/>
+    <cell id="1" fill="200" region="-6 34 -35" universe="0"/>
+    <cell id="2" fill="201" region="-6 35 -36" universe="0"/>
     <cell id="3" material="8" region="-7 31 -32" universe="0"/>
     <cell id="4" material="9" region="-5 32 -33" universe="0"/>
     <cell id="5" material="12" region="-5 33 -34" universe="0"/>
@@ -174,9 +174,9 @@
     <cell id="31" material="2" region="3 -4" universe="4"/>
     <cell id="32" material="4" region="4" universe="4"/>
     <cell id="50" material="3" region="34 -35" universe="5"/>
-    <cell fill="100" id="60" region="34 -35" universe="6"/>
+    <cell id="60" fill="100" region="34 -35" universe="6"/>
     <cell id="70" material="4" region="35 -36" universe="7"/>
-    <cell fill="101" id="80" region="35 -36" universe="8"/>
+    <cell id="80" fill="101" region="35 -36" universe="8"/>
     <lattice id="100" name="Fuel assembly (lower half)">
       <pitch>1.26 1.26</pitch>
       <dimension>17 17</dimension>
@@ -277,30 +277,30 @@
 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 
 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 </universes>
     </lattice>
-    <surface coeffs="0.0 0.0 0.41" id="1" type="z-cylinder"/>
-    <surface coeffs="0.0 0.0 0.475" id="2" type="z-cylinder"/>
-    <surface coeffs="0.0 0.0 0.56" id="3" type="z-cylinder"/>
-    <surface coeffs="0.0 0.0 0.62" id="4" type="z-cylinder"/>
-    <surface coeffs="0.0 0.0 187.6" id="5" type="z-cylinder"/>
-    <surface coeffs="0.0 0.0 209.0" id="6" type="z-cylinder"/>
-    <surface coeffs="0.0 0.0 229.0" id="7" type="z-cylinder"/>
-    <surface boundary="vacuum" coeffs="0.0 0.0 249.0" id="8" type="z-cylinder"/>
-    <surface boundary="vacuum" coeffs="-229.0" id="31" type="z-plane"/>
-    <surface coeffs="-199.0" id="32" type="z-plane"/>
-    <surface coeffs="-193.0" id="33" type="z-plane"/>
-    <surface coeffs="-183.0" id="34" type="z-plane"/>
-    <surface coeffs="0.0" id="35" type="z-plane"/>
-    <surface coeffs="183.0" id="36" type="z-plane"/>
-    <surface coeffs="203.0" id="37" type="z-plane"/>
-    <surface coeffs="215.0" id="38" type="z-plane"/>
-    <surface boundary="vacuum" coeffs="223.0" id="39" type="z-plane"/>
+    <surface id="1" type="z-cylinder" coeffs="0.0 0.0 0.41"/>
+    <surface id="2" type="z-cylinder" coeffs="0.0 0.0 0.475"/>
+    <surface id="3" type="z-cylinder" coeffs="0.0 0.0 0.56"/>
+    <surface id="4" type="z-cylinder" coeffs="0.0 0.0 0.62"/>
+    <surface id="5" type="z-cylinder" coeffs="0.0 0.0 187.6"/>
+    <surface id="6" type="z-cylinder" coeffs="0.0 0.0 209.0"/>
+    <surface id="7" type="z-cylinder" coeffs="0.0 0.0 229.0"/>
+    <surface id="8" type="z-cylinder" boundary="vacuum" coeffs="0.0 0.0 249.0"/>
+    <surface id="31" type="z-plane" boundary="vacuum" coeffs="-229.0"/>
+    <surface id="32" type="z-plane" coeffs="-199.0"/>
+    <surface id="33" type="z-plane" coeffs="-193.0"/>
+    <surface id="34" type="z-plane" coeffs="-183.0"/>
+    <surface id="35" type="z-plane" coeffs="0.0"/>
+    <surface id="36" type="z-plane" coeffs="183.0"/>
+    <surface id="37" type="z-plane" coeffs="203.0"/>
+    <surface id="38" type="z-plane" coeffs="215.0"/>
+    <surface id="39" type="z-plane" boundary="vacuum" coeffs="223.0"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
     <particles>100</particles>
     <batches>3</batches>
     <inactive>0</inactive>
-    <source particle="neutron" strength="1.0" type="independent">
+    <source type="independent" strength="1.0" particle="neutron">
       <space type="box">
         <parameters>-160 -160 -183 160 160 183</parameters>
       </space>
@@ -429,10 +429,10 @@
       <scores>nu-fission scatter</scores>
       <derivative>5</derivative>
     </tally>
-    <derivative id="1" material="3" variable="density"/>
-    <derivative id="2" material="1" variable="density"/>
-    <derivative id="3" material="1" nuclide="O16" variable="nuclide_density"/>
-    <derivative id="4" material="1" nuclide="U235" variable="nuclide_density"/>
-    <derivative id="5" material="1" variable="temperature"/>
+    <derivative id="1" variable="density" material="3"/>
+    <derivative id="2" variable="density" material="1"/>
+    <derivative id="3" variable="nuclide_density" material="1" nuclide="O16"/>
+    <derivative id="4" variable="nuclide_density" material="1" nuclide="U235"/>
+    <derivative id="5" variable="temperature" material="1"/>
   </tallies>
 </model>
diff --git a/tests/regression_tests/distribmat/inputs_true.dat b/tests/regression_tests/distribmat/inputs_true.dat
index ade86999d..35b3b5b9f 100644
--- a/tests/regression_tests/distribmat/inputs_true.dat
+++ b/tests/regression_tests/distribmat/inputs_true.dat
@@ -2,24 +2,24 @@
 <model>
   <materials>
     <material id="1">
-      <density units="g/cc" value="1.0"/>
-      <nuclide ao="2.0" name="H1"/>
-      <nuclide ao="1.0" name="O16"/>
+      <density value="1.0" units="g/cc"/>
+      <nuclide name="H1" ao="2.0"/>
+      <nuclide name="O16" ao="1.0"/>
     </material>
-    <material depletable="true" id="2">
-      <density units="g/cc" value="4.5"/>
-      <nuclide ao="1.0" name="U235"/>
+    <material id="2" depletable="true">
+      <density value="4.5" units="g/cc"/>
+      <nuclide name="U235" ao="1.0"/>
     </material>
-    <material depletable="true" id="3">
-      <density units="g/cc" value="2.0"/>
-      <nuclide ao="1.0" name="U235"/>
+    <material id="3" depletable="true">
+      <density value="2.0" units="g/cc"/>
+      <nuclide name="U235" ao="1.0"/>
     </material>
   </materials>
   <geometry>
     <cell id="1" material="1" universe="1"/>
     <cell id="11" material="2 void 3 2" region="-1" universe="11"/>
     <cell id="12" material="1" region="1" universe="11"/>
-    <cell fill="101" id="101" region="2 -3 4 -5" universe="0"/>
+    <cell id="101" fill="101" region="2 -3 4 -5" universe="0"/>
     <lattice id="101">
       <pitch>2.0 2.0</pitch>
       <outer>1</outer>
@@ -29,30 +29,30 @@
 11 11 
 11 11 </universes>
     </lattice>
-    <surface coeffs="0.0 0.0 0.3" id="1" type="z-cylinder"/>
-    <surface boundary="reflective" coeffs="-3.0" id="2" type="x-plane"/>
-    <surface boundary="reflective" coeffs="3.0" id="3" type="x-plane"/>
-    <surface boundary="reflective" coeffs="-3.0" id="4" type="y-plane"/>
-    <surface boundary="reflective" coeffs="3.0" id="5" type="y-plane"/>
+    <surface id="1" type="z-cylinder" coeffs="0.0 0.0 0.3"/>
+    <surface id="2" type="x-plane" boundary="reflective" coeffs="-3.0"/>
+    <surface id="3" type="x-plane" boundary="reflective" coeffs="3.0"/>
+    <surface id="4" type="y-plane" boundary="reflective" coeffs="-3.0"/>
+    <surface id="5" type="y-plane" boundary="reflective" coeffs="3.0"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
     <particles>1000</particles>
     <batches>5</batches>
     <inactive>0</inactive>
-    <source particle="neutron" strength="1.0" type="independent">
+    <source type="independent" strength="1.0" particle="neutron">
       <space type="box">
         <parameters>-1 -1 -1 1 1 1</parameters>
       </space>
     </source>
   </settings>
   <plots>
-    <plot basis="xy" color_by="cell" filename="cellplot" id="1" type="slice">
+    <plot id="1" filename="cellplot" color_by="cell" type="slice" basis="xy">
       <pixels>400 400</pixels>
       <origin>0 0 0</origin>
       <width>7 7</width>
     </plot>
-    <plot basis="xy" color_by="material" filename="matplot" id="2" type="slice">
+    <plot id="2" filename="matplot" color_by="material" type="slice" basis="xy">
       <pixels>400 400</pixels>
       <origin>0 0 0</origin>
       <width>7 7</width>
diff --git a/tests/regression_tests/eigenvalue_genperbatch/inputs_true.dat b/tests/regression_tests/eigenvalue_genperbatch/inputs_true.dat
index a3e67d62f..15b810a62 100644
--- a/tests/regression_tests/eigenvalue_genperbatch/inputs_true.dat
+++ b/tests/regression_tests/eigenvalue_genperbatch/inputs_true.dat
@@ -1,14 +1,14 @@
 <?xml version='1.0' encoding='utf-8'?>
 <model>
   <materials>
-    <material depletable="true" id="1">
-      <density units="g/cm3" value="4.5"/>
-      <nuclide ao="1.0" name="U235"/>
+    <material id="1" depletable="true">
+      <density value="4.5" units="g/cm3"/>
+      <nuclide name="U235" ao="1.0"/>
     </material>
   </materials>
   <geometry>
     <cell id="1" material="1" region="-1" universe="1"/>
-    <surface boundary="vacuum" coeffs="0.0 0.0 0.0 10.0" id="1" type="sphere"/>
+    <surface id="1" type="sphere" boundary="vacuum" coeffs="0.0 0.0 0.0 10.0"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
@@ -16,7 +16,7 @@
     <batches>7</batches>
     <inactive>3</inactive>
     <generations_per_batch>3</generations_per_batch>
-    <source particle="neutron" strength="1.0" type="independent">
+    <source type="independent" strength="1.0" particle="neutron">
       <space type="box">
         <parameters>-4.0 -4.0 -4.0 4.0 4.0 4.0</parameters>
       </space>
diff --git a/tests/regression_tests/energy_cutoff/inputs_true.dat b/tests/regression_tests/energy_cutoff/inputs_true.dat
index af8f86b67..557cb7a3b 100644
--- a/tests/regression_tests/energy_cutoff/inputs_true.dat
+++ b/tests/regression_tests/energy_cutoff/inputs_true.dat
@@ -2,28 +2,28 @@
 <model>
   <materials>
     <material id="1" name="mat">
-      <density units="atom/b-cm" value="0.069335"/>
-      <nuclide ao="40.0" name="H1"/>
+      <density value="0.069335" units="atom/b-cm"/>
+      <nuclide name="H1" ao="40.0"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="1" name="box" region="1 -2 3 -4 5 -6" universe="0"/>
-    <surface boundary="reflective" coeffs="-1" id="1" type="x-plane"/>
-    <surface boundary="reflective" coeffs="1" id="2" type="x-plane"/>
-    <surface boundary="reflective" coeffs="-1" id="3" type="y-plane"/>
-    <surface boundary="reflective" coeffs="1" id="4" type="y-plane"/>
-    <surface boundary="reflective" coeffs="-1" id="5" type="z-plane"/>
-    <surface boundary="reflective" coeffs="1" id="6" type="z-plane"/>
+    <cell id="1" name="box" material="1" region="1 -2 3 -4 5 -6" universe="0"/>
+    <surface id="1" type="x-plane" boundary="reflective" coeffs="-1"/>
+    <surface id="2" type="x-plane" boundary="reflective" coeffs="1"/>
+    <surface id="3" type="y-plane" boundary="reflective" coeffs="-1"/>
+    <surface id="4" type="y-plane" boundary="reflective" coeffs="1"/>
+    <surface id="5" type="z-plane" boundary="reflective" coeffs="-1"/>
+    <surface id="6" type="z-plane" boundary="reflective" coeffs="1"/>
   </geometry>
   <settings>
     <run_mode>fixed source</run_mode>
     <particles>100</particles>
     <batches>10</batches>
-    <source particle="neutron" strength="1.0" type="independent">
+    <source type="independent" strength="1.0" particle="neutron">
       <space type="box">
         <parameters>-1 -1 -1 1 1 1</parameters>
       </space>
-      <energy parameters="988000.0 2.249e-06" type="watt"/>
+      <energy type="watt" parameters="988000.0 2.249e-06"/>
     </source>
     <cutoff>
       <energy_neutron>4.0</energy_neutron>
diff --git a/tests/regression_tests/energy_laws/inputs_true.dat b/tests/regression_tests/energy_laws/inputs_true.dat
index 4d8e825d1..8c5191217 100644
--- a/tests/regression_tests/energy_laws/inputs_true.dat
+++ b/tests/regression_tests/energy_laws/inputs_true.dat
@@ -1,18 +1,18 @@
 <?xml version='1.0' encoding='utf-8'?>
 <model>
   <materials>
-    <material depletable="true" id="1">
-      <density units="g/cm3" value="20.0"/>
-      <nuclide ao="1.0" name="U233"/>
-      <nuclide ao="1.0" name="Am244"/>
-      <nuclide ao="1.0" name="H2"/>
-      <nuclide ao="1.0" name="Na23"/>
-      <nuclide ao="1.0" name="Ta181"/>
+    <material id="1" depletable="true">
+      <density value="20.0" units="g/cm3"/>
+      <nuclide name="U233" ao="1.0"/>
+      <nuclide name="Am244" ao="1.0"/>
+      <nuclide name="H2" ao="1.0"/>
+      <nuclide name="Na23" ao="1.0"/>
+      <nuclide name="Ta181" ao="1.0"/>
     </material>
   </materials>
   <geometry>
     <cell id="1" material="1" region="-1" universe="1"/>
-    <surface boundary="reflective" coeffs="0.0 0.0 0.0 100.0" id="1" type="sphere"/>
+    <surface id="1" type="sphere" boundary="reflective" coeffs="0.0 0.0 0.0 100.0"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
diff --git a/tests/regression_tests/external_moab/inputs_true.dat b/tests/regression_tests/external_moab/inputs_true.dat
index 23b656bce..ed035f897 100644
--- a/tests/regression_tests/external_moab/inputs_true.dat
+++ b/tests/regression_tests/external_moab/inputs_true.dat
@@ -1,63 +1,63 @@
 <?xml version='1.0' encoding='utf-8'?>
 <model>
   <materials>
-    <material depletable="true" id="1" name="fuel">
-      <density units="g/cc" value="4.5"/>
-      <nuclide ao="1.0" name="U235"/>
+    <material id="1" name="fuel" depletable="true">
+      <density value="4.5" units="g/cc"/>
+      <nuclide name="U235" ao="1.0"/>
     </material>
     <material id="2" name="zircaloy">
-      <density units="g/cc" value="5.77"/>
-      <nuclide ao="0.5145" name="Zr90"/>
-      <nuclide ao="0.1122" name="Zr91"/>
-      <nuclide ao="0.1715" name="Zr92"/>
-      <nuclide ao="0.1738" name="Zr94"/>
-      <nuclide ao="0.028" name="Zr96"/>
+      <density value="5.77" units="g/cc"/>
+      <nuclide name="Zr90" ao="0.5145"/>
+      <nuclide name="Zr91" ao="0.1122"/>
+      <nuclide name="Zr92" ao="0.1715"/>
+      <nuclide name="Zr94" ao="0.1738"/>
+      <nuclide name="Zr96" ao="0.028"/>
     </material>
     <material id="3" name="water">
-      <density units="atom/b-cm" value="0.07416"/>
-      <nuclide ao="2.0" name="H1"/>
-      <nuclide ao="1.0" name="O16"/>
+      <density value="0.07416" units="atom/b-cm"/>
+      <nuclide name="H1" ao="2.0"/>
+      <nuclide name="O16" ao="1.0"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="1" name="fuel" region="1 -2 3 -4 5 -6" universe="1"/>
-    <cell id="2" material="2" name="clad" region="(-1 | 2 | -3 | 4 | -5 | 6) (7 -8 9 -10 11 -12)" universe="1"/>
-    <cell id="3" material="3" name="water" region="(-7 | 8 | -9 | 10 | -11 | 12) (13 -14 15 -16 17 -18)" universe="1"/>
-    <surface coeffs="-5.0" id="1" name="minimum x" type="x-plane"/>
-    <surface coeffs="5.0" id="2" name="maximum x" type="x-plane"/>
-    <surface coeffs="-5.0" id="3" name="minimum y" type="y-plane"/>
-    <surface coeffs="5.0" id="4" name="maximum y" type="y-plane"/>
-    <surface coeffs="-5.0" id="5" name="minimum z" type="z-plane"/>
-    <surface coeffs="5.0" id="6" name="maximum z" type="z-plane"/>
-    <surface coeffs="-6.0" id="7" name="minimum x" type="x-plane"/>
-    <surface coeffs="6.0" id="8" name="maximum x" type="x-plane"/>
-    <surface coeffs="-6.0" id="9" name="minimum y" type="y-plane"/>
-    <surface coeffs="6.0" id="10" name="maximum y" type="y-plane"/>
-    <surface coeffs="-6.0" id="11" name="minimum z" type="z-plane"/>
-    <surface coeffs="6.0" id="12" name="maximum z" type="z-plane"/>
-    <surface boundary="vacuum" coeffs="-10" id="13" name="minimum x" type="x-plane"/>
-    <surface boundary="vacuum" coeffs="10" id="14" name="maximum x" type="x-plane"/>
-    <surface boundary="vacuum" coeffs="-10" id="15" name="minimum y" type="y-plane"/>
-    <surface boundary="vacuum" coeffs="10" id="16" name="maximum y" type="y-plane"/>
-    <surface boundary="vacuum" coeffs="-10" id="17" name="minimum z" type="z-plane"/>
-    <surface boundary="vacuum" coeffs="10" id="18" name="maximum z" type="z-plane"/>
+    <cell id="1" name="fuel" material="1" region="1 -2 3 -4 5 -6" universe="1"/>
+    <cell id="2" name="clad" material="2" region="(-1 | 2 | -3 | 4 | -5 | 6) (7 -8 9 -10 11 -12)" universe="1"/>
+    <cell id="3" name="water" material="3" region="(-7 | 8 | -9 | 10 | -11 | 12) (13 -14 15 -16 17 -18)" universe="1"/>
+    <surface id="1" name="minimum x" type="x-plane" coeffs="-5.0"/>
+    <surface id="2" name="maximum x" type="x-plane" coeffs="5.0"/>
+    <surface id="3" name="minimum y" type="y-plane" coeffs="-5.0"/>
+    <surface id="4" name="maximum y" type="y-plane" coeffs="5.0"/>
+    <surface id="5" name="minimum z" type="z-plane" coeffs="-5.0"/>
+    <surface id="6" name="maximum z" type="z-plane" coeffs="5.0"/>
+    <surface id="7" name="minimum x" type="x-plane" coeffs="-6.0"/>
+    <surface id="8" name="maximum x" type="x-plane" coeffs="6.0"/>
+    <surface id="9" name="minimum y" type="y-plane" coeffs="-6.0"/>
+    <surface id="10" name="maximum y" type="y-plane" coeffs="6.0"/>
+    <surface id="11" name="minimum z" type="z-plane" coeffs="-6.0"/>
+    <surface id="12" name="maximum z" type="z-plane" coeffs="6.0"/>
+    <surface id="13" name="minimum x" type="x-plane" boundary="vacuum" coeffs="-10"/>
+    <surface id="14" name="maximum x" type="x-plane" boundary="vacuum" coeffs="10"/>
+    <surface id="15" name="minimum y" type="y-plane" boundary="vacuum" coeffs="-10"/>
+    <surface id="16" name="maximum y" type="y-plane" boundary="vacuum" coeffs="10"/>
+    <surface id="17" name="minimum z" type="z-plane" boundary="vacuum" coeffs="-10"/>
+    <surface id="18" name="maximum z" type="z-plane" boundary="vacuum" coeffs="10"/>
   </geometry>
   <settings>
     <run_mode>fixed source</run_mode>
     <particles>100</particles>
     <batches>10</batches>
-    <source particle="neutron" strength="1.0" type="independent">
+    <source type="independent" strength="1.0" particle="neutron">
       <space type="point">
         <parameters>0.0 0.0 0.0</parameters>
       </space>
-      <angle reference_uvw="-1.0 0.0 0.0" type="monodirectional"/>
+      <angle type="monodirectional" reference_uvw="-1.0 0.0 0.0"/>
       <energy type="discrete">
         <parameters>15000000.0 1.0</parameters>
       </energy>
     </source>
   </settings>
   <tallies>
-    <mesh id="1" library="moab" type="unstructured">
+    <mesh id="1" type="unstructured" library="moab">
       <filename>test_mesh_tets.h5m</filename>
     </mesh>
     <filter id="1" type="mesh">
diff --git a/tests/regression_tests/filter_cellfrom/inputs_true.dat b/tests/regression_tests/filter_cellfrom/inputs_true.dat
index b85f63c6e..20d0d69d4 100644
--- a/tests/regression_tests/filter_cellfrom/inputs_true.dat
+++ b/tests/regression_tests/filter_cellfrom/inputs_true.dat
@@ -1,54 +1,54 @@
 <?xml version='1.0' encoding='utf-8'?>
 <model>
   <materials>
-    <material depletable="true" id="1">
-      <density units="g/cm3" value="10.97"/>
-      <nuclide ao="0.0004524" name="U234"/>
-      <nuclide ao="0.0506068" name="U235"/>
-      <nuclide ao="0.948709" name="U238"/>
-      <nuclide ao="0.0002318" name="U236"/>
-      <nuclide ao="2.0" name="O16"/>
+    <material id="1" depletable="true">
+      <density value="10.97" units="g/cm3"/>
+      <nuclide name="U234" ao="0.0004524"/>
+      <nuclide name="U235" ao="0.0506068"/>
+      <nuclide name="U238" ao="0.948709"/>
+      <nuclide name="U236" ao="0.0002318"/>
+      <nuclide name="O16" ao="2.0"/>
     </material>
     <material id="2">
-      <density units="g/cm3" value="1.0"/>
-      <nuclide ao="2.0" name="H1"/>
-      <nuclide ao="1.0" name="O16"/>
+      <density value="1.0" units="g/cm3"/>
+      <nuclide name="H1" ao="2.0"/>
+      <nuclide name="O16" ao="1.0"/>
     </material>
     <material id="3">
-      <density units="g/cm3" value="0.001225"/>
-      <nuclide ao="0.1999242" name="O16"/>
-      <nuclide ao="7.58e-05" name="O17"/>
-      <nuclide ao="0.7970696" name="N14"/>
-      <nuclide ao="0.0029304" name="N15"/>
+      <density value="0.001225" units="g/cm3"/>
+      <nuclide name="O16" ao="0.1999242"/>
+      <nuclide name="O17" ao="7.58e-05"/>
+      <nuclide name="N14" ao="0.7970696"/>
+      <nuclide name="N15" ao="0.0029304"/>
     </material>
   </materials>
   <geometry>
     <cell id="1" material="1" region="-1 2 -3" universe="1"/>
     <cell id="2" material="3" region="1 | -2 | 3" universe="1"/>
-    <cell fill="1" id="3" region="-5 4 -7 6 -9 8" universe="2"/>
+    <cell id="3" fill="1" region="-5 4 -7 6 -9 8" universe="2"/>
     <cell id="4" material="2" region="-11 10 -13 12 -15 14 (5 | -4 | 7 | -6 | 9 | -8)" universe="2"/>
-    <surface coeffs="0.0 0.0 2.0" id="1" type="z-cylinder"/>
-    <surface coeffs="-2.0" id="2" type="z-plane"/>
-    <surface coeffs="2.0" id="3" type="z-plane"/>
-    <surface coeffs="-2.05" id="4" type="x-plane"/>
-    <surface coeffs="2.05" id="5" type="x-plane"/>
-    <surface coeffs="-2.05" id="6" type="y-plane"/>
-    <surface coeffs="2.05" id="7" type="y-plane"/>
-    <surface coeffs="-2.05" id="8" type="z-plane"/>
-    <surface coeffs="2.05" id="9" type="z-plane"/>
-    <surface boundary="vacuum" coeffs="-6.0" id="10" type="x-plane"/>
-    <surface boundary="vacuum" coeffs="6.0" id="11" type="x-plane"/>
-    <surface boundary="vacuum" coeffs="-6.0" id="12" type="y-plane"/>
-    <surface boundary="vacuum" coeffs="6.0" id="13" type="y-plane"/>
-    <surface boundary="vacuum" coeffs="-6.0" id="14" type="z-plane"/>
-    <surface boundary="vacuum" coeffs="6.0" id="15" type="z-plane"/>
+    <surface id="1" type="z-cylinder" coeffs="0.0 0.0 2.0"/>
+    <surface id="2" type="z-plane" coeffs="-2.0"/>
+    <surface id="3" type="z-plane" coeffs="2.0"/>
+    <surface id="4" type="x-plane" coeffs="-2.05"/>
+    <surface id="5" type="x-plane" coeffs="2.05"/>
+    <surface id="6" type="y-plane" coeffs="-2.05"/>
+    <surface id="7" type="y-plane" coeffs="2.05"/>
+    <surface id="8" type="z-plane" coeffs="-2.05"/>
+    <surface id="9" type="z-plane" coeffs="2.05"/>
+    <surface id="10" type="x-plane" boundary="vacuum" coeffs="-6.0"/>
+    <surface id="11" type="x-plane" boundary="vacuum" coeffs="6.0"/>
+    <surface id="12" type="y-plane" boundary="vacuum" coeffs="-6.0"/>
+    <surface id="13" type="y-plane" boundary="vacuum" coeffs="6.0"/>
+    <surface id="14" type="z-plane" boundary="vacuum" coeffs="-6.0"/>
+    <surface id="15" type="z-plane" boundary="vacuum" coeffs="6.0"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
     <particles>2000</particles>
     <batches>15</batches>
     <inactive>5</inactive>
-    <source particle="neutron" strength="1.0" type="independent">
+    <source type="independent" strength="1.0" particle="neutron">
       <space type="box">
         <parameters>-2.0 -2.0 -2.0 2.0 2.0 2.0</parameters>
       </space>
diff --git a/tests/regression_tests/filter_cellinstance/inputs_true.dat b/tests/regression_tests/filter_cellinstance/inputs_true.dat
index b17cc0eb5..2677d7ad2 100644
--- a/tests/regression_tests/filter_cellinstance/inputs_true.dat
+++ b/tests/regression_tests/filter_cellinstance/inputs_true.dat
@@ -1,22 +1,22 @@
 <?xml version='1.0' encoding='utf-8'?>
 <model>
   <materials>
-    <material depletable="true" id="1">
-      <density units="g/cc" value="4.5"/>
-      <nuclide ao="1.0" name="U235"/>
+    <material id="1" depletable="true">
+      <density value="4.5" units="g/cc"/>
+      <nuclide name="U235" ao="1.0"/>
     </material>
     <material id="2">
-      <density units="g/cc" value="1.0"/>
-      <nuclide ao="1.0" name="H1"/>
+      <density value="1.0" units="g/cc"/>
+      <nuclide name="H1" ao="1.0"/>
     </material>
   </materials>
   <geometry>
     <cell id="1" material="1" region="-1" universe="2"/>
     <cell id="2" material="2" region="1" universe="1"/>
-    <cell fill="1" id="3" universe="2"/>
+    <cell id="3" fill="1" universe="2"/>
     <cell id="4" material="1" region="-2" universe="3"/>
     <cell id="5" material="2" region="2" universe="3"/>
-    <cell fill="4" id="6" region="3 -4 5 -6" universe="5"/>
+    <cell id="6" fill="4" region="3 -4 5 -6" universe="5"/>
     <lattice id="4">
       <pitch>2 2</pitch>
       <dimension>4 4</dimension>
@@ -27,19 +27,19 @@
 3 3 2 3 
 3 3 3 2 </universes>
     </lattice>
-    <surface coeffs="0.0 0.0 0.7" id="1" type="z-cylinder"/>
-    <surface coeffs="0.0 0.0 0.5" id="2" type="z-cylinder"/>
-    <surface boundary="reflective" coeffs="-4.0" id="3" name="minimum x" type="x-plane"/>
-    <surface boundary="reflective" coeffs="4.0" id="4" name="maximum x" type="x-plane"/>
-    <surface boundary="reflective" coeffs="-4.0" id="5" name="minimum y" type="y-plane"/>
-    <surface boundary="reflective" coeffs="4.0" id="6" name="maximum y" type="y-plane"/>
+    <surface id="1" type="z-cylinder" coeffs="0.0 0.0 0.7"/>
+    <surface id="2" type="z-cylinder" coeffs="0.0 0.0 0.5"/>
+    <surface id="3" name="minimum x" type="x-plane" boundary="reflective" coeffs="-4.0"/>
+    <surface id="4" name="maximum x" type="x-plane" boundary="reflective" coeffs="4.0"/>
+    <surface id="5" name="minimum y" type="y-plane" boundary="reflective" coeffs="-4.0"/>
+    <surface id="6" name="maximum y" type="y-plane" boundary="reflective" coeffs="4.0"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
     <particles>1000</particles>
     <batches>5</batches>
     <inactive>0</inactive>
-    <source particle="neutron" strength="1.0" type="independent">
+    <source type="independent" strength="1.0" particle="neutron">
       <space type="point">
         <parameters>0.0 0.0 0.0</parameters>
       </space>
diff --git a/tests/regression_tests/filter_energyfun/inputs_true.dat b/tests/regression_tests/filter_energyfun/inputs_true.dat
index 4b7b74d28..b7a70290f 100644
--- a/tests/regression_tests/filter_energyfun/inputs_true.dat
+++ b/tests/regression_tests/filter_energyfun/inputs_true.dat
@@ -1,14 +1,14 @@
 <?xml version='1.0' encoding='utf-8'?>
 <model>
   <materials>
-    <material depletable="true" id="1">
-      <density units="g/cm3" value="10.0"/>
-      <nuclide ao="1.0" name="Am241"/>
+    <material id="1" depletable="true">
+      <density value="10.0" units="g/cm3"/>
+      <nuclide name="Am241" ao="1.0"/>
     </material>
   </materials>
   <geometry>
     <cell id="1" material="1" region="-1" universe="1"/>
-    <surface boundary="vacuum" coeffs="0.0 0.0 0.0 100.0" id="1" type="sphere"/>
+    <surface id="1" type="sphere" boundary="vacuum" coeffs="0.0 0.0 0.0 100.0"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
diff --git a/tests/regression_tests/filter_mesh/inputs_true.dat b/tests/regression_tests/filter_mesh/inputs_true.dat
index 4995749bb..10f70a720 100644
--- a/tests/regression_tests/filter_mesh/inputs_true.dat
+++ b/tests/regression_tests/filter_mesh/inputs_true.dat
@@ -1,28 +1,28 @@
 <?xml version='1.0' encoding='utf-8'?>
 <model>
   <materials>
-    <material depletable="true" id="1">
-      <density units="g/cm3" value="10.0"/>
-      <nuclide ao="1.0" name="U235"/>
+    <material id="1" depletable="true">
+      <density value="10.0" units="g/cm3"/>
+      <nuclide name="U235" ao="1.0"/>
     </material>
     <material id="2">
-      <density units="g/cm3" value="1.0"/>
-      <nuclide ao="1.0" name="Zr90"/>
+      <density value="1.0" units="g/cm3"/>
+      <nuclide name="Zr90" ao="1.0"/>
     </material>
   </materials>
   <geometry>
     <cell id="1" material="1" region="1 -2 3 -4 10 -9" universe="1"/>
     <cell id="2" material="2" region="(-1 | 2 | -3 | 4) (5 -6 7 -8) 10 -9" universe="1"/>
-    <surface coeffs="-5.0" id="1" name="minimum x" type="x-plane"/>
-    <surface coeffs="5.0" id="2" name="maximum x" type="x-plane"/>
-    <surface coeffs="-5.0" id="3" name="minimum y" type="y-plane"/>
-    <surface coeffs="5.0" id="4" name="maximum y" type="y-plane"/>
-    <surface boundary="reflective" coeffs="-10.0" id="5" name="minimum x" type="x-plane"/>
-    <surface boundary="reflective" coeffs="10.0" id="6" name="maximum x" type="x-plane"/>
-    <surface boundary="reflective" coeffs="-10.0" id="7" name="minimum y" type="y-plane"/>
-    <surface boundary="reflective" coeffs="10.0" id="8" name="maximum y" type="y-plane"/>
-    <surface boundary="vacuum" coeffs="10.0" id="9" type="z-plane"/>
-    <surface boundary="vacuum" coeffs="-10.0" id="10" type="z-plane"/>
+    <surface id="1" name="minimum x" type="x-plane" coeffs="-5.0"/>
+    <surface id="2" name="maximum x" type="x-plane" coeffs="5.0"/>
+    <surface id="3" name="minimum y" type="y-plane" coeffs="-5.0"/>
+    <surface id="4" name="maximum y" type="y-plane" coeffs="5.0"/>
+    <surface id="5" name="minimum x" type="x-plane" boundary="reflective" coeffs="-10.0"/>
+    <surface id="6" name="maximum x" type="x-plane" boundary="reflective" coeffs="10.0"/>
+    <surface id="7" name="minimum y" type="y-plane" boundary="reflective" coeffs="-10.0"/>
+    <surface id="8" name="maximum y" type="y-plane" boundary="reflective" coeffs="10.0"/>
+    <surface id="9" type="z-plane" boundary="vacuum" coeffs="10.0"/>
+    <surface id="10" type="z-plane" boundary="vacuum" coeffs="-10.0"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
diff --git a/tests/regression_tests/filter_meshborn/inputs_true.dat b/tests/regression_tests/filter_meshborn/inputs_true.dat
index 3ba38d56e..a94646ec8 100644
--- a/tests/regression_tests/filter_meshborn/inputs_true.dat
+++ b/tests/regression_tests/filter_meshborn/inputs_true.dat
@@ -2,19 +2,19 @@
 <model>
   <materials>
     <material id="1">
-      <density units="g/cm3" value="1.0"/>
-      <nuclide ao="1.0" name="H1"/>
+      <density value="1.0" units="g/cm3"/>
+      <nuclide name="H1" ao="1.0"/>
     </material>
   </materials>
   <geometry>
     <cell id="1" material="1" region="-1" universe="1"/>
-    <surface boundary="reflective" coeffs="0.0 0.0 0.0 10.0" id="1" type="sphere"/>
+    <surface id="1" type="sphere" boundary="reflective" coeffs="0.0 0.0 0.0 10.0"/>
   </geometry>
   <settings>
     <run_mode>fixed source</run_mode>
     <particles>2000</particles>
     <batches>8</batches>
-    <source particle="neutron" strength="1.0" type="independent">
+    <source type="independent" strength="1.0" particle="neutron">
       <space type="box">
         <parameters>0.0 -10.0 -10.0 10.0 10.0 10.0</parameters>
       </space>
diff --git a/tests/regression_tests/filter_musurface/inputs_true.dat b/tests/regression_tests/filter_musurface/inputs_true.dat
index 031f62159..6db8543c2 100644
--- a/tests/regression_tests/filter_musurface/inputs_true.dat
+++ b/tests/regression_tests/filter_musurface/inputs_true.dat
@@ -1,20 +1,20 @@
 <?xml version='1.0' encoding='utf-8'?>
 <model>
   <materials>
-    <material depletable="true" id="1">
-      <density units="g/cm3" value="10.0"/>
-      <nuclide ao="1.0" name="U235"/>
+    <material id="1" depletable="true">
+      <density value="10.0" units="g/cm3"/>
+      <nuclide name="U235" ao="1.0"/>
     </material>
     <material id="2">
-      <density units="g/cm3" value="1.0"/>
-      <nuclide ao="1.0" name="Zr90"/>
+      <density value="1.0" units="g/cm3"/>
+      <nuclide name="Zr90" ao="1.0"/>
     </material>
   </materials>
   <geometry>
     <cell id="1" material="1" region="-1" universe="1"/>
     <cell id="2" material="2" region="1 -2" universe="1"/>
-    <surface coeffs="0.0 0.0 1.0" id="1" type="z-cylinder"/>
-    <surface boundary="vacuum" coeffs="0.0 0.0 3.0" id="2" type="z-cylinder"/>
+    <surface id="1" type="z-cylinder" coeffs="0.0 0.0 1.0"/>
+    <surface id="2" type="z-cylinder" boundary="vacuum" coeffs="0.0 0.0 3.0"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
diff --git a/tests/regression_tests/filter_translations/inputs_true.dat b/tests/regression_tests/filter_translations/inputs_true.dat
index 5004c3217..41ae9b6dc 100644
--- a/tests/regression_tests/filter_translations/inputs_true.dat
+++ b/tests/regression_tests/filter_translations/inputs_true.dat
@@ -1,28 +1,28 @@
 <?xml version='1.0' encoding='utf-8'?>
 <model>
   <materials>
-    <material depletable="true" id="1">
-      <density units="g/cm3" value="10.0"/>
-      <nuclide ao="1.0" name="U235"/>
+    <material id="1" depletable="true">
+      <density value="10.0" units="g/cm3"/>
+      <nuclide name="U235" ao="1.0"/>
     </material>
     <material id="2">
-      <density units="g/cm3" value="1.0"/>
-      <nuclide ao="1.0" name="Zr90"/>
+      <density value="1.0" units="g/cm3"/>
+      <nuclide name="Zr90" ao="1.0"/>
     </material>
   </materials>
   <geometry>
     <cell id="1" material="1" region="1 -2 3 -4 10 -9" universe="1"/>
     <cell id="2" material="2" region="(-1 | 2 | -3 | 4) (5 -6 7 -8) 10 -9" universe="1"/>
-    <surface coeffs="-5.0" id="1" name="minimum x" type="x-plane"/>
-    <surface coeffs="5.0" id="2" name="maximum x" type="x-plane"/>
-    <surface coeffs="-5.0" id="3" name="minimum y" type="y-plane"/>
-    <surface coeffs="5.0" id="4" name="maximum y" type="y-plane"/>
-    <surface boundary="reflective" coeffs="-10.0" id="5" name="minimum x" type="x-plane"/>
-    <surface boundary="reflective" coeffs="10.0" id="6" name="maximum x" type="x-plane"/>
-    <surface boundary="reflective" coeffs="-10.0" id="7" name="minimum y" type="y-plane"/>
-    <surface boundary="reflective" coeffs="10.0" id="8" name="maximum y" type="y-plane"/>
-    <surface boundary="vacuum" coeffs="10.0" id="9" type="z-plane"/>
-    <surface boundary="vacuum" coeffs="-10.0" id="10" type="z-plane"/>
+    <surface id="1" name="minimum x" type="x-plane" coeffs="-5.0"/>
+    <surface id="2" name="maximum x" type="x-plane" coeffs="5.0"/>
+    <surface id="3" name="minimum y" type="y-plane" coeffs="-5.0"/>
+    <surface id="4" name="maximum y" type="y-plane" coeffs="5.0"/>
+    <surface id="5" name="minimum x" type="x-plane" boundary="reflective" coeffs="-10.0"/>
+    <surface id="6" name="maximum x" type="x-plane" boundary="reflective" coeffs="10.0"/>
+    <surface id="7" name="minimum y" type="y-plane" boundary="reflective" coeffs="-10.0"/>
+    <surface id="8" name="maximum y" type="y-plane" boundary="reflective" coeffs="10.0"/>
+    <surface id="9" type="z-plane" boundary="vacuum" coeffs="10.0"/>
+    <surface id="10" type="z-plane" boundary="vacuum" coeffs="-10.0"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
@@ -57,10 +57,10 @@
     <filter id="2" type="mesh">
       <bins>2</bins>
     </filter>
-    <filter id="3" translation="10 -5 0" type="mesh">
+    <filter id="3" type="mesh" translation="10 -5 0">
       <bins>3</bins>
     </filter>
-    <filter id="4" translation="10 -5 0" type="mesh">
+    <filter id="4" type="mesh" translation="10 -5 0">
       <bins>4</bins>
     </filter>
     <tally id="1">
diff --git a/tests/regression_tests/fixed_source/inputs_true.dat b/tests/regression_tests/fixed_source/inputs_true.dat
index 0fdb1466e..a36741775 100644
--- a/tests/regression_tests/fixed_source/inputs_true.dat
+++ b/tests/regression_tests/fixed_source/inputs_true.dat
@@ -1,21 +1,21 @@
 <?xml version='1.0' encoding='utf-8'?>
 <model>
   <materials>
-    <material depletable="true" id="1">
-      <density units="g/cc" value="7.5"/>
-      <nuclide ao="1.0" name="O16"/>
-      <nuclide ao="0.0001" name="U238"/>
+    <material id="1" depletable="true">
+      <density value="7.5" units="g/cc"/>
+      <nuclide name="O16" ao="1.0"/>
+      <nuclide name="U238" ao="0.0001"/>
     </material>
   </materials>
   <geometry>
     <cell id="1" material="1" region="-1" universe="1"/>
-    <surface boundary="vacuum" coeffs="0.0 0.0 0.0 10.0" id="1" type="sphere"/>
+    <surface id="1" type="sphere" boundary="vacuum" coeffs="0.0 0.0 0.0 10.0"/>
   </geometry>
   <settings>
     <run_mode>fixed source</run_mode>
     <particles>100</particles>
     <batches>10</batches>
-    <source particle="neutron" strength="10.0" type="independent">
+    <source type="independent" strength="10.0" particle="neutron">
       <space type="point">
         <parameters>0.0 0.0 0.0</parameters>
       </space>
diff --git a/tests/regression_tests/ifp/inputs_true.dat b/tests/regression_tests/ifp/inputs_true.dat
index a3a3f1d77..2d69b29ab 100644
--- a/tests/regression_tests/ifp/inputs_true.dat
+++ b/tests/regression_tests/ifp/inputs_true.dat
@@ -1,21 +1,21 @@
 <?xml version='1.0' encoding='utf-8'?>
 <model>
   <materials>
-    <material depletable="true" id="1" name="core">
-      <density units="g/cm3" value="16.0"/>
-      <nuclide ao="1.0" name="U235"/>
+    <material id="1" name="core" depletable="true">
+      <density value="16.0" units="g/cm3"/>
+      <nuclide name="U235" ao="1.0"/>
     </material>
   </materials>
   <geometry>
     <cell id="1" material="1" region="-1" universe="1"/>
-    <surface boundary="vacuum" coeffs="0.0 0.0 0.0 10.0" id="1" type="sphere"/>
+    <surface id="1" type="sphere" boundary="vacuum" coeffs="0.0 0.0 0.0 10.0"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
     <particles>1000</particles>
     <batches>20</batches>
     <inactive>5</inactive>
-    <source particle="neutron" strength="1.0" type="independent">
+    <source type="independent" strength="1.0" particle="neutron">
       <space type="box">
         <parameters>-10.0 -10.0 -10.0 10.0 10.0 10.0</parameters>
       </space>
diff --git a/tests/regression_tests/iso_in_lab/inputs_true.dat b/tests/regression_tests/iso_in_lab/inputs_true.dat
index bb6494ada..adfcf7e51 100644
--- a/tests/regression_tests/iso_in_lab/inputs_true.dat
+++ b/tests/regression_tests/iso_in_lab/inputs_true.dat
@@ -1,44 +1,44 @@
 <?xml version='1.0' encoding='utf-8'?>
 <model>
   <materials>
-    <material depletable="true" id="1" name="UOX fuel">
-      <density units="g/cm3" value="10.062"/>
-      <nuclide ao="4.9476e-06" name="U234"/>
-      <nuclide ao="0.00048218" name="U235"/>
-      <nuclide ao="0.021504" name="U238"/>
-      <nuclide ao="1.0801e-08" name="Xe135"/>
-      <nuclide ao="0.045737" name="O16"/>
+    <material id="1" name="UOX fuel" depletable="true">
+      <density value="10.062" units="g/cm3"/>
+      <nuclide name="U234" ao="4.9476e-06"/>
+      <nuclide name="U235" ao="0.00048218"/>
+      <nuclide name="U238" ao="0.021504"/>
+      <nuclide name="Xe135" ao="1.0801e-08"/>
+      <nuclide name="O16" ao="0.045737"/>
       <isotropic>U234 U235 U238 Xe135 O16</isotropic>
     </material>
     <material id="2" name="Zircaloy">
-      <density units="g/cm3" value="5.77"/>
-      <nuclide ao="0.5145" name="Zr90"/>
-      <nuclide ao="0.1122" name="Zr91"/>
-      <nuclide ao="0.1715" name="Zr92"/>
-      <nuclide ao="0.1738" name="Zr94"/>
-      <nuclide ao="0.028" name="Zr96"/>
+      <density value="5.77" units="g/cm3"/>
+      <nuclide name="Zr90" ao="0.5145"/>
+      <nuclide name="Zr91" ao="0.1122"/>
+      <nuclide name="Zr92" ao="0.1715"/>
+      <nuclide name="Zr94" ao="0.1738"/>
+      <nuclide name="Zr96" ao="0.028"/>
       <isotropic>Zr90 Zr91 Zr92 Zr94 Zr96</isotropic>
     </material>
     <material id="3" name="Cold borated water">
-      <density units="atom/b-cm" value="0.07416"/>
-      <nuclide ao="2.0" name="H1"/>
-      <nuclide ao="1.0" name="O16"/>
-      <nuclide ao="0.000649" name="B10"/>
-      <nuclide ao="0.002689" name="B11"/>
+      <density value="0.07416" units="atom/b-cm"/>
+      <nuclide name="H1" ao="2.0"/>
+      <nuclide name="O16" ao="1.0"/>
+      <nuclide name="B10" ao="0.000649"/>
+      <nuclide name="B11" ao="0.002689"/>
       <sab name="c_H_in_H2O"/>
       <isotropic>H1 O16 B10 B11</isotropic>
     </material>
     <material id="4" name="Hot borated water">
-      <density units="atom/b-cm" value="0.06614"/>
-      <nuclide ao="2.0" name="H1"/>
-      <nuclide ao="1.0" name="O16"/>
-      <nuclide ao="0.000649" name="B10"/>
-      <nuclide ao="0.002689" name="B11"/>
+      <density value="0.06614" units="atom/b-cm"/>
+      <nuclide name="H1" ao="2.0"/>
+      <nuclide name="O16" ao="1.0"/>
+      <nuclide name="B10" ao="0.000649"/>
+      <nuclide name="B11" ao="0.002689"/>
       <sab name="c_H_in_H2O"/>
       <isotropic>H1 O16 B10 B11</isotropic>
     </material>
     <material id="5" name="Reactor pressure vessel steel">
-      <density units="g/cm3" value="7.9"/>
+      <density value="7.9" units="g/cm3"/>
       <nuclide name="Fe54" wo="0.05437098"/>
       <nuclide name="Fe56" wo="0.88500663"/>
       <nuclide name="Fe57" wo="0.0208008"/>
@@ -52,7 +52,7 @@
       <isotropic>Fe54 Fe56 Fe57 Fe58 Ni58 Ni60 Mn55 Cr52 C0 Cu63</isotropic>
     </material>
     <material id="6" name="Lower radial reflector">
-      <density units="g/cm3" value="4.32"/>
+      <density value="4.32" units="g/cm3"/>
       <nuclide name="H1" wo="0.0095661"/>
       <nuclide name="O16" wo="0.0759107"/>
       <nuclide name="B10" wo="3.08409e-05"/>
@@ -68,7 +68,7 @@
       <isotropic>H1 O16 B10 B11 Fe54 Fe56 Fe57 Fe58 Ni58 Mn55 Cr52</isotropic>
     </material>
     <material id="7" name="Upper radial reflector / Top plate region">
-      <density units="g/cm3" value="4.28"/>
+      <density value="4.28" units="g/cm3"/>
       <nuclide name="H1" wo="0.0086117"/>
       <nuclide name="O16" wo="0.0683369"/>
       <nuclide name="B10" wo="2.77638e-05"/>
@@ -84,7 +84,7 @@
       <isotropic>H1 O16 B10 B11 Fe54 Fe56 Fe57 Fe58 Ni58 Mn55 Cr52</isotropic>
     </material>
     <material id="8" name="Bottom plate region">
-      <density units="g/cm3" value="7.184"/>
+      <density value="7.184" units="g/cm3"/>
       <nuclide name="H1" wo="0.0011505"/>
       <nuclide name="O16" wo="0.0091296"/>
       <nuclide name="B10" wo="3.70915e-06"/>
@@ -100,7 +100,7 @@
       <isotropic>H1 O16 B10 B11 Fe54 Fe56 Fe57 Fe58 Ni58 Mn55 Cr52</isotropic>
     </material>
     <material id="9" name="Bottom nozzle region">
-      <density units="g/cm3" value="2.53"/>
+      <density value="2.53" units="g/cm3"/>
       <nuclide name="H1" wo="0.0245014"/>
       <nuclide name="O16" wo="0.1944274"/>
       <nuclide name="B10" wo="7.89917e-05"/>
@@ -116,7 +116,7 @@
       <isotropic>H1 O16 B10 B11 Fe54 Fe56 Fe57 Fe58 Ni58 Mn55 Cr52</isotropic>
     </material>
     <material id="10" name="Top nozzle region">
-      <density units="g/cm3" value="1.746"/>
+      <density value="1.746" units="g/cm3"/>
       <nuclide name="H1" wo="0.035887"/>
       <nuclide name="O16" wo="0.2847761"/>
       <nuclide name="B10" wo="0.000115699"/>
@@ -132,7 +132,7 @@
       <isotropic>H1 O16 B10 B11 Fe54 Fe56 Fe57 Fe58 Ni58 Mn55 Cr52</isotropic>
     </material>
     <material id="11" name="Top of fuel assemblies">
-      <density units="g/cm3" value="3.044"/>
+      <density value="3.044" units="g/cm3"/>
       <nuclide name="H1" wo="0.0162913"/>
       <nuclide name="O16" wo="0.1292776"/>
       <nuclide name="B10" wo="5.25228e-05"/>
@@ -146,7 +146,7 @@
       <isotropic>H1 O16 B10 B11 Zr90 Zr91 Zr92 Zr94 Zr96</isotropic>
     </material>
     <material id="12" name="Bottom of fuel assemblies">
-      <density units="g/cm3" value="1.762"/>
+      <density value="1.762" units="g/cm3"/>
       <nuclide name="H1" wo="0.0292856"/>
       <nuclide name="O16" wo="0.2323919"/>
       <nuclide name="B10" wo="9.44159e-05"/>
@@ -161,8 +161,8 @@
     </material>
   </materials>
   <geometry>
-    <cell fill="200" id="1" region="-6 34 -35" universe="0"/>
-    <cell fill="201" id="2" region="-6 35 -36" universe="0"/>
+    <cell id="1" fill="200" region="-6 34 -35" universe="0"/>
+    <cell id="2" fill="201" region="-6 35 -36" universe="0"/>
     <cell id="3" material="8" region="-7 31 -32" universe="0"/>
     <cell id="4" material="9" region="-5 32 -33" universe="0"/>
     <cell id="5" material="12" region="-5 33 -34" universe="0"/>
@@ -186,9 +186,9 @@
     <cell id="31" material="2" region="3 -4" universe="4"/>
     <cell id="32" material="4" region="4" universe="4"/>
     <cell id="50" material="3" region="34 -35" universe="5"/>
-    <cell fill="100" id="60" region="34 -35" universe="6"/>
+    <cell id="60" fill="100" region="34 -35" universe="6"/>
     <cell id="70" material="4" region="35 -36" universe="7"/>
-    <cell fill="101" id="80" region="35 -36" universe="8"/>
+    <cell id="80" fill="101" region="35 -36" universe="8"/>
     <lattice id="100" name="Fuel assembly (lower half)">
       <pitch>1.26 1.26</pitch>
       <dimension>17 17</dimension>
@@ -289,30 +289,30 @@
 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 
 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 </universes>
     </lattice>
-    <surface coeffs="0.0 0.0 0.41" id="1" type="z-cylinder"/>
-    <surface coeffs="0.0 0.0 0.475" id="2" type="z-cylinder"/>
-    <surface coeffs="0.0 0.0 0.56" id="3" type="z-cylinder"/>
-    <surface coeffs="0.0 0.0 0.62" id="4" type="z-cylinder"/>
-    <surface coeffs="0.0 0.0 187.6" id="5" type="z-cylinder"/>
-    <surface coeffs="0.0 0.0 209.0" id="6" type="z-cylinder"/>
-    <surface coeffs="0.0 0.0 229.0" id="7" type="z-cylinder"/>
-    <surface boundary="vacuum" coeffs="0.0 0.0 249.0" id="8" type="z-cylinder"/>
-    <surface boundary="vacuum" coeffs="-229.0" id="31" type="z-plane"/>
-    <surface coeffs="-199.0" id="32" type="z-plane"/>
-    <surface coeffs="-193.0" id="33" type="z-plane"/>
-    <surface coeffs="-183.0" id="34" type="z-plane"/>
-    <surface coeffs="0.0" id="35" type="z-plane"/>
-    <surface coeffs="183.0" id="36" type="z-plane"/>
-    <surface coeffs="203.0" id="37" type="z-plane"/>
-    <surface coeffs="215.0" id="38" type="z-plane"/>
-    <surface boundary="vacuum" coeffs="223.0" id="39" type="z-plane"/>
+    <surface id="1" type="z-cylinder" coeffs="0.0 0.0 0.41"/>
+    <surface id="2" type="z-cylinder" coeffs="0.0 0.0 0.475"/>
+    <surface id="3" type="z-cylinder" coeffs="0.0 0.0 0.56"/>
+    <surface id="4" type="z-cylinder" coeffs="0.0 0.0 0.62"/>
+    <surface id="5" type="z-cylinder" coeffs="0.0 0.0 187.6"/>
+    <surface id="6" type="z-cylinder" coeffs="0.0 0.0 209.0"/>
+    <surface id="7" type="z-cylinder" coeffs="0.0 0.0 229.0"/>
+    <surface id="8" type="z-cylinder" boundary="vacuum" coeffs="0.0 0.0 249.0"/>
+    <surface id="31" type="z-plane" boundary="vacuum" coeffs="-229.0"/>
+    <surface id="32" type="z-plane" coeffs="-199.0"/>
+    <surface id="33" type="z-plane" coeffs="-193.0"/>
+    <surface id="34" type="z-plane" coeffs="-183.0"/>
+    <surface id="35" type="z-plane" coeffs="0.0"/>
+    <surface id="36" type="z-plane" coeffs="183.0"/>
+    <surface id="37" type="z-plane" coeffs="203.0"/>
+    <surface id="38" type="z-plane" coeffs="215.0"/>
+    <surface id="39" type="z-plane" boundary="vacuum" coeffs="223.0"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
     <particles>100</particles>
     <batches>10</batches>
     <inactive>5</inactive>
-    <source particle="neutron" strength="1.0" type="independent">
+    <source type="independent" strength="1.0" particle="neutron">
       <space type="box">
         <parameters>-160 -160 -183 160 160 183</parameters>
       </space>
diff --git a/tests/regression_tests/lattice_distribmat/False/inputs_true.dat b/tests/regression_tests/lattice_distribmat/False/inputs_true.dat
index d39a10369..783989057 100644
--- a/tests/regression_tests/lattice_distribmat/False/inputs_true.dat
+++ b/tests/regression_tests/lattice_distribmat/False/inputs_true.dat
@@ -1,26 +1,26 @@
 <?xml version='1.0' encoding='utf-8'?>
 <model>
   <materials>
-    <material depletable="true" id="1" name="UO2">
-      <density units="g/cm3" value="10.0"/>
-      <nuclide ao="1.0" name="U235"/>
-      <nuclide ao="2.0" name="O16"/>
+    <material id="1" name="UO2" depletable="true">
+      <density value="10.0" units="g/cm3"/>
+      <nuclide name="U235" ao="1.0"/>
+      <nuclide name="O16" ao="2.0"/>
     </material>
     <material id="2" name="light water">
-      <density units="g/cm3" value="1.0"/>
-      <nuclide ao="2.0" name="H1"/>
-      <nuclide ao="1.0" name="O16"/>
+      <density value="1.0" units="g/cm3"/>
+      <nuclide name="H1" ao="2.0"/>
+      <nuclide name="O16" ao="1.0"/>
       <sab name="c_H_in_H2O"/>
     </material>
   </materials>
   <geometry>
     <cell id="1" material="1" region="-1" universe="1"/>
     <cell id="2" material="2" region="1" universe="1"/>
-    <cell fill="2" id="3" region="2 -3 4 -5" universe="6"/>
-    <cell fill="3" id="4" region="2 -3 5 -9" universe="6"/>
-    <cell fill="4" id="5" region="3 -11 4 -5" universe="6"/>
-    <cell fill="5" id="6" region="3 -11 5 -9" universe="6"/>
-    <cell fill="6" id="7" region="18 -19 20 -21" universe="7"/>
+    <cell id="3" fill="2" region="2 -3 4 -5" universe="6"/>
+    <cell id="4" fill="3" region="2 -3 5 -9" universe="6"/>
+    <cell id="5" fill="4" region="3 -11 4 -5" universe="6"/>
+    <cell id="6" fill="5" region="3 -11 5 -9" universe="6"/>
+    <cell id="7" fill="6" region="18 -19 20 -21" universe="7"/>
     <lattice id="2">
       <pitch>1.0 1.0</pitch>
       <outer>1</outer>
@@ -53,17 +53,17 @@
       <universes>
 1 </universes>
     </lattice>
-    <surface coeffs="0.0 0.0 0.4" id="1" type="z-cylinder"/>
-    <surface coeffs="-1.0" id="2" name="minimum x" type="x-plane"/>
-    <surface coeffs="0.0" id="3" name="maximum x" type="x-plane"/>
-    <surface coeffs="-1.0" id="4" name="minimum y" type="y-plane"/>
-    <surface coeffs="0.0" id="5" name="maximum y" type="y-plane"/>
-    <surface coeffs="1.0" id="9" name="maximum y" type="y-plane"/>
-    <surface coeffs="1.0" id="11" name="maximum x" type="x-plane"/>
-    <surface boundary="reflective" coeffs="-1.0" id="18" name="minimum x" type="x-plane"/>
-    <surface boundary="reflective" coeffs="1.0" id="19" name="maximum x" type="x-plane"/>
-    <surface boundary="reflective" coeffs="-1.0" id="20" name="minimum y" type="y-plane"/>
-    <surface boundary="reflective" coeffs="1.0" id="21" name="maximum y" type="y-plane"/>
+    <surface id="1" type="z-cylinder" coeffs="0.0 0.0 0.4"/>
+    <surface id="2" name="minimum x" type="x-plane" coeffs="-1.0"/>
+    <surface id="3" name="maximum x" type="x-plane" coeffs="0.0"/>
+    <surface id="4" name="minimum y" type="y-plane" coeffs="-1.0"/>
+    <surface id="5" name="maximum y" type="y-plane" coeffs="0.0"/>
+    <surface id="9" name="maximum y" type="y-plane" coeffs="1.0"/>
+    <surface id="11" name="maximum x" type="x-plane" coeffs="1.0"/>
+    <surface id="18" name="minimum x" type="x-plane" boundary="reflective" coeffs="-1.0"/>
+    <surface id="19" name="maximum x" type="x-plane" boundary="reflective" coeffs="1.0"/>
+    <surface id="20" name="minimum y" type="y-plane" boundary="reflective" coeffs="-1.0"/>
+    <surface id="21" name="maximum y" type="y-plane" boundary="reflective" coeffs="1.0"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
diff --git a/tests/regression_tests/lattice_distribmat/True/inputs_true.dat b/tests/regression_tests/lattice_distribmat/True/inputs_true.dat
index 450306a0c..aec3a5400 100644
--- a/tests/regression_tests/lattice_distribmat/True/inputs_true.dat
+++ b/tests/regression_tests/lattice_distribmat/True/inputs_true.dat
@@ -1,59 +1,59 @@
 <?xml version='1.0' encoding='utf-8'?>
 <model>
   <materials>
-    <material depletable="true" id="1" name="UO2">
-      <density units="g/cm3" value="10.0"/>
-      <nuclide ao="1.0" name="U235"/>
-      <nuclide ao="2.0" name="O16"/>
+    <material id="1" name="UO2" depletable="true">
+      <density value="10.0" units="g/cm3"/>
+      <nuclide name="U235" ao="1.0"/>
+      <nuclide name="O16" ao="2.0"/>
     </material>
-    <material depletable="true" id="2" name="UO2">
-      <density units="g/cm3" value="10.0"/>
-      <nuclide ao="1.0" name="U235"/>
-      <nuclide ao="2.0" name="O16"/>
+    <material id="2" name="UO2" depletable="true">
+      <density value="10.0" units="g/cm3"/>
+      <nuclide name="U235" ao="1.0"/>
+      <nuclide name="O16" ao="2.0"/>
     </material>
-    <material depletable="true" id="3" name="UO2">
-      <density units="g/cm3" value="10.0"/>
-      <nuclide ao="1.0" name="U235"/>
-      <nuclide ao="2.0" name="O16"/>
+    <material id="3" name="UO2" depletable="true">
+      <density value="10.0" units="g/cm3"/>
+      <nuclide name="U235" ao="1.0"/>
+      <nuclide name="O16" ao="2.0"/>
     </material>
-    <material depletable="true" id="4" name="UO2">
-      <density units="g/cm3" value="10.0"/>
-      <nuclide ao="1.0" name="U235"/>
-      <nuclide ao="2.0" name="O16"/>
+    <material id="4" name="UO2" depletable="true">
+      <density value="10.0" units="g/cm3"/>
+      <nuclide name="U235" ao="1.0"/>
+      <nuclide name="O16" ao="2.0"/>
     </material>
     <material id="5" name="light water">
-      <density units="g/cm3" value="1.0"/>
-      <nuclide ao="2.0" name="H1"/>
-      <nuclide ao="1.0" name="O16"/>
+      <density value="1.0" units="g/cm3"/>
+      <nuclide name="H1" ao="2.0"/>
+      <nuclide name="O16" ao="1.0"/>
       <sab name="c_H_in_H2O"/>
     </material>
     <material id="6" name="light water">
-      <density units="g/cm3" value="1.0"/>
-      <nuclide ao="2.0" name="H1"/>
-      <nuclide ao="1.0" name="O16"/>
+      <density value="1.0" units="g/cm3"/>
+      <nuclide name="H1" ao="2.0"/>
+      <nuclide name="O16" ao="1.0"/>
       <sab name="c_H_in_H2O"/>
     </material>
     <material id="7" name="light water">
-      <density units="g/cm3" value="1.0"/>
-      <nuclide ao="2.0" name="H1"/>
-      <nuclide ao="1.0" name="O16"/>
+      <density value="1.0" units="g/cm3"/>
+      <nuclide name="H1" ao="2.0"/>
+      <nuclide name="O16" ao="1.0"/>
       <sab name="c_H_in_H2O"/>
     </material>
     <material id="8" name="light water">
-      <density units="g/cm3" value="1.0"/>
-      <nuclide ao="2.0" name="H1"/>
-      <nuclide ao="1.0" name="O16"/>
+      <density value="1.0" units="g/cm3"/>
+      <nuclide name="H1" ao="2.0"/>
+      <nuclide name="O16" ao="1.0"/>
       <sab name="c_H_in_H2O"/>
     </material>
   </materials>
   <geometry>
     <cell id="8" material="1 2 3 4" region="-6" universe="8"/>
     <cell id="9" material="5 6 7 8" region="6" universe="8"/>
-    <cell fill="9" id="10" region="7 -8 10 -12" universe="13"/>
-    <cell fill="10" id="11" region="7 -8 12 -16" universe="13"/>
-    <cell fill="11" id="12" region="8 -22 10 -12" universe="13"/>
-    <cell fill="12" id="13" region="8 -22 12 -16" universe="13"/>
-    <cell fill="13" id="14" region="29 -30 31 -32" universe="14"/>
+    <cell id="10" fill="9" region="7 -8 10 -12" universe="13"/>
+    <cell id="11" fill="10" region="7 -8 12 -16" universe="13"/>
+    <cell id="12" fill="11" region="8 -22 10 -12" universe="13"/>
+    <cell id="13" fill="12" region="8 -22 12 -16" universe="13"/>
+    <cell id="14" fill="13" region="29 -30 31 -32" universe="14"/>
     <lattice id="9">
       <pitch>1.0 1.0</pitch>
       <outer>8</outer>
@@ -86,17 +86,17 @@
       <universes>
 8 </universes>
     </lattice>
-    <surface coeffs="0.0 0.0 0.4" id="6" type="z-cylinder"/>
-    <surface coeffs="-1.0" id="7" name="minimum x" type="x-plane"/>
-    <surface coeffs="0.0" id="8" name="maximum x" type="x-plane"/>
-    <surface coeffs="-1.0" id="10" name="minimum y" type="y-plane"/>
-    <surface coeffs="0.0" id="12" name="maximum y" type="y-plane"/>
-    <surface coeffs="1.0" id="16" name="maximum y" type="y-plane"/>
-    <surface coeffs="1.0" id="22" name="maximum x" type="x-plane"/>
-    <surface boundary="reflective" coeffs="-1.0" id="29" name="minimum x" type="x-plane"/>
-    <surface boundary="reflective" coeffs="1.0" id="30" name="maximum x" type="x-plane"/>
-    <surface boundary="reflective" coeffs="-1.0" id="31" name="minimum y" type="y-plane"/>
-    <surface boundary="reflective" coeffs="1.0" id="32" name="maximum y" type="y-plane"/>
+    <surface id="6" type="z-cylinder" coeffs="0.0 0.0 0.4"/>
+    <surface id="7" name="minimum x" type="x-plane" coeffs="-1.0"/>
+    <surface id="8" name="maximum x" type="x-plane" coeffs="0.0"/>
+    <surface id="10" name="minimum y" type="y-plane" coeffs="-1.0"/>
+    <surface id="12" name="maximum y" type="y-plane" coeffs="0.0"/>
+    <surface id="16" name="maximum y" type="y-plane" coeffs="1.0"/>
+    <surface id="22" name="maximum x" type="x-plane" coeffs="1.0"/>
+    <surface id="29" name="minimum x" type="x-plane" boundary="reflective" coeffs="-1.0"/>
+    <surface id="30" name="maximum x" type="x-plane" boundary="reflective" coeffs="1.0"/>
+    <surface id="31" name="minimum y" type="y-plane" boundary="reflective" coeffs="-1.0"/>
+    <surface id="32" name="maximum y" type="y-plane" boundary="reflective" coeffs="1.0"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
diff --git a/tests/regression_tests/lattice_hex_coincident/inputs_true.dat b/tests/regression_tests/lattice_hex_coincident/inputs_true.dat
index ac82de0ad..fafc03da1 100644
--- a/tests/regression_tests/lattice_hex_coincident/inputs_true.dat
+++ b/tests/regression_tests/lattice_hex_coincident/inputs_true.dat
@@ -1,45 +1,45 @@
 <?xml version='1.0' encoding='utf-8'?>
 <model>
   <materials>
-    <material depletable="true" id="1">
+    <material id="1" depletable="true">
       <density units="sum"/>
-      <nuclide ao="0.0049817" name="U235"/>
+      <nuclide name="U235" ao="0.0049817"/>
     </material>
     <material id="2">
-      <density units="atom/b-cm" value="0.017742"/>
-      <nuclide ao="1.0" name="C0"/>
+      <density value="0.017742" units="atom/b-cm"/>
+      <nuclide name="C0" ao="1.0"/>
       <sab name="c_Graphite"/>
     </material>
     <material id="3" name="Lead">
-      <density units="g/cm3" value="10.32"/>
-      <nuclide ao="0.014" name="Pb204"/>
-      <nuclide ao="0.241" name="Pb206"/>
-      <nuclide ao="0.221" name="Pb207"/>
-      <nuclide ao="0.524" name="Pb208"/>
+      <density value="10.32" units="g/cm3"/>
+      <nuclide name="Pb204" ao="0.014"/>
+      <nuclide name="Pb206" ao="0.241"/>
+      <nuclide name="Pb207" ao="0.221"/>
+      <nuclide name="Pb208" ao="0.524"/>
     </material>
     <material id="4">
-      <density units="atom/b-cm" value="0.00054464"/>
-      <nuclide ao="1.0" name="He4"/>
+      <density value="0.00054464" units="atom/b-cm"/>
+      <nuclide name="He4" ao="1.0"/>
     </material>
     <material id="5" name="Zirc4">
       <density units="sum"/>
-      <nuclide ao="0.02217" name="Zr90"/>
-      <nuclide ao="0.004781" name="Zr91"/>
-      <nuclide ao="0.007228" name="Zr92"/>
-      <nuclide ao="0.007169" name="Zr94"/>
-      <nuclide ao="0.001131" name="Zr96"/>
+      <nuclide name="Zr90" ao="0.02217"/>
+      <nuclide name="Zr91" ao="0.004781"/>
+      <nuclide name="Zr92" ao="0.007228"/>
+      <nuclide name="Zr94" ao="0.007169"/>
+      <nuclide name="Zr96" ao="0.001131"/>
     </material>
   </materials>
   <geometry>
     <cell id="1" material="1" region="-1 2 -3" universe="1"/>
     <cell id="2" material="2" region="1" universe="1"/>
-    <cell id="3" material="4" name="coolant" region="-4 2 -3" universe="2"/>
-    <cell id="4" material="5" name="zirconium_shell" region="4 -5 2 -3" universe="2"/>
-    <cell id="5" material="3" name="lead_shell" region="5 -6 2 -3" universe="2"/>
-    <cell id="6" material="2" name="matrix coolant surround" region="6 2 -3" universe="2"/>
+    <cell id="3" name="coolant" material="4" region="-4 2 -3" universe="2"/>
+    <cell id="4" name="zirconium_shell" material="5" region="4 -5 2 -3" universe="2"/>
+    <cell id="5" name="lead_shell" material="3" region="5 -6 2 -3" universe="2"/>
+    <cell id="6" name="matrix coolant surround" material="2" region="6 2 -3" universe="2"/>
     <cell id="7" material="2" universe="3"/>
-    <cell fill="4" id="8" name="container cell" region="-7 8 -9 -12 10 11 2 -3" universe="5"/>
-    <hex_lattice id="4" n_rings="2" name="regular fuel assembly">
+    <cell id="8" name="container cell" fill="4" region="-7 8 -9 -12 10 11 2 -3" universe="5"/>
+    <hex_lattice id="4" name="regular fuel assembly" n_rings="2">
       <pitch>1.4</pitch>
       <outer>3</outer>
       <center>0.0 0.0</center>
@@ -50,25 +50,25 @@
 2 2
  2</universes>
     </hex_lattice>
-    <surface coeffs="0.0 0.0 0.7" id="1" type="z-cylinder"/>
-    <surface boundary="reflective" coeffs="0.0" id="2" type="z-plane"/>
-    <surface boundary="reflective" coeffs="10.0" id="3" type="z-plane"/>
-    <surface coeffs="0.0 0.0 0.293" id="4" type="z-cylinder"/>
-    <surface coeffs="0.0 0.0 0.35" id="5" type="z-cylinder"/>
-    <surface coeffs="0.0 0.0 0.352" id="6" type="z-cylinder"/>
-    <surface boundary="reflective" coeffs="1.4" id="7" type="y-plane"/>
-    <surface boundary="reflective" coeffs="-1.4" id="8" type="y-plane"/>
-    <surface boundary="reflective" coeffs="1.7320508075688772 1.0 0.0 2.8" id="9" type="plane"/>
-    <surface boundary="reflective" coeffs="-1.7320508075688772 1.0 0.0 -2.8" id="10" type="plane"/>
-    <surface boundary="reflective" coeffs="1.7320508075688772 1.0 0.0 -2.8" id="11" type="plane"/>
-    <surface boundary="reflective" coeffs="-1.7320508075688772 1.0 0.0 2.8" id="12" type="plane"/>
+    <surface id="1" type="z-cylinder" coeffs="0.0 0.0 0.7"/>
+    <surface id="2" type="z-plane" boundary="reflective" coeffs="0.0"/>
+    <surface id="3" type="z-plane" boundary="reflective" coeffs="10.0"/>
+    <surface id="4" type="z-cylinder" coeffs="0.0 0.0 0.293"/>
+    <surface id="5" type="z-cylinder" coeffs="0.0 0.0 0.35"/>
+    <surface id="6" type="z-cylinder" coeffs="0.0 0.0 0.352"/>
+    <surface id="7" type="y-plane" boundary="reflective" coeffs="1.4"/>
+    <surface id="8" type="y-plane" boundary="reflective" coeffs="-1.4"/>
+    <surface id="9" type="plane" boundary="reflective" coeffs="1.7320508075688772 1.0 0.0 2.8"/>
+    <surface id="10" type="plane" boundary="reflective" coeffs="-1.7320508075688772 1.0 0.0 -2.8"/>
+    <surface id="11" type="plane" boundary="reflective" coeffs="1.7320508075688772 1.0 0.0 -2.8"/>
+    <surface id="12" type="plane" boundary="reflective" coeffs="-1.7320508075688772 1.0 0.0 2.8"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
     <particles>1000</particles>
     <batches>5</batches>
     <inactive>2</inactive>
-    <source particle="neutron" strength="1.0" type="independent">
+    <source type="independent" strength="1.0" particle="neutron">
       <space type="box">
         <parameters>-0.9899494936611666 -0.9899494936611666 0.0 0.9899494936611666 0.9899494936611666 10.0</parameters>
       </space>
diff --git a/tests/regression_tests/lattice_hex_x/inputs_true.dat b/tests/regression_tests/lattice_hex_x/inputs_true.dat
index 252fbfc0b..b6536c6a8 100644
--- a/tests/regression_tests/lattice_hex_x/inputs_true.dat
+++ b/tests/regression_tests/lattice_hex_x/inputs_true.dat
@@ -1,32 +1,32 @@
 <?xml version='1.0' encoding='utf-8'?>
 <model>
   <materials>
-    <material depletable="true" id="1" name="UO2">
+    <material id="1" name="UO2" depletable="true">
       <density units="sum"/>
-      <nuclide ao="0.0008737" name="U235"/>
-      <nuclide ao="0.018744" name="U238"/>
-      <nuclide ao="0.039235" name="O16"/>
+      <nuclide name="U235" ao="0.0008737"/>
+      <nuclide name="U238" ao="0.018744"/>
+      <nuclide name="O16" ao="0.039235"/>
     </material>
     <material id="2" name="borated H2O">
       <density units="sum"/>
-      <nuclide ao="0.06694" name="H1"/>
-      <nuclide ao="0.03347" name="O16"/>
-      <nuclide ao="6.6262e-06" name="B10"/>
-      <nuclide ao="2.6839e-05" name="B11"/>
+      <nuclide name="H1" ao="0.06694"/>
+      <nuclide name="O16" ao="0.03347"/>
+      <nuclide name="B10" ao="6.6262e-06"/>
+      <nuclide name="B11" ao="2.6839e-05"/>
     </material>
     <material id="3" name="pellet B4C">
       <density units="sum"/>
-      <nuclide ao="0.01966" name="C0"/>
-      <nuclide ao="4.7344e-06" name="B11"/>
-      <nuclide ao="1.9177e-05" name="B10"/>
+      <nuclide name="C0" ao="0.01966"/>
+      <nuclide name="B11" ao="4.7344e-06"/>
+      <nuclide name="B10" ao="1.9177e-05"/>
     </material>
     <material id="4" name="Zirc4">
       <density units="sum"/>
-      <nuclide ao="0.021763349999999997" name="Zr90"/>
-      <nuclide ao="0.00474606" name="Zr91"/>
-      <nuclide ao="0.00725445" name="Zr92"/>
-      <nuclide ao="0.00735174" name="Zr94"/>
-      <nuclide ao="0.0011844" name="Zr96"/>
+      <nuclide name="Zr90" ao="0.021763349999999997"/>
+      <nuclide name="Zr91" ao="0.00474606"/>
+      <nuclide name="Zr92" ao="0.00725445"/>
+      <nuclide name="Zr94" ao="0.00735174"/>
+      <nuclide name="Zr96" ao="0.0011844"/>
     </material>
   </materials>
   <geometry>
@@ -42,8 +42,8 @@
     <cell id="10" material="4" region="-8 7" universe="3"/>
     <cell id="11" material="2" region="8" universe="3"/>
     <cell id="12" material="2" universe="4"/>
-    <cell fill="6" id="13" name="container assembly cell" region="-11 12 -13 -16 14 15 9 -10" universe="5"/>
-    <hex_lattice id="6" n_axial="2" n_rings="11" name="regular fuel assembly" orientation="x">
+    <cell id="13" name="container assembly cell" fill="6" region="-11 12 -13 -16 14 15 9 -10" universe="5"/>
+    <hex_lattice id="6" name="regular fuel assembly" n_rings="11" orientation="x" n_axial="2">
       <pitch>1.235 5.0</pitch>
       <outer>4</outer>
       <center>0.0 0.0 5.0</center>
@@ -91,29 +91,29 @@
          1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1</universes>
     </hex_lattice>
-    <surface coeffs="0.0 0.0 0.386" id="1" type="z-cylinder"/>
-    <surface coeffs="0.0 0.0 0.4582" id="2" type="z-cylinder"/>
-    <surface coeffs="0.0 0.0 0.45" id="3" type="z-cylinder"/>
-    <surface coeffs="0.0 0.0 0.5177" id="4" type="z-cylinder"/>
-    <surface coeffs="0.0 0.0 0.35" id="5" type="z-cylinder"/>
-    <surface coeffs="0.0 0.0 0.41" id="6" type="z-cylinder"/>
-    <surface coeffs="0.0 0.0 0.545" id="7" type="z-cylinder"/>
-    <surface coeffs="0.0 0.0 0.6323" id="8" type="z-cylinder"/>
-    <surface boundary="reflective" coeffs="0.0" id="9" type="z-plane"/>
-    <surface boundary="reflective" coeffs="10.0" id="10" type="z-plane"/>
-    <surface boundary="reflective" coeffs="11.8" id="11" type="y-plane"/>
-    <surface boundary="reflective" coeffs="-11.8" id="12" type="y-plane"/>
-    <surface boundary="reflective" coeffs="1.7320508075688772 1.0 0.0 23.6" id="13" type="plane"/>
-    <surface boundary="reflective" coeffs="-1.7320508075688772 1.0 0.0 -23.6" id="14" type="plane"/>
-    <surface boundary="reflective" coeffs="1.7320508075688772 1.0 0.0 -23.6" id="15" type="plane"/>
-    <surface boundary="reflective" coeffs="-1.7320508075688772 1.0 0.0 23.6" id="16" type="plane"/>
+    <surface id="1" type="z-cylinder" coeffs="0.0 0.0 0.386"/>
+    <surface id="2" type="z-cylinder" coeffs="0.0 0.0 0.4582"/>
+    <surface id="3" type="z-cylinder" coeffs="0.0 0.0 0.45"/>
+    <surface id="4" type="z-cylinder" coeffs="0.0 0.0 0.5177"/>
+    <surface id="5" type="z-cylinder" coeffs="0.0 0.0 0.35"/>
+    <surface id="6" type="z-cylinder" coeffs="0.0 0.0 0.41"/>
+    <surface id="7" type="z-cylinder" coeffs="0.0 0.0 0.545"/>
+    <surface id="8" type="z-cylinder" coeffs="0.0 0.0 0.6323"/>
+    <surface id="9" type="z-plane" boundary="reflective" coeffs="0.0"/>
+    <surface id="10" type="z-plane" boundary="reflective" coeffs="10.0"/>
+    <surface id="11" type="y-plane" boundary="reflective" coeffs="11.8"/>
+    <surface id="12" type="y-plane" boundary="reflective" coeffs="-11.8"/>
+    <surface id="13" type="plane" boundary="reflective" coeffs="1.7320508075688772 1.0 0.0 23.6"/>
+    <surface id="14" type="plane" boundary="reflective" coeffs="-1.7320508075688772 1.0 0.0 -23.6"/>
+    <surface id="15" type="plane" boundary="reflective" coeffs="1.7320508075688772 1.0 0.0 -23.6"/>
+    <surface id="16" type="plane" boundary="reflective" coeffs="-1.7320508075688772 1.0 0.0 23.6"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
     <particles>1000</particles>
     <batches>10</batches>
     <inactive>5</inactive>
-    <source particle="neutron" strength="1.0" type="independent">
+    <source type="independent" strength="1.0" particle="neutron">
       <space type="box">
         <parameters>-13.62546635287517 -13.62546635287517 0.0 13.62546635287517 13.62546635287517 10.0</parameters>
       </space>
diff --git a/tests/regression_tests/lattice_multiple/inputs_true.dat b/tests/regression_tests/lattice_multiple/inputs_true.dat
index b249d97c4..06abef582 100644
--- a/tests/regression_tests/lattice_multiple/inputs_true.dat
+++ b/tests/regression_tests/lattice_multiple/inputs_true.dat
@@ -1,15 +1,15 @@
 <?xml version='1.0' encoding='utf-8'?>
 <model>
   <materials>
-    <material depletable="true" id="1" name="UO2">
-      <density units="g/cm3" value="10.0"/>
-      <nuclide ao="1.0" name="U235"/>
-      <nuclide ao="2.0" name="O16"/>
+    <material id="1" name="UO2" depletable="true">
+      <density value="10.0" units="g/cm3"/>
+      <nuclide name="U235" ao="1.0"/>
+      <nuclide name="O16" ao="2.0"/>
     </material>
     <material id="2" name="light water">
-      <density units="g/cm3" value="1.0"/>
-      <nuclide ao="2.0" name="H1"/>
-      <nuclide ao="1.0" name="O16"/>
+      <density value="1.0" units="g/cm3"/>
+      <nuclide name="H1" ao="2.0"/>
+      <nuclide name="O16" ao="1.0"/>
       <sab name="c_H_in_H2O"/>
     </material>
   </materials>
@@ -18,8 +18,8 @@
     <cell id="2" material="2" region="1" universe="1"/>
     <cell id="3" material="1" region="-2" universe="2"/>
     <cell id="4" material="2" region="2" universe="2"/>
-    <cell fill="3" id="5" universe="4"/>
-    <cell fill="5" id="6" region="3 -4 5 -6" universe="6"/>
+    <cell id="5" fill="3" universe="4"/>
+    <cell id="6" fill="5" region="3 -4 5 -6" universe="6"/>
     <lattice id="3">
       <pitch>1.2 1.2</pitch>
       <outer>1</outer>
@@ -37,12 +37,12 @@
 4 4 
 4 4 </universes>
     </lattice>
-    <surface coeffs="0.0 0.0 0.4" id="1" type="z-cylinder"/>
-    <surface coeffs="0.0 0.0 0.5" id="2" type="z-cylinder"/>
-    <surface boundary="reflective" coeffs="-2.4" id="3" name="minimum x" type="x-plane"/>
-    <surface boundary="reflective" coeffs="2.4" id="4" name="maximum x" type="x-plane"/>
-    <surface boundary="reflective" coeffs="-2.4" id="5" name="minimum y" type="y-plane"/>
-    <surface boundary="reflective" coeffs="2.4" id="6" name="maximum y" type="y-plane"/>
+    <surface id="1" type="z-cylinder" coeffs="0.0 0.0 0.4"/>
+    <surface id="2" type="z-cylinder" coeffs="0.0 0.0 0.5"/>
+    <surface id="3" name="minimum x" type="x-plane" boundary="reflective" coeffs="-2.4"/>
+    <surface id="4" name="maximum x" type="x-plane" boundary="reflective" coeffs="2.4"/>
+    <surface id="5" name="minimum y" type="y-plane" boundary="reflective" coeffs="-2.4"/>
+    <surface id="6" name="maximum y" type="y-plane" boundary="reflective" coeffs="2.4"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
diff --git a/tests/regression_tests/lattice_rotated/inputs_true.dat b/tests/regression_tests/lattice_rotated/inputs_true.dat
index 1b7c74870..e53b93f93 100644
--- a/tests/regression_tests/lattice_rotated/inputs_true.dat
+++ b/tests/regression_tests/lattice_rotated/inputs_true.dat
@@ -1,18 +1,18 @@
 <?xml version='1.0' encoding='utf-8'?>
 <model>
   <materials>
-    <material depletable="true" id="1">
-      <density units="g/cm3" value="10.0"/>
-      <nuclide ao="1.0" name="U235"/>
+    <material id="1" depletable="true">
+      <density value="10.0" units="g/cm3"/>
+      <nuclide name="U235" ao="1.0"/>
     </material>
-    <material depletable="true" id="2">
-      <density units="g/cm3" value="10.0"/>
-      <nuclide ao="1.0" name="U238"/>
+    <material id="2" depletable="true">
+      <density value="10.0" units="g/cm3"/>
+      <nuclide name="U238" ao="1.0"/>
     </material>
     <material id="3">
-      <density units="g/cm3" value="1.0"/>
-      <nuclide ao="2.0" name="H1"/>
-      <nuclide ao="1.0" name="O16"/>
+      <density value="1.0" units="g/cm3"/>
+      <nuclide name="H1" ao="2.0"/>
+      <nuclide name="O16" ao="1.0"/>
       <sab name="c_H_in_H2O"/>
     </material>
   </materials>
@@ -22,8 +22,8 @@
     <cell id="3" material="2" region="-2" universe="2"/>
     <cell id="4" material="3" region="2" universe="2"/>
     <cell id="5" material="3" universe="30"/>
-    <cell fill="4" id="6" region="-3" rotation="0.0 0.0 45.0" translation="-4.0 0.0 0.0" universe="5"/>
-    <cell fill="3" id="7" region="-4" rotation="0.0 0.0 30.0" translation="4.0 0.0 0.0" universe="5"/>
+    <cell id="6" fill="4" region="-3" translation="-4.0 0.0 0.0" rotation="0.0 0.0 45.0" universe="5"/>
+    <cell id="7" fill="3" region="-4" translation="4.0 0.0 0.0" rotation="0.0 0.0 30.0" universe="5"/>
     <cell id="8" material="3" region="-5 3 4" universe="5"/>
     <hex_lattice id="3" n_rings="3">
       <pitch>1.25</pitch>
@@ -51,18 +51,18 @@
 1 1 1 1 
 1 1 1 1 </universes>
     </lattice>
-    <surface coeffs="0.0 0.0 0.25" id="1" type="z-cylinder"/>
-    <surface coeffs="0.0 0.0 0.5" id="2" type="z-cylinder"/>
-    <surface coeffs="-4.0 0.0 4.0" id="3" type="z-cylinder"/>
-    <surface coeffs="4.0 0.0 4.0" id="4" type="z-cylinder"/>
-    <surface boundary="vacuum" coeffs="0.0 0.0 8.0" id="5" type="z-cylinder"/>
+    <surface id="1" type="z-cylinder" coeffs="0.0 0.0 0.25"/>
+    <surface id="2" type="z-cylinder" coeffs="0.0 0.0 0.5"/>
+    <surface id="3" type="z-cylinder" coeffs="-4.0 0.0 4.0"/>
+    <surface id="4" type="z-cylinder" coeffs="4.0 0.0 4.0"/>
+    <surface id="5" type="z-cylinder" boundary="vacuum" coeffs="0.0 0.0 8.0"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
     <particles>1000</particles>
     <batches>5</batches>
     <inactive>0</inactive>
-    <source particle="neutron" strength="1.0" type="independent">
+    <source type="independent" strength="1.0" particle="neutron">
       <space type="point">
         <parameters>0.0 0.0 0.0</parameters>
       </space>
diff --git a/tests/regression_tests/mg_basic/inputs_true.dat b/tests/regression_tests/mg_basic/inputs_true.dat
index 8c6faaf07..aa2c2fa0a 100644
--- a/tests/regression_tests/mg_basic/inputs_true.dat
+++ b/tests/regression_tests/mg_basic/inputs_true.dat
@@ -3,29 +3,29 @@
   <materials>
     <cross_sections>2g.h5</cross_sections>
     <material id="1" name="base leg">
-      <density units="macro" value="1.0"/>
+      <density value="1.0" units="macro"/>
       <macroscopic name="mat_1"/>
     </material>
     <material id="2" name="base tab">
-      <density units="macro" value="1.0"/>
+      <density value="1.0" units="macro"/>
       <macroscopic name="mat_2"/>
     </material>
     <material id="3" name="base hist">
-      <density units="macro" value="1.0"/>
+      <density value="1.0" units="macro"/>
       <macroscopic name="mat_3"/>
     </material>
     <material id="4" name="base matrix">
-      <density units="macro" value="1.0"/>
+      <density value="1.0" units="macro"/>
       <macroscopic name="mat_4"/>
     </material>
     <material id="5" name="base ang">
-      <density units="macro" value="1.0"/>
+      <density value="1.0" units="macro"/>
       <macroscopic name="mat_5"/>
     </material>
     <material id="6" name="micro">
       <density units="sum"/>
-      <nuclide ao="0.5" name="mat_1"/>
-      <nuclide ao="0.5" name="mat_6"/>
+      <nuclide name="mat_1" ao="0.5"/>
+      <nuclide name="mat_6" ao="0.5"/>
     </material>
   </materials>
   <geometry>
@@ -35,20 +35,20 @@
     <cell id="4" material="4" region="4 -5" universe="0"/>
     <cell id="5" material="5" region="5 -6" universe="0"/>
     <cell id="6" material="6" region="6 -7" universe="0"/>
-    <surface boundary="reflective" coeffs="0.0" id="1" type="x-plane"/>
-    <surface coeffs="154.90833333333333" id="2" type="x-plane"/>
-    <surface coeffs="309.81666666666666" id="3" type="x-plane"/>
-    <surface coeffs="464.725" id="4" type="x-plane"/>
-    <surface coeffs="619.6333333333333" id="5" type="x-plane"/>
-    <surface coeffs="774.5416666666666" id="6" type="x-plane"/>
-    <surface boundary="vacuum" coeffs="929.45" id="7" type="x-plane"/>
+    <surface id="1" type="x-plane" boundary="reflective" coeffs="0.0"/>
+    <surface id="2" type="x-plane" coeffs="154.90833333333333"/>
+    <surface id="3" type="x-plane" coeffs="309.81666666666666"/>
+    <surface id="4" type="x-plane" coeffs="464.725"/>
+    <surface id="5" type="x-plane" coeffs="619.6333333333333"/>
+    <surface id="6" type="x-plane" coeffs="774.5416666666666"/>
+    <surface id="7" type="x-plane" boundary="vacuum" coeffs="929.45"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
     <particles>1000</particles>
     <batches>10</batches>
     <inactive>5</inactive>
-    <source particle="neutron" strength="1.0" type="independent">
+    <source type="independent" strength="1.0" particle="neutron">
       <space type="box">
         <parameters>0.0 -1000.0 -1000.0 154.90833333333333 1000.0 1000.0</parameters>
       </space>
diff --git a/tests/regression_tests/mg_basic_delayed/inputs_true.dat b/tests/regression_tests/mg_basic_delayed/inputs_true.dat
index e0bcad15c..cc3f2cfb2 100644
--- a/tests/regression_tests/mg_basic_delayed/inputs_true.dat
+++ b/tests/regression_tests/mg_basic_delayed/inputs_true.dat
@@ -3,27 +3,27 @@
   <materials>
     <cross_sections>2g.h5</cross_sections>
     <material id="1" name="vec beta">
-      <density units="macro" value="1.0"/>
+      <density value="1.0" units="macro"/>
       <macroscopic name="mat_1"/>
     </material>
     <material id="2" name="vec no beta">
-      <density units="macro" value="1.0"/>
+      <density value="1.0" units="macro"/>
       <macroscopic name="mat_2"/>
     </material>
     <material id="3" name="matrix beta">
-      <density units="macro" value="1.0"/>
+      <density value="1.0" units="macro"/>
       <macroscopic name="mat_3"/>
     </material>
     <material id="4" name="matrix no beta">
-      <density units="macro" value="1.0"/>
+      <density value="1.0" units="macro"/>
       <macroscopic name="mat_4"/>
     </material>
     <material id="5" name="vec group beta">
-      <density units="macro" value="1.0"/>
+      <density value="1.0" units="macro"/>
       <macroscopic name="mat_5"/>
     </material>
     <material id="6" name="matrix group beta">
-      <density units="macro" value="1.0"/>
+      <density value="1.0" units="macro"/>
       <macroscopic name="mat_6"/>
     </material>
   </materials>
@@ -34,20 +34,20 @@
     <cell id="4" material="4" region="4 -5" universe="0"/>
     <cell id="5" material="5" region="5 -6" universe="0"/>
     <cell id="6" material="6" region="6 -7" universe="0"/>
-    <surface boundary="reflective" coeffs="0.0" id="1" type="x-plane"/>
-    <surface coeffs="154.90833333333333" id="2" type="x-plane"/>
-    <surface coeffs="309.81666666666666" id="3" type="x-plane"/>
-    <surface coeffs="464.725" id="4" type="x-plane"/>
-    <surface coeffs="619.6333333333333" id="5" type="x-plane"/>
-    <surface coeffs="774.5416666666666" id="6" type="x-plane"/>
-    <surface boundary="vacuum" coeffs="929.45" id="7" type="x-plane"/>
+    <surface id="1" type="x-plane" boundary="reflective" coeffs="0.0"/>
+    <surface id="2" type="x-plane" coeffs="154.90833333333333"/>
+    <surface id="3" type="x-plane" coeffs="309.81666666666666"/>
+    <surface id="4" type="x-plane" coeffs="464.725"/>
+    <surface id="5" type="x-plane" coeffs="619.6333333333333"/>
+    <surface id="6" type="x-plane" coeffs="774.5416666666666"/>
+    <surface id="7" type="x-plane" boundary="vacuum" coeffs="929.45"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
     <particles>1000</particles>
     <batches>10</batches>
     <inactive>5</inactive>
-    <source particle="neutron" strength="1.0" type="independent">
+    <source type="independent" strength="1.0" particle="neutron">
       <space type="box">
         <parameters>0.0 -1000.0 -1000.0 154.90833333333333 1000.0 1000.0</parameters>
       </space>
diff --git a/tests/regression_tests/mg_convert/inputs_true.dat b/tests/regression_tests/mg_convert/inputs_true.dat
index 4e51ec80c..3b1f511e6 100644
--- a/tests/regression_tests/mg_convert/inputs_true.dat
+++ b/tests/regression_tests/mg_convert/inputs_true.dat
@@ -3,23 +3,23 @@
   <materials>
     <cross_sections>mgxs.h5</cross_sections>
     <material id="1" name="UO2 fuel">
-      <density units="macro" value="1.1"/>
+      <density value="1.1" units="macro"/>
       <macroscopic name="UO2"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="1" name="cell 1" region="4 -5 6 -7" universe="0"/>
-    <surface boundary="reflective" coeffs="-5.0" id="4" name="left" type="x-plane"/>
-    <surface boundary="vacuum" coeffs="5.0" id="5" name="right" type="x-plane"/>
-    <surface boundary="reflective" coeffs="-5.0" id="6" name="bottom" type="y-plane"/>
-    <surface boundary="reflective" coeffs="5.0" id="7" name="top" type="y-plane"/>
+    <cell id="1" name="cell 1" material="1" region="4 -5 6 -7" universe="0"/>
+    <surface id="4" name="left" type="x-plane" boundary="reflective" coeffs="-5.0"/>
+    <surface id="5" name="right" type="x-plane" boundary="vacuum" coeffs="5.0"/>
+    <surface id="6" name="bottom" type="y-plane" boundary="reflective" coeffs="-5.0"/>
+    <surface id="7" name="top" type="y-plane" boundary="reflective" coeffs="5.0"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
     <particles>100</particles>
     <batches>10</batches>
     <inactive>5</inactive>
-    <source particle="neutron" strength="1.0" type="independent">
+    <source type="independent" strength="1.0" particle="neutron">
       <space type="box">
         <parameters>-5 -5 -5 5 5 5</parameters>
       </space>
diff --git a/tests/regression_tests/mg_legendre/inputs_true.dat b/tests/regression_tests/mg_legendre/inputs_true.dat
index 34ff7b630..81362f20a 100644
--- a/tests/regression_tests/mg_legendre/inputs_true.dat
+++ b/tests/regression_tests/mg_legendre/inputs_true.dat
@@ -3,21 +3,21 @@
   <materials>
     <cross_sections>2g.h5</cross_sections>
     <material id="1" name="mat_1">
-      <density units="macro" value="1.0"/>
+      <density value="1.0" units="macro"/>
       <macroscopic name="mat_1"/>
     </material>
   </materials>
   <geometry>
     <cell id="1" material="1" region="1 -2" universe="0"/>
-    <surface boundary="reflective" coeffs="0.0" id="1" type="x-plane"/>
-    <surface boundary="vacuum" coeffs="929.45" id="2" type="x-plane"/>
+    <surface id="1" type="x-plane" boundary="reflective" coeffs="0.0"/>
+    <surface id="2" type="x-plane" boundary="vacuum" coeffs="929.45"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
     <particles>1000</particles>
     <batches>10</batches>
     <inactive>5</inactive>
-    <source particle="neutron" strength="1.0" type="independent">
+    <source type="independent" strength="1.0" particle="neutron">
       <space type="box">
         <parameters>0.0 -1000.0 -1000.0 929.45 1000.0 1000.0</parameters>
       </space>
diff --git a/tests/regression_tests/mg_max_order/inputs_true.dat b/tests/regression_tests/mg_max_order/inputs_true.dat
index b6d70dc4c..c8f42d1a3 100644
--- a/tests/regression_tests/mg_max_order/inputs_true.dat
+++ b/tests/regression_tests/mg_max_order/inputs_true.dat
@@ -3,21 +3,21 @@
   <materials>
     <cross_sections>2g.h5</cross_sections>
     <material id="1" name="mat_1">
-      <density units="macro" value="1.0"/>
+      <density value="1.0" units="macro"/>
       <macroscopic name="mat_1"/>
     </material>
   </materials>
   <geometry>
     <cell id="1" material="1" region="1 -2" universe="0"/>
-    <surface boundary="reflective" coeffs="0.0" id="1" type="x-plane"/>
-    <surface boundary="vacuum" coeffs="929.45" id="2" type="x-plane"/>
+    <surface id="1" type="x-plane" boundary="reflective" coeffs="0.0"/>
+    <surface id="2" type="x-plane" boundary="vacuum" coeffs="929.45"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
     <particles>1000</particles>
     <batches>10</batches>
     <inactive>5</inactive>
-    <source particle="neutron" strength="1.0" type="independent">
+    <source type="independent" strength="1.0" particle="neutron">
       <space type="box">
         <parameters>0.0 -1000.0 -1000.0 929.45 1000.0 1000.0</parameters>
       </space>
diff --git a/tests/regression_tests/mg_survival_biasing/inputs_true.dat b/tests/regression_tests/mg_survival_biasing/inputs_true.dat
index 6529c60d8..bee69729d 100644
--- a/tests/regression_tests/mg_survival_biasing/inputs_true.dat
+++ b/tests/regression_tests/mg_survival_biasing/inputs_true.dat
@@ -3,21 +3,21 @@
   <materials>
     <cross_sections>2g.h5</cross_sections>
     <material id="1" name="mat_1">
-      <density units="macro" value="1.0"/>
+      <density value="1.0" units="macro"/>
       <macroscopic name="mat_1"/>
     </material>
   </materials>
   <geometry>
     <cell id="1" material="1" region="1 -2" universe="0"/>
-    <surface boundary="reflective" coeffs="0.0" id="1" type="x-plane"/>
-    <surface boundary="vacuum" coeffs="929.45" id="2" type="x-plane"/>
+    <surface id="1" type="x-plane" boundary="reflective" coeffs="0.0"/>
+    <surface id="2" type="x-plane" boundary="vacuum" coeffs="929.45"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
     <particles>1000</particles>
     <batches>10</batches>
     <inactive>5</inactive>
-    <source particle="neutron" strength="1.0" type="independent">
+    <source type="independent" strength="1.0" particle="neutron">
       <space type="box">
         <parameters>0.0 -1000.0 -1000.0 929.45 1000.0 1000.0</parameters>
       </space>
diff --git a/tests/regression_tests/mg_tallies/inputs_true.dat b/tests/regression_tests/mg_tallies/inputs_true.dat
index c526b65a2..f4f154244 100644
--- a/tests/regression_tests/mg_tallies/inputs_true.dat
+++ b/tests/regression_tests/mg_tallies/inputs_true.dat
@@ -3,21 +3,21 @@
   <materials>
     <cross_sections>2g.h5</cross_sections>
     <material id="1" name="mat_1">
-      <density units="macro" value="1.0"/>
+      <density value="1.0" units="macro"/>
       <macroscopic name="mat_1"/>
     </material>
   </materials>
   <geometry>
     <cell id="1" material="1" region="1 -2" universe="0"/>
-    <surface boundary="reflective" coeffs="0.0" id="1" type="x-plane"/>
-    <surface boundary="vacuum" coeffs="929.45" id="2" type="x-plane"/>
+    <surface id="1" type="x-plane" boundary="reflective" coeffs="0.0"/>
+    <surface id="2" type="x-plane" boundary="vacuum" coeffs="929.45"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
     <particles>1000</particles>
     <batches>10</batches>
     <inactive>5</inactive>
-    <source particle="neutron" strength="1.0" type="independent">
+    <source type="independent" strength="1.0" particle="neutron">
       <space type="box">
         <parameters>0.0 -1000.0 -1000.0 929.45 1000.0 1000.0</parameters>
       </space>
diff --git a/tests/regression_tests/mg_temperature_multi/inputs_true.dat b/tests/regression_tests/mg_temperature_multi/inputs_true.dat
index 0c452cd52..b84a6782b 100644
--- a/tests/regression_tests/mg_temperature_multi/inputs_true.dat
+++ b/tests/regression_tests/mg_temperature_multi/inputs_true.dat
@@ -3,31 +3,31 @@
   <materials>
     <cross_sections>mgxs.h5</cross_sections>
     <material id="1" name="UO2 fuel">
-      <density units="macro" value="1.0"/>
+      <density value="1.0" units="macro"/>
       <macroscopic name="UO2"/>
     </material>
     <material id="2" name="Water">
-      <density units="macro" value="1.0"/>
+      <density value="1.0" units="macro"/>
       <macroscopic name="LWTR"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="1" name="fuel inner" region="-1" temperature="600.0" universe="1"/>
-    <cell id="2" material="1" name="fuel outer" region="1 -2" temperature="294.0" universe="1"/>
-    <cell id="3" material="2" name="moderator" region="2 3 -4 5 -6" universe="1"/>
-    <surface coeffs="0.0 0.0 0.25" id="1" name="Fuel IR" type="z-cylinder"/>
-    <surface coeffs="0.0 0.0 0.54" id="2" name="Fuel OR" type="z-cylinder"/>
-    <surface boundary="reflective" coeffs="-0.63" id="3" name="minimum x" type="x-plane"/>
-    <surface boundary="reflective" coeffs="0.63" id="4" name="maximum x" type="x-plane"/>
-    <surface boundary="reflective" coeffs="-0.63" id="5" name="minimum y" type="y-plane"/>
-    <surface boundary="reflective" coeffs="0.63" id="6" name="maximum y" type="y-plane"/>
+    <cell id="1" name="fuel inner" material="1" region="-1" temperature="600.0" universe="1"/>
+    <cell id="2" name="fuel outer" material="1" region="1 -2" temperature="294.0" universe="1"/>
+    <cell id="3" name="moderator" material="2" region="2 3 -4 5 -6" universe="1"/>
+    <surface id="1" name="Fuel IR" type="z-cylinder" coeffs="0.0 0.0 0.25"/>
+    <surface id="2" name="Fuel OR" type="z-cylinder" coeffs="0.0 0.0 0.54"/>
+    <surface id="3" name="minimum x" type="x-plane" boundary="reflective" coeffs="-0.63"/>
+    <surface id="4" name="maximum x" type="x-plane" boundary="reflective" coeffs="0.63"/>
+    <surface id="5" name="minimum y" type="y-plane" boundary="reflective" coeffs="-0.63"/>
+    <surface id="6" name="maximum y" type="y-plane" boundary="reflective" coeffs="0.63"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
     <particles>1000</particles>
     <batches>10</batches>
     <inactive>5</inactive>
-    <source particle="neutron" strength="1.0" type="independent">
+    <source type="independent" strength="1.0" particle="neutron">
       <space type="box">
         <parameters>-0.63 -0.63 -1 0.63 0.63 1</parameters>
       </space>
diff --git a/tests/regression_tests/mgxs_library_ce_to_mg/inputs_true.dat b/tests/regression_tests/mgxs_library_ce_to_mg/inputs_true.dat
index 6c071263f..2f6dde1ab 100644
--- a/tests/regression_tests/mgxs_library_ce_to_mg/inputs_true.dat
+++ b/tests/regression_tests/mgxs_library_ce_to_mg/inputs_true.dat
@@ -1,47 +1,47 @@
 <?xml version='1.0' encoding='utf-8'?>
 <model>
   <materials>
-    <material depletable="true" id="1" name="UO2 (2.4%)">
-      <density units="g/cm3" value="10.29769"/>
-      <nuclide ao="4.4843e-06" name="U234"/>
-      <nuclide ao="0.00055815" name="U235"/>
-      <nuclide ao="0.022408" name="U238"/>
-      <nuclide ao="0.045829" name="O16"/>
+    <material id="1" name="UO2 (2.4%)" depletable="true">
+      <density value="10.29769" units="g/cm3"/>
+      <nuclide name="U234" ao="4.4843e-06"/>
+      <nuclide name="U235" ao="0.00055815"/>
+      <nuclide name="U238" ao="0.022408"/>
+      <nuclide name="O16" ao="0.045829"/>
     </material>
     <material id="2" name="Zircaloy">
-      <density units="g/cm3" value="6.55"/>
-      <nuclide ao="0.021827" name="Zr90"/>
-      <nuclide ao="0.00476" name="Zr91"/>
-      <nuclide ao="0.0072758" name="Zr92"/>
-      <nuclide ao="0.0073734" name="Zr94"/>
-      <nuclide ao="0.0011879" name="Zr96"/>
+      <density value="6.55" units="g/cm3"/>
+      <nuclide name="Zr90" ao="0.021827"/>
+      <nuclide name="Zr91" ao="0.00476"/>
+      <nuclide name="Zr92" ao="0.0072758"/>
+      <nuclide name="Zr94" ao="0.0073734"/>
+      <nuclide name="Zr96" ao="0.0011879"/>
     </material>
     <material id="3" name="Hot borated water">
-      <density units="g/cm3" value="0.740582"/>
-      <nuclide ao="0.049457" name="H1"/>
-      <nuclide ao="0.024672" name="O16"/>
-      <nuclide ao="8.0042e-06" name="B10"/>
-      <nuclide ao="3.2218e-05" name="B11"/>
+      <density value="0.740582" units="g/cm3"/>
+      <nuclide name="H1" ao="0.049457"/>
+      <nuclide name="O16" ao="0.024672"/>
+      <nuclide name="B10" ao="8.0042e-06"/>
+      <nuclide name="B11" ao="3.2218e-05"/>
       <sab name="c_H_in_H2O"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="1" name="Fuel" region="-1" universe="0"/>
-    <cell id="2" material="2" name="Cladding" region="1 -2" universe="0"/>
-    <cell id="3" material="3" name="Water" region="2 3 -4 5 -6" universe="0"/>
-    <surface coeffs="0 0 0.39218" id="1" name="Fuel OR" type="z-cylinder"/>
-    <surface coeffs="0 0 0.4572" id="2" name="Clad OR" type="z-cylinder"/>
-    <surface boundary="reflective" coeffs="-0.63" id="3" name="left" type="x-plane"/>
-    <surface boundary="reflective" coeffs="0.63" id="4" name="right" type="x-plane"/>
-    <surface boundary="reflective" coeffs="-0.63" id="5" name="bottom" type="y-plane"/>
-    <surface boundary="reflective" coeffs="0.63" id="6" name="top" type="y-plane"/>
+    <cell id="1" name="Fuel" material="1" region="-1" universe="0"/>
+    <cell id="2" name="Cladding" material="2" region="1 -2" universe="0"/>
+    <cell id="3" name="Water" material="3" region="2 3 -4 5 -6" universe="0"/>
+    <surface id="1" name="Fuel OR" type="z-cylinder" coeffs="0 0 0.39218"/>
+    <surface id="2" name="Clad OR" type="z-cylinder" coeffs="0 0 0.4572"/>
+    <surface id="3" name="left" type="x-plane" boundary="reflective" coeffs="-0.63"/>
+    <surface id="4" name="right" type="x-plane" boundary="reflective" coeffs="0.63"/>
+    <surface id="5" name="bottom" type="y-plane" boundary="reflective" coeffs="-0.63"/>
+    <surface id="6" name="top" type="y-plane" boundary="reflective" coeffs="0.63"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
     <particles>100</particles>
     <batches>10</batches>
     <inactive>5</inactive>
-    <source particle="neutron" strength="1.0" type="independent">
+    <source type="independent" strength="1.0" particle="neutron">
       <space type="box">
         <parameters>-0.63 -0.63 -1 0.63 0.63 1</parameters>
       </space>
diff --git a/tests/regression_tests/mgxs_library_ce_to_mg_nuclides/inputs_true.dat b/tests/regression_tests/mgxs_library_ce_to_mg_nuclides/inputs_true.dat
index ad3d50974..e1f330cf9 100644
--- a/tests/regression_tests/mgxs_library_ce_to_mg_nuclides/inputs_true.dat
+++ b/tests/regression_tests/mgxs_library_ce_to_mg_nuclides/inputs_true.dat
@@ -1,47 +1,47 @@
 <?xml version='1.0' encoding='utf-8'?>
 <model>
   <materials>
-    <material depletable="true" id="1" name="UO2 (2.4%)">
-      <density units="g/cm3" value="10.29769"/>
-      <nuclide ao="4.4843e-06" name="U234"/>
-      <nuclide ao="0.00055815" name="U235"/>
-      <nuclide ao="0.022408" name="U238"/>
-      <nuclide ao="0.045829" name="O16"/>
+    <material id="1" name="UO2 (2.4%)" depletable="true">
+      <density value="10.29769" units="g/cm3"/>
+      <nuclide name="U234" ao="4.4843e-06"/>
+      <nuclide name="U235" ao="0.00055815"/>
+      <nuclide name="U238" ao="0.022408"/>
+      <nuclide name="O16" ao="0.045829"/>
     </material>
     <material id="2" name="Zircaloy">
-      <density units="g/cm3" value="6.55"/>
-      <nuclide ao="0.021827" name="Zr90"/>
-      <nuclide ao="0.00476" name="Zr91"/>
-      <nuclide ao="0.0072758" name="Zr92"/>
-      <nuclide ao="0.0073734" name="Zr94"/>
-      <nuclide ao="0.0011879" name="Zr96"/>
+      <density value="6.55" units="g/cm3"/>
+      <nuclide name="Zr90" ao="0.021827"/>
+      <nuclide name="Zr91" ao="0.00476"/>
+      <nuclide name="Zr92" ao="0.0072758"/>
+      <nuclide name="Zr94" ao="0.0073734"/>
+      <nuclide name="Zr96" ao="0.0011879"/>
     </material>
     <material id="3" name="Hot borated water">
-      <density units="g/cm3" value="0.740582"/>
-      <nuclide ao="0.049457" name="H1"/>
-      <nuclide ao="0.024672" name="O16"/>
-      <nuclide ao="8.0042e-06" name="B10"/>
-      <nuclide ao="3.2218e-05" name="B11"/>
+      <density value="0.740582" units="g/cm3"/>
+      <nuclide name="H1" ao="0.049457"/>
+      <nuclide name="O16" ao="0.024672"/>
+      <nuclide name="B10" ao="8.0042e-06"/>
+      <nuclide name="B11" ao="3.2218e-05"/>
       <sab name="c_H_in_H2O"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="1" name="Fuel" region="-1" universe="0"/>
-    <cell id="2" material="2" name="Cladding" region="1 -2" universe="0"/>
-    <cell id="3" material="3" name="Water" region="2 3 -4 5 -6" universe="0"/>
-    <surface coeffs="0 0 0.39218" id="1" name="Fuel OR" type="z-cylinder"/>
-    <surface coeffs="0 0 0.4572" id="2" name="Clad OR" type="z-cylinder"/>
-    <surface boundary="reflective" coeffs="-0.63" id="3" name="left" type="x-plane"/>
-    <surface boundary="reflective" coeffs="0.63" id="4" name="right" type="x-plane"/>
-    <surface boundary="reflective" coeffs="-0.63" id="5" name="bottom" type="y-plane"/>
-    <surface boundary="reflective" coeffs="0.63" id="6" name="top" type="y-plane"/>
+    <cell id="1" name="Fuel" material="1" region="-1" universe="0"/>
+    <cell id="2" name="Cladding" material="2" region="1 -2" universe="0"/>
+    <cell id="3" name="Water" material="3" region="2 3 -4 5 -6" universe="0"/>
+    <surface id="1" name="Fuel OR" type="z-cylinder" coeffs="0 0 0.39218"/>
+    <surface id="2" name="Clad OR" type="z-cylinder" coeffs="0 0 0.4572"/>
+    <surface id="3" name="left" type="x-plane" boundary="reflective" coeffs="-0.63"/>
+    <surface id="4" name="right" type="x-plane" boundary="reflective" coeffs="0.63"/>
+    <surface id="5" name="bottom" type="y-plane" boundary="reflective" coeffs="-0.63"/>
+    <surface id="6" name="top" type="y-plane" boundary="reflective" coeffs="0.63"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
     <particles>100</particles>
     <batches>10</batches>
     <inactive>5</inactive>
-    <source particle="neutron" strength="1.0" type="independent">
+    <source type="independent" strength="1.0" particle="neutron">
       <space type="box">
         <parameters>-0.63 -0.63 -1 0.63 0.63 1</parameters>
       </space>
diff --git a/tests/regression_tests/mgxs_library_condense/inputs_true.dat b/tests/regression_tests/mgxs_library_condense/inputs_true.dat
index 8606e9fdd..4451d214c 100644
--- a/tests/regression_tests/mgxs_library_condense/inputs_true.dat
+++ b/tests/regression_tests/mgxs_library_condense/inputs_true.dat
@@ -1,47 +1,47 @@
 <?xml version='1.0' encoding='utf-8'?>
 <model>
   <materials>
-    <material depletable="true" id="1" name="UO2 (2.4%)">
-      <density units="g/cm3" value="10.29769"/>
-      <nuclide ao="4.4843e-06" name="U234"/>
-      <nuclide ao="0.00055815" name="U235"/>
-      <nuclide ao="0.022408" name="U238"/>
-      <nuclide ao="0.045829" name="O16"/>
+    <material id="1" name="UO2 (2.4%)" depletable="true">
+      <density value="10.29769" units="g/cm3"/>
+      <nuclide name="U234" ao="4.4843e-06"/>
+      <nuclide name="U235" ao="0.00055815"/>
+      <nuclide name="U238" ao="0.022408"/>
+      <nuclide name="O16" ao="0.045829"/>
     </material>
     <material id="2" name="Zircaloy">
-      <density units="g/cm3" value="6.55"/>
-      <nuclide ao="0.021827" name="Zr90"/>
-      <nuclide ao="0.00476" name="Zr91"/>
-      <nuclide ao="0.0072758" name="Zr92"/>
-      <nuclide ao="0.0073734" name="Zr94"/>
-      <nuclide ao="0.0011879" name="Zr96"/>
+      <density value="6.55" units="g/cm3"/>
+      <nuclide name="Zr90" ao="0.021827"/>
+      <nuclide name="Zr91" ao="0.00476"/>
+      <nuclide name="Zr92" ao="0.0072758"/>
+      <nuclide name="Zr94" ao="0.0073734"/>
+      <nuclide name="Zr96" ao="0.0011879"/>
     </material>
     <material id="3" name="Hot borated water">
-      <density units="g/cm3" value="0.740582"/>
-      <nuclide ao="0.049457" name="H1"/>
-      <nuclide ao="0.024672" name="O16"/>
-      <nuclide ao="8.0042e-06" name="B10"/>
-      <nuclide ao="3.2218e-05" name="B11"/>
+      <density value="0.740582" units="g/cm3"/>
+      <nuclide name="H1" ao="0.049457"/>
+      <nuclide name="O16" ao="0.024672"/>
+      <nuclide name="B10" ao="8.0042e-06"/>
+      <nuclide name="B11" ao="3.2218e-05"/>
       <sab name="c_H_in_H2O"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="1" name="Fuel" region="-1" universe="0"/>
-    <cell id="2" material="2" name="Cladding" region="1 -2" universe="0"/>
-    <cell id="3" material="3" name="Water" region="2 3 -4 5 -6" universe="0"/>
-    <surface coeffs="0 0 0.39218" id="1" name="Fuel OR" type="z-cylinder"/>
-    <surface coeffs="0 0 0.4572" id="2" name="Clad OR" type="z-cylinder"/>
-    <surface boundary="reflective" coeffs="-0.63" id="3" name="left" type="x-plane"/>
-    <surface boundary="reflective" coeffs="0.63" id="4" name="right" type="x-plane"/>
-    <surface boundary="reflective" coeffs="-0.63" id="5" name="bottom" type="y-plane"/>
-    <surface boundary="reflective" coeffs="0.63" id="6" name="top" type="y-plane"/>
+    <cell id="1" name="Fuel" material="1" region="-1" universe="0"/>
+    <cell id="2" name="Cladding" material="2" region="1 -2" universe="0"/>
+    <cell id="3" name="Water" material="3" region="2 3 -4 5 -6" universe="0"/>
+    <surface id="1" name="Fuel OR" type="z-cylinder" coeffs="0 0 0.39218"/>
+    <surface id="2" name="Clad OR" type="z-cylinder" coeffs="0 0 0.4572"/>
+    <surface id="3" name="left" type="x-plane" boundary="reflective" coeffs="-0.63"/>
+    <surface id="4" name="right" type="x-plane" boundary="reflective" coeffs="0.63"/>
+    <surface id="5" name="bottom" type="y-plane" boundary="reflective" coeffs="-0.63"/>
+    <surface id="6" name="top" type="y-plane" boundary="reflective" coeffs="0.63"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
     <particles>100</particles>
     <batches>10</batches>
     <inactive>5</inactive>
-    <source particle="neutron" strength="1.0" type="independent">
+    <source type="independent" strength="1.0" particle="neutron">
       <space type="box">
         <parameters>-0.63 -0.63 -1 0.63 0.63 1</parameters>
       </space>
diff --git a/tests/regression_tests/mgxs_library_correction/inputs_true.dat b/tests/regression_tests/mgxs_library_correction/inputs_true.dat
index ea2d1b714..bb463778f 100644
--- a/tests/regression_tests/mgxs_library_correction/inputs_true.dat
+++ b/tests/regression_tests/mgxs_library_correction/inputs_true.dat
@@ -1,47 +1,47 @@
 <?xml version='1.0' encoding='utf-8'?>
 <model>
   <materials>
-    <material depletable="true" id="1" name="UO2 (2.4%)">
-      <density units="g/cm3" value="10.29769"/>
-      <nuclide ao="4.4843e-06" name="U234"/>
-      <nuclide ao="0.00055815" name="U235"/>
-      <nuclide ao="0.022408" name="U238"/>
-      <nuclide ao="0.045829" name="O16"/>
+    <material id="1" name="UO2 (2.4%)" depletable="true">
+      <density value="10.29769" units="g/cm3"/>
+      <nuclide name="U234" ao="4.4843e-06"/>
+      <nuclide name="U235" ao="0.00055815"/>
+      <nuclide name="U238" ao="0.022408"/>
+      <nuclide name="O16" ao="0.045829"/>
     </material>
     <material id="2" name="Zircaloy">
-      <density units="g/cm3" value="6.55"/>
-      <nuclide ao="0.021827" name="Zr90"/>
-      <nuclide ao="0.00476" name="Zr91"/>
-      <nuclide ao="0.0072758" name="Zr92"/>
-      <nuclide ao="0.0073734" name="Zr94"/>
-      <nuclide ao="0.0011879" name="Zr96"/>
+      <density value="6.55" units="g/cm3"/>
+      <nuclide name="Zr90" ao="0.021827"/>
+      <nuclide name="Zr91" ao="0.00476"/>
+      <nuclide name="Zr92" ao="0.0072758"/>
+      <nuclide name="Zr94" ao="0.0073734"/>
+      <nuclide name="Zr96" ao="0.0011879"/>
     </material>
     <material id="3" name="Hot borated water">
-      <density units="g/cm3" value="0.740582"/>
-      <nuclide ao="0.049457" name="H1"/>
-      <nuclide ao="0.024672" name="O16"/>
-      <nuclide ao="8.0042e-06" name="B10"/>
-      <nuclide ao="3.2218e-05" name="B11"/>
+      <density value="0.740582" units="g/cm3"/>
+      <nuclide name="H1" ao="0.049457"/>
+      <nuclide name="O16" ao="0.024672"/>
+      <nuclide name="B10" ao="8.0042e-06"/>
+      <nuclide name="B11" ao="3.2218e-05"/>
       <sab name="c_H_in_H2O"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="1" name="Fuel" region="-1" universe="0"/>
-    <cell id="2" material="2" name="Cladding" region="1 -2" universe="0"/>
-    <cell id="3" material="3" name="Water" region="2 3 -4 5 -6" universe="0"/>
-    <surface coeffs="0 0 0.39218" id="1" name="Fuel OR" type="z-cylinder"/>
-    <surface coeffs="0 0 0.4572" id="2" name="Clad OR" type="z-cylinder"/>
-    <surface boundary="reflective" coeffs="-0.63" id="3" name="left" type="x-plane"/>
-    <surface boundary="reflective" coeffs="0.63" id="4" name="right" type="x-plane"/>
-    <surface boundary="reflective" coeffs="-0.63" id="5" name="bottom" type="y-plane"/>
-    <surface boundary="reflective" coeffs="0.63" id="6" name="top" type="y-plane"/>
+    <cell id="1" name="Fuel" material="1" region="-1" universe="0"/>
+    <cell id="2" name="Cladding" material="2" region="1 -2" universe="0"/>
+    <cell id="3" name="Water" material="3" region="2 3 -4 5 -6" universe="0"/>
+    <surface id="1" name="Fuel OR" type="z-cylinder" coeffs="0 0 0.39218"/>
+    <surface id="2" name="Clad OR" type="z-cylinder" coeffs="0 0 0.4572"/>
+    <surface id="3" name="left" type="x-plane" boundary="reflective" coeffs="-0.63"/>
+    <surface id="4" name="right" type="x-plane" boundary="reflective" coeffs="0.63"/>
+    <surface id="5" name="bottom" type="y-plane" boundary="reflective" coeffs="-0.63"/>
+    <surface id="6" name="top" type="y-plane" boundary="reflective" coeffs="0.63"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
     <particles>100</particles>
     <batches>10</batches>
     <inactive>5</inactive>
-    <source particle="neutron" strength="1.0" type="independent">
+    <source type="independent" strength="1.0" particle="neutron">
       <space type="box">
         <parameters>-0.63 -0.63 -1 0.63 0.63 1</parameters>
       </space>
diff --git a/tests/regression_tests/mgxs_library_distribcell/inputs_true.dat b/tests/regression_tests/mgxs_library_distribcell/inputs_true.dat
index f1a605334..e3826cc18 100644
--- a/tests/regression_tests/mgxs_library_distribcell/inputs_true.dat
+++ b/tests/regression_tests/mgxs_library_distribcell/inputs_true.dat
@@ -1,38 +1,38 @@
 <?xml version='1.0' encoding='utf-8'?>
 <model>
   <materials>
-    <material depletable="true" id="1" name="Fuel">
-      <density units="g/cm3" value="10.29769"/>
-      <nuclide ao="4.4843e-06" name="U234"/>
-      <nuclide ao="0.00055815" name="U235"/>
-      <nuclide ao="0.022408" name="U238"/>
-      <nuclide ao="0.045829" name="O16"/>
+    <material id="1" name="Fuel" depletable="true">
+      <density value="10.29769" units="g/cm3"/>
+      <nuclide name="U234" ao="4.4843e-06"/>
+      <nuclide name="U235" ao="0.00055815"/>
+      <nuclide name="U238" ao="0.022408"/>
+      <nuclide name="O16" ao="0.045829"/>
     </material>
     <material id="2" name="Cladding">
-      <density units="g/cm3" value="6.55"/>
-      <nuclide ao="0.021827" name="Zr90"/>
-      <nuclide ao="0.00476" name="Zr91"/>
-      <nuclide ao="0.0072758" name="Zr92"/>
-      <nuclide ao="0.0073734" name="Zr94"/>
-      <nuclide ao="0.0011879" name="Zr96"/>
+      <density value="6.55" units="g/cm3"/>
+      <nuclide name="Zr90" ao="0.021827"/>
+      <nuclide name="Zr91" ao="0.00476"/>
+      <nuclide name="Zr92" ao="0.0072758"/>
+      <nuclide name="Zr94" ao="0.0073734"/>
+      <nuclide name="Zr96" ao="0.0011879"/>
     </material>
     <material id="3" name="Hot borated water">
-      <density units="g/cm3" value="0.740582"/>
-      <nuclide ao="0.049457" name="H1"/>
-      <nuclide ao="0.024672" name="O16"/>
-      <nuclide ao="8.0042e-06" name="B10"/>
-      <nuclide ao="3.2218e-05" name="B11"/>
+      <density value="0.740582" units="g/cm3"/>
+      <nuclide name="H1" ao="0.049457"/>
+      <nuclide name="O16" ao="0.024672"/>
+      <nuclide name="B10" ao="8.0042e-06"/>
+      <nuclide name="B11" ao="3.2218e-05"/>
       <sab name="c_H_in_H2O"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="1" name="fuel" region="-1" universe="1"/>
-    <cell id="2" material="2" name="clad" region="1 -2" universe="1"/>
-    <cell id="3" material="3" name="hot water" region="2" universe="1"/>
-    <cell id="4" material="3" name="guide tube inner water" region="-1" universe="2"/>
-    <cell id="5" material="2" name="guide tube clad" region="1 -2" universe="2"/>
-    <cell id="6" material="3" name="guide tube outer water" region="2" universe="2"/>
-    <cell fill="3" id="7" name="root cell" region="3 -4 5 -6" universe="4"/>
+    <cell id="1" name="fuel" material="1" region="-1" universe="1"/>
+    <cell id="2" name="clad" material="2" region="1 -2" universe="1"/>
+    <cell id="3" name="hot water" material="3" region="2" universe="1"/>
+    <cell id="4" name="guide tube inner water" material="3" region="-1" universe="2"/>
+    <cell id="5" name="guide tube clad" material="2" region="1 -2" universe="2"/>
+    <cell id="6" name="guide tube outer water" material="3" region="2" universe="2"/>
+    <cell id="7" name="root cell" fill="3" region="3 -4 5 -6" universe="4"/>
     <lattice id="3" name="Fuel Assembly">
       <pitch>1.26 1.26</pitch>
       <dimension>17 17</dimension>
@@ -56,19 +56,19 @@
 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 
 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 </universes>
     </lattice>
-    <surface coeffs="0 0 0.39218" id="1" name="Fuel OR" type="z-cylinder"/>
-    <surface coeffs="0 0 0.4572" id="2" name="Clad OR" type="z-cylinder"/>
-    <surface boundary="reflective" coeffs="-10.71" id="3" type="x-plane"/>
-    <surface boundary="reflective" coeffs="10.71" id="4" type="x-plane"/>
-    <surface boundary="reflective" coeffs="-10.71" id="5" type="y-plane"/>
-    <surface boundary="reflective" coeffs="10.71" id="6" type="y-plane"/>
+    <surface id="1" name="Fuel OR" type="z-cylinder" coeffs="0 0 0.39218"/>
+    <surface id="2" name="Clad OR" type="z-cylinder" coeffs="0 0 0.4572"/>
+    <surface id="3" type="x-plane" boundary="reflective" coeffs="-10.71"/>
+    <surface id="4" type="x-plane" boundary="reflective" coeffs="10.71"/>
+    <surface id="5" type="y-plane" boundary="reflective" coeffs="-10.71"/>
+    <surface id="6" type="y-plane" boundary="reflective" coeffs="10.71"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
     <particles>100</particles>
     <batches>10</batches>
     <inactive>5</inactive>
-    <source particle="neutron" strength="1.0" type="independent">
+    <source type="independent" strength="1.0" particle="neutron">
       <space type="box">
         <parameters>-10.71 -10.71 -1 10.71 10.71 1</parameters>
       </space>
diff --git a/tests/regression_tests/mgxs_library_hdf5/inputs_true.dat b/tests/regression_tests/mgxs_library_hdf5/inputs_true.dat
index 8606e9fdd..4451d214c 100644
--- a/tests/regression_tests/mgxs_library_hdf5/inputs_true.dat
+++ b/tests/regression_tests/mgxs_library_hdf5/inputs_true.dat
@@ -1,47 +1,47 @@
 <?xml version='1.0' encoding='utf-8'?>
 <model>
   <materials>
-    <material depletable="true" id="1" name="UO2 (2.4%)">
-      <density units="g/cm3" value="10.29769"/>
-      <nuclide ao="4.4843e-06" name="U234"/>
-      <nuclide ao="0.00055815" name="U235"/>
-      <nuclide ao="0.022408" name="U238"/>
-      <nuclide ao="0.045829" name="O16"/>
+    <material id="1" name="UO2 (2.4%)" depletable="true">
+      <density value="10.29769" units="g/cm3"/>
+      <nuclide name="U234" ao="4.4843e-06"/>
+      <nuclide name="U235" ao="0.00055815"/>
+      <nuclide name="U238" ao="0.022408"/>
+      <nuclide name="O16" ao="0.045829"/>
     </material>
     <material id="2" name="Zircaloy">
-      <density units="g/cm3" value="6.55"/>
-      <nuclide ao="0.021827" name="Zr90"/>
-      <nuclide ao="0.00476" name="Zr91"/>
-      <nuclide ao="0.0072758" name="Zr92"/>
-      <nuclide ao="0.0073734" name="Zr94"/>
-      <nuclide ao="0.0011879" name="Zr96"/>
+      <density value="6.55" units="g/cm3"/>
+      <nuclide name="Zr90" ao="0.021827"/>
+      <nuclide name="Zr91" ao="0.00476"/>
+      <nuclide name="Zr92" ao="0.0072758"/>
+      <nuclide name="Zr94" ao="0.0073734"/>
+      <nuclide name="Zr96" ao="0.0011879"/>
     </material>
     <material id="3" name="Hot borated water">
-      <density units="g/cm3" value="0.740582"/>
-      <nuclide ao="0.049457" name="H1"/>
-      <nuclide ao="0.024672" name="O16"/>
-      <nuclide ao="8.0042e-06" name="B10"/>
-      <nuclide ao="3.2218e-05" name="B11"/>
+      <density value="0.740582" units="g/cm3"/>
+      <nuclide name="H1" ao="0.049457"/>
+      <nuclide name="O16" ao="0.024672"/>
+      <nuclide name="B10" ao="8.0042e-06"/>
+      <nuclide name="B11" ao="3.2218e-05"/>
       <sab name="c_H_in_H2O"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="1" name="Fuel" region="-1" universe="0"/>
-    <cell id="2" material="2" name="Cladding" region="1 -2" universe="0"/>
-    <cell id="3" material="3" name="Water" region="2 3 -4 5 -6" universe="0"/>
-    <surface coeffs="0 0 0.39218" id="1" name="Fuel OR" type="z-cylinder"/>
-    <surface coeffs="0 0 0.4572" id="2" name="Clad OR" type="z-cylinder"/>
-    <surface boundary="reflective" coeffs="-0.63" id="3" name="left" type="x-plane"/>
-    <surface boundary="reflective" coeffs="0.63" id="4" name="right" type="x-plane"/>
-    <surface boundary="reflective" coeffs="-0.63" id="5" name="bottom" type="y-plane"/>
-    <surface boundary="reflective" coeffs="0.63" id="6" name="top" type="y-plane"/>
+    <cell id="1" name="Fuel" material="1" region="-1" universe="0"/>
+    <cell id="2" name="Cladding" material="2" region="1 -2" universe="0"/>
+    <cell id="3" name="Water" material="3" region="2 3 -4 5 -6" universe="0"/>
+    <surface id="1" name="Fuel OR" type="z-cylinder" coeffs="0 0 0.39218"/>
+    <surface id="2" name="Clad OR" type="z-cylinder" coeffs="0 0 0.4572"/>
+    <surface id="3" name="left" type="x-plane" boundary="reflective" coeffs="-0.63"/>
+    <surface id="4" name="right" type="x-plane" boundary="reflective" coeffs="0.63"/>
+    <surface id="5" name="bottom" type="y-plane" boundary="reflective" coeffs="-0.63"/>
+    <surface id="6" name="top" type="y-plane" boundary="reflective" coeffs="0.63"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
     <particles>100</particles>
     <batches>10</batches>
     <inactive>5</inactive>
-    <source particle="neutron" strength="1.0" type="independent">
+    <source type="independent" strength="1.0" particle="neutron">
       <space type="box">
         <parameters>-0.63 -0.63 -1 0.63 0.63 1</parameters>
       </space>
diff --git a/tests/regression_tests/mgxs_library_histogram/inputs_true.dat b/tests/regression_tests/mgxs_library_histogram/inputs_true.dat
index 013fcd0fa..94c656418 100644
--- a/tests/regression_tests/mgxs_library_histogram/inputs_true.dat
+++ b/tests/regression_tests/mgxs_library_histogram/inputs_true.dat
@@ -1,47 +1,47 @@
 <?xml version='1.0' encoding='utf-8'?>
 <model>
   <materials>
-    <material depletable="true" id="1" name="UO2 (2.4%)">
-      <density units="g/cm3" value="10.29769"/>
-      <nuclide ao="4.4843e-06" name="U234"/>
-      <nuclide ao="0.00055815" name="U235"/>
-      <nuclide ao="0.022408" name="U238"/>
-      <nuclide ao="0.045829" name="O16"/>
+    <material id="1" name="UO2 (2.4%)" depletable="true">
+      <density value="10.29769" units="g/cm3"/>
+      <nuclide name="U234" ao="4.4843e-06"/>
+      <nuclide name="U235" ao="0.00055815"/>
+      <nuclide name="U238" ao="0.022408"/>
+      <nuclide name="O16" ao="0.045829"/>
     </material>
     <material id="2" name="Zircaloy">
-      <density units="g/cm3" value="6.55"/>
-      <nuclide ao="0.021827" name="Zr90"/>
-      <nuclide ao="0.00476" name="Zr91"/>
-      <nuclide ao="0.0072758" name="Zr92"/>
-      <nuclide ao="0.0073734" name="Zr94"/>
-      <nuclide ao="0.0011879" name="Zr96"/>
+      <density value="6.55" units="g/cm3"/>
+      <nuclide name="Zr90" ao="0.021827"/>
+      <nuclide name="Zr91" ao="0.00476"/>
+      <nuclide name="Zr92" ao="0.0072758"/>
+      <nuclide name="Zr94" ao="0.0073734"/>
+      <nuclide name="Zr96" ao="0.0011879"/>
     </material>
     <material id="3" name="Hot borated water">
-      <density units="g/cm3" value="0.740582"/>
-      <nuclide ao="0.049457" name="H1"/>
-      <nuclide ao="0.024672" name="O16"/>
-      <nuclide ao="8.0042e-06" name="B10"/>
-      <nuclide ao="3.2218e-05" name="B11"/>
+      <density value="0.740582" units="g/cm3"/>
+      <nuclide name="H1" ao="0.049457"/>
+      <nuclide name="O16" ao="0.024672"/>
+      <nuclide name="B10" ao="8.0042e-06"/>
+      <nuclide name="B11" ao="3.2218e-05"/>
       <sab name="c_H_in_H2O"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="1" name="Fuel" region="-1" universe="0"/>
-    <cell id="2" material="2" name="Cladding" region="1 -2" universe="0"/>
-    <cell id="3" material="3" name="Water" region="2 3 -4 5 -6" universe="0"/>
-    <surface coeffs="0 0 0.39218" id="1" name="Fuel OR" type="z-cylinder"/>
-    <surface coeffs="0 0 0.4572" id="2" name="Clad OR" type="z-cylinder"/>
-    <surface boundary="reflective" coeffs="-0.63" id="3" name="left" type="x-plane"/>
-    <surface boundary="reflective" coeffs="0.63" id="4" name="right" type="x-plane"/>
-    <surface boundary="reflective" coeffs="-0.63" id="5" name="bottom" type="y-plane"/>
-    <surface boundary="reflective" coeffs="0.63" id="6" name="top" type="y-plane"/>
+    <cell id="1" name="Fuel" material="1" region="-1" universe="0"/>
+    <cell id="2" name="Cladding" material="2" region="1 -2" universe="0"/>
+    <cell id="3" name="Water" material="3" region="2 3 -4 5 -6" universe="0"/>
+    <surface id="1" name="Fuel OR" type="z-cylinder" coeffs="0 0 0.39218"/>
+    <surface id="2" name="Clad OR" type="z-cylinder" coeffs="0 0 0.4572"/>
+    <surface id="3" name="left" type="x-plane" boundary="reflective" coeffs="-0.63"/>
+    <surface id="4" name="right" type="x-plane" boundary="reflective" coeffs="0.63"/>
+    <surface id="5" name="bottom" type="y-plane" boundary="reflective" coeffs="-0.63"/>
+    <surface id="6" name="top" type="y-plane" boundary="reflective" coeffs="0.63"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
     <particles>100</particles>
     <batches>10</batches>
     <inactive>5</inactive>
-    <source particle="neutron" strength="1.0" type="independent">
+    <source type="independent" strength="1.0" particle="neutron">
       <space type="box">
         <parameters>-0.63 -0.63 -1 0.63 0.63 1</parameters>
       </space>
diff --git a/tests/regression_tests/mgxs_library_mesh/inputs_true.dat b/tests/regression_tests/mgxs_library_mesh/inputs_true.dat
index 1ecb7a2d3..5a6e8a20a 100644
--- a/tests/regression_tests/mgxs_library_mesh/inputs_true.dat
+++ b/tests/regression_tests/mgxs_library_mesh/inputs_true.dat
@@ -1,28 +1,28 @@
 <?xml version='1.0' encoding='utf-8'?>
 <model>
   <materials>
-    <material depletable="true" id="1">
-      <density units="g/cm3" value="10.0"/>
-      <nuclide ao="1.0" name="U235"/>
+    <material id="1" depletable="true">
+      <density value="10.0" units="g/cm3"/>
+      <nuclide name="U235" ao="1.0"/>
     </material>
     <material id="2">
-      <density units="g/cm3" value="1.0"/>
-      <nuclide ao="1.0" name="Zr90"/>
+      <density value="1.0" units="g/cm3"/>
+      <nuclide name="Zr90" ao="1.0"/>
     </material>
   </materials>
   <geometry>
     <cell id="1" material="1" region="1 -2 3 -4 10 -9" universe="1"/>
     <cell id="2" material="2" region="(-1 | 2 | -3 | 4) (5 -6 7 -8) 10 -9" universe="1"/>
-    <surface coeffs="-5.0" id="1" name="minimum x" type="x-plane"/>
-    <surface coeffs="5.0" id="2" name="maximum x" type="x-plane"/>
-    <surface coeffs="-5.0" id="3" name="minimum y" type="y-plane"/>
-    <surface coeffs="5.0" id="4" name="maximum y" type="y-plane"/>
-    <surface boundary="reflective" coeffs="-10.0" id="5" name="minimum x" type="x-plane"/>
-    <surface boundary="reflective" coeffs="10.0" id="6" name="maximum x" type="x-plane"/>
-    <surface boundary="reflective" coeffs="-10.0" id="7" name="minimum y" type="y-plane"/>
-    <surface boundary="reflective" coeffs="10.0" id="8" name="maximum y" type="y-plane"/>
-    <surface boundary="vacuum" coeffs="10.0" id="9" type="z-plane"/>
-    <surface boundary="vacuum" coeffs="-10.0" id="10" type="z-plane"/>
+    <surface id="1" name="minimum x" type="x-plane" coeffs="-5.0"/>
+    <surface id="2" name="maximum x" type="x-plane" coeffs="5.0"/>
+    <surface id="3" name="minimum y" type="y-plane" coeffs="-5.0"/>
+    <surface id="4" name="maximum y" type="y-plane" coeffs="5.0"/>
+    <surface id="5" name="minimum x" type="x-plane" boundary="reflective" coeffs="-10.0"/>
+    <surface id="6" name="maximum x" type="x-plane" boundary="reflective" coeffs="10.0"/>
+    <surface id="7" name="minimum y" type="y-plane" boundary="reflective" coeffs="-10.0"/>
+    <surface id="8" name="maximum y" type="y-plane" boundary="reflective" coeffs="10.0"/>
+    <surface id="9" type="z-plane" boundary="vacuum" coeffs="10.0"/>
+    <surface id="10" type="z-plane" boundary="vacuum" coeffs="-10.0"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
diff --git a/tests/regression_tests/mgxs_library_no_nuclides/inputs_true.dat b/tests/regression_tests/mgxs_library_no_nuclides/inputs_true.dat
index 5cad36b7e..af09268cd 100644
--- a/tests/regression_tests/mgxs_library_no_nuclides/inputs_true.dat
+++ b/tests/regression_tests/mgxs_library_no_nuclides/inputs_true.dat
@@ -1,47 +1,47 @@
 <?xml version='1.0' encoding='utf-8'?>
 <model>
   <materials>
-    <material depletable="true" id="1" name="UO2 (2.4%)">
-      <density units="g/cm3" value="10.29769"/>
-      <nuclide ao="4.4843e-06" name="U234"/>
-      <nuclide ao="0.00055815" name="U235"/>
-      <nuclide ao="0.022408" name="U238"/>
-      <nuclide ao="0.045829" name="O16"/>
+    <material id="1" name="UO2 (2.4%)" depletable="true">
+      <density value="10.29769" units="g/cm3"/>
+      <nuclide name="U234" ao="4.4843e-06"/>
+      <nuclide name="U235" ao="0.00055815"/>
+      <nuclide name="U238" ao="0.022408"/>
+      <nuclide name="O16" ao="0.045829"/>
     </material>
     <material id="2" name="Zircaloy">
-      <density units="g/cm3" value="6.55"/>
-      <nuclide ao="0.021827" name="Zr90"/>
-      <nuclide ao="0.00476" name="Zr91"/>
-      <nuclide ao="0.0072758" name="Zr92"/>
-      <nuclide ao="0.0073734" name="Zr94"/>
-      <nuclide ao="0.0011879" name="Zr96"/>
+      <density value="6.55" units="g/cm3"/>
+      <nuclide name="Zr90" ao="0.021827"/>
+      <nuclide name="Zr91" ao="0.00476"/>
+      <nuclide name="Zr92" ao="0.0072758"/>
+      <nuclide name="Zr94" ao="0.0073734"/>
+      <nuclide name="Zr96" ao="0.0011879"/>
     </material>
     <material id="3" name="Hot borated water">
-      <density units="g/cm3" value="0.740582"/>
-      <nuclide ao="0.049457" name="H1"/>
-      <nuclide ao="0.024672" name="O16"/>
-      <nuclide ao="8.0042e-06" name="B10"/>
-      <nuclide ao="3.2218e-05" name="B11"/>
+      <density value="0.740582" units="g/cm3"/>
+      <nuclide name="H1" ao="0.049457"/>
+      <nuclide name="O16" ao="0.024672"/>
+      <nuclide name="B10" ao="8.0042e-06"/>
+      <nuclide name="B11" ao="3.2218e-05"/>
       <sab name="c_H_in_H2O"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="1" name="Fuel" region="-1" universe="0"/>
-    <cell id="2" material="2" name="Cladding" region="1 -2" universe="0"/>
-    <cell id="3" material="3" name="Water" region="2 3 -4 5 -6" universe="0"/>
-    <surface coeffs="0 0 0.39218" id="1" name="Fuel OR" type="z-cylinder"/>
-    <surface coeffs="0 0 0.4572" id="2" name="Clad OR" type="z-cylinder"/>
-    <surface boundary="reflective" coeffs="-0.63" id="3" name="left" type="x-plane"/>
-    <surface boundary="reflective" coeffs="0.63" id="4" name="right" type="x-plane"/>
-    <surface boundary="reflective" coeffs="-0.63" id="5" name="bottom" type="y-plane"/>
-    <surface boundary="reflective" coeffs="0.63" id="6" name="top" type="y-plane"/>
+    <cell id="1" name="Fuel" material="1" region="-1" universe="0"/>
+    <cell id="2" name="Cladding" material="2" region="1 -2" universe="0"/>
+    <cell id="3" name="Water" material="3" region="2 3 -4 5 -6" universe="0"/>
+    <surface id="1" name="Fuel OR" type="z-cylinder" coeffs="0 0 0.39218"/>
+    <surface id="2" name="Clad OR" type="z-cylinder" coeffs="0 0 0.4572"/>
+    <surface id="3" name="left" type="x-plane" boundary="reflective" coeffs="-0.63"/>
+    <surface id="4" name="right" type="x-plane" boundary="reflective" coeffs="0.63"/>
+    <surface id="5" name="bottom" type="y-plane" boundary="reflective" coeffs="-0.63"/>
+    <surface id="6" name="top" type="y-plane" boundary="reflective" coeffs="0.63"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
     <particles>100</particles>
     <batches>10</batches>
     <inactive>5</inactive>
-    <source particle="neutron" strength="1.0" type="independent">
+    <source type="independent" strength="1.0" particle="neutron">
       <space type="box">
         <parameters>-0.63 -0.63 -1 0.63 0.63 1</parameters>
       </space>
diff --git a/tests/regression_tests/mgxs_library_nuclides/inputs_true.dat b/tests/regression_tests/mgxs_library_nuclides/inputs_true.dat
index 9b3a22510..c35e57f0e 100644
--- a/tests/regression_tests/mgxs_library_nuclides/inputs_true.dat
+++ b/tests/regression_tests/mgxs_library_nuclides/inputs_true.dat
@@ -1,47 +1,47 @@
 <?xml version='1.0' encoding='utf-8'?>
 <model>
   <materials>
-    <material depletable="true" id="1" name="UO2 (2.4%)">
-      <density units="g/cm3" value="10.29769"/>
-      <nuclide ao="4.4843e-06" name="U234"/>
-      <nuclide ao="0.00055815" name="U235"/>
-      <nuclide ao="0.022408" name="U238"/>
-      <nuclide ao="0.045829" name="O16"/>
+    <material id="1" name="UO2 (2.4%)" depletable="true">
+      <density value="10.29769" units="g/cm3"/>
+      <nuclide name="U234" ao="4.4843e-06"/>
+      <nuclide name="U235" ao="0.00055815"/>
+      <nuclide name="U238" ao="0.022408"/>
+      <nuclide name="O16" ao="0.045829"/>
     </material>
     <material id="2" name="Zircaloy">
-      <density units="g/cm3" value="6.55"/>
-      <nuclide ao="0.021827" name="Zr90"/>
-      <nuclide ao="0.00476" name="Zr91"/>
-      <nuclide ao="0.0072758" name="Zr92"/>
-      <nuclide ao="0.0073734" name="Zr94"/>
-      <nuclide ao="0.0011879" name="Zr96"/>
+      <density value="6.55" units="g/cm3"/>
+      <nuclide name="Zr90" ao="0.021827"/>
+      <nuclide name="Zr91" ao="0.00476"/>
+      <nuclide name="Zr92" ao="0.0072758"/>
+      <nuclide name="Zr94" ao="0.0073734"/>
+      <nuclide name="Zr96" ao="0.0011879"/>
     </material>
     <material id="3" name="Hot borated water">
-      <density units="g/cm3" value="0.740582"/>
-      <nuclide ao="0.049457" name="H1"/>
-      <nuclide ao="0.024672" name="O16"/>
-      <nuclide ao="8.0042e-06" name="B10"/>
-      <nuclide ao="3.2218e-05" name="B11"/>
+      <density value="0.740582" units="g/cm3"/>
+      <nuclide name="H1" ao="0.049457"/>
+      <nuclide name="O16" ao="0.024672"/>
+      <nuclide name="B10" ao="8.0042e-06"/>
+      <nuclide name="B11" ao="3.2218e-05"/>
       <sab name="c_H_in_H2O"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="1" name="Fuel" region="-1" universe="0"/>
-    <cell id="2" material="2" name="Cladding" region="1 -2" universe="0"/>
-    <cell id="3" material="3" name="Water" region="2 3 -4 5 -6" universe="0"/>
-    <surface coeffs="0 0 0.39218" id="1" name="Fuel OR" type="z-cylinder"/>
-    <surface coeffs="0 0 0.4572" id="2" name="Clad OR" type="z-cylinder"/>
-    <surface boundary="reflective" coeffs="-0.63" id="3" name="left" type="x-plane"/>
-    <surface boundary="reflective" coeffs="0.63" id="4" name="right" type="x-plane"/>
-    <surface boundary="reflective" coeffs="-0.63" id="5" name="bottom" type="y-plane"/>
-    <surface boundary="reflective" coeffs="0.63" id="6" name="top" type="y-plane"/>
+    <cell id="1" name="Fuel" material="1" region="-1" universe="0"/>
+    <cell id="2" name="Cladding" material="2" region="1 -2" universe="0"/>
+    <cell id="3" name="Water" material="3" region="2 3 -4 5 -6" universe="0"/>
+    <surface id="1" name="Fuel OR" type="z-cylinder" coeffs="0 0 0.39218"/>
+    <surface id="2" name="Clad OR" type="z-cylinder" coeffs="0 0 0.4572"/>
+    <surface id="3" name="left" type="x-plane" boundary="reflective" coeffs="-0.63"/>
+    <surface id="4" name="right" type="x-plane" boundary="reflective" coeffs="0.63"/>
+    <surface id="5" name="bottom" type="y-plane" boundary="reflective" coeffs="-0.63"/>
+    <surface id="6" name="top" type="y-plane" boundary="reflective" coeffs="0.63"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
     <particles>100</particles>
     <batches>10</batches>
     <inactive>5</inactive>
-    <source particle="neutron" strength="1.0" type="independent">
+    <source type="independent" strength="1.0" particle="neutron">
       <space type="box">
         <parameters>-0.63 -0.63 -1 0.63 0.63 1</parameters>
       </space>
diff --git a/tests/regression_tests/mgxs_library_specific_nuclides/inputs_true.dat b/tests/regression_tests/mgxs_library_specific_nuclides/inputs_true.dat
index 1372741c9..dd9d1ceb0 100644
--- a/tests/regression_tests/mgxs_library_specific_nuclides/inputs_true.dat
+++ b/tests/regression_tests/mgxs_library_specific_nuclides/inputs_true.dat
@@ -1,47 +1,47 @@
 <?xml version='1.0' encoding='utf-8'?>
 <model>
   <materials>
-    <material depletable="true" id="1" name="UO2 (2.4%)">
-      <density units="g/cm3" value="10.29769"/>
-      <nuclide ao="4.4843e-06" name="U234"/>
-      <nuclide ao="0.00055815" name="U235"/>
-      <nuclide ao="0.022408" name="U238"/>
-      <nuclide ao="0.045829" name="O16"/>
+    <material id="1" name="UO2 (2.4%)" depletable="true">
+      <density value="10.29769" units="g/cm3"/>
+      <nuclide name="U234" ao="4.4843e-06"/>
+      <nuclide name="U235" ao="0.00055815"/>
+      <nuclide name="U238" ao="0.022408"/>
+      <nuclide name="O16" ao="0.045829"/>
     </material>
     <material id="2" name="Zircaloy">
-      <density units="g/cm3" value="6.55"/>
-      <nuclide ao="0.021827" name="Zr90"/>
-      <nuclide ao="0.00476" name="Zr91"/>
-      <nuclide ao="0.0072758" name="Zr92"/>
-      <nuclide ao="0.0073734" name="Zr94"/>
-      <nuclide ao="0.0011879" name="Zr96"/>
+      <density value="6.55" units="g/cm3"/>
+      <nuclide name="Zr90" ao="0.021827"/>
+      <nuclide name="Zr91" ao="0.00476"/>
+      <nuclide name="Zr92" ao="0.0072758"/>
+      <nuclide name="Zr94" ao="0.0073734"/>
+      <nuclide name="Zr96" ao="0.0011879"/>
     </material>
     <material id="3" name="Hot borated water">
-      <density units="g/cm3" value="0.740582"/>
-      <nuclide ao="0.049457" name="H1"/>
-      <nuclide ao="0.024672" name="O16"/>
-      <nuclide ao="8.0042e-06" name="B10"/>
-      <nuclide ao="3.2218e-05" name="B11"/>
+      <density value="0.740582" units="g/cm3"/>
+      <nuclide name="H1" ao="0.049457"/>
+      <nuclide name="O16" ao="0.024672"/>
+      <nuclide name="B10" ao="8.0042e-06"/>
+      <nuclide name="B11" ao="3.2218e-05"/>
       <sab name="c_H_in_H2O"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="1" name="Fuel" region="-1" universe="0"/>
-    <cell id="2" material="2" name="Cladding" region="1 -2" universe="0"/>
-    <cell id="3" material="3" name="Water" region="2 3 -4 5 -6" universe="0"/>
-    <surface coeffs="0 0 0.39218" id="1" name="Fuel OR" type="z-cylinder"/>
-    <surface coeffs="0 0 0.4572" id="2" name="Clad OR" type="z-cylinder"/>
-    <surface boundary="reflective" coeffs="-0.63" id="3" name="left" type="x-plane"/>
-    <surface boundary="reflective" coeffs="0.63" id="4" name="right" type="x-plane"/>
-    <surface boundary="reflective" coeffs="-0.63" id="5" name="bottom" type="y-plane"/>
-    <surface boundary="reflective" coeffs="0.63" id="6" name="top" type="y-plane"/>
+    <cell id="1" name="Fuel" material="1" region="-1" universe="0"/>
+    <cell id="2" name="Cladding" material="2" region="1 -2" universe="0"/>
+    <cell id="3" name="Water" material="3" region="2 3 -4 5 -6" universe="0"/>
+    <surface id="1" name="Fuel OR" type="z-cylinder" coeffs="0 0 0.39218"/>
+    <surface id="2" name="Clad OR" type="z-cylinder" coeffs="0 0 0.4572"/>
+    <surface id="3" name="left" type="x-plane" boundary="reflective" coeffs="-0.63"/>
+    <surface id="4" name="right" type="x-plane" boundary="reflective" coeffs="0.63"/>
+    <surface id="5" name="bottom" type="y-plane" boundary="reflective" coeffs="-0.63"/>
+    <surface id="6" name="top" type="y-plane" boundary="reflective" coeffs="0.63"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
     <particles>100</particles>
     <batches>10</batches>
     <inactive>5</inactive>
-    <source particle="neutron" strength="1.0" type="independent">
+    <source type="independent" strength="1.0" particle="neutron">
       <space type="box">
         <parameters>-0.63 -0.63 -1 0.63 0.63 1</parameters>
       </space>
diff --git a/tests/regression_tests/model_xml/adj_cell_rotation_inputs_true.dat b/tests/regression_tests/model_xml/adj_cell_rotation_inputs_true.dat
index 7e2a0cf62..18c0552ce 100644
--- a/tests/regression_tests/model_xml/adj_cell_rotation_inputs_true.dat
+++ b/tests/regression_tests/model_xml/adj_cell_rotation_inputs_true.dat
@@ -1,35 +1,35 @@
 <?xml version='1.0' encoding='utf-8'?>
 <model>
   <materials>
-    <material depletable="true" id="1">
-      <density units="g/cc" value="10.0"/>
-      <nuclide ao="1.0" name="U235"/>
+    <material id="1" depletable="true">
+      <density value="10.0" units="g/cc"/>
+      <nuclide name="U235" ao="1.0"/>
     </material>
     <material id="2">
-      <density units="g/cc" value="0.1"/>
-      <nuclide ao="0.1" name="H1"/>
+      <density value="0.1" units="g/cc"/>
+      <nuclide name="H1" ao="0.1"/>
     </material>
   </materials>
   <geometry>
     <cell id="1" material="1" region="-1" universe="1"/>
     <cell id="2" material="2" region="1" universe="1"/>
-    <cell fill="1" id="3" region="2 -3 4 -5 6 -8" rotation="10 20 30" universe="2"/>
-    <cell fill="1" id="4" region="2 -3 4 -5 8 -7" translation="0 0 15" universe="2"/>
-    <surface coeffs="1.0 0.0 0.0 5.0" id="1" type="sphere"/>
-    <surface boundary="vacuum" coeffs="-7.5" id="2" name="minimum x" type="x-plane"/>
-    <surface boundary="vacuum" coeffs="7.5" id="3" name="maximum x" type="x-plane"/>
-    <surface boundary="vacuum" coeffs="-7.5" id="4" name="minimum y" type="y-plane"/>
-    <surface boundary="vacuum" coeffs="7.5" id="5" name="maximum y" type="y-plane"/>
-    <surface boundary="vacuum" coeffs="-7.5" id="6" type="z-plane"/>
-    <surface boundary="vacuum" coeffs="22.5" id="7" type="z-plane"/>
-    <surface coeffs="7.5" id="8" type="z-plane"/>
+    <cell id="3" fill="1" region="2 -3 4 -5 6 -8" rotation="10 20 30" universe="2"/>
+    <cell id="4" fill="1" region="2 -3 4 -5 8 -7" translation="0 0 15" universe="2"/>
+    <surface id="1" type="sphere" coeffs="1.0 0.0 0.0 5.0"/>
+    <surface id="2" name="minimum x" type="x-plane" boundary="vacuum" coeffs="-7.5"/>
+    <surface id="3" name="maximum x" type="x-plane" boundary="vacuum" coeffs="7.5"/>
+    <surface id="4" name="minimum y" type="y-plane" boundary="vacuum" coeffs="-7.5"/>
+    <surface id="5" name="maximum y" type="y-plane" boundary="vacuum" coeffs="7.5"/>
+    <surface id="6" type="z-plane" boundary="vacuum" coeffs="-7.5"/>
+    <surface id="7" type="z-plane" boundary="vacuum" coeffs="22.5"/>
+    <surface id="8" type="z-plane" coeffs="7.5"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
     <particles>10000</particles>
     <batches>10</batches>
     <inactive>5</inactive>
-    <source particle="neutron" strength="1.0" type="independent">
+    <source type="independent" strength="1.0" particle="neutron">
       <space type="box">
         <parameters>-4.0 -4.0 -4.0 4.0 4.0 4.0</parameters>
       </space>
diff --git a/tests/regression_tests/model_xml/energy_laws_inputs_true.dat b/tests/regression_tests/model_xml/energy_laws_inputs_true.dat
index 4d8e825d1..8c5191217 100644
--- a/tests/regression_tests/model_xml/energy_laws_inputs_true.dat
+++ b/tests/regression_tests/model_xml/energy_laws_inputs_true.dat
@@ -1,18 +1,18 @@
 <?xml version='1.0' encoding='utf-8'?>
 <model>
   <materials>
-    <material depletable="true" id="1">
-      <density units="g/cm3" value="20.0"/>
-      <nuclide ao="1.0" name="U233"/>
-      <nuclide ao="1.0" name="Am244"/>
-      <nuclide ao="1.0" name="H2"/>
-      <nuclide ao="1.0" name="Na23"/>
-      <nuclide ao="1.0" name="Ta181"/>
+    <material id="1" depletable="true">
+      <density value="20.0" units="g/cm3"/>
+      <nuclide name="U233" ao="1.0"/>
+      <nuclide name="Am244" ao="1.0"/>
+      <nuclide name="H2" ao="1.0"/>
+      <nuclide name="Na23" ao="1.0"/>
+      <nuclide name="Ta181" ao="1.0"/>
     </material>
   </materials>
   <geometry>
     <cell id="1" material="1" region="-1" universe="1"/>
-    <surface boundary="reflective" coeffs="0.0 0.0 0.0 100.0" id="1" type="sphere"/>
+    <surface id="1" type="sphere" boundary="reflective" coeffs="0.0 0.0 0.0 100.0"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
diff --git a/tests/regression_tests/model_xml/lattice_multiple_inputs_true.dat b/tests/regression_tests/model_xml/lattice_multiple_inputs_true.dat
index b249d97c4..06abef582 100644
--- a/tests/regression_tests/model_xml/lattice_multiple_inputs_true.dat
+++ b/tests/regression_tests/model_xml/lattice_multiple_inputs_true.dat
@@ -1,15 +1,15 @@
 <?xml version='1.0' encoding='utf-8'?>
 <model>
   <materials>
-    <material depletable="true" id="1" name="UO2">
-      <density units="g/cm3" value="10.0"/>
-      <nuclide ao="1.0" name="U235"/>
-      <nuclide ao="2.0" name="O16"/>
+    <material id="1" name="UO2" depletable="true">
+      <density value="10.0" units="g/cm3"/>
+      <nuclide name="U235" ao="1.0"/>
+      <nuclide name="O16" ao="2.0"/>
     </material>
     <material id="2" name="light water">
-      <density units="g/cm3" value="1.0"/>
-      <nuclide ao="2.0" name="H1"/>
-      <nuclide ao="1.0" name="O16"/>
+      <density value="1.0" units="g/cm3"/>
+      <nuclide name="H1" ao="2.0"/>
+      <nuclide name="O16" ao="1.0"/>
       <sab name="c_H_in_H2O"/>
     </material>
   </materials>
@@ -18,8 +18,8 @@
     <cell id="2" material="2" region="1" universe="1"/>
     <cell id="3" material="1" region="-2" universe="2"/>
     <cell id="4" material="2" region="2" universe="2"/>
-    <cell fill="3" id="5" universe="4"/>
-    <cell fill="5" id="6" region="3 -4 5 -6" universe="6"/>
+    <cell id="5" fill="3" universe="4"/>
+    <cell id="6" fill="5" region="3 -4 5 -6" universe="6"/>
     <lattice id="3">
       <pitch>1.2 1.2</pitch>
       <outer>1</outer>
@@ -37,12 +37,12 @@
 4 4 
 4 4 </universes>
     </lattice>
-    <surface coeffs="0.0 0.0 0.4" id="1" type="z-cylinder"/>
-    <surface coeffs="0.0 0.0 0.5" id="2" type="z-cylinder"/>
-    <surface boundary="reflective" coeffs="-2.4" id="3" name="minimum x" type="x-plane"/>
-    <surface boundary="reflective" coeffs="2.4" id="4" name="maximum x" type="x-plane"/>
-    <surface boundary="reflective" coeffs="-2.4" id="5" name="minimum y" type="y-plane"/>
-    <surface boundary="reflective" coeffs="2.4" id="6" name="maximum y" type="y-plane"/>
+    <surface id="1" type="z-cylinder" coeffs="0.0 0.0 0.4"/>
+    <surface id="2" type="z-cylinder" coeffs="0.0 0.0 0.5"/>
+    <surface id="3" name="minimum x" type="x-plane" boundary="reflective" coeffs="-2.4"/>
+    <surface id="4" name="maximum x" type="x-plane" boundary="reflective" coeffs="2.4"/>
+    <surface id="5" name="minimum y" type="y-plane" boundary="reflective" coeffs="-2.4"/>
+    <surface id="6" name="maximum y" type="y-plane" boundary="reflective" coeffs="2.4"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
diff --git a/tests/regression_tests/model_xml/photon_production_inputs_true.dat b/tests/regression_tests/model_xml/photon_production_inputs_true.dat
index 10f0bad98..07eebaa3e 100644
--- a/tests/regression_tests/model_xml/photon_production_inputs_true.dat
+++ b/tests/regression_tests/model_xml/photon_production_inputs_true.dat
@@ -2,28 +2,28 @@
 <model>
   <materials>
     <material id="1">
-      <density units="g/cm3" value="2.6989"/>
-      <nuclide ao="1.0" name="Al27"/>
+      <density value="2.6989" units="g/cm3"/>
+      <nuclide name="Al27" ao="1.0"/>
     </material>
   </materials>
   <geometry>
     <cell id="1" material="void" region="-1 2 -3" universe="1"/>
     <cell id="2" material="1" region="-1 3 -4" universe="1"/>
     <cell id="3" material="void" region="1 | -2 | 4" universe="1"/>
-    <surface boundary="vacuum" coeffs="0.0 0.0 1.0" id="1" type="x-cylinder"/>
-    <surface boundary="vacuum" coeffs="-1.0" id="2" type="x-plane"/>
-    <surface coeffs="1.0" id="3" type="x-plane"/>
-    <surface boundary="vacuum" coeffs="1000000000.0" id="4" type="x-plane"/>
+    <surface id="1" type="x-cylinder" boundary="vacuum" coeffs="0.0 0.0 1.0"/>
+    <surface id="2" type="x-plane" boundary="vacuum" coeffs="-1.0"/>
+    <surface id="3" type="x-plane" coeffs="1.0"/>
+    <surface id="4" type="x-plane" boundary="vacuum" coeffs="1000000000.0"/>
   </geometry>
   <settings>
     <run_mode>fixed source</run_mode>
     <particles>10000</particles>
     <batches>1</batches>
-    <source particle="neutron" strength="1.0" type="independent">
+    <source type="independent" strength="1.0" particle="neutron">
       <space type="point">
         <parameters>0 0 0</parameters>
       </space>
-      <angle reference_uvw="1.0 0.0 0.0" type="monodirectional"/>
+      <angle type="monodirectional" reference_uvw="1.0 0.0 0.0"/>
       <energy type="discrete">
         <parameters>14000000.0 1.0</parameters>
       </energy>
diff --git a/tests/regression_tests/multipole/inputs_true.dat b/tests/regression_tests/multipole/inputs_true.dat
index 7bea66930..22a351240 100644
--- a/tests/regression_tests/multipole/inputs_true.dat
+++ b/tests/regression_tests/multipole/inputs_true.dat
@@ -2,21 +2,21 @@
 <model>
   <materials>
     <material id="1">
-      <density units="g/cc" value="1.0"/>
-      <nuclide ao="2.0" name="H1"/>
-      <nuclide ao="1.0" name="O16"/>
+      <density value="1.0" units="g/cc"/>
+      <nuclide name="H1" ao="2.0"/>
+      <nuclide name="O16" ao="1.0"/>
       <sab name="c_H_in_H2O"/>
     </material>
-    <material depletable="true" id="2">
-      <density units="g/cc" value="4.5"/>
-      <nuclide ao="1.0" name="U235"/>
+    <material id="2" depletable="true">
+      <density value="4.5" units="g/cc"/>
+      <nuclide name="U235" ao="1.0"/>
     </material>
   </materials>
   <geometry>
     <cell id="1" material="1" universe="1"/>
     <cell id="11" material="2" region="-1" temperature="500 700 0 800" universe="11"/>
     <cell id="12" material="1" region="1" universe="11"/>
-    <cell fill="101" id="101" region="2 -3 4 -5" universe="0"/>
+    <cell id="101" fill="101" region="2 -3 4 -5" universe="0"/>
     <lattice id="101">
       <pitch>2.0 2.0</pitch>
       <outer>1</outer>
@@ -26,18 +26,18 @@
 11 11 
 11 11 </universes>
     </lattice>
-    <surface coeffs="0.0 0.0 0.3" id="1" type="z-cylinder"/>
-    <surface boundary="reflective" coeffs="-3.0" id="2" type="x-plane"/>
-    <surface boundary="reflective" coeffs="3.0" id="3" type="x-plane"/>
-    <surface boundary="reflective" coeffs="-3.0" id="4" type="y-plane"/>
-    <surface boundary="reflective" coeffs="3.0" id="5" type="y-plane"/>
+    <surface id="1" type="z-cylinder" coeffs="0.0 0.0 0.3"/>
+    <surface id="2" type="x-plane" boundary="reflective" coeffs="-3.0"/>
+    <surface id="3" type="x-plane" boundary="reflective" coeffs="3.0"/>
+    <surface id="4" type="y-plane" boundary="reflective" coeffs="-3.0"/>
+    <surface id="5" type="y-plane" boundary="reflective" coeffs="3.0"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
     <particles>1000</particles>
     <batches>5</batches>
     <inactive>0</inactive>
-    <source particle="neutron" strength="1.0" type="independent">
+    <source type="independent" strength="1.0" particle="neutron">
       <space type="box">
         <parameters>-1 -1 -1 1 1 1</parameters>
       </space>
diff --git a/tests/regression_tests/ncrystal/inputs_true.dat b/tests/regression_tests/ncrystal/inputs_true.dat
index ecbc3c54f..81ee2e312 100644
--- a/tests/regression_tests/ncrystal/inputs_true.dat
+++ b/tests/regression_tests/ncrystal/inputs_true.dat
@@ -1,26 +1,26 @@
 <?xml version='1.0' encoding='utf-8'?>
 <model>
   <materials>
-    <material cfg="Al_sg225.ncmat" id="1" temperature="293.15">
-      <density units="g/cm3" value="2.6986455176922477"/>
-      <nuclide ao="1.0" name="Al27"/>
+    <material id="1" cfg="Al_sg225.ncmat" temperature="293.15">
+      <density value="2.6986455176922477" units="g/cm3"/>
+      <nuclide name="Al27" ao="1.0"/>
     </material>
   </materials>
   <geometry>
     <cell id="1" material="1" region="-1" universe="1"/>
     <cell id="2" material="void" region="1 -2" universe="1"/>
-    <surface coeffs="0.0 0.0 0.0 0.1" id="1" type="sphere"/>
-    <surface boundary="vacuum" coeffs="0.0 0.0 0.0 100" id="2" type="sphere"/>
+    <surface id="1" type="sphere" coeffs="0.0 0.0 0.0 0.1"/>
+    <surface id="2" type="sphere" boundary="vacuum" coeffs="0.0 0.0 0.0 100"/>
   </geometry>
   <settings>
     <run_mode>fixed source</run_mode>
     <particles>100000</particles>
     <batches>10</batches>
-    <source particle="neutron" strength="1.0" type="independent">
+    <source type="independent" strength="1.0" particle="neutron">
       <space type="point">
         <parameters>0 0 -20</parameters>
       </space>
-      <angle reference_uvw="0.0 0.0 1.0" type="monodirectional"/>
+      <angle type="monodirectional" reference_uvw="0.0 0.0 1.0"/>
       <energy type="discrete">
         <parameters>0.012 1.0</parameters>
       </energy>
diff --git a/tests/regression_tests/periodic/inputs_true.dat b/tests/regression_tests/periodic/inputs_true.dat
index 65e1b5ce3..9183db3c4 100644
--- a/tests/regression_tests/periodic/inputs_true.dat
+++ b/tests/regression_tests/periodic/inputs_true.dat
@@ -2,33 +2,33 @@
 <model>
   <materials>
     <material id="1">
-      <density units="g/cc" value="1.0"/>
-      <nuclide ao="2.0" name="H1"/>
-      <nuclide ao="1.0" name="O16"/>
+      <density value="1.0" units="g/cc"/>
+      <nuclide name="H1" ao="2.0"/>
+      <nuclide name="O16" ao="1.0"/>
       <sab name="c_H_in_H2O"/>
     </material>
-    <material depletable="true" id="2">
-      <density units="g/cc" value="4.5"/>
-      <nuclide ao="1.0" name="U235"/>
+    <material id="2" depletable="true">
+      <density value="4.5" units="g/cc"/>
+      <nuclide name="U235" ao="1.0"/>
     </material>
   </materials>
   <geometry>
     <cell id="1" material="1" region="1 -2 3 -4 5 -6 7" universe="0"/>
     <cell id="2" material="2" region="3 5 -6 -7" universe="0"/>
-    <surface boundary="periodic" coeffs="0.0" id="1" periodic_surface_id="3" type="x-plane"/>
-    <surface boundary="reflective" coeffs="5.0" id="2" type="x-plane"/>
-    <surface boundary="periodic" coeffs="0.0" id="3" periodic_surface_id="1" type="y-plane"/>
-    <surface boundary="reflective" coeffs="5.0" id="4" type="y-plane"/>
-    <surface boundary="periodic" coeffs="-5.0" id="5" type="z-plane"/>
-    <surface boundary="periodic" coeffs="0 0 1 5.0" id="6" type="plane"/>
-    <surface coeffs="2.5 0.0 2.0" id="7" type="z-cylinder"/>
+    <surface id="1" type="x-plane" boundary="periodic" coeffs="0.0" periodic_surface_id="3"/>
+    <surface id="2" type="x-plane" boundary="reflective" coeffs="5.0"/>
+    <surface id="3" type="y-plane" boundary="periodic" coeffs="0.0" periodic_surface_id="1"/>
+    <surface id="4" type="y-plane" boundary="reflective" coeffs="5.0"/>
+    <surface id="5" type="z-plane" boundary="periodic" coeffs="-5.0"/>
+    <surface id="6" type="plane" boundary="periodic" coeffs="0 0 1 5.0"/>
+    <surface id="7" type="z-cylinder" coeffs="2.5 0.0 2.0"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
     <particles>1000</particles>
     <batches>4</batches>
     <inactive>0</inactive>
-    <source particle="neutron" strength="1.0" type="independent">
+    <source type="independent" strength="1.0" particle="neutron">
       <space type="box">
         <parameters>0 0 0 5 5 0</parameters>
       </space>
diff --git a/tests/regression_tests/periodic_6fold/inputs_true.dat b/tests/regression_tests/periodic_6fold/inputs_true.dat
index f7f413d09..075cffc12 100644
--- a/tests/regression_tests/periodic_6fold/inputs_true.dat
+++ b/tests/regression_tests/periodic_6fold/inputs_true.dat
@@ -2,30 +2,30 @@
 <model>
   <materials>
     <material id="1">
-      <density units="g/cc" value="1.0"/>
-      <nuclide ao="2.0" name="H1"/>
-      <nuclide ao="1.0" name="O16"/>
+      <density value="1.0" units="g/cc"/>
+      <nuclide name="H1" ao="2.0"/>
+      <nuclide name="O16" ao="1.0"/>
       <sab name="c_H_in_H2O"/>
     </material>
-    <material depletable="true" id="2">
-      <density units="g/cc" value="4.5"/>
-      <nuclide ao="1.0" name="U235"/>
+    <material id="2" depletable="true">
+      <density value="4.5" units="g/cc"/>
+      <nuclide name="U235" ao="1.0"/>
     </material>
   </materials>
   <geometry>
     <cell id="1" material="1" region="1 2 -3 4" universe="0"/>
     <cell id="2" material="2" region="1 2 -4" universe="0"/>
-    <surface boundary="periodic" coeffs="0.4999999999999999 0.8660254037844387 0.0 0.0" id="1" type="plane"/>
-    <surface boundary="periodic" coeffs="0.4999999999999999 -0.8660254037844387 0.0 0.0" id="2" type="plane"/>
-    <surface boundary="reflective" coeffs="5.0" id="3" type="x-plane"/>
-    <surface coeffs="2.598076211353316 1.4999999999999998 2.0" id="4" type="z-cylinder"/>
+    <surface id="1" type="plane" boundary="periodic" coeffs="0.4999999999999999 0.8660254037844387 0.0 0.0"/>
+    <surface id="2" type="plane" boundary="periodic" coeffs="0.4999999999999999 -0.8660254037844387 0.0 0.0"/>
+    <surface id="3" type="x-plane" boundary="reflective" coeffs="5.0"/>
+    <surface id="4" type="z-cylinder" coeffs="2.598076211353316 1.4999999999999998 2.0"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
     <particles>1000</particles>
     <batches>4</batches>
     <inactive>0</inactive>
-    <source particle="neutron" strength="1.0" type="independent">
+    <source type="independent" strength="1.0" particle="neutron">
       <space type="box">
         <parameters>0 0 0 5 5 0</parameters>
       </space>
diff --git a/tests/regression_tests/periodic_hex/inputs_true.dat b/tests/regression_tests/periodic_hex/inputs_true.dat
index 188c8dfa9..e65af3d94 100644
--- a/tests/regression_tests/periodic_hex/inputs_true.dat
+++ b/tests/regression_tests/periodic_hex/inputs_true.dat
@@ -1,19 +1,19 @@
 <?xml version='1.0' encoding='utf-8'?>
 <model>
   <materials>
-    <material depletable="true" id="1">
-      <density units="g/cc" value="4.5"/>
-      <nuclide ao="1.0" name="U235"/>
+    <material id="1" depletable="true">
+      <density value="4.5" units="g/cc"/>
+      <nuclide name="U235" ao="1.0"/>
     </material>
   </materials>
   <geometry>
     <cell id="1" material="1" region="-1 2 -3 -4 5 6" universe="1"/>
-    <surface boundary="periodic" coeffs="8.660254037844386" id="1" periodic_surface_id="2" type="x-plane"/>
-    <surface boundary="periodic" coeffs="-8.660254037844386" id="2" periodic_surface_id="1" type="x-plane"/>
-    <surface boundary="periodic" coeffs="0.5773502691896257 1.0 0.0 10.0" id="3" periodic_surface_id="6" type="plane"/>
-    <surface boundary="periodic" coeffs="-0.5773502691896257 1.0 0.0 10.0" id="4" periodic_surface_id="5" type="plane"/>
-    <surface boundary="periodic" coeffs="-0.5773502691896257 1.0 0.0 -10.0" id="5" periodic_surface_id="4" type="plane"/>
-    <surface boundary="periodic" coeffs="0.5773502691896257 1.0 0.0 -10.0" id="6" periodic_surface_id="3" type="plane"/>
+    <surface id="1" type="x-plane" boundary="periodic" coeffs="8.660254037844386" periodic_surface_id="2"/>
+    <surface id="2" type="x-plane" boundary="periodic" coeffs="-8.660254037844386" periodic_surface_id="1"/>
+    <surface id="3" type="plane" boundary="periodic" coeffs="0.5773502691896257 1.0 0.0 10.0" periodic_surface_id="6"/>
+    <surface id="4" type="plane" boundary="periodic" coeffs="-0.5773502691896257 1.0 0.0 10.0" periodic_surface_id="5"/>
+    <surface id="5" type="plane" boundary="periodic" coeffs="-0.5773502691896257 1.0 0.0 -10.0" periodic_surface_id="4"/>
+    <surface id="6" type="plane" boundary="periodic" coeffs="0.5773502691896257 1.0 0.0 -10.0" periodic_surface_id="3"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
diff --git a/tests/regression_tests/photon_production/inputs_true.dat b/tests/regression_tests/photon_production/inputs_true.dat
index 10f0bad98..07eebaa3e 100644
--- a/tests/regression_tests/photon_production/inputs_true.dat
+++ b/tests/regression_tests/photon_production/inputs_true.dat
@@ -2,28 +2,28 @@
 <model>
   <materials>
     <material id="1">
-      <density units="g/cm3" value="2.6989"/>
-      <nuclide ao="1.0" name="Al27"/>
+      <density value="2.6989" units="g/cm3"/>
+      <nuclide name="Al27" ao="1.0"/>
     </material>
   </materials>
   <geometry>
     <cell id="1" material="void" region="-1 2 -3" universe="1"/>
     <cell id="2" material="1" region="-1 3 -4" universe="1"/>
     <cell id="3" material="void" region="1 | -2 | 4" universe="1"/>
-    <surface boundary="vacuum" coeffs="0.0 0.0 1.0" id="1" type="x-cylinder"/>
-    <surface boundary="vacuum" coeffs="-1.0" id="2" type="x-plane"/>
-    <surface coeffs="1.0" id="3" type="x-plane"/>
-    <surface boundary="vacuum" coeffs="1000000000.0" id="4" type="x-plane"/>
+    <surface id="1" type="x-cylinder" boundary="vacuum" coeffs="0.0 0.0 1.0"/>
+    <surface id="2" type="x-plane" boundary="vacuum" coeffs="-1.0"/>
+    <surface id="3" type="x-plane" coeffs="1.0"/>
+    <surface id="4" type="x-plane" boundary="vacuum" coeffs="1000000000.0"/>
   </geometry>
   <settings>
     <run_mode>fixed source</run_mode>
     <particles>10000</particles>
     <batches>1</batches>
-    <source particle="neutron" strength="1.0" type="independent">
+    <source type="independent" strength="1.0" particle="neutron">
       <space type="point">
         <parameters>0 0 0</parameters>
       </space>
-      <angle reference_uvw="1.0 0.0 0.0" type="monodirectional"/>
+      <angle type="monodirectional" reference_uvw="1.0 0.0 0.0"/>
       <energy type="discrete">
         <parameters>14000000.0 1.0</parameters>
       </energy>
diff --git a/tests/regression_tests/photon_production_fission/inputs_true.dat b/tests/regression_tests/photon_production_fission/inputs_true.dat
index fa379b39e..11a194e3c 100644
--- a/tests/regression_tests/photon_production_fission/inputs_true.dat
+++ b/tests/regression_tests/photon_production_fission/inputs_true.dat
@@ -1,21 +1,21 @@
 <?xml version='1.0' encoding='utf-8'?>
 <model>
   <materials>
-    <material depletable="true" id="1">
-      <density units="g/cm3" value="10.0"/>
-      <nuclide ao="1.0" name="U235"/>
+    <material id="1" depletable="true">
+      <density value="10.0" units="g/cm3"/>
+      <nuclide name="U235" ao="1.0"/>
     </material>
   </materials>
   <geometry>
     <cell id="1" material="1" region="-1" universe="1"/>
-    <surface boundary="reflective" coeffs="0.0 0.0 0.0 100.0" id="1" type="sphere"/>
+    <surface id="1" type="sphere" boundary="reflective" coeffs="0.0 0.0 0.0 100.0"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
     <particles>1000</particles>
     <batches>5</batches>
     <inactive>2</inactive>
-    <source particle="neutron" strength="1.0" type="independent">
+    <source type="independent" strength="1.0" particle="neutron">
       <space type="point">
         <parameters>0 0 0</parameters>
       </space>
diff --git a/tests/regression_tests/photon_source/inputs_true.dat b/tests/regression_tests/photon_source/inputs_true.dat
index 3d2e05243..adaa5fb42 100644
--- a/tests/regression_tests/photon_source/inputs_true.dat
+++ b/tests/regression_tests/photon_source/inputs_true.dat
@@ -2,22 +2,22 @@
 <model>
   <materials>
     <material id="1">
-      <density units="g/cm3" value="0.998207"/>
-      <nuclide ao="0.11187657362844" name="H1"/>
-      <nuclide ao="1.7426371559999997e-05" name="H2"/>
-      <nuclide ao="0.8877694078259999" name="O16"/>
-      <nuclide ao="0.000336592174" name="O17"/>
+      <density value="0.998207" units="g/cm3"/>
+      <nuclide name="H1" ao="0.11187657362844"/>
+      <nuclide name="H2" ao="1.7426371559999997e-05"/>
+      <nuclide name="O16" ao="0.8877694078259999"/>
+      <nuclide name="O17" ao="0.000336592174"/>
     </material>
   </materials>
   <geometry>
     <cell id="1" material="1" region="-1" universe="1"/>
-    <surface boundary="reflective" coeffs="0.0 0.0 0.0 1000000000.0" id="1" type="sphere"/>
+    <surface id="1" type="sphere" boundary="reflective" coeffs="0.0 0.0 0.0 1000000000.0"/>
   </geometry>
   <settings>
     <run_mode>fixed source</run_mode>
     <particles>10000</particles>
     <batches>1</batches>
-    <source particle="photon" strength="1.0" type="independent">
+    <source type="independent" strength="1.0" particle="photon">
       <space type="point">
         <parameters>0 0 0</parameters>
       </space>
diff --git a/tests/regression_tests/pulse_height/inputs_true.dat b/tests/regression_tests/pulse_height/inputs_true.dat
index 544ddb097..590928e43 100644
--- a/tests/regression_tests/pulse_height/inputs_true.dat
+++ b/tests/regression_tests/pulse_height/inputs_true.dat
@@ -2,22 +2,22 @@
 <model>
   <materials>
     <material id="1">
-      <density units="g/cc" value="3.7"/>
-      <nuclide ao="1.0" name="Na23"/>
-      <nuclide ao="1.0" name="I127"/>
+      <density value="3.7" units="g/cc"/>
+      <nuclide name="Na23" ao="1.0"/>
+      <nuclide name="I127" ao="1.0"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="1" name="inner sphere" region="-1" universe="1"/>
-    <cell id="2" material="void" name="outer sphere" region="1 -2" universe="1"/>
-    <surface coeffs="0.0 0.0 0.0 1" id="1" type="sphere"/>
-    <surface boundary="vacuum" coeffs="0.0 0.0 0.0 2" id="2" type="sphere"/>
+    <cell id="1" name="inner sphere" material="1" region="-1" universe="1"/>
+    <cell id="2" name="outer sphere" material="void" region="1 -2" universe="1"/>
+    <surface id="1" type="sphere" coeffs="0.0 0.0 0.0 1"/>
+    <surface id="2" type="sphere" boundary="vacuum" coeffs="0.0 0.0 0.0 2"/>
   </geometry>
   <settings>
     <run_mode>fixed source</run_mode>
     <particles>100</particles>
     <batches>5</batches>
-    <source particle="photon" strength="1.0" type="independent">
+    <source type="independent" strength="1.0" particle="photon">
       <space type="point">
         <parameters>0.0 0.0 0.0</parameters>
       </space>
diff --git a/tests/regression_tests/random_ray_adjoint_fixed_source/inputs_true.dat b/tests/regression_tests/random_ray_adjoint_fixed_source/inputs_true.dat
index 65ffd5af7..30e62a885 100644
--- a/tests/regression_tests/random_ray_adjoint_fixed_source/inputs_true.dat
+++ b/tests/regression_tests/random_ray_adjoint_fixed_source/inputs_true.dat
@@ -3,24 +3,24 @@
   <materials>
     <cross_sections>mgxs.h5</cross_sections>
     <material id="1" name="source">
-      <density units="macro" value="1.0"/>
+      <density value="1.0" units="macro"/>
       <macroscopic name="source"/>
     </material>
     <material id="2" name="void">
-      <density units="macro" value="1.0"/>
+      <density value="1.0" units="macro"/>
       <macroscopic name="void"/>
     </material>
     <material id="3" name="absorber">
-      <density units="macro" value="1.0"/>
+      <density value="1.0" units="macro"/>
       <macroscopic name="absorber"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="1" name="infinite source region" universe="1"/>
-    <cell id="2" material="2" name="infinite void region" universe="2"/>
-    <cell id="3" material="3" name="infinite absorber region" universe="3"/>
-    <cell fill="4" id="4" universe="5"/>
-    <cell fill="5" id="5" name="full domain" region="1 -2 3 -4 5 -6" universe="6"/>
+    <cell id="1" name="infinite source region" material="1" universe="1"/>
+    <cell id="2" name="infinite void region" material="2" universe="2"/>
+    <cell id="3" name="infinite absorber region" material="3" universe="3"/>
+    <cell id="4" fill="4" universe="5"/>
+    <cell id="5" name="full domain" fill="5" region="1 -2 3 -4 5 -6" universe="6"/>
     <lattice id="4">
       <pitch>2.5 2.5 2.5</pitch>
       <dimension>12 12 12</dimension>
@@ -182,19 +182,19 @@
 3 3 3 3 3 3 3 3 3 3 3 3 
 3 3 3 3 3 3 3 3 3 3 3 3 </universes>
     </lattice>
-    <surface boundary="reflective" coeffs="0.0" id="1" type="x-plane"/>
-    <surface boundary="vacuum" coeffs="30.0" id="2" type="x-plane"/>
-    <surface boundary="reflective" coeffs="0.0" id="3" type="y-plane"/>
-    <surface boundary="vacuum" coeffs="30.0" id="4" type="y-plane"/>
-    <surface boundary="reflective" coeffs="0.0" id="5" type="z-plane"/>
-    <surface boundary="vacuum" coeffs="30.0" id="6" type="z-plane"/>
+    <surface id="1" type="x-plane" boundary="reflective" coeffs="0.0"/>
+    <surface id="2" type="x-plane" boundary="vacuum" coeffs="30.0"/>
+    <surface id="3" type="y-plane" boundary="reflective" coeffs="0.0"/>
+    <surface id="4" type="y-plane" boundary="vacuum" coeffs="30.0"/>
+    <surface id="5" type="z-plane" boundary="reflective" coeffs="0.0"/>
+    <surface id="6" type="z-plane" boundary="vacuum" coeffs="30.0"/>
   </geometry>
   <settings>
     <run_mode>fixed source</run_mode>
     <particles>500</particles>
     <batches>10</batches>
     <inactive>5</inactive>
-    <source particle="neutron" strength="3.14" type="independent">
+    <source type="independent" strength="3.14" particle="neutron">
       <energy type="discrete">
         <parameters>100.0 1.0</parameters>
       </energy>
@@ -207,7 +207,7 @@
     <random_ray>
       <distance_active>500.0</distance_active>
       <distance_inactive>100.0</distance_inactive>
-      <source particle="neutron" strength="1.0" type="independent">
+      <source type="independent" strength="1.0" particle="neutron">
         <space type="box">
           <parameters>0.0 0.0 0.0 30.0 30.0 30.0</parameters>
         </space>
diff --git a/tests/regression_tests/random_ray_adjoint_k_eff/inputs_true.dat b/tests/regression_tests/random_ray_adjoint_k_eff/inputs_true.dat
index 725702a49..cd4e92aa1 100644
--- a/tests/regression_tests/random_ray_adjoint_k_eff/inputs_true.dat
+++ b/tests/regression_tests/random_ray_adjoint_k_eff/inputs_true.dat
@@ -3,32 +3,32 @@
   <materials>
     <cross_sections>mgxs.h5</cross_sections>
     <material id="1" name="UO2 fuel">
-      <density units="macro" value="1.0"/>
+      <density value="1.0" units="macro"/>
       <macroscopic name="UO2"/>
     </material>
     <material id="2" name="Water">
-      <density units="macro" value="1.0"/>
+      <density value="1.0" units="macro"/>
       <macroscopic name="LWTR"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="1" name="fuel inner a" region="-2" universe="1"/>
-    <cell id="2" material="1" name="fuel inner b" region="2 -3" universe="1"/>
-    <cell id="3" material="1" name="fuel inner c" region="3 -1" universe="1"/>
-    <cell id="4" material="2" name="moderator inner a" region="1 -4" universe="1"/>
-    <cell id="5" material="2" name="moderator outer b" region="4 -5" universe="1"/>
-    <cell id="6" material="2" name="moderator outer c" region="5" universe="1"/>
-    <cell fill="1" id="7" name="azimuthal_cell_0" region="6 -7" universe="2"/>
-    <cell fill="1" id="8" name="azimuthal_cell_1" region="7 -8" universe="2"/>
-    <cell fill="1" id="9" name="azimuthal_cell_2" region="8 -9" universe="2"/>
-    <cell fill="1" id="10" name="azimuthal_cell_3" region="9 -10" universe="2"/>
-    <cell fill="1" id="11" name="azimuthal_cell_4" region="10 -11" universe="2"/>
-    <cell fill="1" id="12" name="azimuthal_cell_5" region="11 -12" universe="2"/>
-    <cell fill="1" id="13" name="azimuthal_cell_6" region="12 -13" universe="2"/>
-    <cell fill="1" id="14" name="azimuthal_cell_7" region="13 -6" universe="2"/>
-    <cell id="15" material="2" name="moderator infinite" universe="3"/>
-    <cell fill="4" id="16" universe="5"/>
-    <cell fill="6" id="17" name="assembly" region="14 -15 16 -17" universe="7"/>
+    <cell id="1" name="fuel inner a" material="1" region="-2" universe="1"/>
+    <cell id="2" name="fuel inner b" material="1" region="2 -3" universe="1"/>
+    <cell id="3" name="fuel inner c" material="1" region="3 -1" universe="1"/>
+    <cell id="4" name="moderator inner a" material="2" region="1 -4" universe="1"/>
+    <cell id="5" name="moderator outer b" material="2" region="4 -5" universe="1"/>
+    <cell id="6" name="moderator outer c" material="2" region="5" universe="1"/>
+    <cell id="7" name="azimuthal_cell_0" fill="1" region="6 -7" universe="2"/>
+    <cell id="8" name="azimuthal_cell_1" fill="1" region="7 -8" universe="2"/>
+    <cell id="9" name="azimuthal_cell_2" fill="1" region="8 -9" universe="2"/>
+    <cell id="10" name="azimuthal_cell_3" fill="1" region="9 -10" universe="2"/>
+    <cell id="11" name="azimuthal_cell_4" fill="1" region="10 -11" universe="2"/>
+    <cell id="12" name="azimuthal_cell_5" fill="1" region="11 -12" universe="2"/>
+    <cell id="13" name="azimuthal_cell_6" fill="1" region="12 -13" universe="2"/>
+    <cell id="14" name="azimuthal_cell_7" fill="1" region="13 -6" universe="2"/>
+    <cell id="15" name="moderator infinite" material="2" universe="3"/>
+    <cell id="16" fill="4" universe="5"/>
+    <cell id="17" name="assembly" fill="6" region="14 -15 16 -17" universe="7"/>
     <lattice id="4">
       <pitch>0.126 0.126</pitch>
       <dimension>10 10</dimension>
@@ -53,23 +53,23 @@
 2 2 
 2 5 </universes>
     </lattice>
-    <surface coeffs="0.0 0.0 0.54" id="1" name="Fuel OR" type="z-cylinder"/>
-    <surface coeffs="0.0 0.0 0.33" id="2" name="inner ring a" type="z-cylinder"/>
-    <surface coeffs="0.0 0.0 0.45" id="3" name="inner ring b" type="z-cylinder"/>
-    <surface coeffs="0.0 0.0 0.6" id="4" name="outer ring a" type="z-cylinder"/>
-    <surface coeffs="0.0 0.0 0.69" id="5" name="outer ring b" type="z-cylinder"/>
-    <surface coeffs="-0.0 1.0 0 0" id="6" type="plane"/>
-    <surface coeffs="-0.7071067811865475 0.7071067811865476 0 0" id="7" type="plane"/>
-    <surface coeffs="-1.0 6.123233995736766e-17 0 0" id="8" type="plane"/>
-    <surface coeffs="-0.7071067811865476 -0.7071067811865475 0 0" id="9" type="plane"/>
-    <surface coeffs="-1.2246467991473532e-16 -1.0 0 0" id="10" type="plane"/>
-    <surface coeffs="0.7071067811865475 -0.7071067811865477 0 0" id="11" type="plane"/>
-    <surface coeffs="1.0 -1.8369701987210297e-16 0 0" id="12" type="plane"/>
-    <surface coeffs="0.7071067811865477 0.7071067811865474 0 0" id="13" type="plane"/>
-    <surface boundary="reflective" coeffs="-1.26" id="14" name="minimum x" type="x-plane"/>
-    <surface boundary="reflective" coeffs="1.26" id="15" name="maximum x" type="x-plane"/>
-    <surface boundary="reflective" coeffs="-1.26" id="16" name="minimum y" type="y-plane"/>
-    <surface boundary="reflective" coeffs="1.26" id="17" name="maximum y" type="y-plane"/>
+    <surface id="1" name="Fuel OR" type="z-cylinder" coeffs="0.0 0.0 0.54"/>
+    <surface id="2" name="inner ring a" type="z-cylinder" coeffs="0.0 0.0 0.33"/>
+    <surface id="3" name="inner ring b" type="z-cylinder" coeffs="0.0 0.0 0.45"/>
+    <surface id="4" name="outer ring a" type="z-cylinder" coeffs="0.0 0.0 0.6"/>
+    <surface id="5" name="outer ring b" type="z-cylinder" coeffs="0.0 0.0 0.69"/>
+    <surface id="6" type="plane" coeffs="-0.0 1.0 0 0"/>
+    <surface id="7" type="plane" coeffs="-0.7071067811865475 0.7071067811865476 0 0"/>
+    <surface id="8" type="plane" coeffs="-1.0 6.123233995736766e-17 0 0"/>
+    <surface id="9" type="plane" coeffs="-0.7071067811865476 -0.7071067811865475 0 0"/>
+    <surface id="10" type="plane" coeffs="-1.2246467991473532e-16 -1.0 0 0"/>
+    <surface id="11" type="plane" coeffs="0.7071067811865475 -0.7071067811865477 0 0"/>
+    <surface id="12" type="plane" coeffs="1.0 -1.8369701987210297e-16 0 0"/>
+    <surface id="13" type="plane" coeffs="0.7071067811865477 0.7071067811865474 0 0"/>
+    <surface id="14" name="minimum x" type="x-plane" boundary="reflective" coeffs="-1.26"/>
+    <surface id="15" name="maximum x" type="x-plane" boundary="reflective" coeffs="1.26"/>
+    <surface id="16" name="minimum y" type="y-plane" boundary="reflective" coeffs="-1.26"/>
+    <surface id="17" name="maximum y" type="y-plane" boundary="reflective" coeffs="1.26"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
@@ -80,7 +80,7 @@
     <random_ray>
       <distance_active>100.0</distance_active>
       <distance_inactive>20.0</distance_inactive>
-      <source particle="neutron" strength="1.0" type="independent">
+      <source type="independent" strength="1.0" particle="neutron">
         <space type="box">
           <parameters>-1.26 -1.26 -1 1.26 1.26 1</parameters>
         </space>
diff --git a/tests/regression_tests/random_ray_auto_convert/infinite_medium/inputs_true.dat b/tests/regression_tests/random_ray_auto_convert/infinite_medium/inputs_true.dat
index 02be4ea7a..464c89a5d 100644
--- a/tests/regression_tests/random_ray_auto_convert/infinite_medium/inputs_true.dat
+++ b/tests/regression_tests/random_ray_auto_convert/infinite_medium/inputs_true.dat
@@ -2,36 +2,36 @@
 <model>
   <materials>
     <cross_sections>mgxs.h5</cross_sections>
-    <material depletable="true" id="1" name="UO2__2_4__">
-      <density units="macro" value="1.0"/>
+    <material id="1" name="UO2__2_4__" depletable="true">
+      <density value="1.0" units="macro"/>
       <macroscopic name="UO2__2_4__"/>
     </material>
     <material id="2" name="Zircaloy">
-      <density units="macro" value="1.0"/>
+      <density value="1.0" units="macro"/>
       <macroscopic name="Zircaloy"/>
     </material>
     <material id="3" name="Hot_borated_water">
-      <density units="macro" value="1.0"/>
+      <density value="1.0" units="macro"/>
       <macroscopic name="Hot_borated_water"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="1" name="Fuel" region="-1" universe="0"/>
-    <cell id="2" material="2" name="Cladding" region="1 -2" universe="0"/>
-    <cell id="3" material="3" name="Water" region="2 3 -4 5 -6" universe="0"/>
-    <surface coeffs="0 0 0.39218" id="1" name="Fuel OR" type="z-cylinder"/>
-    <surface coeffs="0 0 0.4572" id="2" name="Clad OR" type="z-cylinder"/>
-    <surface boundary="reflective" coeffs="-0.63" id="3" name="left" type="x-plane"/>
-    <surface boundary="reflective" coeffs="0.63" id="4" name="right" type="x-plane"/>
-    <surface boundary="reflective" coeffs="-0.63" id="5" name="bottom" type="y-plane"/>
-    <surface boundary="reflective" coeffs="0.63" id="6" name="top" type="y-plane"/>
+    <cell id="1" name="Fuel" material="1" region="-1" universe="0"/>
+    <cell id="2" name="Cladding" material="2" region="1 -2" universe="0"/>
+    <cell id="3" name="Water" material="3" region="2 3 -4 5 -6" universe="0"/>
+    <surface id="1" name="Fuel OR" type="z-cylinder" coeffs="0 0 0.39218"/>
+    <surface id="2" name="Clad OR" type="z-cylinder" coeffs="0 0 0.4572"/>
+    <surface id="3" name="left" type="x-plane" boundary="reflective" coeffs="-0.63"/>
+    <surface id="4" name="right" type="x-plane" boundary="reflective" coeffs="0.63"/>
+    <surface id="5" name="bottom" type="y-plane" boundary="reflective" coeffs="-0.63"/>
+    <surface id="6" name="top" type="y-plane" boundary="reflective" coeffs="0.63"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
     <particles>100</particles>
     <batches>10</batches>
     <inactive>5</inactive>
-    <source particle="neutron" strength="1.0" type="independent">
+    <source type="independent" strength="1.0" particle="neutron">
       <space type="box">
         <parameters>-0.63 -0.63 -1 0.63 0.63 1</parameters>
       </space>
@@ -41,7 +41,7 @@
     </source>
     <energy_mode>multi-group</energy_mode>
     <random_ray>
-      <source particle="neutron" strength="1.0" type="independent">
+      <source type="independent" strength="1.0" particle="neutron">
         <space type="box">
           <parameters>-0.63 -0.63 -1.0 0.63 0.63 1.0</parameters>
         </space>
diff --git a/tests/regression_tests/random_ray_auto_convert/material_wise/inputs_true.dat b/tests/regression_tests/random_ray_auto_convert/material_wise/inputs_true.dat
index 02be4ea7a..464c89a5d 100644
--- a/tests/regression_tests/random_ray_auto_convert/material_wise/inputs_true.dat
+++ b/tests/regression_tests/random_ray_auto_convert/material_wise/inputs_true.dat
@@ -2,36 +2,36 @@
 <model>
   <materials>
     <cross_sections>mgxs.h5</cross_sections>
-    <material depletable="true" id="1" name="UO2__2_4__">
-      <density units="macro" value="1.0"/>
+    <material id="1" name="UO2__2_4__" depletable="true">
+      <density value="1.0" units="macro"/>
       <macroscopic name="UO2__2_4__"/>
     </material>
     <material id="2" name="Zircaloy">
-      <density units="macro" value="1.0"/>
+      <density value="1.0" units="macro"/>
       <macroscopic name="Zircaloy"/>
     </material>
     <material id="3" name="Hot_borated_water">
-      <density units="macro" value="1.0"/>
+      <density value="1.0" units="macro"/>
       <macroscopic name="Hot_borated_water"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="1" name="Fuel" region="-1" universe="0"/>
-    <cell id="2" material="2" name="Cladding" region="1 -2" universe="0"/>
-    <cell id="3" material="3" name="Water" region="2 3 -4 5 -6" universe="0"/>
-    <surface coeffs="0 0 0.39218" id="1" name="Fuel OR" type="z-cylinder"/>
-    <surface coeffs="0 0 0.4572" id="2" name="Clad OR" type="z-cylinder"/>
-    <surface boundary="reflective" coeffs="-0.63" id="3" name="left" type="x-plane"/>
-    <surface boundary="reflective" coeffs="0.63" id="4" name="right" type="x-plane"/>
-    <surface boundary="reflective" coeffs="-0.63" id="5" name="bottom" type="y-plane"/>
-    <surface boundary="reflective" coeffs="0.63" id="6" name="top" type="y-plane"/>
+    <cell id="1" name="Fuel" material="1" region="-1" universe="0"/>
+    <cell id="2" name="Cladding" material="2" region="1 -2" universe="0"/>
+    <cell id="3" name="Water" material="3" region="2 3 -4 5 -6" universe="0"/>
+    <surface id="1" name="Fuel OR" type="z-cylinder" coeffs="0 0 0.39218"/>
+    <surface id="2" name="Clad OR" type="z-cylinder" coeffs="0 0 0.4572"/>
+    <surface id="3" name="left" type="x-plane" boundary="reflective" coeffs="-0.63"/>
+    <surface id="4" name="right" type="x-plane" boundary="reflective" coeffs="0.63"/>
+    <surface id="5" name="bottom" type="y-plane" boundary="reflective" coeffs="-0.63"/>
+    <surface id="6" name="top" type="y-plane" boundary="reflective" coeffs="0.63"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
     <particles>100</particles>
     <batches>10</batches>
     <inactive>5</inactive>
-    <source particle="neutron" strength="1.0" type="independent">
+    <source type="independent" strength="1.0" particle="neutron">
       <space type="box">
         <parameters>-0.63 -0.63 -1 0.63 0.63 1</parameters>
       </space>
@@ -41,7 +41,7 @@
     </source>
     <energy_mode>multi-group</energy_mode>
     <random_ray>
-      <source particle="neutron" strength="1.0" type="independent">
+      <source type="independent" strength="1.0" particle="neutron">
         <space type="box">
           <parameters>-0.63 -0.63 -1.0 0.63 0.63 1.0</parameters>
         </space>
diff --git a/tests/regression_tests/random_ray_auto_convert/stochastic_slab/inputs_true.dat b/tests/regression_tests/random_ray_auto_convert/stochastic_slab/inputs_true.dat
index 02be4ea7a..464c89a5d 100644
--- a/tests/regression_tests/random_ray_auto_convert/stochastic_slab/inputs_true.dat
+++ b/tests/regression_tests/random_ray_auto_convert/stochastic_slab/inputs_true.dat
@@ -2,36 +2,36 @@
 <model>
   <materials>
     <cross_sections>mgxs.h5</cross_sections>
-    <material depletable="true" id="1" name="UO2__2_4__">
-      <density units="macro" value="1.0"/>
+    <material id="1" name="UO2__2_4__" depletable="true">
+      <density value="1.0" units="macro"/>
       <macroscopic name="UO2__2_4__"/>
     </material>
     <material id="2" name="Zircaloy">
-      <density units="macro" value="1.0"/>
+      <density value="1.0" units="macro"/>
       <macroscopic name="Zircaloy"/>
     </material>
     <material id="3" name="Hot_borated_water">
-      <density units="macro" value="1.0"/>
+      <density value="1.0" units="macro"/>
       <macroscopic name="Hot_borated_water"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="1" name="Fuel" region="-1" universe="0"/>
-    <cell id="2" material="2" name="Cladding" region="1 -2" universe="0"/>
-    <cell id="3" material="3" name="Water" region="2 3 -4 5 -6" universe="0"/>
-    <surface coeffs="0 0 0.39218" id="1" name="Fuel OR" type="z-cylinder"/>
-    <surface coeffs="0 0 0.4572" id="2" name="Clad OR" type="z-cylinder"/>
-    <surface boundary="reflective" coeffs="-0.63" id="3" name="left" type="x-plane"/>
-    <surface boundary="reflective" coeffs="0.63" id="4" name="right" type="x-plane"/>
-    <surface boundary="reflective" coeffs="-0.63" id="5" name="bottom" type="y-plane"/>
-    <surface boundary="reflective" coeffs="0.63" id="6" name="top" type="y-plane"/>
+    <cell id="1" name="Fuel" material="1" region="-1" universe="0"/>
+    <cell id="2" name="Cladding" material="2" region="1 -2" universe="0"/>
+    <cell id="3" name="Water" material="3" region="2 3 -4 5 -6" universe="0"/>
+    <surface id="1" name="Fuel OR" type="z-cylinder" coeffs="0 0 0.39218"/>
+    <surface id="2" name="Clad OR" type="z-cylinder" coeffs="0 0 0.4572"/>
+    <surface id="3" name="left" type="x-plane" boundary="reflective" coeffs="-0.63"/>
+    <surface id="4" name="right" type="x-plane" boundary="reflective" coeffs="0.63"/>
+    <surface id="5" name="bottom" type="y-plane" boundary="reflective" coeffs="-0.63"/>
+    <surface id="6" name="top" type="y-plane" boundary="reflective" coeffs="0.63"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
     <particles>100</particles>
     <batches>10</batches>
     <inactive>5</inactive>
-    <source particle="neutron" strength="1.0" type="independent">
+    <source type="independent" strength="1.0" particle="neutron">
       <space type="box">
         <parameters>-0.63 -0.63 -1 0.63 0.63 1</parameters>
       </space>
@@ -41,7 +41,7 @@
     </source>
     <energy_mode>multi-group</energy_mode>
     <random_ray>
-      <source particle="neutron" strength="1.0" type="independent">
+      <source type="independent" strength="1.0" particle="neutron">
         <space type="box">
           <parameters>-0.63 -0.63 -1.0 0.63 0.63 1.0</parameters>
         </space>
diff --git a/tests/regression_tests/random_ray_diagonal_stabilization/inputs_true.dat b/tests/regression_tests/random_ray_diagonal_stabilization/inputs_true.dat
index 4d4ed76dc..47325ebd7 100644
--- a/tests/regression_tests/random_ray_diagonal_stabilization/inputs_true.dat
+++ b/tests/regression_tests/random_ray_diagonal_stabilization/inputs_true.dat
@@ -2,36 +2,36 @@
 <model>
   <materials>
     <cross_sections>mgxs.h5</cross_sections>
-    <material depletable="true" id="1" name="UO2__2_4__">
-      <density units="macro" value="1.0"/>
+    <material id="1" name="UO2__2_4__" depletable="true">
+      <density value="1.0" units="macro"/>
       <macroscopic name="UO2__2_4__"/>
     </material>
     <material id="2" name="Zircaloy">
-      <density units="macro" value="1.0"/>
+      <density value="1.0" units="macro"/>
       <macroscopic name="Zircaloy"/>
     </material>
     <material id="3" name="Hot_borated_water">
-      <density units="macro" value="1.0"/>
+      <density value="1.0" units="macro"/>
       <macroscopic name="Hot_borated_water"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="1" name="Fuel" region="-1" universe="0"/>
-    <cell id="2" material="2" name="Cladding" region="1 -2" universe="0"/>
-    <cell id="3" material="3" name="Water" region="2 3 -4 5 -6" universe="0"/>
-    <surface coeffs="0 0 0.39218" id="1" name="Fuel OR" type="z-cylinder"/>
-    <surface coeffs="0 0 0.4572" id="2" name="Clad OR" type="z-cylinder"/>
-    <surface boundary="reflective" coeffs="-0.63" id="3" name="left" type="x-plane"/>
-    <surface boundary="reflective" coeffs="0.63" id="4" name="right" type="x-plane"/>
-    <surface boundary="reflective" coeffs="-0.63" id="5" name="bottom" type="y-plane"/>
-    <surface boundary="reflective" coeffs="0.63" id="6" name="top" type="y-plane"/>
+    <cell id="1" name="Fuel" material="1" region="-1" universe="0"/>
+    <cell id="2" name="Cladding" material="2" region="1 -2" universe="0"/>
+    <cell id="3" name="Water" material="3" region="2 3 -4 5 -6" universe="0"/>
+    <surface id="1" name="Fuel OR" type="z-cylinder" coeffs="0 0 0.39218"/>
+    <surface id="2" name="Clad OR" type="z-cylinder" coeffs="0 0 0.4572"/>
+    <surface id="3" name="left" type="x-plane" boundary="reflective" coeffs="-0.63"/>
+    <surface id="4" name="right" type="x-plane" boundary="reflective" coeffs="0.63"/>
+    <surface id="5" name="bottom" type="y-plane" boundary="reflective" coeffs="-0.63"/>
+    <surface id="6" name="top" type="y-plane" boundary="reflective" coeffs="0.63"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
     <particles>100</particles>
     <batches>20</batches>
     <inactive>15</inactive>
-    <source particle="neutron" strength="1.0" type="independent">
+    <source type="independent" strength="1.0" particle="neutron">
       <space type="box">
         <parameters>-0.63 -0.63 -1 0.63 0.63 1</parameters>
       </space>
@@ -41,7 +41,7 @@
     </source>
     <energy_mode>multi-group</energy_mode>
     <random_ray>
-      <source particle="neutron" strength="1.0" type="independent">
+      <source type="independent" strength="1.0" particle="neutron">
         <space type="box">
           <parameters>-0.63 -0.63 -1.0 0.63 0.63 1.0</parameters>
         </space>
diff --git a/tests/regression_tests/random_ray_fixed_source_domain/cell/inputs_true.dat b/tests/regression_tests/random_ray_fixed_source_domain/cell/inputs_true.dat
index d6ca8918c..4b8af76aa 100644
--- a/tests/regression_tests/random_ray_fixed_source_domain/cell/inputs_true.dat
+++ b/tests/regression_tests/random_ray_fixed_source_domain/cell/inputs_true.dat
@@ -3,24 +3,24 @@
   <materials>
     <cross_sections>mgxs.h5</cross_sections>
     <material id="1" name="source">
-      <density units="macro" value="1.0"/>
+      <density value="1.0" units="macro"/>
       <macroscopic name="source"/>
     </material>
     <material id="2" name="void">
-      <density units="macro" value="1.0"/>
+      <density value="1.0" units="macro"/>
       <macroscopic name="void"/>
     </material>
     <material id="3" name="absorber">
-      <density units="macro" value="1.0"/>
+      <density value="1.0" units="macro"/>
       <macroscopic name="absorber"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="1" name="infinite source region" universe="1"/>
-    <cell id="2" material="2" name="infinite void region" universe="2"/>
-    <cell id="3" material="3" name="infinite absorber region" universe="3"/>
-    <cell fill="4" id="4" universe="5"/>
-    <cell fill="5" id="5" name="full domain" region="1 -2 3 -4 5 -6" universe="6"/>
+    <cell id="1" name="infinite source region" material="1" universe="1"/>
+    <cell id="2" name="infinite void region" material="2" universe="2"/>
+    <cell id="3" name="infinite absorber region" material="3" universe="3"/>
+    <cell id="4" fill="4" universe="5"/>
+    <cell id="5" name="full domain" fill="5" region="1 -2 3 -4 5 -6" universe="6"/>
     <lattice id="4">
       <pitch>2.5 2.5 2.5</pitch>
       <dimension>12 12 12</dimension>
@@ -182,19 +182,19 @@
 3 3 3 3 3 3 3 3 3 3 3 3 
 3 3 3 3 3 3 3 3 3 3 3 3 </universes>
     </lattice>
-    <surface boundary="reflective" coeffs="0.0" id="1" type="x-plane"/>
-    <surface boundary="vacuum" coeffs="30.0" id="2" type="x-plane"/>
-    <surface boundary="reflective" coeffs="0.0" id="3" type="y-plane"/>
-    <surface boundary="vacuum" coeffs="30.0" id="4" type="y-plane"/>
-    <surface boundary="reflective" coeffs="0.0" id="5" type="z-plane"/>
-    <surface boundary="vacuum" coeffs="30.0" id="6" type="z-plane"/>
+    <surface id="1" type="x-plane" boundary="reflective" coeffs="0.0"/>
+    <surface id="2" type="x-plane" boundary="vacuum" coeffs="30.0"/>
+    <surface id="3" type="y-plane" boundary="reflective" coeffs="0.0"/>
+    <surface id="4" type="y-plane" boundary="vacuum" coeffs="30.0"/>
+    <surface id="5" type="z-plane" boundary="reflective" coeffs="0.0"/>
+    <surface id="6" type="z-plane" boundary="vacuum" coeffs="30.0"/>
   </geometry>
   <settings>
     <run_mode>fixed source</run_mode>
     <particles>90</particles>
     <batches>10</batches>
     <inactive>5</inactive>
-    <source particle="neutron" strength="3.14" type="independent">
+    <source type="independent" strength="3.14" particle="neutron">
       <energy type="discrete">
         <parameters>100.0 1.0</parameters>
       </energy>
@@ -207,7 +207,7 @@
     <random_ray>
       <distance_active>500.0</distance_active>
       <distance_inactive>100.0</distance_inactive>
-      <source particle="neutron" strength="1.0" type="independent">
+      <source type="independent" strength="1.0" particle="neutron">
         <space type="box">
           <parameters>0.0 0.0 0.0 30.0 30.0 30.0</parameters>
         </space>
diff --git a/tests/regression_tests/random_ray_fixed_source_domain/material/inputs_true.dat b/tests/regression_tests/random_ray_fixed_source_domain/material/inputs_true.dat
index 7fae491ae..82fe48b61 100644
--- a/tests/regression_tests/random_ray_fixed_source_domain/material/inputs_true.dat
+++ b/tests/regression_tests/random_ray_fixed_source_domain/material/inputs_true.dat
@@ -3,24 +3,24 @@
   <materials>
     <cross_sections>mgxs.h5</cross_sections>
     <material id="1" name="source">
-      <density units="macro" value="1.0"/>
+      <density value="1.0" units="macro"/>
       <macroscopic name="source"/>
     </material>
     <material id="2" name="void">
-      <density units="macro" value="1.0"/>
+      <density value="1.0" units="macro"/>
       <macroscopic name="void"/>
     </material>
     <material id="3" name="absorber">
-      <density units="macro" value="1.0"/>
+      <density value="1.0" units="macro"/>
       <macroscopic name="absorber"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="1" name="infinite source region" universe="1"/>
-    <cell id="2" material="2" name="infinite void region" universe="2"/>
-    <cell id="3" material="3" name="infinite absorber region" universe="3"/>
-    <cell fill="4" id="4" universe="5"/>
-    <cell fill="5" id="5" name="full domain" region="1 -2 3 -4 5 -6" universe="6"/>
+    <cell id="1" name="infinite source region" material="1" universe="1"/>
+    <cell id="2" name="infinite void region" material="2" universe="2"/>
+    <cell id="3" name="infinite absorber region" material="3" universe="3"/>
+    <cell id="4" fill="4" universe="5"/>
+    <cell id="5" name="full domain" fill="5" region="1 -2 3 -4 5 -6" universe="6"/>
     <lattice id="4">
       <pitch>2.5 2.5 2.5</pitch>
       <dimension>12 12 12</dimension>
@@ -182,19 +182,19 @@
 3 3 3 3 3 3 3 3 3 3 3 3 
 3 3 3 3 3 3 3 3 3 3 3 3 </universes>
     </lattice>
-    <surface boundary="reflective" coeffs="0.0" id="1" type="x-plane"/>
-    <surface boundary="vacuum" coeffs="30.0" id="2" type="x-plane"/>
-    <surface boundary="reflective" coeffs="0.0" id="3" type="y-plane"/>
-    <surface boundary="vacuum" coeffs="30.0" id="4" type="y-plane"/>
-    <surface boundary="reflective" coeffs="0.0" id="5" type="z-plane"/>
-    <surface boundary="vacuum" coeffs="30.0" id="6" type="z-plane"/>
+    <surface id="1" type="x-plane" boundary="reflective" coeffs="0.0"/>
+    <surface id="2" type="x-plane" boundary="vacuum" coeffs="30.0"/>
+    <surface id="3" type="y-plane" boundary="reflective" coeffs="0.0"/>
+    <surface id="4" type="y-plane" boundary="vacuum" coeffs="30.0"/>
+    <surface id="5" type="z-plane" boundary="reflective" coeffs="0.0"/>
+    <surface id="6" type="z-plane" boundary="vacuum" coeffs="30.0"/>
   </geometry>
   <settings>
     <run_mode>fixed source</run_mode>
     <particles>90</particles>
     <batches>10</batches>
     <inactive>5</inactive>
-    <source particle="neutron" strength="3.14" type="independent">
+    <source type="independent" strength="3.14" particle="neutron">
       <energy type="discrete">
         <parameters>100.0 1.0</parameters>
       </energy>
@@ -207,7 +207,7 @@
     <random_ray>
       <distance_active>500.0</distance_active>
       <distance_inactive>100.0</distance_inactive>
-      <source particle="neutron" strength="1.0" type="independent">
+      <source type="independent" strength="1.0" particle="neutron">
         <space type="box">
           <parameters>0.0 0.0 0.0 30.0 30.0 30.0</parameters>
         </space>
diff --git a/tests/regression_tests/random_ray_fixed_source_domain/universe/inputs_true.dat b/tests/regression_tests/random_ray_fixed_source_domain/universe/inputs_true.dat
index 75d84efe9..c4fd06f42 100644
--- a/tests/regression_tests/random_ray_fixed_source_domain/universe/inputs_true.dat
+++ b/tests/regression_tests/random_ray_fixed_source_domain/universe/inputs_true.dat
@@ -3,24 +3,24 @@
   <materials>
     <cross_sections>mgxs.h5</cross_sections>
     <material id="1" name="source">
-      <density units="macro" value="1.0"/>
+      <density value="1.0" units="macro"/>
       <macroscopic name="source"/>
     </material>
     <material id="2" name="void">
-      <density units="macro" value="1.0"/>
+      <density value="1.0" units="macro"/>
       <macroscopic name="void"/>
     </material>
     <material id="3" name="absorber">
-      <density units="macro" value="1.0"/>
+      <density value="1.0" units="macro"/>
       <macroscopic name="absorber"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="1" name="infinite source region" universe="1"/>
-    <cell id="2" material="2" name="infinite void region" universe="2"/>
-    <cell id="3" material="3" name="infinite absorber region" universe="3"/>
-    <cell fill="4" id="4" universe="5"/>
-    <cell fill="5" id="5" name="full domain" region="1 -2 3 -4 5 -6" universe="6"/>
+    <cell id="1" name="infinite source region" material="1" universe="1"/>
+    <cell id="2" name="infinite void region" material="2" universe="2"/>
+    <cell id="3" name="infinite absorber region" material="3" universe="3"/>
+    <cell id="4" fill="4" universe="5"/>
+    <cell id="5" name="full domain" fill="5" region="1 -2 3 -4 5 -6" universe="6"/>
     <lattice id="4">
       <pitch>2.5 2.5 2.5</pitch>
       <dimension>12 12 12</dimension>
@@ -182,19 +182,19 @@
 3 3 3 3 3 3 3 3 3 3 3 3 
 3 3 3 3 3 3 3 3 3 3 3 3 </universes>
     </lattice>
-    <surface boundary="reflective" coeffs="0.0" id="1" type="x-plane"/>
-    <surface boundary="vacuum" coeffs="30.0" id="2" type="x-plane"/>
-    <surface boundary="reflective" coeffs="0.0" id="3" type="y-plane"/>
-    <surface boundary="vacuum" coeffs="30.0" id="4" type="y-plane"/>
-    <surface boundary="reflective" coeffs="0.0" id="5" type="z-plane"/>
-    <surface boundary="vacuum" coeffs="30.0" id="6" type="z-plane"/>
+    <surface id="1" type="x-plane" boundary="reflective" coeffs="0.0"/>
+    <surface id="2" type="x-plane" boundary="vacuum" coeffs="30.0"/>
+    <surface id="3" type="y-plane" boundary="reflective" coeffs="0.0"/>
+    <surface id="4" type="y-plane" boundary="vacuum" coeffs="30.0"/>
+    <surface id="5" type="z-plane" boundary="reflective" coeffs="0.0"/>
+    <surface id="6" type="z-plane" boundary="vacuum" coeffs="30.0"/>
   </geometry>
   <settings>
     <run_mode>fixed source</run_mode>
     <particles>90</particles>
     <batches>10</batches>
     <inactive>5</inactive>
-    <source particle="neutron" strength="3.14" type="independent">
+    <source type="independent" strength="3.14" particle="neutron">
       <energy type="discrete">
         <parameters>100.0 1.0</parameters>
       </energy>
@@ -207,7 +207,7 @@
     <random_ray>
       <distance_active>500.0</distance_active>
       <distance_inactive>100.0</distance_inactive>
-      <source particle="neutron" strength="1.0" type="independent">
+      <source type="independent" strength="1.0" particle="neutron">
         <space type="box">
           <parameters>0.0 0.0 0.0 30.0 30.0 30.0</parameters>
         </space>
diff --git a/tests/regression_tests/random_ray_fixed_source_linear/linear/inputs_true.dat b/tests/regression_tests/random_ray_fixed_source_linear/linear/inputs_true.dat
index 6ef3f0871..4085b0c7a 100644
--- a/tests/regression_tests/random_ray_fixed_source_linear/linear/inputs_true.dat
+++ b/tests/regression_tests/random_ray_fixed_source_linear/linear/inputs_true.dat
@@ -3,24 +3,24 @@
   <materials>
     <cross_sections>mgxs.h5</cross_sections>
     <material id="1" name="source">
-      <density units="macro" value="1.0"/>
+      <density value="1.0" units="macro"/>
       <macroscopic name="source"/>
     </material>
     <material id="2" name="void">
-      <density units="macro" value="1.0"/>
+      <density value="1.0" units="macro"/>
       <macroscopic name="void"/>
     </material>
     <material id="3" name="absorber">
-      <density units="macro" value="1.0"/>
+      <density value="1.0" units="macro"/>
       <macroscopic name="absorber"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="1" name="infinite source region" universe="1"/>
-    <cell id="2" material="2" name="infinite void region" universe="2"/>
-    <cell id="3" material="3" name="infinite absorber region" universe="3"/>
-    <cell fill="4" id="4" universe="5"/>
-    <cell fill="5" id="5" name="full domain" region="1 -2 3 -4 5 -6" universe="6"/>
+    <cell id="1" name="infinite source region" material="1" universe="1"/>
+    <cell id="2" name="infinite void region" material="2" universe="2"/>
+    <cell id="3" name="infinite absorber region" material="3" universe="3"/>
+    <cell id="4" fill="4" universe="5"/>
+    <cell id="5" name="full domain" fill="5" region="1 -2 3 -4 5 -6" universe="6"/>
     <lattice id="4">
       <pitch>2.5 2.5 2.5</pitch>
       <dimension>12 12 12</dimension>
@@ -182,19 +182,19 @@
 3 3 3 3 3 3 3 3 3 3 3 3 
 3 3 3 3 3 3 3 3 3 3 3 3 </universes>
     </lattice>
-    <surface boundary="reflective" coeffs="0.0" id="1" type="x-plane"/>
-    <surface boundary="vacuum" coeffs="30.0" id="2" type="x-plane"/>
-    <surface boundary="reflective" coeffs="0.0" id="3" type="y-plane"/>
-    <surface boundary="vacuum" coeffs="30.0" id="4" type="y-plane"/>
-    <surface boundary="reflective" coeffs="0.0" id="5" type="z-plane"/>
-    <surface boundary="vacuum" coeffs="30.0" id="6" type="z-plane"/>
+    <surface id="1" type="x-plane" boundary="reflective" coeffs="0.0"/>
+    <surface id="2" type="x-plane" boundary="vacuum" coeffs="30.0"/>
+    <surface id="3" type="y-plane" boundary="reflective" coeffs="0.0"/>
+    <surface id="4" type="y-plane" boundary="vacuum" coeffs="30.0"/>
+    <surface id="5" type="z-plane" boundary="reflective" coeffs="0.0"/>
+    <surface id="6" type="z-plane" boundary="vacuum" coeffs="30.0"/>
   </geometry>
   <settings>
     <run_mode>fixed source</run_mode>
     <particles>90</particles>
     <batches>40</batches>
     <inactive>20</inactive>
-    <source particle="neutron" strength="3.14" type="independent">
+    <source type="independent" strength="3.14" particle="neutron">
       <energy type="discrete">
         <parameters>100.0 1.0</parameters>
       </energy>
@@ -207,7 +207,7 @@
     <random_ray>
       <distance_active>500.0</distance_active>
       <distance_inactive>100.0</distance_inactive>
-      <source particle="neutron" strength="1.0" type="independent">
+      <source type="independent" strength="1.0" particle="neutron">
         <space type="box">
           <parameters>0.0 0.0 0.0 30.0 30.0 30.0</parameters>
         </space>
diff --git a/tests/regression_tests/random_ray_fixed_source_linear/linear_xy/inputs_true.dat b/tests/regression_tests/random_ray_fixed_source_linear/linear_xy/inputs_true.dat
index 805c53fe6..ff085d2fb 100644
--- a/tests/regression_tests/random_ray_fixed_source_linear/linear_xy/inputs_true.dat
+++ b/tests/regression_tests/random_ray_fixed_source_linear/linear_xy/inputs_true.dat
@@ -3,24 +3,24 @@
   <materials>
     <cross_sections>mgxs.h5</cross_sections>
     <material id="1" name="source">
-      <density units="macro" value="1.0"/>
+      <density value="1.0" units="macro"/>
       <macroscopic name="source"/>
     </material>
     <material id="2" name="void">
-      <density units="macro" value="1.0"/>
+      <density value="1.0" units="macro"/>
       <macroscopic name="void"/>
     </material>
     <material id="3" name="absorber">
-      <density units="macro" value="1.0"/>
+      <density value="1.0" units="macro"/>
       <macroscopic name="absorber"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="1" name="infinite source region" universe="1"/>
-    <cell id="2" material="2" name="infinite void region" universe="2"/>
-    <cell id="3" material="3" name="infinite absorber region" universe="3"/>
-    <cell fill="4" id="4" universe="5"/>
-    <cell fill="5" id="5" name="full domain" region="1 -2 3 -4 5 -6" universe="6"/>
+    <cell id="1" name="infinite source region" material="1" universe="1"/>
+    <cell id="2" name="infinite void region" material="2" universe="2"/>
+    <cell id="3" name="infinite absorber region" material="3" universe="3"/>
+    <cell id="4" fill="4" universe="5"/>
+    <cell id="5" name="full domain" fill="5" region="1 -2 3 -4 5 -6" universe="6"/>
     <lattice id="4">
       <pitch>2.5 2.5 2.5</pitch>
       <dimension>12 12 12</dimension>
@@ -182,19 +182,19 @@
 3 3 3 3 3 3 3 3 3 3 3 3 
 3 3 3 3 3 3 3 3 3 3 3 3 </universes>
     </lattice>
-    <surface boundary="reflective" coeffs="0.0" id="1" type="x-plane"/>
-    <surface boundary="vacuum" coeffs="30.0" id="2" type="x-plane"/>
-    <surface boundary="reflective" coeffs="0.0" id="3" type="y-plane"/>
-    <surface boundary="vacuum" coeffs="30.0" id="4" type="y-plane"/>
-    <surface boundary="reflective" coeffs="0.0" id="5" type="z-plane"/>
-    <surface boundary="vacuum" coeffs="30.0" id="6" type="z-plane"/>
+    <surface id="1" type="x-plane" boundary="reflective" coeffs="0.0"/>
+    <surface id="2" type="x-plane" boundary="vacuum" coeffs="30.0"/>
+    <surface id="3" type="y-plane" boundary="reflective" coeffs="0.0"/>
+    <surface id="4" type="y-plane" boundary="vacuum" coeffs="30.0"/>
+    <surface id="5" type="z-plane" boundary="reflective" coeffs="0.0"/>
+    <surface id="6" type="z-plane" boundary="vacuum" coeffs="30.0"/>
   </geometry>
   <settings>
     <run_mode>fixed source</run_mode>
     <particles>90</particles>
     <batches>40</batches>
     <inactive>20</inactive>
-    <source particle="neutron" strength="3.14" type="independent">
+    <source type="independent" strength="3.14" particle="neutron">
       <energy type="discrete">
         <parameters>100.0 1.0</parameters>
       </energy>
@@ -207,7 +207,7 @@
     <random_ray>
       <distance_active>500.0</distance_active>
       <distance_inactive>100.0</distance_inactive>
-      <source particle="neutron" strength="1.0" type="independent">
+      <source type="independent" strength="1.0" particle="neutron">
         <space type="box">
           <parameters>0.0 0.0 0.0 30.0 30.0 30.0</parameters>
         </space>
diff --git a/tests/regression_tests/random_ray_fixed_source_mesh/flat/inputs_true.dat b/tests/regression_tests/random_ray_fixed_source_mesh/flat/inputs_true.dat
index 67c2ffc15..12c4d74ed 100644
--- a/tests/regression_tests/random_ray_fixed_source_mesh/flat/inputs_true.dat
+++ b/tests/regression_tests/random_ray_fixed_source_mesh/flat/inputs_true.dat
@@ -3,24 +3,24 @@
   <materials>
     <cross_sections>mgxs.h5</cross_sections>
     <material id="1" name="source">
-      <density units="macro" value="1.0"/>
+      <density value="1.0" units="macro"/>
       <macroscopic name="source"/>
     </material>
     <material id="2" name="void">
-      <density units="macro" value="1.0"/>
+      <density value="1.0" units="macro"/>
       <macroscopic name="void"/>
     </material>
     <material id="3" name="absorber">
-      <density units="macro" value="1.0"/>
+      <density value="1.0" units="macro"/>
       <macroscopic name="absorber"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="1" name="infinite source region" universe="1"/>
-    <cell id="2" material="2" name="infinite void region" universe="2"/>
-    <cell id="3" material="3" name="infinite absorber region" universe="3"/>
-    <cell fill="4" id="4" universe="5"/>
-    <cell fill="5" id="5" name="full domain" region="1 -2 3 -4 5 -6" universe="6"/>
+    <cell id="1" name="infinite source region" material="1" universe="1"/>
+    <cell id="2" name="infinite void region" material="2" universe="2"/>
+    <cell id="3" name="infinite absorber region" material="3" universe="3"/>
+    <cell id="4" fill="4" universe="5"/>
+    <cell id="5" name="full domain" fill="5" region="1 -2 3 -4 5 -6" universe="6"/>
     <lattice id="4">
       <pitch>2.5 2.5 2.5</pitch>
       <dimension>12 12 12</dimension>
@@ -182,19 +182,19 @@
 3 3 3 3 3 3 3 3 3 3 3 3 
 3 3 3 3 3 3 3 3 3 3 3 3 </universes>
     </lattice>
-    <surface boundary="reflective" coeffs="0.0" id="1" type="x-plane"/>
-    <surface boundary="vacuum" coeffs="30.0" id="2" type="x-plane"/>
-    <surface boundary="reflective" coeffs="0.0" id="3" type="y-plane"/>
-    <surface boundary="vacuum" coeffs="30.0" id="4" type="y-plane"/>
-    <surface boundary="reflective" coeffs="0.0" id="5" type="z-plane"/>
-    <surface boundary="vacuum" coeffs="30.0" id="6" type="z-plane"/>
+    <surface id="1" type="x-plane" boundary="reflective" coeffs="0.0"/>
+    <surface id="2" type="x-plane" boundary="vacuum" coeffs="30.0"/>
+    <surface id="3" type="y-plane" boundary="reflective" coeffs="0.0"/>
+    <surface id="4" type="y-plane" boundary="vacuum" coeffs="30.0"/>
+    <surface id="5" type="z-plane" boundary="reflective" coeffs="0.0"/>
+    <surface id="6" type="z-plane" boundary="vacuum" coeffs="30.0"/>
   </geometry>
   <settings>
     <run_mode>fixed source</run_mode>
     <particles>90</particles>
     <batches>30</batches>
     <inactive>15</inactive>
-    <source particle="neutron" strength="3.14" type="independent">
+    <source type="independent" strength="3.14" particle="neutron">
       <energy type="discrete">
         <parameters>100.0 1.0</parameters>
       </energy>
@@ -207,7 +207,7 @@
     <random_ray>
       <distance_active>500.0</distance_active>
       <distance_inactive>100.0</distance_inactive>
-      <source particle="neutron" strength="1.0" type="independent">
+      <source type="independent" strength="1.0" particle="neutron">
         <space type="box">
           <parameters>0.0 0.0 0.0 30.0 30.0 30.0</parameters>
         </space>
diff --git a/tests/regression_tests/random_ray_fixed_source_mesh/linear/inputs_true.dat b/tests/regression_tests/random_ray_fixed_source_mesh/linear/inputs_true.dat
index 10b7c74f1..07adb1ff5 100644
--- a/tests/regression_tests/random_ray_fixed_source_mesh/linear/inputs_true.dat
+++ b/tests/regression_tests/random_ray_fixed_source_mesh/linear/inputs_true.dat
@@ -3,24 +3,24 @@
   <materials>
     <cross_sections>mgxs.h5</cross_sections>
     <material id="1" name="source">
-      <density units="macro" value="1.0"/>
+      <density value="1.0" units="macro"/>
       <macroscopic name="source"/>
     </material>
     <material id="2" name="void">
-      <density units="macro" value="1.0"/>
+      <density value="1.0" units="macro"/>
       <macroscopic name="void"/>
     </material>
     <material id="3" name="absorber">
-      <density units="macro" value="1.0"/>
+      <density value="1.0" units="macro"/>
       <macroscopic name="absorber"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="1" name="infinite source region" universe="1"/>
-    <cell id="2" material="2" name="infinite void region" universe="2"/>
-    <cell id="3" material="3" name="infinite absorber region" universe="3"/>
-    <cell fill="4" id="4" universe="5"/>
-    <cell fill="5" id="5" name="full domain" region="1 -2 3 -4 5 -6" universe="6"/>
+    <cell id="1" name="infinite source region" material="1" universe="1"/>
+    <cell id="2" name="infinite void region" material="2" universe="2"/>
+    <cell id="3" name="infinite absorber region" material="3" universe="3"/>
+    <cell id="4" fill="4" universe="5"/>
+    <cell id="5" name="full domain" fill="5" region="1 -2 3 -4 5 -6" universe="6"/>
     <lattice id="4">
       <pitch>2.5 2.5 2.5</pitch>
       <dimension>12 12 12</dimension>
@@ -182,19 +182,19 @@
 3 3 3 3 3 3 3 3 3 3 3 3 
 3 3 3 3 3 3 3 3 3 3 3 3 </universes>
     </lattice>
-    <surface boundary="reflective" coeffs="0.0" id="1" type="x-plane"/>
-    <surface boundary="vacuum" coeffs="30.0" id="2" type="x-plane"/>
-    <surface boundary="reflective" coeffs="0.0" id="3" type="y-plane"/>
-    <surface boundary="vacuum" coeffs="30.0" id="4" type="y-plane"/>
-    <surface boundary="reflective" coeffs="0.0" id="5" type="z-plane"/>
-    <surface boundary="vacuum" coeffs="30.0" id="6" type="z-plane"/>
+    <surface id="1" type="x-plane" boundary="reflective" coeffs="0.0"/>
+    <surface id="2" type="x-plane" boundary="vacuum" coeffs="30.0"/>
+    <surface id="3" type="y-plane" boundary="reflective" coeffs="0.0"/>
+    <surface id="4" type="y-plane" boundary="vacuum" coeffs="30.0"/>
+    <surface id="5" type="z-plane" boundary="reflective" coeffs="0.0"/>
+    <surface id="6" type="z-plane" boundary="vacuum" coeffs="30.0"/>
   </geometry>
   <settings>
     <run_mode>fixed source</run_mode>
     <particles>90</particles>
     <batches>30</batches>
     <inactive>15</inactive>
-    <source particle="neutron" strength="3.14" type="independent">
+    <source type="independent" strength="3.14" particle="neutron">
       <energy type="discrete">
         <parameters>100.0 1.0</parameters>
       </energy>
@@ -207,7 +207,7 @@
     <random_ray>
       <distance_active>500.0</distance_active>
       <distance_inactive>100.0</distance_inactive>
-      <source particle="neutron" strength="1.0" type="independent">
+      <source type="independent" strength="1.0" particle="neutron">
         <space type="box">
           <parameters>0.0 0.0 0.0 30.0 30.0 30.0</parameters>
         </space>
diff --git a/tests/regression_tests/random_ray_fixed_source_normalization/False/inputs_true.dat b/tests/regression_tests/random_ray_fixed_source_normalization/False/inputs_true.dat
index 559cff0f0..ab077ae8a 100644
--- a/tests/regression_tests/random_ray_fixed_source_normalization/False/inputs_true.dat
+++ b/tests/regression_tests/random_ray_fixed_source_normalization/False/inputs_true.dat
@@ -3,24 +3,24 @@
   <materials>
     <cross_sections>mgxs.h5</cross_sections>
     <material id="1" name="source">
-      <density units="macro" value="1.0"/>
+      <density value="1.0" units="macro"/>
       <macroscopic name="source"/>
     </material>
     <material id="2" name="void">
-      <density units="macro" value="1.0"/>
+      <density value="1.0" units="macro"/>
       <macroscopic name="void"/>
     </material>
     <material id="3" name="absorber">
-      <density units="macro" value="1.0"/>
+      <density value="1.0" units="macro"/>
       <macroscopic name="absorber"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="1" name="infinite source region" universe="1"/>
-    <cell id="2" material="2" name="infinite void region" universe="2"/>
-    <cell id="3" material="3" name="infinite absorber region" universe="3"/>
-    <cell fill="4" id="4" universe="5"/>
-    <cell fill="5" id="5" name="full domain" region="1 -2 3 -4 5 -6" universe="6"/>
+    <cell id="1" name="infinite source region" material="1" universe="1"/>
+    <cell id="2" name="infinite void region" material="2" universe="2"/>
+    <cell id="3" name="infinite absorber region" material="3" universe="3"/>
+    <cell id="4" fill="4" universe="5"/>
+    <cell id="5" name="full domain" fill="5" region="1 -2 3 -4 5 -6" universe="6"/>
     <lattice id="4">
       <pitch>2.5 2.5 2.5</pitch>
       <dimension>12 12 12</dimension>
@@ -182,19 +182,19 @@
 3 3 3 3 3 3 3 3 3 3 3 3 
 3 3 3 3 3 3 3 3 3 3 3 3 </universes>
     </lattice>
-    <surface boundary="reflective" coeffs="0.0" id="1" type="x-plane"/>
-    <surface boundary="vacuum" coeffs="30.0" id="2" type="x-plane"/>
-    <surface boundary="reflective" coeffs="0.0" id="3" type="y-plane"/>
-    <surface boundary="vacuum" coeffs="30.0" id="4" type="y-plane"/>
-    <surface boundary="reflective" coeffs="0.0" id="5" type="z-plane"/>
-    <surface boundary="vacuum" coeffs="30.0" id="6" type="z-plane"/>
+    <surface id="1" type="x-plane" boundary="reflective" coeffs="0.0"/>
+    <surface id="2" type="x-plane" boundary="vacuum" coeffs="30.0"/>
+    <surface id="3" type="y-plane" boundary="reflective" coeffs="0.0"/>
+    <surface id="4" type="y-plane" boundary="vacuum" coeffs="30.0"/>
+    <surface id="5" type="z-plane" boundary="reflective" coeffs="0.0"/>
+    <surface id="6" type="z-plane" boundary="vacuum" coeffs="30.0"/>
   </geometry>
   <settings>
     <run_mode>fixed source</run_mode>
     <particles>90</particles>
     <batches>10</batches>
     <inactive>5</inactive>
-    <source particle="neutron" strength="3.14" type="independent">
+    <source type="independent" strength="3.14" particle="neutron">
       <energy type="discrete">
         <parameters>100.0 1.0</parameters>
       </energy>
@@ -207,7 +207,7 @@
     <random_ray>
       <distance_active>500.0</distance_active>
       <distance_inactive>100.0</distance_inactive>
-      <source particle="neutron" strength="1.0" type="independent">
+      <source type="independent" strength="1.0" particle="neutron">
         <space type="box">
           <parameters>0.0 0.0 0.0 30.0 30.0 30.0</parameters>
         </space>
diff --git a/tests/regression_tests/random_ray_fixed_source_normalization/True/inputs_true.dat b/tests/regression_tests/random_ray_fixed_source_normalization/True/inputs_true.dat
index 75d84efe9..c4fd06f42 100644
--- a/tests/regression_tests/random_ray_fixed_source_normalization/True/inputs_true.dat
+++ b/tests/regression_tests/random_ray_fixed_source_normalization/True/inputs_true.dat
@@ -3,24 +3,24 @@
   <materials>
     <cross_sections>mgxs.h5</cross_sections>
     <material id="1" name="source">
-      <density units="macro" value="1.0"/>
+      <density value="1.0" units="macro"/>
       <macroscopic name="source"/>
     </material>
     <material id="2" name="void">
-      <density units="macro" value="1.0"/>
+      <density value="1.0" units="macro"/>
       <macroscopic name="void"/>
     </material>
     <material id="3" name="absorber">
-      <density units="macro" value="1.0"/>
+      <density value="1.0" units="macro"/>
       <macroscopic name="absorber"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="1" name="infinite source region" universe="1"/>
-    <cell id="2" material="2" name="infinite void region" universe="2"/>
-    <cell id="3" material="3" name="infinite absorber region" universe="3"/>
-    <cell fill="4" id="4" universe="5"/>
-    <cell fill="5" id="5" name="full domain" region="1 -2 3 -4 5 -6" universe="6"/>
+    <cell id="1" name="infinite source region" material="1" universe="1"/>
+    <cell id="2" name="infinite void region" material="2" universe="2"/>
+    <cell id="3" name="infinite absorber region" material="3" universe="3"/>
+    <cell id="4" fill="4" universe="5"/>
+    <cell id="5" name="full domain" fill="5" region="1 -2 3 -4 5 -6" universe="6"/>
     <lattice id="4">
       <pitch>2.5 2.5 2.5</pitch>
       <dimension>12 12 12</dimension>
@@ -182,19 +182,19 @@
 3 3 3 3 3 3 3 3 3 3 3 3 
 3 3 3 3 3 3 3 3 3 3 3 3 </universes>
     </lattice>
-    <surface boundary="reflective" coeffs="0.0" id="1" type="x-plane"/>
-    <surface boundary="vacuum" coeffs="30.0" id="2" type="x-plane"/>
-    <surface boundary="reflective" coeffs="0.0" id="3" type="y-plane"/>
-    <surface boundary="vacuum" coeffs="30.0" id="4" type="y-plane"/>
-    <surface boundary="reflective" coeffs="0.0" id="5" type="z-plane"/>
-    <surface boundary="vacuum" coeffs="30.0" id="6" type="z-plane"/>
+    <surface id="1" type="x-plane" boundary="reflective" coeffs="0.0"/>
+    <surface id="2" type="x-plane" boundary="vacuum" coeffs="30.0"/>
+    <surface id="3" type="y-plane" boundary="reflective" coeffs="0.0"/>
+    <surface id="4" type="y-plane" boundary="vacuum" coeffs="30.0"/>
+    <surface id="5" type="z-plane" boundary="reflective" coeffs="0.0"/>
+    <surface id="6" type="z-plane" boundary="vacuum" coeffs="30.0"/>
   </geometry>
   <settings>
     <run_mode>fixed source</run_mode>
     <particles>90</particles>
     <batches>10</batches>
     <inactive>5</inactive>
-    <source particle="neutron" strength="3.14" type="independent">
+    <source type="independent" strength="3.14" particle="neutron">
       <energy type="discrete">
         <parameters>100.0 1.0</parameters>
       </energy>
@@ -207,7 +207,7 @@
     <random_ray>
       <distance_active>500.0</distance_active>
       <distance_inactive>100.0</distance_inactive>
-      <source particle="neutron" strength="1.0" type="independent">
+      <source type="independent" strength="1.0" particle="neutron">
         <space type="box">
           <parameters>0.0 0.0 0.0 30.0 30.0 30.0</parameters>
         </space>
diff --git a/tests/regression_tests/random_ray_fixed_source_subcritical/flat/inputs_true.dat b/tests/regression_tests/random_ray_fixed_source_subcritical/flat/inputs_true.dat
index 0bf4cfdc9..a124b5e3c 100644
--- a/tests/regression_tests/random_ray_fixed_source_subcritical/flat/inputs_true.dat
+++ b/tests/regression_tests/random_ray_fixed_source_subcritical/flat/inputs_true.dat
@@ -3,34 +3,34 @@
   <materials>
     <cross_sections>mgxs.h5</cross_sections>
     <material id="1" name="UO2 fuel">
-      <density units="macro" value="1.0"/>
+      <density value="1.0" units="macro"/>
       <macroscopic name="UO2"/>
     </material>
     <material id="2" name="Water">
-      <density units="macro" value="1.0"/>
+      <density value="1.0" units="macro"/>
       <macroscopic name="LWTR"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="1" name="fuel inner a" region="-2" universe="1"/>
-    <cell id="2" material="1" name="fuel inner b" region="2 -3" universe="1"/>
-    <cell id="3" material="1" name="fuel inner c" region="3 -1" universe="1"/>
-    <cell id="4" material="2" name="moderator inner a" region="1 -4" universe="1"/>
-    <cell id="5" material="2" name="moderator outer b" region="4 -5" universe="1"/>
-    <cell id="6" material="2" name="moderator outer c" region="5" universe="1"/>
-    <cell fill="1" id="7" name="azimuthal_cell_0" region="6 -7" universe="2"/>
-    <cell fill="1" id="8" name="azimuthal_cell_1" region="7 -8" universe="2"/>
-    <cell fill="1" id="9" name="azimuthal_cell_2" region="8 -9" universe="2"/>
-    <cell fill="1" id="10" name="azimuthal_cell_3" region="9 -10" universe="2"/>
-    <cell fill="1" id="11" name="azimuthal_cell_4" region="10 -11" universe="2"/>
-    <cell fill="1" id="12" name="azimuthal_cell_5" region="11 -12" universe="2"/>
-    <cell fill="1" id="13" name="azimuthal_cell_6" region="12 -13" universe="2"/>
-    <cell fill="1" id="14" name="azimuthal_cell_7" region="13 -6" universe="2"/>
-    <cell id="18" material="2" name="moderator infinite" universe="8"/>
-    <cell id="19" material="2" name="moderator infinite 2" universe="9"/>
-    <cell fill="10" id="20" universe="12"/>
-    <cell fill="11" id="21" universe="13"/>
-    <cell fill="14" id="22" name="assembly" region="18 -19 20 -21" universe="15"/>
+    <cell id="1" name="fuel inner a" material="1" region="-2" universe="1"/>
+    <cell id="2" name="fuel inner b" material="1" region="2 -3" universe="1"/>
+    <cell id="3" name="fuel inner c" material="1" region="3 -1" universe="1"/>
+    <cell id="4" name="moderator inner a" material="2" region="1 -4" universe="1"/>
+    <cell id="5" name="moderator outer b" material="2" region="4 -5" universe="1"/>
+    <cell id="6" name="moderator outer c" material="2" region="5" universe="1"/>
+    <cell id="7" name="azimuthal_cell_0" fill="1" region="6 -7" universe="2"/>
+    <cell id="8" name="azimuthal_cell_1" fill="1" region="7 -8" universe="2"/>
+    <cell id="9" name="azimuthal_cell_2" fill="1" region="8 -9" universe="2"/>
+    <cell id="10" name="azimuthal_cell_3" fill="1" region="9 -10" universe="2"/>
+    <cell id="11" name="azimuthal_cell_4" fill="1" region="10 -11" universe="2"/>
+    <cell id="12" name="azimuthal_cell_5" fill="1" region="11 -12" universe="2"/>
+    <cell id="13" name="azimuthal_cell_6" fill="1" region="12 -13" universe="2"/>
+    <cell id="14" name="azimuthal_cell_7" fill="1" region="13 -6" universe="2"/>
+    <cell id="18" name="moderator infinite" material="2" universe="8"/>
+    <cell id="19" name="moderator infinite 2" material="2" universe="9"/>
+    <cell id="20" fill="10" universe="12"/>
+    <cell id="21" fill="11" universe="13"/>
+    <cell id="22" name="assembly" fill="14" region="18 -19 20 -21" universe="15"/>
     <lattice id="10">
       <pitch>0.126 0.126</pitch>
       <dimension>10 10</dimension>
@@ -71,30 +71,30 @@
 2 12 
 12 13 </universes>
     </lattice>
-    <surface coeffs="0.0 0.0 0.54" id="1" name="Fuel OR" type="z-cylinder"/>
-    <surface coeffs="0.0 0.0 0.33" id="2" name="inner ring a" type="z-cylinder"/>
-    <surface coeffs="0.0 0.0 0.45" id="3" name="inner ring b" type="z-cylinder"/>
-    <surface coeffs="0.0 0.0 0.6" id="4" name="outer ring a" type="z-cylinder"/>
-    <surface coeffs="0.0 0.0 0.69" id="5" name="outer ring b" type="z-cylinder"/>
-    <surface coeffs="-0.0 1.0 0 0" id="6" type="plane"/>
-    <surface coeffs="-0.7071067811865475 0.7071067811865476 0 0" id="7" type="plane"/>
-    <surface coeffs="-1.0 6.123233995736766e-17 0 0" id="8" type="plane"/>
-    <surface coeffs="-0.7071067811865476 -0.7071067811865475 0 0" id="9" type="plane"/>
-    <surface coeffs="-1.2246467991473532e-16 -1.0 0 0" id="10" type="plane"/>
-    <surface coeffs="0.7071067811865475 -0.7071067811865477 0 0" id="11" type="plane"/>
-    <surface coeffs="1.0 -1.8369701987210297e-16 0 0" id="12" type="plane"/>
-    <surface coeffs="0.7071067811865477 0.7071067811865474 0 0" id="13" type="plane"/>
-    <surface boundary="reflective" coeffs="-1.26" id="18" name="minimum x" type="x-plane"/>
-    <surface boundary="reflective" coeffs="1.26" id="19" name="maximum x" type="x-plane"/>
-    <surface boundary="reflective" coeffs="-1.26" id="20" name="minimum y" type="y-plane"/>
-    <surface boundary="reflective" coeffs="1.26" id="21" name="maximum y" type="y-plane"/>
+    <surface id="1" name="Fuel OR" type="z-cylinder" coeffs="0.0 0.0 0.54"/>
+    <surface id="2" name="inner ring a" type="z-cylinder" coeffs="0.0 0.0 0.33"/>
+    <surface id="3" name="inner ring b" type="z-cylinder" coeffs="0.0 0.0 0.45"/>
+    <surface id="4" name="outer ring a" type="z-cylinder" coeffs="0.0 0.0 0.6"/>
+    <surface id="5" name="outer ring b" type="z-cylinder" coeffs="0.0 0.0 0.69"/>
+    <surface id="6" type="plane" coeffs="-0.0 1.0 0 0"/>
+    <surface id="7" type="plane" coeffs="-0.7071067811865475 0.7071067811865476 0 0"/>
+    <surface id="8" type="plane" coeffs="-1.0 6.123233995736766e-17 0 0"/>
+    <surface id="9" type="plane" coeffs="-0.7071067811865476 -0.7071067811865475 0 0"/>
+    <surface id="10" type="plane" coeffs="-1.2246467991473532e-16 -1.0 0 0"/>
+    <surface id="11" type="plane" coeffs="0.7071067811865475 -0.7071067811865477 0 0"/>
+    <surface id="12" type="plane" coeffs="1.0 -1.8369701987210297e-16 0 0"/>
+    <surface id="13" type="plane" coeffs="0.7071067811865477 0.7071067811865474 0 0"/>
+    <surface id="18" name="minimum x" type="x-plane" boundary="reflective" coeffs="-1.26"/>
+    <surface id="19" name="maximum x" type="x-plane" boundary="reflective" coeffs="1.26"/>
+    <surface id="20" name="minimum y" type="y-plane" boundary="reflective" coeffs="-1.26"/>
+    <surface id="21" name="maximum y" type="y-plane" boundary="reflective" coeffs="1.26"/>
   </geometry>
   <settings>
     <run_mode>fixed source</run_mode>
     <particles>30</particles>
     <batches>125</batches>
     <inactive>100</inactive>
-    <source particle="neutron" strength="1.0" type="independent">
+    <source type="independent" strength="1.0" particle="neutron">
       <space type="box">
         <parameters>1.134 -1.26 -1.0 1.26 -1.134 1.0</parameters>
       </space>
@@ -110,7 +110,7 @@
     <random_ray>
       <distance_active>40.0</distance_active>
       <distance_inactive>40.0</distance_inactive>
-      <source particle="neutron" strength="1.0" type="independent">
+      <source type="independent" strength="1.0" particle="neutron">
         <space type="box">
           <parameters>-1.26 -1.26 -1 1.26 1.26 1</parameters>
         </space>
diff --git a/tests/regression_tests/random_ray_fixed_source_subcritical/linear_xy/inputs_true.dat b/tests/regression_tests/random_ray_fixed_source_subcritical/linear_xy/inputs_true.dat
index f7572a072..cc557afb6 100644
--- a/tests/regression_tests/random_ray_fixed_source_subcritical/linear_xy/inputs_true.dat
+++ b/tests/regression_tests/random_ray_fixed_source_subcritical/linear_xy/inputs_true.dat
@@ -3,34 +3,34 @@
   <materials>
     <cross_sections>mgxs.h5</cross_sections>
     <material id="1" name="UO2 fuel">
-      <density units="macro" value="1.0"/>
+      <density value="1.0" units="macro"/>
       <macroscopic name="UO2"/>
     </material>
     <material id="2" name="Water">
-      <density units="macro" value="1.0"/>
+      <density value="1.0" units="macro"/>
       <macroscopic name="LWTR"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="1" name="fuel inner a" region="-2" universe="1"/>
-    <cell id="2" material="1" name="fuel inner b" region="2 -3" universe="1"/>
-    <cell id="3" material="1" name="fuel inner c" region="3 -1" universe="1"/>
-    <cell id="4" material="2" name="moderator inner a" region="1 -4" universe="1"/>
-    <cell id="5" material="2" name="moderator outer b" region="4 -5" universe="1"/>
-    <cell id="6" material="2" name="moderator outer c" region="5" universe="1"/>
-    <cell fill="1" id="7" name="azimuthal_cell_0" region="6 -7" universe="2"/>
-    <cell fill="1" id="8" name="azimuthal_cell_1" region="7 -8" universe="2"/>
-    <cell fill="1" id="9" name="azimuthal_cell_2" region="8 -9" universe="2"/>
-    <cell fill="1" id="10" name="azimuthal_cell_3" region="9 -10" universe="2"/>
-    <cell fill="1" id="11" name="azimuthal_cell_4" region="10 -11" universe="2"/>
-    <cell fill="1" id="12" name="azimuthal_cell_5" region="11 -12" universe="2"/>
-    <cell fill="1" id="13" name="azimuthal_cell_6" region="12 -13" universe="2"/>
-    <cell fill="1" id="14" name="azimuthal_cell_7" region="13 -6" universe="2"/>
-    <cell id="18" material="2" name="moderator infinite" universe="8"/>
-    <cell id="19" material="2" name="moderator infinite 2" universe="9"/>
-    <cell fill="10" id="20" universe="12"/>
-    <cell fill="11" id="21" universe="13"/>
-    <cell fill="14" id="22" name="assembly" region="18 -19 20 -21" universe="15"/>
+    <cell id="1" name="fuel inner a" material="1" region="-2" universe="1"/>
+    <cell id="2" name="fuel inner b" material="1" region="2 -3" universe="1"/>
+    <cell id="3" name="fuel inner c" material="1" region="3 -1" universe="1"/>
+    <cell id="4" name="moderator inner a" material="2" region="1 -4" universe="1"/>
+    <cell id="5" name="moderator outer b" material="2" region="4 -5" universe="1"/>
+    <cell id="6" name="moderator outer c" material="2" region="5" universe="1"/>
+    <cell id="7" name="azimuthal_cell_0" fill="1" region="6 -7" universe="2"/>
+    <cell id="8" name="azimuthal_cell_1" fill="1" region="7 -8" universe="2"/>
+    <cell id="9" name="azimuthal_cell_2" fill="1" region="8 -9" universe="2"/>
+    <cell id="10" name="azimuthal_cell_3" fill="1" region="9 -10" universe="2"/>
+    <cell id="11" name="azimuthal_cell_4" fill="1" region="10 -11" universe="2"/>
+    <cell id="12" name="azimuthal_cell_5" fill="1" region="11 -12" universe="2"/>
+    <cell id="13" name="azimuthal_cell_6" fill="1" region="12 -13" universe="2"/>
+    <cell id="14" name="azimuthal_cell_7" fill="1" region="13 -6" universe="2"/>
+    <cell id="18" name="moderator infinite" material="2" universe="8"/>
+    <cell id="19" name="moderator infinite 2" material="2" universe="9"/>
+    <cell id="20" fill="10" universe="12"/>
+    <cell id="21" fill="11" universe="13"/>
+    <cell id="22" name="assembly" fill="14" region="18 -19 20 -21" universe="15"/>
     <lattice id="10">
       <pitch>0.126 0.126</pitch>
       <dimension>10 10</dimension>
@@ -71,30 +71,30 @@
 2 12 
 12 13 </universes>
     </lattice>
-    <surface coeffs="0.0 0.0 0.54" id="1" name="Fuel OR" type="z-cylinder"/>
-    <surface coeffs="0.0 0.0 0.33" id="2" name="inner ring a" type="z-cylinder"/>
-    <surface coeffs="0.0 0.0 0.45" id="3" name="inner ring b" type="z-cylinder"/>
-    <surface coeffs="0.0 0.0 0.6" id="4" name="outer ring a" type="z-cylinder"/>
-    <surface coeffs="0.0 0.0 0.69" id="5" name="outer ring b" type="z-cylinder"/>
-    <surface coeffs="-0.0 1.0 0 0" id="6" type="plane"/>
-    <surface coeffs="-0.7071067811865475 0.7071067811865476 0 0" id="7" type="plane"/>
-    <surface coeffs="-1.0 6.123233995736766e-17 0 0" id="8" type="plane"/>
-    <surface coeffs="-0.7071067811865476 -0.7071067811865475 0 0" id="9" type="plane"/>
-    <surface coeffs="-1.2246467991473532e-16 -1.0 0 0" id="10" type="plane"/>
-    <surface coeffs="0.7071067811865475 -0.7071067811865477 0 0" id="11" type="plane"/>
-    <surface coeffs="1.0 -1.8369701987210297e-16 0 0" id="12" type="plane"/>
-    <surface coeffs="0.7071067811865477 0.7071067811865474 0 0" id="13" type="plane"/>
-    <surface boundary="reflective" coeffs="-1.26" id="18" name="minimum x" type="x-plane"/>
-    <surface boundary="reflective" coeffs="1.26" id="19" name="maximum x" type="x-plane"/>
-    <surface boundary="reflective" coeffs="-1.26" id="20" name="minimum y" type="y-plane"/>
-    <surface boundary="reflective" coeffs="1.26" id="21" name="maximum y" type="y-plane"/>
+    <surface id="1" name="Fuel OR" type="z-cylinder" coeffs="0.0 0.0 0.54"/>
+    <surface id="2" name="inner ring a" type="z-cylinder" coeffs="0.0 0.0 0.33"/>
+    <surface id="3" name="inner ring b" type="z-cylinder" coeffs="0.0 0.0 0.45"/>
+    <surface id="4" name="outer ring a" type="z-cylinder" coeffs="0.0 0.0 0.6"/>
+    <surface id="5" name="outer ring b" type="z-cylinder" coeffs="0.0 0.0 0.69"/>
+    <surface id="6" type="plane" coeffs="-0.0 1.0 0 0"/>
+    <surface id="7" type="plane" coeffs="-0.7071067811865475 0.7071067811865476 0 0"/>
+    <surface id="8" type="plane" coeffs="-1.0 6.123233995736766e-17 0 0"/>
+    <surface id="9" type="plane" coeffs="-0.7071067811865476 -0.7071067811865475 0 0"/>
+    <surface id="10" type="plane" coeffs="-1.2246467991473532e-16 -1.0 0 0"/>
+    <surface id="11" type="plane" coeffs="0.7071067811865475 -0.7071067811865477 0 0"/>
+    <surface id="12" type="plane" coeffs="1.0 -1.8369701987210297e-16 0 0"/>
+    <surface id="13" type="plane" coeffs="0.7071067811865477 0.7071067811865474 0 0"/>
+    <surface id="18" name="minimum x" type="x-plane" boundary="reflective" coeffs="-1.26"/>
+    <surface id="19" name="maximum x" type="x-plane" boundary="reflective" coeffs="1.26"/>
+    <surface id="20" name="minimum y" type="y-plane" boundary="reflective" coeffs="-1.26"/>
+    <surface id="21" name="maximum y" type="y-plane" boundary="reflective" coeffs="1.26"/>
   </geometry>
   <settings>
     <run_mode>fixed source</run_mode>
     <particles>30</particles>
     <batches>125</batches>
     <inactive>100</inactive>
-    <source particle="neutron" strength="1.0" type="independent">
+    <source type="independent" strength="1.0" particle="neutron">
       <space type="box">
         <parameters>1.134 -1.26 -1.0 1.26 -1.134 1.0</parameters>
       </space>
@@ -110,7 +110,7 @@
     <random_ray>
       <distance_active>40.0</distance_active>
       <distance_inactive>40.0</distance_inactive>
-      <source particle="neutron" strength="1.0" type="independent">
+      <source type="independent" strength="1.0" particle="neutron">
         <space type="box">
           <parameters>-1.26 -1.26 -1 1.26 1.26 1</parameters>
         </space>
diff --git a/tests/regression_tests/random_ray_halton_samples/inputs_true.dat b/tests/regression_tests/random_ray_halton_samples/inputs_true.dat
index 624ab495f..3f058e45c 100644
--- a/tests/regression_tests/random_ray_halton_samples/inputs_true.dat
+++ b/tests/regression_tests/random_ray_halton_samples/inputs_true.dat
@@ -3,32 +3,32 @@
   <materials>
     <cross_sections>mgxs.h5</cross_sections>
     <material id="1" name="UO2 fuel">
-      <density units="macro" value="1.0"/>
+      <density value="1.0" units="macro"/>
       <macroscopic name="UO2"/>
     </material>
     <material id="2" name="Water">
-      <density units="macro" value="1.0"/>
+      <density value="1.0" units="macro"/>
       <macroscopic name="LWTR"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="1" name="fuel inner a" region="-2" universe="1"/>
-    <cell id="2" material="1" name="fuel inner b" region="2 -3" universe="1"/>
-    <cell id="3" material="1" name="fuel inner c" region="3 -1" universe="1"/>
-    <cell id="4" material="2" name="moderator inner a" region="1 -4" universe="1"/>
-    <cell id="5" material="2" name="moderator outer b" region="4 -5" universe="1"/>
-    <cell id="6" material="2" name="moderator outer c" region="5" universe="1"/>
-    <cell fill="1" id="7" name="azimuthal_cell_0" region="6 -7" universe="2"/>
-    <cell fill="1" id="8" name="azimuthal_cell_1" region="7 -8" universe="2"/>
-    <cell fill="1" id="9" name="azimuthal_cell_2" region="8 -9" universe="2"/>
-    <cell fill="1" id="10" name="azimuthal_cell_3" region="9 -10" universe="2"/>
-    <cell fill="1" id="11" name="azimuthal_cell_4" region="10 -11" universe="2"/>
-    <cell fill="1" id="12" name="azimuthal_cell_5" region="11 -12" universe="2"/>
-    <cell fill="1" id="13" name="azimuthal_cell_6" region="12 -13" universe="2"/>
-    <cell fill="1" id="14" name="azimuthal_cell_7" region="13 -6" universe="2"/>
-    <cell id="15" material="2" name="moderator infinite" universe="3"/>
-    <cell fill="4" id="16" universe="5"/>
-    <cell fill="6" id="17" name="assembly" region="14 -15 16 -17" universe="7"/>
+    <cell id="1" name="fuel inner a" material="1" region="-2" universe="1"/>
+    <cell id="2" name="fuel inner b" material="1" region="2 -3" universe="1"/>
+    <cell id="3" name="fuel inner c" material="1" region="3 -1" universe="1"/>
+    <cell id="4" name="moderator inner a" material="2" region="1 -4" universe="1"/>
+    <cell id="5" name="moderator outer b" material="2" region="4 -5" universe="1"/>
+    <cell id="6" name="moderator outer c" material="2" region="5" universe="1"/>
+    <cell id="7" name="azimuthal_cell_0" fill="1" region="6 -7" universe="2"/>
+    <cell id="8" name="azimuthal_cell_1" fill="1" region="7 -8" universe="2"/>
+    <cell id="9" name="azimuthal_cell_2" fill="1" region="8 -9" universe="2"/>
+    <cell id="10" name="azimuthal_cell_3" fill="1" region="9 -10" universe="2"/>
+    <cell id="11" name="azimuthal_cell_4" fill="1" region="10 -11" universe="2"/>
+    <cell id="12" name="azimuthal_cell_5" fill="1" region="11 -12" universe="2"/>
+    <cell id="13" name="azimuthal_cell_6" fill="1" region="12 -13" universe="2"/>
+    <cell id="14" name="azimuthal_cell_7" fill="1" region="13 -6" universe="2"/>
+    <cell id="15" name="moderator infinite" material="2" universe="3"/>
+    <cell id="16" fill="4" universe="5"/>
+    <cell id="17" name="assembly" fill="6" region="14 -15 16 -17" universe="7"/>
     <lattice id="4">
       <pitch>0.126 0.126</pitch>
       <dimension>10 10</dimension>
@@ -53,23 +53,23 @@
 2 2 
 2 5 </universes>
     </lattice>
-    <surface coeffs="0.0 0.0 0.54" id="1" name="Fuel OR" type="z-cylinder"/>
-    <surface coeffs="0.0 0.0 0.33" id="2" name="inner ring a" type="z-cylinder"/>
-    <surface coeffs="0.0 0.0 0.45" id="3" name="inner ring b" type="z-cylinder"/>
-    <surface coeffs="0.0 0.0 0.6" id="4" name="outer ring a" type="z-cylinder"/>
-    <surface coeffs="0.0 0.0 0.69" id="5" name="outer ring b" type="z-cylinder"/>
-    <surface coeffs="-0.0 1.0 0 0" id="6" type="plane"/>
-    <surface coeffs="-0.7071067811865475 0.7071067811865476 0 0" id="7" type="plane"/>
-    <surface coeffs="-1.0 6.123233995736766e-17 0 0" id="8" type="plane"/>
-    <surface coeffs="-0.7071067811865476 -0.7071067811865475 0 0" id="9" type="plane"/>
-    <surface coeffs="-1.2246467991473532e-16 -1.0 0 0" id="10" type="plane"/>
-    <surface coeffs="0.7071067811865475 -0.7071067811865477 0 0" id="11" type="plane"/>
-    <surface coeffs="1.0 -1.8369701987210297e-16 0 0" id="12" type="plane"/>
-    <surface coeffs="0.7071067811865477 0.7071067811865474 0 0" id="13" type="plane"/>
-    <surface boundary="reflective" coeffs="-1.26" id="14" name="minimum x" type="x-plane"/>
-    <surface boundary="reflective" coeffs="1.26" id="15" name="maximum x" type="x-plane"/>
-    <surface boundary="reflective" coeffs="-1.26" id="16" name="minimum y" type="y-plane"/>
-    <surface boundary="reflective" coeffs="1.26" id="17" name="maximum y" type="y-plane"/>
+    <surface id="1" name="Fuel OR" type="z-cylinder" coeffs="0.0 0.0 0.54"/>
+    <surface id="2" name="inner ring a" type="z-cylinder" coeffs="0.0 0.0 0.33"/>
+    <surface id="3" name="inner ring b" type="z-cylinder" coeffs="0.0 0.0 0.45"/>
+    <surface id="4" name="outer ring a" type="z-cylinder" coeffs="0.0 0.0 0.6"/>
+    <surface id="5" name="outer ring b" type="z-cylinder" coeffs="0.0 0.0 0.69"/>
+    <surface id="6" type="plane" coeffs="-0.0 1.0 0 0"/>
+    <surface id="7" type="plane" coeffs="-0.7071067811865475 0.7071067811865476 0 0"/>
+    <surface id="8" type="plane" coeffs="-1.0 6.123233995736766e-17 0 0"/>
+    <surface id="9" type="plane" coeffs="-0.7071067811865476 -0.7071067811865475 0 0"/>
+    <surface id="10" type="plane" coeffs="-1.2246467991473532e-16 -1.0 0 0"/>
+    <surface id="11" type="plane" coeffs="0.7071067811865475 -0.7071067811865477 0 0"/>
+    <surface id="12" type="plane" coeffs="1.0 -1.8369701987210297e-16 0 0"/>
+    <surface id="13" type="plane" coeffs="0.7071067811865477 0.7071067811865474 0 0"/>
+    <surface id="14" name="minimum x" type="x-plane" boundary="reflective" coeffs="-1.26"/>
+    <surface id="15" name="maximum x" type="x-plane" boundary="reflective" coeffs="1.26"/>
+    <surface id="16" name="minimum y" type="y-plane" boundary="reflective" coeffs="-1.26"/>
+    <surface id="17" name="maximum y" type="y-plane" boundary="reflective" coeffs="1.26"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
@@ -80,7 +80,7 @@
     <random_ray>
       <distance_active>100.0</distance_active>
       <distance_inactive>20.0</distance_inactive>
-      <source particle="neutron" strength="1.0" type="independent">
+      <source type="independent" strength="1.0" particle="neutron">
         <space type="box">
           <parameters>-1.26 -1.26 -1 1.26 1.26 1</parameters>
         </space>
diff --git a/tests/regression_tests/random_ray_k_eff/inputs_true.dat b/tests/regression_tests/random_ray_k_eff/inputs_true.dat
index a2b058f2b..33c9cac33 100644
--- a/tests/regression_tests/random_ray_k_eff/inputs_true.dat
+++ b/tests/regression_tests/random_ray_k_eff/inputs_true.dat
@@ -3,32 +3,32 @@
   <materials>
     <cross_sections>mgxs.h5</cross_sections>
     <material id="1" name="UO2 fuel">
-      <density units="macro" value="1.0"/>
+      <density value="1.0" units="macro"/>
       <macroscopic name="UO2"/>
     </material>
     <material id="2" name="Water">
-      <density units="macro" value="1.0"/>
+      <density value="1.0" units="macro"/>
       <macroscopic name="LWTR"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="1" name="fuel inner a" region="-2" universe="1"/>
-    <cell id="2" material="1" name="fuel inner b" region="2 -3" universe="1"/>
-    <cell id="3" material="1" name="fuel inner c" region="3 -1" universe="1"/>
-    <cell id="4" material="2" name="moderator inner a" region="1 -4" universe="1"/>
-    <cell id="5" material="2" name="moderator outer b" region="4 -5" universe="1"/>
-    <cell id="6" material="2" name="moderator outer c" region="5" universe="1"/>
-    <cell fill="1" id="7" name="azimuthal_cell_0" region="6 -7" universe="2"/>
-    <cell fill="1" id="8" name="azimuthal_cell_1" region="7 -8" universe="2"/>
-    <cell fill="1" id="9" name="azimuthal_cell_2" region="8 -9" universe="2"/>
-    <cell fill="1" id="10" name="azimuthal_cell_3" region="9 -10" universe="2"/>
-    <cell fill="1" id="11" name="azimuthal_cell_4" region="10 -11" universe="2"/>
-    <cell fill="1" id="12" name="azimuthal_cell_5" region="11 -12" universe="2"/>
-    <cell fill="1" id="13" name="azimuthal_cell_6" region="12 -13" universe="2"/>
-    <cell fill="1" id="14" name="azimuthal_cell_7" region="13 -6" universe="2"/>
-    <cell id="15" material="2" name="moderator infinite" universe="3"/>
-    <cell fill="4" id="16" universe="5"/>
-    <cell fill="6" id="17" name="assembly" region="14 -15 16 -17" universe="7"/>
+    <cell id="1" name="fuel inner a" material="1" region="-2" universe="1"/>
+    <cell id="2" name="fuel inner b" material="1" region="2 -3" universe="1"/>
+    <cell id="3" name="fuel inner c" material="1" region="3 -1" universe="1"/>
+    <cell id="4" name="moderator inner a" material="2" region="1 -4" universe="1"/>
+    <cell id="5" name="moderator outer b" material="2" region="4 -5" universe="1"/>
+    <cell id="6" name="moderator outer c" material="2" region="5" universe="1"/>
+    <cell id="7" name="azimuthal_cell_0" fill="1" region="6 -7" universe="2"/>
+    <cell id="8" name="azimuthal_cell_1" fill="1" region="7 -8" universe="2"/>
+    <cell id="9" name="azimuthal_cell_2" fill="1" region="8 -9" universe="2"/>
+    <cell id="10" name="azimuthal_cell_3" fill="1" region="9 -10" universe="2"/>
+    <cell id="11" name="azimuthal_cell_4" fill="1" region="10 -11" universe="2"/>
+    <cell id="12" name="azimuthal_cell_5" fill="1" region="11 -12" universe="2"/>
+    <cell id="13" name="azimuthal_cell_6" fill="1" region="12 -13" universe="2"/>
+    <cell id="14" name="azimuthal_cell_7" fill="1" region="13 -6" universe="2"/>
+    <cell id="15" name="moderator infinite" material="2" universe="3"/>
+    <cell id="16" fill="4" universe="5"/>
+    <cell id="17" name="assembly" fill="6" region="14 -15 16 -17" universe="7"/>
     <lattice id="4">
       <pitch>0.126 0.126</pitch>
       <dimension>10 10</dimension>
@@ -53,23 +53,23 @@
 2 2 
 2 5 </universes>
     </lattice>
-    <surface coeffs="0.0 0.0 0.54" id="1" name="Fuel OR" type="z-cylinder"/>
-    <surface coeffs="0.0 0.0 0.33" id="2" name="inner ring a" type="z-cylinder"/>
-    <surface coeffs="0.0 0.0 0.45" id="3" name="inner ring b" type="z-cylinder"/>
-    <surface coeffs="0.0 0.0 0.6" id="4" name="outer ring a" type="z-cylinder"/>
-    <surface coeffs="0.0 0.0 0.69" id="5" name="outer ring b" type="z-cylinder"/>
-    <surface coeffs="-0.0 1.0 0 0" id="6" type="plane"/>
-    <surface coeffs="-0.7071067811865475 0.7071067811865476 0 0" id="7" type="plane"/>
-    <surface coeffs="-1.0 6.123233995736766e-17 0 0" id="8" type="plane"/>
-    <surface coeffs="-0.7071067811865476 -0.7071067811865475 0 0" id="9" type="plane"/>
-    <surface coeffs="-1.2246467991473532e-16 -1.0 0 0" id="10" type="plane"/>
-    <surface coeffs="0.7071067811865475 -0.7071067811865477 0 0" id="11" type="plane"/>
-    <surface coeffs="1.0 -1.8369701987210297e-16 0 0" id="12" type="plane"/>
-    <surface coeffs="0.7071067811865477 0.7071067811865474 0 0" id="13" type="plane"/>
-    <surface boundary="reflective" coeffs="-1.26" id="14" name="minimum x" type="x-plane"/>
-    <surface boundary="reflective" coeffs="1.26" id="15" name="maximum x" type="x-plane"/>
-    <surface boundary="reflective" coeffs="-1.26" id="16" name="minimum y" type="y-plane"/>
-    <surface boundary="reflective" coeffs="1.26" id="17" name="maximum y" type="y-plane"/>
+    <surface id="1" name="Fuel OR" type="z-cylinder" coeffs="0.0 0.0 0.54"/>
+    <surface id="2" name="inner ring a" type="z-cylinder" coeffs="0.0 0.0 0.33"/>
+    <surface id="3" name="inner ring b" type="z-cylinder" coeffs="0.0 0.0 0.45"/>
+    <surface id="4" name="outer ring a" type="z-cylinder" coeffs="0.0 0.0 0.6"/>
+    <surface id="5" name="outer ring b" type="z-cylinder" coeffs="0.0 0.0 0.69"/>
+    <surface id="6" type="plane" coeffs="-0.0 1.0 0 0"/>
+    <surface id="7" type="plane" coeffs="-0.7071067811865475 0.7071067811865476 0 0"/>
+    <surface id="8" type="plane" coeffs="-1.0 6.123233995736766e-17 0 0"/>
+    <surface id="9" type="plane" coeffs="-0.7071067811865476 -0.7071067811865475 0 0"/>
+    <surface id="10" type="plane" coeffs="-1.2246467991473532e-16 -1.0 0 0"/>
+    <surface id="11" type="plane" coeffs="0.7071067811865475 -0.7071067811865477 0 0"/>
+    <surface id="12" type="plane" coeffs="1.0 -1.8369701987210297e-16 0 0"/>
+    <surface id="13" type="plane" coeffs="0.7071067811865477 0.7071067811865474 0 0"/>
+    <surface id="14" name="minimum x" type="x-plane" boundary="reflective" coeffs="-1.26"/>
+    <surface id="15" name="maximum x" type="x-plane" boundary="reflective" coeffs="1.26"/>
+    <surface id="16" name="minimum y" type="y-plane" boundary="reflective" coeffs="-1.26"/>
+    <surface id="17" name="maximum y" type="y-plane" boundary="reflective" coeffs="1.26"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
@@ -80,7 +80,7 @@
     <random_ray>
       <distance_active>100.0</distance_active>
       <distance_inactive>20.0</distance_inactive>
-      <source particle="neutron" strength="1.0" type="independent">
+      <source type="independent" strength="1.0" particle="neutron">
         <space type="box">
           <parameters>-1.26 -1.26 -1 1.26 1.26 1</parameters>
         </space>
diff --git a/tests/regression_tests/random_ray_k_eff_mesh/inputs_true.dat b/tests/regression_tests/random_ray_k_eff_mesh/inputs_true.dat
index cdc717198..f0822d9f9 100644
--- a/tests/regression_tests/random_ray_k_eff_mesh/inputs_true.dat
+++ b/tests/regression_tests/random_ray_k_eff_mesh/inputs_true.dat
@@ -3,32 +3,32 @@
   <materials>
     <cross_sections>mgxs.h5</cross_sections>
     <material id="1" name="UO2 fuel">
-      <density units="macro" value="1.0"/>
+      <density value="1.0" units="macro"/>
       <macroscopic name="UO2"/>
     </material>
     <material id="2" name="Water">
-      <density units="macro" value="1.0"/>
+      <density value="1.0" units="macro"/>
       <macroscopic name="LWTR"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="1" name="fuel inner a" region="-2" universe="1"/>
-    <cell id="2" material="1" name="fuel inner b" region="2 -3" universe="1"/>
-    <cell id="3" material="1" name="fuel inner c" region="3 -1" universe="1"/>
-    <cell id="4" material="2" name="moderator inner a" region="1 -4" universe="1"/>
-    <cell id="5" material="2" name="moderator outer b" region="4 -5" universe="1"/>
-    <cell id="6" material="2" name="moderator outer c" region="5" universe="1"/>
-    <cell fill="1" id="7" name="azimuthal_cell_0" region="6 -7" universe="2"/>
-    <cell fill="1" id="8" name="azimuthal_cell_1" region="7 -8" universe="2"/>
-    <cell fill="1" id="9" name="azimuthal_cell_2" region="8 -9" universe="2"/>
-    <cell fill="1" id="10" name="azimuthal_cell_3" region="9 -10" universe="2"/>
-    <cell fill="1" id="11" name="azimuthal_cell_4" region="10 -11" universe="2"/>
-    <cell fill="1" id="12" name="azimuthal_cell_5" region="11 -12" universe="2"/>
-    <cell fill="1" id="13" name="azimuthal_cell_6" region="12 -13" universe="2"/>
-    <cell fill="1" id="14" name="azimuthal_cell_7" region="13 -6" universe="2"/>
-    <cell id="15" material="2" name="moderator infinite" universe="3"/>
-    <cell fill="4" id="16" universe="5"/>
-    <cell fill="6" id="17" name="assembly" region="14 -15 16 -17" universe="7"/>
+    <cell id="1" name="fuel inner a" material="1" region="-2" universe="1"/>
+    <cell id="2" name="fuel inner b" material="1" region="2 -3" universe="1"/>
+    <cell id="3" name="fuel inner c" material="1" region="3 -1" universe="1"/>
+    <cell id="4" name="moderator inner a" material="2" region="1 -4" universe="1"/>
+    <cell id="5" name="moderator outer b" material="2" region="4 -5" universe="1"/>
+    <cell id="6" name="moderator outer c" material="2" region="5" universe="1"/>
+    <cell id="7" name="azimuthal_cell_0" fill="1" region="6 -7" universe="2"/>
+    <cell id="8" name="azimuthal_cell_1" fill="1" region="7 -8" universe="2"/>
+    <cell id="9" name="azimuthal_cell_2" fill="1" region="8 -9" universe="2"/>
+    <cell id="10" name="azimuthal_cell_3" fill="1" region="9 -10" universe="2"/>
+    <cell id="11" name="azimuthal_cell_4" fill="1" region="10 -11" universe="2"/>
+    <cell id="12" name="azimuthal_cell_5" fill="1" region="11 -12" universe="2"/>
+    <cell id="13" name="azimuthal_cell_6" fill="1" region="12 -13" universe="2"/>
+    <cell id="14" name="azimuthal_cell_7" fill="1" region="13 -6" universe="2"/>
+    <cell id="15" name="moderator infinite" material="2" universe="3"/>
+    <cell id="16" fill="4" universe="5"/>
+    <cell id="17" name="assembly" fill="6" region="14 -15 16 -17" universe="7"/>
     <lattice id="4">
       <pitch>0.126 0.126</pitch>
       <dimension>10 10</dimension>
@@ -53,23 +53,23 @@
 2 2 
 2 5 </universes>
     </lattice>
-    <surface coeffs="0.0 0.0 0.54" id="1" name="Fuel OR" type="z-cylinder"/>
-    <surface coeffs="0.0 0.0 0.33" id="2" name="inner ring a" type="z-cylinder"/>
-    <surface coeffs="0.0 0.0 0.45" id="3" name="inner ring b" type="z-cylinder"/>
-    <surface coeffs="0.0 0.0 0.6" id="4" name="outer ring a" type="z-cylinder"/>
-    <surface coeffs="0.0 0.0 0.69" id="5" name="outer ring b" type="z-cylinder"/>
-    <surface coeffs="-0.0 1.0 0 0" id="6" type="plane"/>
-    <surface coeffs="-0.7071067811865475 0.7071067811865476 0 0" id="7" type="plane"/>
-    <surface coeffs="-1.0 6.123233995736766e-17 0 0" id="8" type="plane"/>
-    <surface coeffs="-0.7071067811865476 -0.7071067811865475 0 0" id="9" type="plane"/>
-    <surface coeffs="-1.2246467991473532e-16 -1.0 0 0" id="10" type="plane"/>
-    <surface coeffs="0.7071067811865475 -0.7071067811865477 0 0" id="11" type="plane"/>
-    <surface coeffs="1.0 -1.8369701987210297e-16 0 0" id="12" type="plane"/>
-    <surface coeffs="0.7071067811865477 0.7071067811865474 0 0" id="13" type="plane"/>
-    <surface boundary="reflective" coeffs="-1.26" id="14" name="minimum x" type="x-plane"/>
-    <surface boundary="reflective" coeffs="1.26" id="15" name="maximum x" type="x-plane"/>
-    <surface boundary="reflective" coeffs="-1.26" id="16" name="minimum y" type="y-plane"/>
-    <surface boundary="reflective" coeffs="1.26" id="17" name="maximum y" type="y-plane"/>
+    <surface id="1" name="Fuel OR" type="z-cylinder" coeffs="0.0 0.0 0.54"/>
+    <surface id="2" name="inner ring a" type="z-cylinder" coeffs="0.0 0.0 0.33"/>
+    <surface id="3" name="inner ring b" type="z-cylinder" coeffs="0.0 0.0 0.45"/>
+    <surface id="4" name="outer ring a" type="z-cylinder" coeffs="0.0 0.0 0.6"/>
+    <surface id="5" name="outer ring b" type="z-cylinder" coeffs="0.0 0.0 0.69"/>
+    <surface id="6" type="plane" coeffs="-0.0 1.0 0 0"/>
+    <surface id="7" type="plane" coeffs="-0.7071067811865475 0.7071067811865476 0 0"/>
+    <surface id="8" type="plane" coeffs="-1.0 6.123233995736766e-17 0 0"/>
+    <surface id="9" type="plane" coeffs="-0.7071067811865476 -0.7071067811865475 0 0"/>
+    <surface id="10" type="plane" coeffs="-1.2246467991473532e-16 -1.0 0 0"/>
+    <surface id="11" type="plane" coeffs="0.7071067811865475 -0.7071067811865477 0 0"/>
+    <surface id="12" type="plane" coeffs="1.0 -1.8369701987210297e-16 0 0"/>
+    <surface id="13" type="plane" coeffs="0.7071067811865477 0.7071067811865474 0 0"/>
+    <surface id="14" name="minimum x" type="x-plane" boundary="reflective" coeffs="-1.26"/>
+    <surface id="15" name="maximum x" type="x-plane" boundary="reflective" coeffs="1.26"/>
+    <surface id="16" name="minimum y" type="y-plane" boundary="reflective" coeffs="-1.26"/>
+    <surface id="17" name="maximum y" type="y-plane" boundary="reflective" coeffs="1.26"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
@@ -80,7 +80,7 @@
     <random_ray>
       <distance_active>100.0</distance_active>
       <distance_inactive>20.0</distance_inactive>
-      <source particle="neutron" strength="1.0" type="independent">
+      <source type="independent" strength="1.0" particle="neutron">
         <space type="box">
           <parameters>-1.26 -1.26 -1 1.26 1.26 1</parameters>
         </space>
diff --git a/tests/regression_tests/random_ray_linear/linear/inputs_true.dat b/tests/regression_tests/random_ray_linear/linear/inputs_true.dat
index 4df51bad5..006996557 100644
--- a/tests/regression_tests/random_ray_linear/linear/inputs_true.dat
+++ b/tests/regression_tests/random_ray_linear/linear/inputs_true.dat
@@ -3,32 +3,32 @@
   <materials>
     <cross_sections>mgxs.h5</cross_sections>
     <material id="1" name="UO2 fuel">
-      <density units="macro" value="1.0"/>
+      <density value="1.0" units="macro"/>
       <macroscopic name="UO2"/>
     </material>
     <material id="2" name="Water">
-      <density units="macro" value="1.0"/>
+      <density value="1.0" units="macro"/>
       <macroscopic name="LWTR"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="1" name="fuel inner a" region="-2" universe="1"/>
-    <cell id="2" material="1" name="fuel inner b" region="2 -3" universe="1"/>
-    <cell id="3" material="1" name="fuel inner c" region="3 -1" universe="1"/>
-    <cell id="4" material="2" name="moderator inner a" region="1 -4" universe="1"/>
-    <cell id="5" material="2" name="moderator outer b" region="4 -5" universe="1"/>
-    <cell id="6" material="2" name="moderator outer c" region="5" universe="1"/>
-    <cell fill="1" id="7" name="azimuthal_cell_0" region="6 -7" universe="2"/>
-    <cell fill="1" id="8" name="azimuthal_cell_1" region="7 -8" universe="2"/>
-    <cell fill="1" id="9" name="azimuthal_cell_2" region="8 -9" universe="2"/>
-    <cell fill="1" id="10" name="azimuthal_cell_3" region="9 -10" universe="2"/>
-    <cell fill="1" id="11" name="azimuthal_cell_4" region="10 -11" universe="2"/>
-    <cell fill="1" id="12" name="azimuthal_cell_5" region="11 -12" universe="2"/>
-    <cell fill="1" id="13" name="azimuthal_cell_6" region="12 -13" universe="2"/>
-    <cell fill="1" id="14" name="azimuthal_cell_7" region="13 -6" universe="2"/>
-    <cell id="15" material="2" name="moderator infinite" universe="3"/>
-    <cell fill="4" id="16" universe="5"/>
-    <cell fill="6" id="17" name="assembly" region="14 -15 16 -17" universe="7"/>
+    <cell id="1" name="fuel inner a" material="1" region="-2" universe="1"/>
+    <cell id="2" name="fuel inner b" material="1" region="2 -3" universe="1"/>
+    <cell id="3" name="fuel inner c" material="1" region="3 -1" universe="1"/>
+    <cell id="4" name="moderator inner a" material="2" region="1 -4" universe="1"/>
+    <cell id="5" name="moderator outer b" material="2" region="4 -5" universe="1"/>
+    <cell id="6" name="moderator outer c" material="2" region="5" universe="1"/>
+    <cell id="7" name="azimuthal_cell_0" fill="1" region="6 -7" universe="2"/>
+    <cell id="8" name="azimuthal_cell_1" fill="1" region="7 -8" universe="2"/>
+    <cell id="9" name="azimuthal_cell_2" fill="1" region="8 -9" universe="2"/>
+    <cell id="10" name="azimuthal_cell_3" fill="1" region="9 -10" universe="2"/>
+    <cell id="11" name="azimuthal_cell_4" fill="1" region="10 -11" universe="2"/>
+    <cell id="12" name="azimuthal_cell_5" fill="1" region="11 -12" universe="2"/>
+    <cell id="13" name="azimuthal_cell_6" fill="1" region="12 -13" universe="2"/>
+    <cell id="14" name="azimuthal_cell_7" fill="1" region="13 -6" universe="2"/>
+    <cell id="15" name="moderator infinite" material="2" universe="3"/>
+    <cell id="16" fill="4" universe="5"/>
+    <cell id="17" name="assembly" fill="6" region="14 -15 16 -17" universe="7"/>
     <lattice id="4">
       <pitch>0.126 0.126</pitch>
       <dimension>10 10</dimension>
@@ -53,23 +53,23 @@
 2 2 
 2 5 </universes>
     </lattice>
-    <surface coeffs="0.0 0.0 0.54" id="1" name="Fuel OR" type="z-cylinder"/>
-    <surface coeffs="0.0 0.0 0.33" id="2" name="inner ring a" type="z-cylinder"/>
-    <surface coeffs="0.0 0.0 0.45" id="3" name="inner ring b" type="z-cylinder"/>
-    <surface coeffs="0.0 0.0 0.6" id="4" name="outer ring a" type="z-cylinder"/>
-    <surface coeffs="0.0 0.0 0.69" id="5" name="outer ring b" type="z-cylinder"/>
-    <surface coeffs="-0.0 1.0 0 0" id="6" type="plane"/>
-    <surface coeffs="-0.7071067811865475 0.7071067811865476 0 0" id="7" type="plane"/>
-    <surface coeffs="-1.0 6.123233995736766e-17 0 0" id="8" type="plane"/>
-    <surface coeffs="-0.7071067811865476 -0.7071067811865475 0 0" id="9" type="plane"/>
-    <surface coeffs="-1.2246467991473532e-16 -1.0 0 0" id="10" type="plane"/>
-    <surface coeffs="0.7071067811865475 -0.7071067811865477 0 0" id="11" type="plane"/>
-    <surface coeffs="1.0 -1.8369701987210297e-16 0 0" id="12" type="plane"/>
-    <surface coeffs="0.7071067811865477 0.7071067811865474 0 0" id="13" type="plane"/>
-    <surface boundary="reflective" coeffs="-1.26" id="14" name="minimum x" type="x-plane"/>
-    <surface boundary="reflective" coeffs="1.26" id="15" name="maximum x" type="x-plane"/>
-    <surface boundary="reflective" coeffs="-1.26" id="16" name="minimum y" type="y-plane"/>
-    <surface boundary="reflective" coeffs="1.26" id="17" name="maximum y" type="y-plane"/>
+    <surface id="1" name="Fuel OR" type="z-cylinder" coeffs="0.0 0.0 0.54"/>
+    <surface id="2" name="inner ring a" type="z-cylinder" coeffs="0.0 0.0 0.33"/>
+    <surface id="3" name="inner ring b" type="z-cylinder" coeffs="0.0 0.0 0.45"/>
+    <surface id="4" name="outer ring a" type="z-cylinder" coeffs="0.0 0.0 0.6"/>
+    <surface id="5" name="outer ring b" type="z-cylinder" coeffs="0.0 0.0 0.69"/>
+    <surface id="6" type="plane" coeffs="-0.0 1.0 0 0"/>
+    <surface id="7" type="plane" coeffs="-0.7071067811865475 0.7071067811865476 0 0"/>
+    <surface id="8" type="plane" coeffs="-1.0 6.123233995736766e-17 0 0"/>
+    <surface id="9" type="plane" coeffs="-0.7071067811865476 -0.7071067811865475 0 0"/>
+    <surface id="10" type="plane" coeffs="-1.2246467991473532e-16 -1.0 0 0"/>
+    <surface id="11" type="plane" coeffs="0.7071067811865475 -0.7071067811865477 0 0"/>
+    <surface id="12" type="plane" coeffs="1.0 -1.8369701987210297e-16 0 0"/>
+    <surface id="13" type="plane" coeffs="0.7071067811865477 0.7071067811865474 0 0"/>
+    <surface id="14" name="minimum x" type="x-plane" boundary="reflective" coeffs="-1.26"/>
+    <surface id="15" name="maximum x" type="x-plane" boundary="reflective" coeffs="1.26"/>
+    <surface id="16" name="minimum y" type="y-plane" boundary="reflective" coeffs="-1.26"/>
+    <surface id="17" name="maximum y" type="y-plane" boundary="reflective" coeffs="1.26"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
@@ -80,7 +80,7 @@
     <random_ray>
       <distance_active>100.0</distance_active>
       <distance_inactive>20.0</distance_inactive>
-      <source particle="neutron" strength="1.0" type="independent">
+      <source type="independent" strength="1.0" particle="neutron">
         <space type="box">
           <parameters>-1.26 -1.26 -1 1.26 1.26 1</parameters>
         </space>
diff --git a/tests/regression_tests/random_ray_linear/linear_xy/inputs_true.dat b/tests/regression_tests/random_ray_linear/linear_xy/inputs_true.dat
index 113771438..81527c479 100644
--- a/tests/regression_tests/random_ray_linear/linear_xy/inputs_true.dat
+++ b/tests/regression_tests/random_ray_linear/linear_xy/inputs_true.dat
@@ -3,32 +3,32 @@
   <materials>
     <cross_sections>mgxs.h5</cross_sections>
     <material id="1" name="UO2 fuel">
-      <density units="macro" value="1.0"/>
+      <density value="1.0" units="macro"/>
       <macroscopic name="UO2"/>
     </material>
     <material id="2" name="Water">
-      <density units="macro" value="1.0"/>
+      <density value="1.0" units="macro"/>
       <macroscopic name="LWTR"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="1" name="fuel inner a" region="-2" universe="1"/>
-    <cell id="2" material="1" name="fuel inner b" region="2 -3" universe="1"/>
-    <cell id="3" material="1" name="fuel inner c" region="3 -1" universe="1"/>
-    <cell id="4" material="2" name="moderator inner a" region="1 -4" universe="1"/>
-    <cell id="5" material="2" name="moderator outer b" region="4 -5" universe="1"/>
-    <cell id="6" material="2" name="moderator outer c" region="5" universe="1"/>
-    <cell fill="1" id="7" name="azimuthal_cell_0" region="6 -7" universe="2"/>
-    <cell fill="1" id="8" name="azimuthal_cell_1" region="7 -8" universe="2"/>
-    <cell fill="1" id="9" name="azimuthal_cell_2" region="8 -9" universe="2"/>
-    <cell fill="1" id="10" name="azimuthal_cell_3" region="9 -10" universe="2"/>
-    <cell fill="1" id="11" name="azimuthal_cell_4" region="10 -11" universe="2"/>
-    <cell fill="1" id="12" name="azimuthal_cell_5" region="11 -12" universe="2"/>
-    <cell fill="1" id="13" name="azimuthal_cell_6" region="12 -13" universe="2"/>
-    <cell fill="1" id="14" name="azimuthal_cell_7" region="13 -6" universe="2"/>
-    <cell id="15" material="2" name="moderator infinite" universe="3"/>
-    <cell fill="4" id="16" universe="5"/>
-    <cell fill="6" id="17" name="assembly" region="14 -15 16 -17" universe="7"/>
+    <cell id="1" name="fuel inner a" material="1" region="-2" universe="1"/>
+    <cell id="2" name="fuel inner b" material="1" region="2 -3" universe="1"/>
+    <cell id="3" name="fuel inner c" material="1" region="3 -1" universe="1"/>
+    <cell id="4" name="moderator inner a" material="2" region="1 -4" universe="1"/>
+    <cell id="5" name="moderator outer b" material="2" region="4 -5" universe="1"/>
+    <cell id="6" name="moderator outer c" material="2" region="5" universe="1"/>
+    <cell id="7" name="azimuthal_cell_0" fill="1" region="6 -7" universe="2"/>
+    <cell id="8" name="azimuthal_cell_1" fill="1" region="7 -8" universe="2"/>
+    <cell id="9" name="azimuthal_cell_2" fill="1" region="8 -9" universe="2"/>
+    <cell id="10" name="azimuthal_cell_3" fill="1" region="9 -10" universe="2"/>
+    <cell id="11" name="azimuthal_cell_4" fill="1" region="10 -11" universe="2"/>
+    <cell id="12" name="azimuthal_cell_5" fill="1" region="11 -12" universe="2"/>
+    <cell id="13" name="azimuthal_cell_6" fill="1" region="12 -13" universe="2"/>
+    <cell id="14" name="azimuthal_cell_7" fill="1" region="13 -6" universe="2"/>
+    <cell id="15" name="moderator infinite" material="2" universe="3"/>
+    <cell id="16" fill="4" universe="5"/>
+    <cell id="17" name="assembly" fill="6" region="14 -15 16 -17" universe="7"/>
     <lattice id="4">
       <pitch>0.126 0.126</pitch>
       <dimension>10 10</dimension>
@@ -53,23 +53,23 @@
 2 2 
 2 5 </universes>
     </lattice>
-    <surface coeffs="0.0 0.0 0.54" id="1" name="Fuel OR" type="z-cylinder"/>
-    <surface coeffs="0.0 0.0 0.33" id="2" name="inner ring a" type="z-cylinder"/>
-    <surface coeffs="0.0 0.0 0.45" id="3" name="inner ring b" type="z-cylinder"/>
-    <surface coeffs="0.0 0.0 0.6" id="4" name="outer ring a" type="z-cylinder"/>
-    <surface coeffs="0.0 0.0 0.69" id="5" name="outer ring b" type="z-cylinder"/>
-    <surface coeffs="-0.0 1.0 0 0" id="6" type="plane"/>
-    <surface coeffs="-0.7071067811865475 0.7071067811865476 0 0" id="7" type="plane"/>
-    <surface coeffs="-1.0 6.123233995736766e-17 0 0" id="8" type="plane"/>
-    <surface coeffs="-0.7071067811865476 -0.7071067811865475 0 0" id="9" type="plane"/>
-    <surface coeffs="-1.2246467991473532e-16 -1.0 0 0" id="10" type="plane"/>
-    <surface coeffs="0.7071067811865475 -0.7071067811865477 0 0" id="11" type="plane"/>
-    <surface coeffs="1.0 -1.8369701987210297e-16 0 0" id="12" type="plane"/>
-    <surface coeffs="0.7071067811865477 0.7071067811865474 0 0" id="13" type="plane"/>
-    <surface boundary="reflective" coeffs="-1.26" id="14" name="minimum x" type="x-plane"/>
-    <surface boundary="reflective" coeffs="1.26" id="15" name="maximum x" type="x-plane"/>
-    <surface boundary="reflective" coeffs="-1.26" id="16" name="minimum y" type="y-plane"/>
-    <surface boundary="reflective" coeffs="1.26" id="17" name="maximum y" type="y-plane"/>
+    <surface id="1" name="Fuel OR" type="z-cylinder" coeffs="0.0 0.0 0.54"/>
+    <surface id="2" name="inner ring a" type="z-cylinder" coeffs="0.0 0.0 0.33"/>
+    <surface id="3" name="inner ring b" type="z-cylinder" coeffs="0.0 0.0 0.45"/>
+    <surface id="4" name="outer ring a" type="z-cylinder" coeffs="0.0 0.0 0.6"/>
+    <surface id="5" name="outer ring b" type="z-cylinder" coeffs="0.0 0.0 0.69"/>
+    <surface id="6" type="plane" coeffs="-0.0 1.0 0 0"/>
+    <surface id="7" type="plane" coeffs="-0.7071067811865475 0.7071067811865476 0 0"/>
+    <surface id="8" type="plane" coeffs="-1.0 6.123233995736766e-17 0 0"/>
+    <surface id="9" type="plane" coeffs="-0.7071067811865476 -0.7071067811865475 0 0"/>
+    <surface id="10" type="plane" coeffs="-1.2246467991473532e-16 -1.0 0 0"/>
+    <surface id="11" type="plane" coeffs="0.7071067811865475 -0.7071067811865477 0 0"/>
+    <surface id="12" type="plane" coeffs="1.0 -1.8369701987210297e-16 0 0"/>
+    <surface id="13" type="plane" coeffs="0.7071067811865477 0.7071067811865474 0 0"/>
+    <surface id="14" name="minimum x" type="x-plane" boundary="reflective" coeffs="-1.26"/>
+    <surface id="15" name="maximum x" type="x-plane" boundary="reflective" coeffs="1.26"/>
+    <surface id="16" name="minimum y" type="y-plane" boundary="reflective" coeffs="-1.26"/>
+    <surface id="17" name="maximum y" type="y-plane" boundary="reflective" coeffs="1.26"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
@@ -80,7 +80,7 @@
     <random_ray>
       <distance_active>100.0</distance_active>
       <distance_inactive>20.0</distance_inactive>
-      <source particle="neutron" strength="1.0" type="independent">
+      <source type="independent" strength="1.0" particle="neutron">
         <space type="box">
           <parameters>-1.26 -1.26 -1 1.26 1.26 1</parameters>
         </space>
diff --git a/tests/regression_tests/random_ray_point_source_locator/inputs_true.dat b/tests/regression_tests/random_ray_point_source_locator/inputs_true.dat
index 9c7cd4ab5..82ad979da 100644
--- a/tests/regression_tests/random_ray_point_source_locator/inputs_true.dat
+++ b/tests/regression_tests/random_ray_point_source_locator/inputs_true.dat
@@ -3,24 +3,24 @@
   <materials>
     <cross_sections>mgxs.h5</cross_sections>
     <material id="1" name="source">
-      <density units="macro" value="1.0"/>
+      <density value="1.0" units="macro"/>
       <macroscopic name="source"/>
     </material>
     <material id="2" name="void">
-      <density units="macro" value="1.0"/>
+      <density value="1.0" units="macro"/>
       <macroscopic name="void"/>
     </material>
     <material id="3" name="absorber">
-      <density units="macro" value="1.0"/>
+      <density value="1.0" units="macro"/>
       <macroscopic name="absorber"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="1" name="infinite source region" universe="1"/>
-    <cell id="2" material="2" name="infinite void region" universe="2"/>
-    <cell id="3" material="3" name="infinite absorber region" universe="3"/>
-    <cell fill="4" id="4" universe="5"/>
-    <cell fill="5" id="5" name="full domain" region="1 -2 3 -4 5 -6" universe="6"/>
+    <cell id="1" name="infinite source region" material="1" universe="1"/>
+    <cell id="2" name="infinite void region" material="2" universe="2"/>
+    <cell id="3" name="infinite absorber region" material="3" universe="3"/>
+    <cell id="4" fill="4" universe="5"/>
+    <cell id="5" name="full domain" fill="5" region="1 -2 3 -4 5 -6" universe="6"/>
     <lattice id="4">
       <pitch>2.5 2.5 2.5</pitch>
       <dimension>12 12 12</dimension>
@@ -182,19 +182,19 @@
 3 3 3 3 3 3 3 3 3 3 3 3 
 3 3 3 3 3 3 3 3 3 3 3 3 </universes>
     </lattice>
-    <surface boundary="reflective" coeffs="0.0" id="1" type="x-plane"/>
-    <surface boundary="vacuum" coeffs="30.0" id="2" type="x-plane"/>
-    <surface boundary="reflective" coeffs="0.0" id="3" type="y-plane"/>
-    <surface boundary="vacuum" coeffs="30.0" id="4" type="y-plane"/>
-    <surface boundary="reflective" coeffs="0.0" id="5" type="z-plane"/>
-    <surface boundary="vacuum" coeffs="30.0" id="6" type="z-plane"/>
+    <surface id="1" type="x-plane" boundary="reflective" coeffs="0.0"/>
+    <surface id="2" type="x-plane" boundary="vacuum" coeffs="30.0"/>
+    <surface id="3" type="y-plane" boundary="reflective" coeffs="0.0"/>
+    <surface id="4" type="y-plane" boundary="vacuum" coeffs="30.0"/>
+    <surface id="5" type="z-plane" boundary="reflective" coeffs="0.0"/>
+    <surface id="6" type="z-plane" boundary="vacuum" coeffs="30.0"/>
   </geometry>
   <settings>
     <run_mode>fixed source</run_mode>
     <particles>90</particles>
     <batches>30</batches>
     <inactive>15</inactive>
-    <source particle="neutron" strength="3.14" type="independent">
+    <source type="independent" strength="3.14" particle="neutron">
       <space type="point">
         <parameters>2.5 2.5 2.5</parameters>
       </space>
@@ -206,7 +206,7 @@
     <random_ray>
       <distance_active>500.0</distance_active>
       <distance_inactive>100.0</distance_inactive>
-      <source particle="neutron" strength="1.0" type="independent">
+      <source type="independent" strength="1.0" particle="neutron">
         <space type="box">
           <parameters>0.0 0.0 0.0 30.0 30.0 30.0</parameters>
         </space>
diff --git a/tests/regression_tests/random_ray_void/flat/inputs_true.dat b/tests/regression_tests/random_ray_void/flat/inputs_true.dat
index 617a66053..ea8c22f0b 100644
--- a/tests/regression_tests/random_ray_void/flat/inputs_true.dat
+++ b/tests/regression_tests/random_ray_void/flat/inputs_true.dat
@@ -3,24 +3,24 @@
   <materials>
     <cross_sections>mgxs.h5</cross_sections>
     <material id="1" name="source">
-      <density units="macro" value="1.0"/>
+      <density value="1.0" units="macro"/>
       <macroscopic name="source"/>
     </material>
     <material id="2" name="void">
-      <density units="macro" value="1.0"/>
+      <density value="1.0" units="macro"/>
       <macroscopic name="void"/>
     </material>
     <material id="3" name="absorber">
-      <density units="macro" value="1.0"/>
+      <density value="1.0" units="macro"/>
       <macroscopic name="absorber"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="void" name="infinite source region" universe="1"/>
-    <cell id="2" material="void" name="infinite void region" universe="2"/>
-    <cell id="3" material="3" name="infinite absorber region" universe="3"/>
-    <cell fill="4" id="4" universe="5"/>
-    <cell fill="5" id="5" name="full domain" region="1 -2 3 -4 5 -6" universe="6"/>
+    <cell id="1" name="infinite source region" material="void" universe="1"/>
+    <cell id="2" name="infinite void region" material="void" universe="2"/>
+    <cell id="3" name="infinite absorber region" material="3" universe="3"/>
+    <cell id="4" fill="4" universe="5"/>
+    <cell id="5" name="full domain" fill="5" region="1 -2 3 -4 5 -6" universe="6"/>
     <lattice id="4">
       <pitch>2.5 2.5 2.5</pitch>
       <dimension>12 12 12</dimension>
@@ -182,19 +182,19 @@
 3 3 3 3 3 3 3 3 3 3 3 3 
 3 3 3 3 3 3 3 3 3 3 3 3 </universes>
     </lattice>
-    <surface boundary="reflective" coeffs="0.0" id="1" type="x-plane"/>
-    <surface boundary="vacuum" coeffs="30.0" id="2" type="x-plane"/>
-    <surface boundary="reflective" coeffs="0.0" id="3" type="y-plane"/>
-    <surface boundary="vacuum" coeffs="30.0" id="4" type="y-plane"/>
-    <surface boundary="reflective" coeffs="0.0" id="5" type="z-plane"/>
-    <surface boundary="vacuum" coeffs="30.0" id="6" type="z-plane"/>
+    <surface id="1" type="x-plane" boundary="reflective" coeffs="0.0"/>
+    <surface id="2" type="x-plane" boundary="vacuum" coeffs="30.0"/>
+    <surface id="3" type="y-plane" boundary="reflective" coeffs="0.0"/>
+    <surface id="4" type="y-plane" boundary="vacuum" coeffs="30.0"/>
+    <surface id="5" type="z-plane" boundary="reflective" coeffs="0.0"/>
+    <surface id="6" type="z-plane" boundary="vacuum" coeffs="30.0"/>
   </geometry>
   <settings>
     <run_mode>fixed source</run_mode>
     <particles>90</particles>
     <batches>40</batches>
     <inactive>20</inactive>
-    <source particle="neutron" strength="3.14" type="independent">
+    <source type="independent" strength="3.14" particle="neutron">
       <energy type="discrete">
         <parameters>100.0 1.0</parameters>
       </energy>
@@ -207,7 +207,7 @@
     <random_ray>
       <distance_active>500.0</distance_active>
       <distance_inactive>100.0</distance_inactive>
-      <source particle="neutron" strength="1.0" type="independent">
+      <source type="independent" strength="1.0" particle="neutron">
         <space type="box">
           <parameters>0.0 0.0 0.0 30.0 30.0 30.0</parameters>
         </space>
diff --git a/tests/regression_tests/random_ray_void/linear/inputs_true.dat b/tests/regression_tests/random_ray_void/linear/inputs_true.dat
index 4b6a682d9..a089604ef 100644
--- a/tests/regression_tests/random_ray_void/linear/inputs_true.dat
+++ b/tests/regression_tests/random_ray_void/linear/inputs_true.dat
@@ -3,24 +3,24 @@
   <materials>
     <cross_sections>mgxs.h5</cross_sections>
     <material id="1" name="source">
-      <density units="macro" value="1.0"/>
+      <density value="1.0" units="macro"/>
       <macroscopic name="source"/>
     </material>
     <material id="2" name="void">
-      <density units="macro" value="1.0"/>
+      <density value="1.0" units="macro"/>
       <macroscopic name="void"/>
     </material>
     <material id="3" name="absorber">
-      <density units="macro" value="1.0"/>
+      <density value="1.0" units="macro"/>
       <macroscopic name="absorber"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="void" name="infinite source region" universe="1"/>
-    <cell id="2" material="void" name="infinite void region" universe="2"/>
-    <cell id="3" material="3" name="infinite absorber region" universe="3"/>
-    <cell fill="4" id="4" universe="5"/>
-    <cell fill="5" id="5" name="full domain" region="1 -2 3 -4 5 -6" universe="6"/>
+    <cell id="1" name="infinite source region" material="void" universe="1"/>
+    <cell id="2" name="infinite void region" material="void" universe="2"/>
+    <cell id="3" name="infinite absorber region" material="3" universe="3"/>
+    <cell id="4" fill="4" universe="5"/>
+    <cell id="5" name="full domain" fill="5" region="1 -2 3 -4 5 -6" universe="6"/>
     <lattice id="4">
       <pitch>2.5 2.5 2.5</pitch>
       <dimension>12 12 12</dimension>
@@ -182,19 +182,19 @@
 3 3 3 3 3 3 3 3 3 3 3 3 
 3 3 3 3 3 3 3 3 3 3 3 3 </universes>
     </lattice>
-    <surface boundary="reflective" coeffs="0.0" id="1" type="x-plane"/>
-    <surface boundary="vacuum" coeffs="30.0" id="2" type="x-plane"/>
-    <surface boundary="reflective" coeffs="0.0" id="3" type="y-plane"/>
-    <surface boundary="vacuum" coeffs="30.0" id="4" type="y-plane"/>
-    <surface boundary="reflective" coeffs="0.0" id="5" type="z-plane"/>
-    <surface boundary="vacuum" coeffs="30.0" id="6" type="z-plane"/>
+    <surface id="1" type="x-plane" boundary="reflective" coeffs="0.0"/>
+    <surface id="2" type="x-plane" boundary="vacuum" coeffs="30.0"/>
+    <surface id="3" type="y-plane" boundary="reflective" coeffs="0.0"/>
+    <surface id="4" type="y-plane" boundary="vacuum" coeffs="30.0"/>
+    <surface id="5" type="z-plane" boundary="reflective" coeffs="0.0"/>
+    <surface id="6" type="z-plane" boundary="vacuum" coeffs="30.0"/>
   </geometry>
   <settings>
     <run_mode>fixed source</run_mode>
     <particles>90</particles>
     <batches>40</batches>
     <inactive>20</inactive>
-    <source particle="neutron" strength="3.14" type="independent">
+    <source type="independent" strength="3.14" particle="neutron">
       <energy type="discrete">
         <parameters>100.0 1.0</parameters>
       </energy>
@@ -207,7 +207,7 @@
     <random_ray>
       <distance_active>500.0</distance_active>
       <distance_inactive>100.0</distance_inactive>
-      <source particle="neutron" strength="1.0" type="independent">
+      <source type="independent" strength="1.0" particle="neutron">
         <space type="box">
           <parameters>0.0 0.0 0.0 30.0 30.0 30.0</parameters>
         </space>
diff --git a/tests/regression_tests/random_ray_volume_estimator/hybrid/inputs_true.dat b/tests/regression_tests/random_ray_volume_estimator/hybrid/inputs_true.dat
index 9c15ec97d..089534d74 100644
--- a/tests/regression_tests/random_ray_volume_estimator/hybrid/inputs_true.dat
+++ b/tests/regression_tests/random_ray_volume_estimator/hybrid/inputs_true.dat
@@ -3,24 +3,24 @@
   <materials>
     <cross_sections>mgxs.h5</cross_sections>
     <material id="1" name="source">
-      <density units="macro" value="1.0"/>
+      <density value="1.0" units="macro"/>
       <macroscopic name="source"/>
     </material>
     <material id="2" name="void">
-      <density units="macro" value="1.0"/>
+      <density value="1.0" units="macro"/>
       <macroscopic name="void"/>
     </material>
     <material id="3" name="absorber">
-      <density units="macro" value="1.0"/>
+      <density value="1.0" units="macro"/>
       <macroscopic name="absorber"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="1" name="infinite source region" universe="1"/>
-    <cell id="2" material="2" name="infinite void region" universe="2"/>
-    <cell id="3" material="3" name="infinite absorber region" universe="3"/>
-    <cell fill="4" id="4" universe="5"/>
-    <cell fill="5" id="5" name="full domain" region="1 -2 3 -4 5 -6" universe="6"/>
+    <cell id="1" name="infinite source region" material="1" universe="1"/>
+    <cell id="2" name="infinite void region" material="2" universe="2"/>
+    <cell id="3" name="infinite absorber region" material="3" universe="3"/>
+    <cell id="4" fill="4" universe="5"/>
+    <cell id="5" name="full domain" fill="5" region="1 -2 3 -4 5 -6" universe="6"/>
     <lattice id="4">
       <pitch>2.5 2.5 2.5</pitch>
       <dimension>12 12 12</dimension>
@@ -182,19 +182,19 @@
 3 3 3 3 3 3 3 3 3 3 3 3 
 3 3 3 3 3 3 3 3 3 3 3 3 </universes>
     </lattice>
-    <surface boundary="reflective" coeffs="0.0" id="1" type="x-plane"/>
-    <surface boundary="vacuum" coeffs="30.0" id="2" type="x-plane"/>
-    <surface boundary="reflective" coeffs="0.0" id="3" type="y-plane"/>
-    <surface boundary="vacuum" coeffs="30.0" id="4" type="y-plane"/>
-    <surface boundary="reflective" coeffs="0.0" id="5" type="z-plane"/>
-    <surface boundary="vacuum" coeffs="30.0" id="6" type="z-plane"/>
+    <surface id="1" type="x-plane" boundary="reflective" coeffs="0.0"/>
+    <surface id="2" type="x-plane" boundary="vacuum" coeffs="30.0"/>
+    <surface id="3" type="y-plane" boundary="reflective" coeffs="0.0"/>
+    <surface id="4" type="y-plane" boundary="vacuum" coeffs="30.0"/>
+    <surface id="5" type="z-plane" boundary="reflective" coeffs="0.0"/>
+    <surface id="6" type="z-plane" boundary="vacuum" coeffs="30.0"/>
   </geometry>
   <settings>
     <run_mode>fixed source</run_mode>
     <particles>90</particles>
     <batches>10</batches>
     <inactive>5</inactive>
-    <source particle="neutron" strength="3.14" type="independent">
+    <source type="independent" strength="3.14" particle="neutron">
       <energy type="discrete">
         <parameters>100.0 1.0</parameters>
       </energy>
@@ -207,7 +207,7 @@
     <random_ray>
       <distance_active>500.0</distance_active>
       <distance_inactive>100.0</distance_inactive>
-      <source particle="neutron" strength="1.0" type="independent">
+      <source type="independent" strength="1.0" particle="neutron">
         <space type="box">
           <parameters>0.0 0.0 0.0 30.0 30.0 30.0</parameters>
         </space>
diff --git a/tests/regression_tests/random_ray_volume_estimator/naive/inputs_true.dat b/tests/regression_tests/random_ray_volume_estimator/naive/inputs_true.dat
index 7d05f0978..56507df04 100644
--- a/tests/regression_tests/random_ray_volume_estimator/naive/inputs_true.dat
+++ b/tests/regression_tests/random_ray_volume_estimator/naive/inputs_true.dat
@@ -3,24 +3,24 @@
   <materials>
     <cross_sections>mgxs.h5</cross_sections>
     <material id="1" name="source">
-      <density units="macro" value="1.0"/>
+      <density value="1.0" units="macro"/>
       <macroscopic name="source"/>
     </material>
     <material id="2" name="void">
-      <density units="macro" value="1.0"/>
+      <density value="1.0" units="macro"/>
       <macroscopic name="void"/>
     </material>
     <material id="3" name="absorber">
-      <density units="macro" value="1.0"/>
+      <density value="1.0" units="macro"/>
       <macroscopic name="absorber"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="1" name="infinite source region" universe="1"/>
-    <cell id="2" material="2" name="infinite void region" universe="2"/>
-    <cell id="3" material="3" name="infinite absorber region" universe="3"/>
-    <cell fill="4" id="4" universe="5"/>
-    <cell fill="5" id="5" name="full domain" region="1 -2 3 -4 5 -6" universe="6"/>
+    <cell id="1" name="infinite source region" material="1" universe="1"/>
+    <cell id="2" name="infinite void region" material="2" universe="2"/>
+    <cell id="3" name="infinite absorber region" material="3" universe="3"/>
+    <cell id="4" fill="4" universe="5"/>
+    <cell id="5" name="full domain" fill="5" region="1 -2 3 -4 5 -6" universe="6"/>
     <lattice id="4">
       <pitch>2.5 2.5 2.5</pitch>
       <dimension>12 12 12</dimension>
@@ -182,19 +182,19 @@
 3 3 3 3 3 3 3 3 3 3 3 3 
 3 3 3 3 3 3 3 3 3 3 3 3 </universes>
     </lattice>
-    <surface boundary="reflective" coeffs="0.0" id="1" type="x-plane"/>
-    <surface boundary="vacuum" coeffs="30.0" id="2" type="x-plane"/>
-    <surface boundary="reflective" coeffs="0.0" id="3" type="y-plane"/>
-    <surface boundary="vacuum" coeffs="30.0" id="4" type="y-plane"/>
-    <surface boundary="reflective" coeffs="0.0" id="5" type="z-plane"/>
-    <surface boundary="vacuum" coeffs="30.0" id="6" type="z-plane"/>
+    <surface id="1" type="x-plane" boundary="reflective" coeffs="0.0"/>
+    <surface id="2" type="x-plane" boundary="vacuum" coeffs="30.0"/>
+    <surface id="3" type="y-plane" boundary="reflective" coeffs="0.0"/>
+    <surface id="4" type="y-plane" boundary="vacuum" coeffs="30.0"/>
+    <surface id="5" type="z-plane" boundary="reflective" coeffs="0.0"/>
+    <surface id="6" type="z-plane" boundary="vacuum" coeffs="30.0"/>
   </geometry>
   <settings>
     <run_mode>fixed source</run_mode>
     <particles>90</particles>
     <batches>10</batches>
     <inactive>5</inactive>
-    <source particle="neutron" strength="3.14" type="independent">
+    <source type="independent" strength="3.14" particle="neutron">
       <energy type="discrete">
         <parameters>100.0 1.0</parameters>
       </energy>
@@ -207,7 +207,7 @@
     <random_ray>
       <distance_active>500.0</distance_active>
       <distance_inactive>100.0</distance_inactive>
-      <source particle="neutron" strength="1.0" type="independent">
+      <source type="independent" strength="1.0" particle="neutron">
         <space type="box">
           <parameters>0.0 0.0 0.0 30.0 30.0 30.0</parameters>
         </space>
diff --git a/tests/regression_tests/random_ray_volume_estimator/simulation_averaged/inputs_true.dat b/tests/regression_tests/random_ray_volume_estimator/simulation_averaged/inputs_true.dat
index 301671e6d..0331b562c 100644
--- a/tests/regression_tests/random_ray_volume_estimator/simulation_averaged/inputs_true.dat
+++ b/tests/regression_tests/random_ray_volume_estimator/simulation_averaged/inputs_true.dat
@@ -3,24 +3,24 @@
   <materials>
     <cross_sections>mgxs.h5</cross_sections>
     <material id="1" name="source">
-      <density units="macro" value="1.0"/>
+      <density value="1.0" units="macro"/>
       <macroscopic name="source"/>
     </material>
     <material id="2" name="void">
-      <density units="macro" value="1.0"/>
+      <density value="1.0" units="macro"/>
       <macroscopic name="void"/>
     </material>
     <material id="3" name="absorber">
-      <density units="macro" value="1.0"/>
+      <density value="1.0" units="macro"/>
       <macroscopic name="absorber"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="1" name="infinite source region" universe="1"/>
-    <cell id="2" material="2" name="infinite void region" universe="2"/>
-    <cell id="3" material="3" name="infinite absorber region" universe="3"/>
-    <cell fill="4" id="4" universe="5"/>
-    <cell fill="5" id="5" name="full domain" region="1 -2 3 -4 5 -6" universe="6"/>
+    <cell id="1" name="infinite source region" material="1" universe="1"/>
+    <cell id="2" name="infinite void region" material="2" universe="2"/>
+    <cell id="3" name="infinite absorber region" material="3" universe="3"/>
+    <cell id="4" fill="4" universe="5"/>
+    <cell id="5" name="full domain" fill="5" region="1 -2 3 -4 5 -6" universe="6"/>
     <lattice id="4">
       <pitch>2.5 2.5 2.5</pitch>
       <dimension>12 12 12</dimension>
@@ -182,19 +182,19 @@
 3 3 3 3 3 3 3 3 3 3 3 3 
 3 3 3 3 3 3 3 3 3 3 3 3 </universes>
     </lattice>
-    <surface boundary="reflective" coeffs="0.0" id="1" type="x-plane"/>
-    <surface boundary="vacuum" coeffs="30.0" id="2" type="x-plane"/>
-    <surface boundary="reflective" coeffs="0.0" id="3" type="y-plane"/>
-    <surface boundary="vacuum" coeffs="30.0" id="4" type="y-plane"/>
-    <surface boundary="reflective" coeffs="0.0" id="5" type="z-plane"/>
-    <surface boundary="vacuum" coeffs="30.0" id="6" type="z-plane"/>
+    <surface id="1" type="x-plane" boundary="reflective" coeffs="0.0"/>
+    <surface id="2" type="x-plane" boundary="vacuum" coeffs="30.0"/>
+    <surface id="3" type="y-plane" boundary="reflective" coeffs="0.0"/>
+    <surface id="4" type="y-plane" boundary="vacuum" coeffs="30.0"/>
+    <surface id="5" type="z-plane" boundary="reflective" coeffs="0.0"/>
+    <surface id="6" type="z-plane" boundary="vacuum" coeffs="30.0"/>
   </geometry>
   <settings>
     <run_mode>fixed source</run_mode>
     <particles>90</particles>
     <batches>10</batches>
     <inactive>5</inactive>
-    <source particle="neutron" strength="3.14" type="independent">
+    <source type="independent" strength="3.14" particle="neutron">
       <energy type="discrete">
         <parameters>100.0 1.0</parameters>
       </energy>
@@ -207,7 +207,7 @@
     <random_ray>
       <distance_active>500.0</distance_active>
       <distance_inactive>100.0</distance_inactive>
-      <source particle="neutron" strength="1.0" type="independent">
+      <source type="independent" strength="1.0" particle="neutron">
         <space type="box">
           <parameters>0.0 0.0 0.0 30.0 30.0 30.0</parameters>
         </space>
diff --git a/tests/regression_tests/random_ray_volume_estimator_linear/hybrid/inputs_true.dat b/tests/regression_tests/random_ray_volume_estimator_linear/hybrid/inputs_true.dat
index 6440cca04..343833210 100644
--- a/tests/regression_tests/random_ray_volume_estimator_linear/hybrid/inputs_true.dat
+++ b/tests/regression_tests/random_ray_volume_estimator_linear/hybrid/inputs_true.dat
@@ -3,24 +3,24 @@
   <materials>
     <cross_sections>mgxs.h5</cross_sections>
     <material id="1" name="source">
-      <density units="macro" value="1.0"/>
+      <density value="1.0" units="macro"/>
       <macroscopic name="source"/>
     </material>
     <material id="2" name="void">
-      <density units="macro" value="1.0"/>
+      <density value="1.0" units="macro"/>
       <macroscopic name="void"/>
     </material>
     <material id="3" name="absorber">
-      <density units="macro" value="1.0"/>
+      <density value="1.0" units="macro"/>
       <macroscopic name="absorber"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="1" name="infinite source region" universe="1"/>
-    <cell id="2" material="2" name="infinite void region" universe="2"/>
-    <cell id="3" material="3" name="infinite absorber region" universe="3"/>
-    <cell fill="4" id="4" universe="5"/>
-    <cell fill="5" id="5" name="full domain" region="1 -2 3 -4 5 -6" universe="6"/>
+    <cell id="1" name="infinite source region" material="1" universe="1"/>
+    <cell id="2" name="infinite void region" material="2" universe="2"/>
+    <cell id="3" name="infinite absorber region" material="3" universe="3"/>
+    <cell id="4" fill="4" universe="5"/>
+    <cell id="5" name="full domain" fill="5" region="1 -2 3 -4 5 -6" universe="6"/>
     <lattice id="4">
       <pitch>2.5 2.5 2.5</pitch>
       <dimension>12 12 12</dimension>
@@ -182,19 +182,19 @@
 3 3 3 3 3 3 3 3 3 3 3 3 
 3 3 3 3 3 3 3 3 3 3 3 3 </universes>
     </lattice>
-    <surface boundary="reflective" coeffs="0.0" id="1" type="x-plane"/>
-    <surface boundary="vacuum" coeffs="30.0" id="2" type="x-plane"/>
-    <surface boundary="reflective" coeffs="0.0" id="3" type="y-plane"/>
-    <surface boundary="vacuum" coeffs="30.0" id="4" type="y-plane"/>
-    <surface boundary="reflective" coeffs="0.0" id="5" type="z-plane"/>
-    <surface boundary="vacuum" coeffs="30.0" id="6" type="z-plane"/>
+    <surface id="1" type="x-plane" boundary="reflective" coeffs="0.0"/>
+    <surface id="2" type="x-plane" boundary="vacuum" coeffs="30.0"/>
+    <surface id="3" type="y-plane" boundary="reflective" coeffs="0.0"/>
+    <surface id="4" type="y-plane" boundary="vacuum" coeffs="30.0"/>
+    <surface id="5" type="z-plane" boundary="reflective" coeffs="0.0"/>
+    <surface id="6" type="z-plane" boundary="vacuum" coeffs="30.0"/>
   </geometry>
   <settings>
     <run_mode>fixed source</run_mode>
     <particles>90</particles>
     <batches>40</batches>
     <inactive>20</inactive>
-    <source particle="neutron" strength="3.14" type="independent">
+    <source type="independent" strength="3.14" particle="neutron">
       <energy type="discrete">
         <parameters>100.0 1.0</parameters>
       </energy>
@@ -207,7 +207,7 @@
     <random_ray>
       <distance_active>500.0</distance_active>
       <distance_inactive>100.0</distance_inactive>
-      <source particle="neutron" strength="1.0" type="independent">
+      <source type="independent" strength="1.0" particle="neutron">
         <space type="box">
           <parameters>0.0 0.0 0.0 30.0 30.0 30.0</parameters>
         </space>
diff --git a/tests/regression_tests/random_ray_volume_estimator_linear/naive/inputs_true.dat b/tests/regression_tests/random_ray_volume_estimator_linear/naive/inputs_true.dat
index fcf93b046..50be43eb3 100644
--- a/tests/regression_tests/random_ray_volume_estimator_linear/naive/inputs_true.dat
+++ b/tests/regression_tests/random_ray_volume_estimator_linear/naive/inputs_true.dat
@@ -3,24 +3,24 @@
   <materials>
     <cross_sections>mgxs.h5</cross_sections>
     <material id="1" name="source">
-      <density units="macro" value="1.0"/>
+      <density value="1.0" units="macro"/>
       <macroscopic name="source"/>
     </material>
     <material id="2" name="void">
-      <density units="macro" value="1.0"/>
+      <density value="1.0" units="macro"/>
       <macroscopic name="void"/>
     </material>
     <material id="3" name="absorber">
-      <density units="macro" value="1.0"/>
+      <density value="1.0" units="macro"/>
       <macroscopic name="absorber"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="1" name="infinite source region" universe="1"/>
-    <cell id="2" material="2" name="infinite void region" universe="2"/>
-    <cell id="3" material="3" name="infinite absorber region" universe="3"/>
-    <cell fill="4" id="4" universe="5"/>
-    <cell fill="5" id="5" name="full domain" region="1 -2 3 -4 5 -6" universe="6"/>
+    <cell id="1" name="infinite source region" material="1" universe="1"/>
+    <cell id="2" name="infinite void region" material="2" universe="2"/>
+    <cell id="3" name="infinite absorber region" material="3" universe="3"/>
+    <cell id="4" fill="4" universe="5"/>
+    <cell id="5" name="full domain" fill="5" region="1 -2 3 -4 5 -6" universe="6"/>
     <lattice id="4">
       <pitch>2.5 2.5 2.5</pitch>
       <dimension>12 12 12</dimension>
@@ -182,19 +182,19 @@
 3 3 3 3 3 3 3 3 3 3 3 3 
 3 3 3 3 3 3 3 3 3 3 3 3 </universes>
     </lattice>
-    <surface boundary="reflective" coeffs="0.0" id="1" type="x-plane"/>
-    <surface boundary="vacuum" coeffs="30.0" id="2" type="x-plane"/>
-    <surface boundary="reflective" coeffs="0.0" id="3" type="y-plane"/>
-    <surface boundary="vacuum" coeffs="30.0" id="4" type="y-plane"/>
-    <surface boundary="reflective" coeffs="0.0" id="5" type="z-plane"/>
-    <surface boundary="vacuum" coeffs="30.0" id="6" type="z-plane"/>
+    <surface id="1" type="x-plane" boundary="reflective" coeffs="0.0"/>
+    <surface id="2" type="x-plane" boundary="vacuum" coeffs="30.0"/>
+    <surface id="3" type="y-plane" boundary="reflective" coeffs="0.0"/>
+    <surface id="4" type="y-plane" boundary="vacuum" coeffs="30.0"/>
+    <surface id="5" type="z-plane" boundary="reflective" coeffs="0.0"/>
+    <surface id="6" type="z-plane" boundary="vacuum" coeffs="30.0"/>
   </geometry>
   <settings>
     <run_mode>fixed source</run_mode>
     <particles>90</particles>
     <batches>40</batches>
     <inactive>20</inactive>
-    <source particle="neutron" strength="3.14" type="independent">
+    <source type="independent" strength="3.14" particle="neutron">
       <energy type="discrete">
         <parameters>100.0 1.0</parameters>
       </energy>
@@ -207,7 +207,7 @@
     <random_ray>
       <distance_active>500.0</distance_active>
       <distance_inactive>100.0</distance_inactive>
-      <source particle="neutron" strength="1.0" type="independent">
+      <source type="independent" strength="1.0" particle="neutron">
         <space type="box">
           <parameters>0.0 0.0 0.0 30.0 30.0 30.0</parameters>
         </space>
diff --git a/tests/regression_tests/random_ray_volume_estimator_linear/simulation_averaged/inputs_true.dat b/tests/regression_tests/random_ray_volume_estimator_linear/simulation_averaged/inputs_true.dat
index 1df3204a3..3d64ab978 100644
--- a/tests/regression_tests/random_ray_volume_estimator_linear/simulation_averaged/inputs_true.dat
+++ b/tests/regression_tests/random_ray_volume_estimator_linear/simulation_averaged/inputs_true.dat
@@ -3,24 +3,24 @@
   <materials>
     <cross_sections>mgxs.h5</cross_sections>
     <material id="1" name="source">
-      <density units="macro" value="1.0"/>
+      <density value="1.0" units="macro"/>
       <macroscopic name="source"/>
     </material>
     <material id="2" name="void">
-      <density units="macro" value="1.0"/>
+      <density value="1.0" units="macro"/>
       <macroscopic name="void"/>
     </material>
     <material id="3" name="absorber">
-      <density units="macro" value="1.0"/>
+      <density value="1.0" units="macro"/>
       <macroscopic name="absorber"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="1" name="infinite source region" universe="1"/>
-    <cell id="2" material="2" name="infinite void region" universe="2"/>
-    <cell id="3" material="3" name="infinite absorber region" universe="3"/>
-    <cell fill="4" id="4" universe="5"/>
-    <cell fill="5" id="5" name="full domain" region="1 -2 3 -4 5 -6" universe="6"/>
+    <cell id="1" name="infinite source region" material="1" universe="1"/>
+    <cell id="2" name="infinite void region" material="2" universe="2"/>
+    <cell id="3" name="infinite absorber region" material="3" universe="3"/>
+    <cell id="4" fill="4" universe="5"/>
+    <cell id="5" name="full domain" fill="5" region="1 -2 3 -4 5 -6" universe="6"/>
     <lattice id="4">
       <pitch>2.5 2.5 2.5</pitch>
       <dimension>12 12 12</dimension>
@@ -182,19 +182,19 @@
 3 3 3 3 3 3 3 3 3 3 3 3 
 3 3 3 3 3 3 3 3 3 3 3 3 </universes>
     </lattice>
-    <surface boundary="reflective" coeffs="0.0" id="1" type="x-plane"/>
-    <surface boundary="vacuum" coeffs="30.0" id="2" type="x-plane"/>
-    <surface boundary="reflective" coeffs="0.0" id="3" type="y-plane"/>
-    <surface boundary="vacuum" coeffs="30.0" id="4" type="y-plane"/>
-    <surface boundary="reflective" coeffs="0.0" id="5" type="z-plane"/>
-    <surface boundary="vacuum" coeffs="30.0" id="6" type="z-plane"/>
+    <surface id="1" type="x-plane" boundary="reflective" coeffs="0.0"/>
+    <surface id="2" type="x-plane" boundary="vacuum" coeffs="30.0"/>
+    <surface id="3" type="y-plane" boundary="reflective" coeffs="0.0"/>
+    <surface id="4" type="y-plane" boundary="vacuum" coeffs="30.0"/>
+    <surface id="5" type="z-plane" boundary="reflective" coeffs="0.0"/>
+    <surface id="6" type="z-plane" boundary="vacuum" coeffs="30.0"/>
   </geometry>
   <settings>
     <run_mode>fixed source</run_mode>
     <particles>90</particles>
     <batches>40</batches>
     <inactive>20</inactive>
-    <source particle="neutron" strength="3.14" type="independent">
+    <source type="independent" strength="3.14" particle="neutron">
       <energy type="discrete">
         <parameters>100.0 1.0</parameters>
       </energy>
@@ -207,7 +207,7 @@
     <random_ray>
       <distance_active>500.0</distance_active>
       <distance_inactive>100.0</distance_inactive>
-      <source particle="neutron" strength="1.0" type="independent">
+      <source type="independent" strength="1.0" particle="neutron">
         <space type="box">
           <parameters>0.0 0.0 0.0 30.0 30.0 30.0</parameters>
         </space>
diff --git a/tests/regression_tests/resonance_scattering/inputs_true.dat b/tests/regression_tests/resonance_scattering/inputs_true.dat
index dba4535c2..ebe6a5dbe 100644
--- a/tests/regression_tests/resonance_scattering/inputs_true.dat
+++ b/tests/regression_tests/resonance_scattering/inputs_true.dat
@@ -1,24 +1,24 @@
 <?xml version='1.0' encoding='utf-8'?>
 <model>
   <materials>
-    <material depletable="true" id="1">
-      <density units="g/cc" value="1.0"/>
-      <nuclide ao="1.0" name="U238"/>
-      <nuclide ao="0.02" name="U235"/>
-      <nuclide ao="0.02" name="Pu239"/>
-      <nuclide ao="20.0" name="H1"/>
+    <material id="1" depletable="true">
+      <density value="1.0" units="g/cc"/>
+      <nuclide name="U238" ao="1.0"/>
+      <nuclide name="U235" ao="0.02"/>
+      <nuclide name="Pu239" ao="0.02"/>
+      <nuclide name="H1" ao="20.0"/>
     </material>
   </materials>
   <geometry>
     <cell id="1" material="1" region="-1" universe="0"/>
-    <surface boundary="reflective" coeffs="100" id="1" type="x-plane"/>
+    <surface id="1" type="x-plane" boundary="reflective" coeffs="100"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
     <particles>1000</particles>
     <batches>10</batches>
     <inactive>5</inactive>
-    <source particle="neutron" strength="1.0" type="independent">
+    <source type="independent" strength="1.0" particle="neutron">
       <space type="box">
         <parameters>-4 -4 -4 4 4 4</parameters>
       </space>
diff --git a/tests/regression_tests/salphabeta/inputs_true.dat b/tests/regression_tests/salphabeta/inputs_true.dat
index ef0e843c2..56f4be375 100644
--- a/tests/regression_tests/salphabeta/inputs_true.dat
+++ b/tests/regression_tests/salphabeta/inputs_true.dat
@@ -1,36 +1,36 @@
 <?xml version='1.0' encoding='utf-8'?>
 <model>
   <materials>
-    <material depletable="true" id="1">
-      <density units="g/cc" value="4.5"/>
-      <nuclide ao="1.0" name="U235"/>
-      <nuclide ao="1.0" name="H1"/>
-      <sab fraction="0.5" name="c_H_in_H2O"/>
+    <material id="1" depletable="true">
+      <density value="4.5" units="g/cc"/>
+      <nuclide name="U235" ao="1.0"/>
+      <nuclide name="H1" ao="1.0"/>
+      <sab name="c_H_in_H2O" fraction="0.5"/>
     </material>
-    <material depletable="true" id="2">
-      <density units="g/cc" value="4.5"/>
-      <nuclide ao="1.0" name="U235"/>
-      <nuclide ao="1.0" name="C0"/>
+    <material id="2" depletable="true">
+      <density value="4.5" units="g/cc"/>
+      <nuclide name="U235" ao="1.0"/>
+      <nuclide name="C0" ao="1.0"/>
       <sab name="c_Graphite"/>
     </material>
-    <material depletable="true" id="3">
-      <density units="g/cc" value="4.5"/>
-      <nuclide ao="1.0" name="U235"/>
-      <nuclide ao="1.0" name="Be9"/>
-      <nuclide ao="1.0" name="O16"/>
+    <material id="3" depletable="true">
+      <density value="4.5" units="g/cc"/>
+      <nuclide name="U235" ao="1.0"/>
+      <nuclide name="Be9" ao="1.0"/>
+      <nuclide name="O16" ao="1.0"/>
       <sab name="c_Be_in_BeO"/>
       <sab name="c_O_in_BeO"/>
     </material>
-    <material depletable="true" id="4">
-      <density units="g/cm3" value="5.90168"/>
-      <nuclide ao="0.3" name="H1"/>
-      <nuclide ao="0.15" name="Zr90"/>
-      <nuclide ao="0.1" name="Zr91"/>
-      <nuclide ao="0.1" name="Zr92"/>
-      <nuclide ao="0.05" name="Zr94"/>
-      <nuclide ao="0.05" name="Zr96"/>
-      <nuclide ao="0.1" name="U235"/>
-      <nuclide ao="0.15" name="U238"/>
+    <material id="4" depletable="true">
+      <density value="5.90168" units="g/cm3"/>
+      <nuclide name="H1" ao="0.3"/>
+      <nuclide name="Zr90" ao="0.15"/>
+      <nuclide name="Zr91" ao="0.1"/>
+      <nuclide name="Zr92" ao="0.1"/>
+      <nuclide name="Zr94" ao="0.05"/>
+      <nuclide name="Zr96" ao="0.05"/>
+      <nuclide name="U235" ao="0.1"/>
+      <nuclide name="U238" ao="0.15"/>
       <sab name="c_Zr_in_ZrH"/>
       <sab name="c_H_in_ZrH"/>
     </material>
@@ -40,18 +40,18 @@
     <cell id="2" material="2" region="2 -3" universe="1"/>
     <cell id="3" material="3" region="3 -4" universe="1"/>
     <cell id="4" material="4" region="4 -5" universe="1"/>
-    <surface boundary="vacuum" coeffs="-10" id="1" type="x-plane"/>
-    <surface coeffs="-5" id="2" type="x-plane"/>
-    <surface coeffs="0" id="3" type="x-plane"/>
-    <surface coeffs="5" id="4" type="x-plane"/>
-    <surface boundary="vacuum" coeffs="10" id="5" type="x-plane"/>
+    <surface id="1" type="x-plane" boundary="vacuum" coeffs="-10"/>
+    <surface id="2" type="x-plane" coeffs="-5"/>
+    <surface id="3" type="x-plane" coeffs="0"/>
+    <surface id="4" type="x-plane" coeffs="5"/>
+    <surface id="5" type="x-plane" boundary="vacuum" coeffs="10"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
     <particles>400</particles>
     <batches>5</batches>
     <inactive>0</inactive>
-    <source particle="neutron" strength="1.0" type="independent">
+    <source type="independent" strength="1.0" particle="neutron">
       <space type="box">
         <parameters>-4 -4 -4 4 4 4</parameters>
       </space>
diff --git a/tests/regression_tests/score_current/inputs_true.dat b/tests/regression_tests/score_current/inputs_true.dat
index ddbd6c24b..42c2d3df2 100644
--- a/tests/regression_tests/score_current/inputs_true.dat
+++ b/tests/regression_tests/score_current/inputs_true.dat
@@ -1,28 +1,28 @@
 <?xml version='1.0' encoding='utf-8'?>
 <model>
   <materials>
-    <material depletable="true" id="1">
-      <density units="g/cm3" value="10.0"/>
-      <nuclide ao="1.0" name="U235"/>
+    <material id="1" depletable="true">
+      <density value="10.0" units="g/cm3"/>
+      <nuclide name="U235" ao="1.0"/>
     </material>
     <material id="2">
-      <density units="g/cm3" value="1.0"/>
-      <nuclide ao="1.0" name="Zr90"/>
+      <density value="1.0" units="g/cm3"/>
+      <nuclide name="Zr90" ao="1.0"/>
     </material>
   </materials>
   <geometry>
     <cell id="1" material="1" region="1 -2 3 -4 10 -9" universe="1"/>
     <cell id="2" material="2" region="(-1 | 2 | -3 | 4) (5 -6 7 -8) 10 -9" universe="1"/>
-    <surface coeffs="-5.0" id="1" name="minimum x" type="x-plane"/>
-    <surface coeffs="5.0" id="2" name="maximum x" type="x-plane"/>
-    <surface coeffs="-5.0" id="3" name="minimum y" type="y-plane"/>
-    <surface coeffs="5.0" id="4" name="maximum y" type="y-plane"/>
-    <surface boundary="reflective" coeffs="-10.0" id="5" name="minimum x" type="x-plane"/>
-    <surface boundary="reflective" coeffs="10.0" id="6" name="maximum x" type="x-plane"/>
-    <surface boundary="reflective" coeffs="-10.0" id="7" name="minimum y" type="y-plane"/>
-    <surface boundary="reflective" coeffs="10.0" id="8" name="maximum y" type="y-plane"/>
-    <surface boundary="vacuum" coeffs="10.0" id="9" type="z-plane"/>
-    <surface boundary="vacuum" coeffs="-10.0" id="10" type="z-plane"/>
+    <surface id="1" name="minimum x" type="x-plane" coeffs="-5.0"/>
+    <surface id="2" name="maximum x" type="x-plane" coeffs="5.0"/>
+    <surface id="3" name="minimum y" type="y-plane" coeffs="-5.0"/>
+    <surface id="4" name="maximum y" type="y-plane" coeffs="5.0"/>
+    <surface id="5" name="minimum x" type="x-plane" boundary="reflective" coeffs="-10.0"/>
+    <surface id="6" name="maximum x" type="x-plane" boundary="reflective" coeffs="10.0"/>
+    <surface id="7" name="minimum y" type="y-plane" boundary="reflective" coeffs="-10.0"/>
+    <surface id="8" name="maximum y" type="y-plane" boundary="reflective" coeffs="10.0"/>
+    <surface id="9" type="z-plane" boundary="vacuum" coeffs="10.0"/>
+    <surface id="10" type="z-plane" boundary="vacuum" coeffs="-10.0"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
diff --git a/tests/regression_tests/source/inputs_true.dat b/tests/regression_tests/source/inputs_true.dat
index e787f24d4..9f10b79d6 100644
--- a/tests/regression_tests/source/inputs_true.dat
+++ b/tests/regression_tests/source/inputs_true.dat
@@ -1,150 +1,150 @@
 <?xml version='1.0' encoding='utf-8'?>
 <model>
   <materials>
-    <material depletable="true" id="1" temperature="294">
-      <density units="g/cm3" value="4.5"/>
-      <nuclide ao="1.0" name="U235"/>
+    <material id="1" depletable="true" temperature="294">
+      <density value="4.5" units="g/cm3"/>
+      <nuclide name="U235" ao="1.0"/>
     </material>
   </materials>
   <geometry>
     <cell id="1" material="1" region="-1" universe="0"/>
-    <surface boundary="vacuum" coeffs="0.0 0.0 0.0 10.0" id="1" type="sphere"/>
+    <surface id="1" type="sphere" boundary="vacuum" coeffs="0.0 0.0 0.0 10.0"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
     <particles>1000</particles>
     <batches>10</batches>
     <inactive>5</inactive>
-    <source particle="neutron" strength="0.3" type="independent">
+    <source type="independent" strength="0.3" particle="neutron">
       <space type="cartesian">
-        <x parameters="-3.0 3.0" type="uniform"/>
+        <x type="uniform" parameters="-3.0 3.0"/>
         <y type="discrete">
           <parameters>-4.0 -1.0 3.0 0.2 0.3 0.5</parameters>
         </y>
-        <z interpolation="linear-linear" type="tabular">
+        <z type="tabular" interpolation="linear-linear">
           <parameters>-2.0 0.0 2.0 0.2 0.3 0.2</parameters>
         </z>
       </space>
-      <angle reference_uvw="0.0 0.0 1.0" type="mu-phi">
+      <angle type="mu-phi" reference_uvw="0.0 0.0 1.0">
         <mu type="discrete">
           <parameters>-1.0 0.0 1.0 0.5 0.25 0.25</parameters>
         </mu>
-        <phi parameters="0.0 6.28318530718" type="uniform"/>
+        <phi type="uniform" parameters="0.0 6.28318530718"/>
       </angle>
-      <energy parameters="1289500.0" type="maxwell"/>
+      <energy type="maxwell" parameters="1289500.0"/>
     </source>
-    <source particle="neutron" strength="0.1" type="independent">
+    <source type="independent" strength="0.1" particle="neutron">
       <space type="box">
         <parameters>-4.0 -4.0 -4.0 4.0 4.0 4.0</parameters>
       </space>
-      <angle reference_uvw="0.0 1.0 0.0" type="monodirectional"/>
-      <energy parameters="988000.0 2.249e-06" type="watt"/>
+      <angle type="monodirectional" reference_uvw="0.0 1.0 0.0"/>
+      <energy type="watt" parameters="988000.0 2.249e-06"/>
     </source>
-    <source particle="neutron" strength="0.1" type="independent">
+    <source type="independent" strength="0.1" particle="neutron">
       <space type="point">
         <parameters>1.2 -2.3 0.781</parameters>
       </space>
       <angle type="isotropic"/>
-      <energy interpolation="histogram" type="tabular">
+      <energy type="tabular" interpolation="histogram">
         <parameters>1.0 1.3894954943731377 1.93069772888325 2.6826957952797255 3.72759372031494 5.17947467923121 7.196856730011519 10.0 13.894954943731374 19.306977288832496 26.826957952797247 37.2759372031494 51.7947467923121 71.96856730011518 100.0 138.94954943731375 193.06977288832496 268.26957952797244 372.7593720314938 517.9474679231207 719.6856730011514 1000.0 1389.4954943731375 1930.6977288832495 2682.6957952797247 3727.593720314938 5179.474679231207 7196.856730011514 10000.0 13894.95494373136 19306.977288832495 26826.95795279722 37275.93720314938 51794.74679231213 71968.56730011514 100000.0 138949.5494373136 193069.77288832495 268269.5795279722 372759.3720314938 517947.4679231202 719685.6730011514 1000000.0 1389495.494373136 1930697.7288832497 2682695.7952797217 3727593.720314938 5179474.679231202 7196856.730011513 10000000.0 0.0 2.9086439299358713e-08 5.80533561806147e-08 8.67817193689187e-08 1.1515347785771536e-07 1.4305204600565115e-07 1.7036278261198208e-07 1.9697346200185813e-07 2.227747351856934e-07 2.4766057919761985e-07 2.715287327665956e-07 2.9428111652990295e-07 3.1582423606228735e-07 3.360695660646056e-07 3.549339141332686e-07 3.723397626156721e-07 3.882155871468592e-07 4.024961505584776e-07 4.151227709522976e-07 4.260435628367196e-07 4.3521365033538783e-07 4.4259535159179273e-07 4.4815833361210174e-07 4.5187973690993757e-07 4.5374426944091084e-07 4.5374426944091084e-07 4.5187973690993757e-07 4.4815833361210174e-07 4.4259535159179273e-07 4.352136503353879e-07 4.2604356283671966e-07 4.1512277095229767e-07 4.0249615055847764e-07 3.8821558714685926e-07 3.723397626156722e-07 3.5493391413326864e-07 3.360695660646057e-07 3.158242360622874e-07 2.942811165299031e-07 2.715287327665957e-07 2.4766057919762e-07 2.2277473518569352e-07 1.9697346200185819e-07 1.7036278261198226e-07 1.4305204600565126e-07 1.1515347785771556e-07 8.678171936891881e-08 5.805335618061493e-08 2.9086439299358858e-08 5.559621115282002e-23</parameters>
       </energy>
     </source>
-    <source particle="neutron" strength="0.1" type="independent">
-      <space origin="1.0 1.0 0.0" type="spherical">
-        <r parameters="2.0 3.0" type="uniform"/>
+    <source type="independent" strength="0.1" particle="neutron">
+      <space type="spherical" origin="1.0 1.0 0.0">
+        <r type="uniform" parameters="2.0 3.0"/>
         <cos_theta type="discrete">
           <parameters>0.7071067811865476 0.0 -0.7071067811865475 0.3 0.4 0.3</parameters>
         </cos_theta>
-        <phi parameters="0.0 6.283185307179586" type="uniform"/>
+        <phi type="uniform" parameters="0.0 6.283185307179586"/>
       </space>
       <angle type="isotropic"/>
-      <energy interpolation="histogram" type="tabular">
+      <energy type="tabular" interpolation="histogram">
         <parameters>1.0 1.3894954943731377 1.93069772888325 2.6826957952797255 3.72759372031494 5.17947467923121 7.196856730011519 10.0 13.894954943731374 19.306977288832496 26.826957952797247 37.2759372031494 51.7947467923121 71.96856730011518 100.0 138.94954943731375 193.06977288832496 268.26957952797244 372.7593720314938 517.9474679231207 719.6856730011514 1000.0 1389.4954943731375 1930.6977288832495 2682.6957952797247 3727.593720314938 5179.474679231207 7196.856730011514 10000.0 13894.95494373136 19306.977288832495 26826.95795279722 37275.93720314938 51794.74679231213 71968.56730011514 100000.0 138949.5494373136 193069.77288832495 268269.5795279722 372759.3720314938 517947.4679231202 719685.6730011514 1000000.0 1389495.494373136 1930697.7288832497 2682695.7952797217 3727593.720314938 5179474.679231202 7196856.730011513 10000000.0 0.0 2.9086439299358713e-08 5.80533561806147e-08 8.67817193689187e-08 1.1515347785771536e-07 1.4305204600565115e-07 1.7036278261198208e-07 1.9697346200185813e-07 2.227747351856934e-07 2.4766057919761985e-07 2.715287327665956e-07 2.9428111652990295e-07 3.1582423606228735e-07 3.360695660646056e-07 3.549339141332686e-07 3.723397626156721e-07 3.882155871468592e-07 4.024961505584776e-07 4.151227709522976e-07 4.260435628367196e-07 4.3521365033538783e-07 4.4259535159179273e-07 4.4815833361210174e-07 4.5187973690993757e-07 4.5374426944091084e-07 4.5374426944091084e-07 4.5187973690993757e-07 4.4815833361210174e-07 4.4259535159179273e-07 4.352136503353879e-07 4.2604356283671966e-07 4.1512277095229767e-07 4.0249615055847764e-07 3.8821558714685926e-07 3.723397626156722e-07 3.5493391413326864e-07 3.360695660646057e-07 3.158242360622874e-07 2.942811165299031e-07 2.715287327665957e-07 2.4766057919762e-07 2.2277473518569352e-07 1.9697346200185819e-07 1.7036278261198226e-07 1.4305204600565126e-07 1.1515347785771556e-07 8.678171936891881e-08 5.805335618061493e-08 2.9086439299358858e-08 5.559621115282002e-23</parameters>
       </energy>
     </source>
-    <source particle="neutron" strength="0.1" type="independent">
-      <space origin="1.0 1.0 0.0" type="cylindrical">
-        <r parameters="2.0 3.0" type="uniform"/>
-        <phi parameters="0.0 6.283185307179586" type="uniform"/>
-        <z interpolation="linear-linear" type="tabular">
+    <source type="independent" strength="0.1" particle="neutron">
+      <space type="cylindrical" origin="1.0 1.0 0.0">
+        <r type="uniform" parameters="2.0 3.0"/>
+        <phi type="uniform" parameters="0.0 6.283185307179586"/>
+        <z type="tabular" interpolation="linear-linear">
           <parameters>-2.0 0.0 2.0 0.2 0.3 0.2</parameters>
         </z>
       </space>
       <angle type="isotropic"/>
-      <energy interpolation="histogram" type="tabular">
+      <energy type="tabular" interpolation="histogram">
         <parameters>1.0 1.3894954943731377 1.93069772888325 2.6826957952797255 3.72759372031494 5.17947467923121 7.196856730011519 10.0 13.894954943731374 19.306977288832496 26.826957952797247 37.2759372031494 51.7947467923121 71.96856730011518 100.0 138.94954943731375 193.06977288832496 268.26957952797244 372.7593720314938 517.9474679231207 719.6856730011514 1000.0 1389.4954943731375 1930.6977288832495 2682.6957952797247 3727.593720314938 5179.474679231207 7196.856730011514 10000.0 13894.95494373136 19306.977288832495 26826.95795279722 37275.93720314938 51794.74679231213 71968.56730011514 100000.0 138949.5494373136 193069.77288832495 268269.5795279722 372759.3720314938 517947.4679231202 719685.6730011514 1000000.0 1389495.494373136 1930697.7288832497 2682695.7952797217 3727593.720314938 5179474.679231202 7196856.730011513 10000000.0 0.0 2.9086439299358713e-08 5.80533561806147e-08 8.67817193689187e-08 1.1515347785771536e-07 1.4305204600565115e-07 1.7036278261198208e-07 1.9697346200185813e-07 2.227747351856934e-07 2.4766057919761985e-07 2.715287327665956e-07 2.9428111652990295e-07 3.1582423606228735e-07 3.360695660646056e-07 3.549339141332686e-07 3.723397626156721e-07 3.882155871468592e-07 4.024961505584776e-07 4.151227709522976e-07 4.260435628367196e-07 4.3521365033538783e-07 4.4259535159179273e-07 4.4815833361210174e-07 4.5187973690993757e-07 4.5374426944091084e-07 4.5374426944091084e-07 4.5187973690993757e-07 4.4815833361210174e-07 4.4259535159179273e-07 4.352136503353879e-07 4.2604356283671966e-07 4.1512277095229767e-07 4.0249615055847764e-07 3.8821558714685926e-07 3.723397626156722e-07 3.5493391413326864e-07 3.360695660646057e-07 3.158242360622874e-07 2.942811165299031e-07 2.715287327665957e-07 2.4766057919762e-07 2.2277473518569352e-07 1.9697346200185819e-07 1.7036278261198226e-07 1.4305204600565126e-07 1.1515347785771556e-07 8.678171936891881e-08 5.805335618061493e-08 2.9086439299358858e-08 5.559621115282002e-23</parameters>
       </energy>
     </source>
-    <source particle="neutron" strength="0.1" type="independent">
-      <space origin="1.0 1.0 0.0" type="cylindrical">
-        <r parameters="2.0 3.0" type="uniform"/>
-        <phi parameters="0.0 6.283185307179586" type="uniform"/>
-        <z interpolation="linear-linear" type="tabular">
+    <source type="independent" strength="0.1" particle="neutron">
+      <space type="cylindrical" origin="1.0 1.0 0.0">
+        <r type="uniform" parameters="2.0 3.0"/>
+        <phi type="uniform" parameters="0.0 6.283185307179586"/>
+        <z type="tabular" interpolation="linear-linear">
           <parameters>-2.0 0.0 2.0 0.2 0.3 0.2</parameters>
         </z>
       </space>
       <angle type="isotropic"/>
       <energy type="mixture">
         <pair probability="1.0">
-          <dist parameters="1289500.0" type="maxwell"/>
+          <dist type="maxwell" parameters="1289500.0"/>
         </pair>
         <pair probability="2.0">
-          <dist parameters="988000.0 2.249e-06" type="watt"/>
+          <dist type="watt" parameters="988000.0 2.249e-06"/>
         </pair>
         <pair probability="3.0">
-          <dist interpolation="histogram" type="tabular">
+          <dist type="tabular" interpolation="histogram">
             <parameters>1.0 1.3894954943731377 1.93069772888325 2.6826957952797255 3.72759372031494 5.17947467923121 7.196856730011519 10.0 13.894954943731374 19.306977288832496 26.826957952797247 37.2759372031494 51.7947467923121 71.96856730011518 100.0 138.94954943731375 193.06977288832496 268.26957952797244 372.7593720314938 517.9474679231207 719.6856730011514 1000.0 1389.4954943731375 1930.6977288832495 2682.6957952797247 3727.593720314938 5179.474679231207 7196.856730011514 10000.0 13894.95494373136 19306.977288832495 26826.95795279722 37275.93720314938 51794.74679231213 71968.56730011514 100000.0 138949.5494373136 193069.77288832495 268269.5795279722 372759.3720314938 517947.4679231202 719685.6730011514 1000000.0 1389495.494373136 1930697.7288832497 2682695.7952797217 3727593.720314938 5179474.679231202 7196856.730011513 10000000.0 0.0 2.9086439299358713e-08 5.80533561806147e-08 8.67817193689187e-08 1.1515347785771536e-07 1.4305204600565115e-07 1.7036278261198208e-07 1.9697346200185813e-07 2.227747351856934e-07 2.4766057919761985e-07 2.715287327665956e-07 2.9428111652990295e-07 3.1582423606228735e-07 3.360695660646056e-07 3.549339141332686e-07 3.723397626156721e-07 3.882155871468592e-07 4.024961505584776e-07 4.151227709522976e-07 4.260435628367196e-07 4.3521365033538783e-07 4.4259535159179273e-07 4.4815833361210174e-07 4.5187973690993757e-07 4.5374426944091084e-07 4.5374426944091084e-07 4.5187973690993757e-07 4.4815833361210174e-07 4.4259535159179273e-07 4.352136503353879e-07 4.2604356283671966e-07 4.1512277095229767e-07 4.0249615055847764e-07 3.8821558714685926e-07 3.723397626156722e-07 3.5493391413326864e-07 3.360695660646057e-07 3.158242360622874e-07 2.942811165299031e-07 2.715287327665957e-07 2.4766057919762e-07 2.2277473518569352e-07 1.9697346200185819e-07 1.7036278261198226e-07 1.4305204600565126e-07 1.1515347785771556e-07 8.678171936891881e-08 5.805335618061493e-08 2.9086439299358858e-08 5.559621115282002e-23</parameters>
           </dist>
         </pair>
       </energy>
     </source>
-    <source particle="neutron" strength="0.1" type="independent">
-      <space origin="1.0 1.0 0.0" type="spherical">
-        <r parameters="2.0 3.0 2.0" type="powerlaw"/>
+    <source type="independent" strength="0.1" particle="neutron">
+      <space type="spherical" origin="1.0 1.0 0.0">
+        <r type="powerlaw" parameters="2.0 3.0 2.0"/>
         <cos_theta type="discrete">
           <parameters>0.7071067811865476 0.0 -0.7071067811865475 0.3 0.4 0.3</parameters>
         </cos_theta>
-        <phi parameters="0.0 6.283185307179586" type="uniform"/>
+        <phi type="uniform" parameters="0.0 6.283185307179586"/>
       </space>
       <angle type="isotropic"/>
       <energy type="mixture">
         <pair probability="1.0">
-          <dist parameters="1289500.0" type="maxwell"/>
+          <dist type="maxwell" parameters="1289500.0"/>
         </pair>
         <pair probability="2.0">
-          <dist parameters="988000.0 2.249e-06" type="watt"/>
+          <dist type="watt" parameters="988000.0 2.249e-06"/>
         </pair>
         <pair probability="3.0">
-          <dist interpolation="histogram" type="tabular">
+          <dist type="tabular" interpolation="histogram">
             <parameters>1.0 1.3894954943731377 1.93069772888325 2.6826957952797255 3.72759372031494 5.17947467923121 7.196856730011519 10.0 13.894954943731374 19.306977288832496 26.826957952797247 37.2759372031494 51.7947467923121 71.96856730011518 100.0 138.94954943731375 193.06977288832496 268.26957952797244 372.7593720314938 517.9474679231207 719.6856730011514 1000.0 1389.4954943731375 1930.6977288832495 2682.6957952797247 3727.593720314938 5179.474679231207 7196.856730011514 10000.0 13894.95494373136 19306.977288832495 26826.95795279722 37275.93720314938 51794.74679231213 71968.56730011514 100000.0 138949.5494373136 193069.77288832495 268269.5795279722 372759.3720314938 517947.4679231202 719685.6730011514 1000000.0 1389495.494373136 1930697.7288832497 2682695.7952797217 3727593.720314938 5179474.679231202 7196856.730011513 10000000.0 0.0 2.9086439299358713e-08 5.80533561806147e-08 8.67817193689187e-08 1.1515347785771536e-07 1.4305204600565115e-07 1.7036278261198208e-07 1.9697346200185813e-07 2.227747351856934e-07 2.4766057919761985e-07 2.715287327665956e-07 2.9428111652990295e-07 3.1582423606228735e-07 3.360695660646056e-07 3.549339141332686e-07 3.723397626156721e-07 3.882155871468592e-07 4.024961505584776e-07 4.151227709522976e-07 4.260435628367196e-07 4.3521365033538783e-07 4.4259535159179273e-07 4.4815833361210174e-07 4.5187973690993757e-07 4.5374426944091084e-07 4.5374426944091084e-07 4.5187973690993757e-07 4.4815833361210174e-07 4.4259535159179273e-07 4.352136503353879e-07 4.2604356283671966e-07 4.1512277095229767e-07 4.0249615055847764e-07 3.8821558714685926e-07 3.723397626156722e-07 3.5493391413326864e-07 3.360695660646057e-07 3.158242360622874e-07 2.942811165299031e-07 2.715287327665957e-07 2.4766057919762e-07 2.2277473518569352e-07 1.9697346200185819e-07 1.7036278261198226e-07 1.4305204600565126e-07 1.1515347785771556e-07 8.678171936891881e-08 5.805335618061493e-08 2.9086439299358858e-08 5.559621115282002e-23</parameters>
           </dist>
         </pair>
       </energy>
-      <time parameters="2 5" type="uniform"/>
+      <time type="uniform" parameters="2 5"/>
     </source>
-    <source particle="neutron" strength="0.1" type="independent">
-      <space origin="1.0 1.0 0.0" type="cylindrical">
-        <r parameters="2.0 3.0 1.0" type="powerlaw"/>
-        <phi parameters="0.0 6.283185307179586" type="uniform"/>
-        <z interpolation="linear-linear" type="tabular">
+    <source type="independent" strength="0.1" particle="neutron">
+      <space type="cylindrical" origin="1.0 1.0 0.0">
+        <r type="powerlaw" parameters="2.0 3.0 1.0"/>
+        <phi type="uniform" parameters="0.0 6.283185307179586"/>
+        <z type="tabular" interpolation="linear-linear">
           <parameters>-2.0 0.0 2.0 0.2 0.3 0.2</parameters>
         </z>
       </space>
       <angle type="isotropic"/>
       <energy type="mixture">
         <pair probability="1.0">
-          <dist parameters="1289500.0" type="maxwell"/>
+          <dist type="maxwell" parameters="1289500.0"/>
         </pair>
         <pair probability="2.0">
-          <dist parameters="988000.0 2.249e-06" type="watt"/>
+          <dist type="watt" parameters="988000.0 2.249e-06"/>
         </pair>
         <pair probability="3.0">
-          <dist interpolation="histogram" type="tabular">
+          <dist type="tabular" interpolation="histogram">
             <parameters>1.0 1.3894954943731377 1.93069772888325 2.6826957952797255 3.72759372031494 5.17947467923121 7.196856730011519 10.0 13.894954943731374 19.306977288832496 26.826957952797247 37.2759372031494 51.7947467923121 71.96856730011518 100.0 138.94954943731375 193.06977288832496 268.26957952797244 372.7593720314938 517.9474679231207 719.6856730011514 1000.0 1389.4954943731375 1930.6977288832495 2682.6957952797247 3727.593720314938 5179.474679231207 7196.856730011514 10000.0 13894.95494373136 19306.977288832495 26826.95795279722 37275.93720314938 51794.74679231213 71968.56730011514 100000.0 138949.5494373136 193069.77288832495 268269.5795279722 372759.3720314938 517947.4679231202 719685.6730011514 1000000.0 1389495.494373136 1930697.7288832497 2682695.7952797217 3727593.720314938 5179474.679231202 7196856.730011513 10000000.0 0.0 2.9086439299358713e-08 5.80533561806147e-08 8.67817193689187e-08 1.1515347785771536e-07 1.4305204600565115e-07 1.7036278261198208e-07 1.9697346200185813e-07 2.227747351856934e-07 2.4766057919761985e-07 2.715287327665956e-07 2.9428111652990295e-07 3.1582423606228735e-07 3.360695660646056e-07 3.549339141332686e-07 3.723397626156721e-07 3.882155871468592e-07 4.024961505584776e-07 4.151227709522976e-07 4.260435628367196e-07 4.3521365033538783e-07 4.4259535159179273e-07 4.4815833361210174e-07 4.5187973690993757e-07 4.5374426944091084e-07 4.5374426944091084e-07 4.5187973690993757e-07 4.4815833361210174e-07 4.4259535159179273e-07 4.352136503353879e-07 4.2604356283671966e-07 4.1512277095229767e-07 4.0249615055847764e-07 3.8821558714685926e-07 3.723397626156722e-07 3.5493391413326864e-07 3.360695660646057e-07 3.158242360622874e-07 2.942811165299031e-07 2.715287327665957e-07 2.4766057919762e-07 2.2277473518569352e-07 1.9697346200185819e-07 1.7036278261198226e-07 1.4305204600565126e-07 1.1515347785771556e-07 8.678171936891881e-08 5.805335618061493e-08 2.9086439299358858e-08 5.559621115282002e-23</parameters>
           </dist>
         </pair>
       </energy>
-      <time parameters="2 5" type="uniform"/>
+      <time type="uniform" parameters="2 5"/>
     </source>
   </settings>
   </model>
diff --git a/tests/regression_tests/source_dlopen/inputs_true.dat b/tests/regression_tests/source_dlopen/inputs_true.dat
index 28d1e06e2..9b4601d9f 100644
--- a/tests/regression_tests/source_dlopen/inputs_true.dat
+++ b/tests/regression_tests/source_dlopen/inputs_true.dat
@@ -2,23 +2,23 @@
 <model>
   <materials>
     <material id="1" name="natural_lead">
-      <density units="g/cm3" value="11.34"/>
-      <nuclide ao="0.014" name="Pb204"/>
-      <nuclide ao="0.241" name="Pb206"/>
-      <nuclide ao="0.221" name="Pb207"/>
-      <nuclide ao="0.524" name="Pb208"/>
+      <density value="11.34" units="g/cm3"/>
+      <nuclide name="Pb204" ao="0.014"/>
+      <nuclide name="Pb206" ao="0.241"/>
+      <nuclide name="Pb207" ao="0.221"/>
+      <nuclide name="Pb208" ao="0.524"/>
     </material>
   </materials>
   <geometry>
     <cell id="1" material="1" region="-1" universe="1"/>
-    <surface boundary="vacuum" coeffs="0.0 0.0 0.0 100" id="1" type="sphere"/>
+    <surface id="1" type="sphere" boundary="vacuum" coeffs="0.0 0.0 0.0 100"/>
   </geometry>
   <settings>
     <run_mode>fixed source</run_mode>
     <particles>1000</particles>
     <batches>10</batches>
     <inactive>0</inactive>
-    <source library="build/libsource.so" strength="1.0" type="compiled"/>
+    <source type="compiled" strength="1.0" library="build/libsource.so"/>
   </settings>
   <tallies>
     <filter id="1" type="material">
diff --git a/tests/regression_tests/source_parameterized_dlopen/inputs_true.dat b/tests/regression_tests/source_parameterized_dlopen/inputs_true.dat
index 6cf3473f9..088d65ada 100644
--- a/tests/regression_tests/source_parameterized_dlopen/inputs_true.dat
+++ b/tests/regression_tests/source_parameterized_dlopen/inputs_true.dat
@@ -2,23 +2,23 @@
 <model>
   <materials>
     <material id="1" name="natural_lead">
-      <density units="g/cm3" value="11.34"/>
-      <nuclide ao="0.014" name="Pb204"/>
-      <nuclide ao="0.241" name="Pb206"/>
-      <nuclide ao="0.221" name="Pb207"/>
-      <nuclide ao="0.524" name="Pb208"/>
+      <density value="11.34" units="g/cm3"/>
+      <nuclide name="Pb204" ao="0.014"/>
+      <nuclide name="Pb206" ao="0.241"/>
+      <nuclide name="Pb207" ao="0.221"/>
+      <nuclide name="Pb208" ao="0.524"/>
     </material>
   </materials>
   <geometry>
     <cell id="1" material="1" region="-1" universe="1"/>
-    <surface boundary="vacuum" coeffs="0.0 0.0 0.0 100" id="1" type="sphere"/>
+    <surface id="1" type="sphere" boundary="vacuum" coeffs="0.0 0.0 0.0 100"/>
   </geometry>
   <settings>
     <run_mode>fixed source</run_mode>
     <particles>1000</particles>
     <batches>10</batches>
     <inactive>0</inactive>
-    <source library="build/libsource.so" parameters="1e3" strength="1.0" type="compiled"/>
+    <source type="compiled" strength="1.0" library="build/libsource.so" parameters="1e3"/>
   </settings>
   <tallies>
     <filter id="1" type="material">
diff --git a/tests/regression_tests/stride/inputs_true.dat b/tests/regression_tests/stride/inputs_true.dat
index f93ec33d1..ebae53c05 100644
--- a/tests/regression_tests/stride/inputs_true.dat
+++ b/tests/regression_tests/stride/inputs_true.dat
@@ -1,21 +1,21 @@
 <?xml version='1.0' encoding='utf-8'?>
 <model>
   <materials>
-    <material depletable="true" id="1">
-      <density units="g/cm3" value="4.5"/>
-      <nuclide ao="1.0" name="U235"/>
+    <material id="1" depletable="true">
+      <density value="4.5" units="g/cm3"/>
+      <nuclide name="U235" ao="1.0"/>
     </material>
   </materials>
   <geometry>
     <cell id="1" material="1" region="-1" universe="1"/>
-    <surface boundary="vacuum" coeffs="0.0 0.0 0.0 10.0" id="1" type="sphere"/>
+    <surface id="1" type="sphere" boundary="vacuum" coeffs="0.0 0.0 0.0 10.0"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
     <particles>1000</particles>
     <batches>10</batches>
     <inactive>5</inactive>
-    <source particle="neutron" strength="1.0" type="independent">
+    <source type="independent" strength="1.0" particle="neutron">
       <space type="box">
         <parameters>-4 -4 -4 4 4 4</parameters>
       </space>
diff --git a/tests/regression_tests/surface_source/inputs_true_read_h5.dat b/tests/regression_tests/surface_source/inputs_true_read_h5.dat
index 14a55f0bf..321c11d42 100644
--- a/tests/regression_tests/surface_source/inputs_true_read_h5.dat
+++ b/tests/regression_tests/surface_source/inputs_true_read_h5.dat
@@ -7,10 +7,10 @@
     <cell id="2" material="void" region="1 -2" universe="1"/>
     <cell id="3" material="void" region="2 -3" universe="1"/>
     <cell id="4" material="void" region="3 -4" universe="1"/>
-    <surface coeffs="0.0 0.0 0.0 1.0" id="1" type="sphere"/>
-    <surface coeffs="0.0 0.0 0.0 2.0" id="2" type="sphere"/>
-    <surface coeffs="0.0 0.0 0.0 2.5" id="3" type="sphere"/>
-    <surface boundary="vacuum" coeffs="0.0 0.0 0.0 4.0" id="4" type="sphere"/>
+    <surface id="1" type="sphere" coeffs="0.0 0.0 0.0 1.0"/>
+    <surface id="2" type="sphere" coeffs="0.0 0.0 0.0 2.0"/>
+    <surface id="3" type="sphere" coeffs="0.0 0.0 0.0 2.5"/>
+    <surface id="4" type="sphere" boundary="vacuum" coeffs="0.0 0.0 0.0 4.0"/>
   </geometry>
   <settings>
     <run_mode>fixed source</run_mode>
diff --git a/tests/regression_tests/surface_source/inputs_true_read_mcpl.dat b/tests/regression_tests/surface_source/inputs_true_read_mcpl.dat
index b8d8c575a..2ee76f618 100644
--- a/tests/regression_tests/surface_source/inputs_true_read_mcpl.dat
+++ b/tests/regression_tests/surface_source/inputs_true_read_mcpl.dat
@@ -7,10 +7,10 @@
     <cell id="2" material="void" region="1 -2" universe="1"/>
     <cell id="3" material="void" region="2 -3" universe="1"/>
     <cell id="4" material="void" region="3 -4" universe="1"/>
-    <surface coeffs="0.0 0.0 0.0 1.0" id="1" type="sphere"/>
-    <surface coeffs="0.0 0.0 0.0 2.0" id="2" type="sphere"/>
-    <surface coeffs="0.0 0.0 0.0 2.5" id="3" type="sphere"/>
-    <surface boundary="vacuum" coeffs="0.0 0.0 0.0 4.0" id="4" type="sphere"/>
+    <surface id="1" type="sphere" coeffs="0.0 0.0 0.0 1.0"/>
+    <surface id="2" type="sphere" coeffs="0.0 0.0 0.0 2.0"/>
+    <surface id="3" type="sphere" coeffs="0.0 0.0 0.0 2.5"/>
+    <surface id="4" type="sphere" boundary="vacuum" coeffs="0.0 0.0 0.0 4.0"/>
   </geometry>
   <settings>
     <run_mode>fixed source</run_mode>
diff --git a/tests/regression_tests/surface_source/inputs_true_write_h5.dat b/tests/regression_tests/surface_source/inputs_true_write_h5.dat
index 5c85de631..10e3af0a7 100644
--- a/tests/regression_tests/surface_source/inputs_true_write_h5.dat
+++ b/tests/regression_tests/surface_source/inputs_true_write_h5.dat
@@ -7,16 +7,16 @@
     <cell id="2" material="void" region="1 -2" universe="1"/>
     <cell id="3" material="void" region="2 -3" universe="1"/>
     <cell id="4" material="void" region="3 -4" universe="1"/>
-    <surface coeffs="0.0 0.0 0.0 1.0" id="1" type="sphere"/>
-    <surface coeffs="0.0 0.0 0.0 2.0" id="2" type="sphere"/>
-    <surface coeffs="0.0 0.0 0.0 2.5" id="3" type="sphere"/>
-    <surface boundary="vacuum" coeffs="0.0 0.0 0.0 4.0" id="4" type="sphere"/>
+    <surface id="1" type="sphere" coeffs="0.0 0.0 0.0 1.0"/>
+    <surface id="2" type="sphere" coeffs="0.0 0.0 0.0 2.0"/>
+    <surface id="3" type="sphere" coeffs="0.0 0.0 0.0 2.5"/>
+    <surface id="4" type="sphere" boundary="vacuum" coeffs="0.0 0.0 0.0 4.0"/>
   </geometry>
   <settings>
     <run_mode>fixed source</run_mode>
     <particles>1000</particles>
     <batches>10</batches>
-    <source particle="neutron" strength="1.0" type="independent">
+    <source type="independent" strength="1.0" particle="neutron">
       <space type="point">
         <parameters>0 0 0</parameters>
       </space>
diff --git a/tests/regression_tests/surface_source/inputs_true_write_mcpl.dat b/tests/regression_tests/surface_source/inputs_true_write_mcpl.dat
index c55223324..e9758144d 100644
--- a/tests/regression_tests/surface_source/inputs_true_write_mcpl.dat
+++ b/tests/regression_tests/surface_source/inputs_true_write_mcpl.dat
@@ -7,16 +7,16 @@
     <cell id="2" material="void" region="1 -2" universe="1"/>
     <cell id="3" material="void" region="2 -3" universe="1"/>
     <cell id="4" material="void" region="3 -4" universe="1"/>
-    <surface coeffs="0.0 0.0 0.0 1.0" id="1" type="sphere"/>
-    <surface coeffs="0.0 0.0 0.0 2.0" id="2" type="sphere"/>
-    <surface coeffs="0.0 0.0 0.0 2.5" id="3" type="sphere"/>
-    <surface boundary="vacuum" coeffs="0.0 0.0 0.0 4.0" id="4" type="sphere"/>
+    <surface id="1" type="sphere" coeffs="0.0 0.0 0.0 1.0"/>
+    <surface id="2" type="sphere" coeffs="0.0 0.0 0.0 2.0"/>
+    <surface id="3" type="sphere" coeffs="0.0 0.0 0.0 2.5"/>
+    <surface id="4" type="sphere" boundary="vacuum" coeffs="0.0 0.0 0.0 4.0"/>
   </geometry>
   <settings>
     <run_mode>fixed source</run_mode>
     <particles>1000</particles>
     <batches>10</batches>
-    <source particle="neutron" strength="1.0" type="independent">
+    <source type="independent" strength="1.0" particle="neutron">
       <space type="point">
         <parameters>0 0 0</parameters>
       </space>
diff --git a/tests/regression_tests/surface_source_write/case-01/inputs_true.dat b/tests/regression_tests/surface_source_write/case-01/inputs_true.dat
index 7368debd5..2a67b03dd 100644
--- a/tests/regression_tests/surface_source_write/case-01/inputs_true.dat
+++ b/tests/regression_tests/surface_source_write/case-01/inputs_true.dat
@@ -1,47 +1,47 @@
 <?xml version='1.0' encoding='utf-8'?>
 <model>
   <materials>
-    <material depletable="true" id="1">
-      <density units="g/cm3" value="11.0"/>
-      <nuclide ao="0.0004524" name="U234"/>
-      <nuclide ao="0.0506068" name="U235"/>
-      <nuclide ao="0.948709" name="U238"/>
-      <nuclide ao="0.0002318" name="U236"/>
-      <nuclide ao="2.0" name="O16"/>
+    <material id="1" depletable="true">
+      <density value="11.0" units="g/cm3"/>
+      <nuclide name="U234" ao="0.0004524"/>
+      <nuclide name="U235" ao="0.0506068"/>
+      <nuclide name="U238" ao="0.948709"/>
+      <nuclide name="U236" ao="0.0002318"/>
+      <nuclide name="O16" ao="2.0"/>
     </material>
     <material id="2">
-      <density units="g/cm3" value="1.0"/>
-      <nuclide ao="2.0" name="H1"/>
-      <nuclide ao="1.0" name="O16"/>
+      <density value="1.0" units="g/cm3"/>
+      <nuclide name="H1" ao="2.0"/>
+      <nuclide name="O16" ao="1.0"/>
     </material>
   </materials>
   <geometry>
     <cell id="1" material="1" region="-1 2 -3" universe="1"/>
     <cell id="2" material="2" region="1 | -2 | 3" universe="1"/>
-    <cell fill="1" id="3" region="-5 4 -7 6 -9 8" universe="2"/>
+    <cell id="3" fill="1" region="-5 4 -7 6 -9 8" universe="2"/>
     <cell id="4" material="2" region="-11 10 -13 12 -15 14 (5 | -4 | 7 | -6 | 9 | -8)" universe="2"/>
-    <surface coeffs="0.0 0.0 2.0" id="1" type="z-cylinder"/>
-    <surface coeffs="-2.0" id="2" type="z-plane"/>
-    <surface coeffs="2.0" id="3" type="z-plane"/>
-    <surface coeffs="-3.0" id="4" type="x-plane"/>
-    <surface coeffs="3.0" id="5" type="x-plane"/>
-    <surface coeffs="-3.0" id="6" type="y-plane"/>
-    <surface coeffs="3.0" id="7" type="y-plane"/>
-    <surface coeffs="-3.0" id="8" type="z-plane"/>
-    <surface coeffs="3.0" id="9" type="z-plane"/>
-    <surface boundary="vacuum" coeffs="-4.0" id="10" type="x-plane"/>
-    <surface boundary="vacuum" coeffs="4.0" id="11" type="x-plane"/>
-    <surface boundary="vacuum" coeffs="-4.0" id="12" type="y-plane"/>
-    <surface boundary="vacuum" coeffs="4.0" id="13" type="y-plane"/>
-    <surface boundary="vacuum" coeffs="-4.0" id="14" type="z-plane"/>
-    <surface boundary="vacuum" coeffs="4.0" id="15" type="z-plane"/>
+    <surface id="1" type="z-cylinder" coeffs="0.0 0.0 2.0"/>
+    <surface id="2" type="z-plane" coeffs="-2.0"/>
+    <surface id="3" type="z-plane" coeffs="2.0"/>
+    <surface id="4" type="x-plane" coeffs="-3.0"/>
+    <surface id="5" type="x-plane" coeffs="3.0"/>
+    <surface id="6" type="y-plane" coeffs="-3.0"/>
+    <surface id="7" type="y-plane" coeffs="3.0"/>
+    <surface id="8" type="z-plane" coeffs="-3.0"/>
+    <surface id="9" type="z-plane" coeffs="3.0"/>
+    <surface id="10" type="x-plane" boundary="vacuum" coeffs="-4.0"/>
+    <surface id="11" type="x-plane" boundary="vacuum" coeffs="4.0"/>
+    <surface id="12" type="y-plane" boundary="vacuum" coeffs="-4.0"/>
+    <surface id="13" type="y-plane" boundary="vacuum" coeffs="4.0"/>
+    <surface id="14" type="z-plane" boundary="vacuum" coeffs="-4.0"/>
+    <surface id="15" type="z-plane" boundary="vacuum" coeffs="4.0"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
     <particles>100</particles>
     <batches>5</batches>
     <inactive>1</inactive>
-    <source particle="neutron" strength="1.0" type="independent">
+    <source type="independent" strength="1.0" particle="neutron">
       <space type="box">
         <parameters>-2.0 -2.0 -2.0 2.0 2.0 2.0</parameters>
       </space>
diff --git a/tests/regression_tests/surface_source_write/case-02/inputs_true.dat b/tests/regression_tests/surface_source_write/case-02/inputs_true.dat
index 12f15499f..527f076b9 100644
--- a/tests/regression_tests/surface_source_write/case-02/inputs_true.dat
+++ b/tests/regression_tests/surface_source_write/case-02/inputs_true.dat
@@ -1,47 +1,47 @@
 <?xml version='1.0' encoding='utf-8'?>
 <model>
   <materials>
-    <material depletable="true" id="1">
-      <density units="g/cm3" value="11.0"/>
-      <nuclide ao="0.0004524" name="U234"/>
-      <nuclide ao="0.0506068" name="U235"/>
-      <nuclide ao="0.948709" name="U238"/>
-      <nuclide ao="0.0002318" name="U236"/>
-      <nuclide ao="2.0" name="O16"/>
+    <material id="1" depletable="true">
+      <density value="11.0" units="g/cm3"/>
+      <nuclide name="U234" ao="0.0004524"/>
+      <nuclide name="U235" ao="0.0506068"/>
+      <nuclide name="U238" ao="0.948709"/>
+      <nuclide name="U236" ao="0.0002318"/>
+      <nuclide name="O16" ao="2.0"/>
     </material>
     <material id="2">
-      <density units="g/cm3" value="1.0"/>
-      <nuclide ao="2.0" name="H1"/>
-      <nuclide ao="1.0" name="O16"/>
+      <density value="1.0" units="g/cm3"/>
+      <nuclide name="H1" ao="2.0"/>
+      <nuclide name="O16" ao="1.0"/>
     </material>
   </materials>
   <geometry>
     <cell id="1" material="1" region="-1 2 -3" universe="1"/>
     <cell id="2" material="2" region="1 | -2 | 3" universe="1"/>
-    <cell fill="1" id="3" region="-5 4 -7 6 -9 8" universe="2"/>
+    <cell id="3" fill="1" region="-5 4 -7 6 -9 8" universe="2"/>
     <cell id="4" material="2" region="-11 10 -13 12 -15 14 (5 | -4 | 7 | -6 | 9 | -8)" universe="2"/>
-    <surface coeffs="0.0 0.0 2.0" id="1" type="z-cylinder"/>
-    <surface coeffs="-2.0" id="2" type="z-plane"/>
-    <surface coeffs="2.0" id="3" type="z-plane"/>
-    <surface coeffs="-3.0" id="4" type="x-plane"/>
-    <surface coeffs="3.0" id="5" type="x-plane"/>
-    <surface coeffs="-3.0" id="6" type="y-plane"/>
-    <surface coeffs="3.0" id="7" type="y-plane"/>
-    <surface coeffs="-3.0" id="8" type="z-plane"/>
-    <surface coeffs="3.0" id="9" type="z-plane"/>
-    <surface boundary="vacuum" coeffs="-4.0" id="10" type="x-plane"/>
-    <surface boundary="vacuum" coeffs="4.0" id="11" type="x-plane"/>
-    <surface boundary="vacuum" coeffs="-4.0" id="12" type="y-plane"/>
-    <surface boundary="vacuum" coeffs="4.0" id="13" type="y-plane"/>
-    <surface boundary="vacuum" coeffs="-4.0" id="14" type="z-plane"/>
-    <surface boundary="vacuum" coeffs="4.0" id="15" type="z-plane"/>
+    <surface id="1" type="z-cylinder" coeffs="0.0 0.0 2.0"/>
+    <surface id="2" type="z-plane" coeffs="-2.0"/>
+    <surface id="3" type="z-plane" coeffs="2.0"/>
+    <surface id="4" type="x-plane" coeffs="-3.0"/>
+    <surface id="5" type="x-plane" coeffs="3.0"/>
+    <surface id="6" type="y-plane" coeffs="-3.0"/>
+    <surface id="7" type="y-plane" coeffs="3.0"/>
+    <surface id="8" type="z-plane" coeffs="-3.0"/>
+    <surface id="9" type="z-plane" coeffs="3.0"/>
+    <surface id="10" type="x-plane" boundary="vacuum" coeffs="-4.0"/>
+    <surface id="11" type="x-plane" boundary="vacuum" coeffs="4.0"/>
+    <surface id="12" type="y-plane" boundary="vacuum" coeffs="-4.0"/>
+    <surface id="13" type="y-plane" boundary="vacuum" coeffs="4.0"/>
+    <surface id="14" type="z-plane" boundary="vacuum" coeffs="-4.0"/>
+    <surface id="15" type="z-plane" boundary="vacuum" coeffs="4.0"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
     <particles>100</particles>
     <batches>5</batches>
     <inactive>1</inactive>
-    <source particle="neutron" strength="1.0" type="independent">
+    <source type="independent" strength="1.0" particle="neutron">
       <space type="box">
         <parameters>-2.0 -2.0 -2.0 2.0 2.0 2.0</parameters>
       </space>
diff --git a/tests/regression_tests/surface_source_write/case-03/inputs_true.dat b/tests/regression_tests/surface_source_write/case-03/inputs_true.dat
index cd0f7deda..58c4e0a24 100644
--- a/tests/regression_tests/surface_source_write/case-03/inputs_true.dat
+++ b/tests/regression_tests/surface_source_write/case-03/inputs_true.dat
@@ -1,47 +1,47 @@
 <?xml version='1.0' encoding='utf-8'?>
 <model>
   <materials>
-    <material depletable="true" id="1">
-      <density units="g/cm3" value="11.0"/>
-      <nuclide ao="0.0004524" name="U234"/>
-      <nuclide ao="0.0506068" name="U235"/>
-      <nuclide ao="0.948709" name="U238"/>
-      <nuclide ao="0.0002318" name="U236"/>
-      <nuclide ao="2.0" name="O16"/>
+    <material id="1" depletable="true">
+      <density value="11.0" units="g/cm3"/>
+      <nuclide name="U234" ao="0.0004524"/>
+      <nuclide name="U235" ao="0.0506068"/>
+      <nuclide name="U238" ao="0.948709"/>
+      <nuclide name="U236" ao="0.0002318"/>
+      <nuclide name="O16" ao="2.0"/>
     </material>
     <material id="2">
-      <density units="g/cm3" value="1.0"/>
-      <nuclide ao="2.0" name="H1"/>
-      <nuclide ao="1.0" name="O16"/>
+      <density value="1.0" units="g/cm3"/>
+      <nuclide name="H1" ao="2.0"/>
+      <nuclide name="O16" ao="1.0"/>
     </material>
   </materials>
   <geometry>
     <cell id="1" material="1" region="-1 2 -3" universe="1"/>
     <cell id="2" material="2" region="1 | -2 | 3" universe="1"/>
-    <cell fill="1" id="3" region="-5 4 -7 6 -9 8" universe="2"/>
+    <cell id="3" fill="1" region="-5 4 -7 6 -9 8" universe="2"/>
     <cell id="4" material="2" region="-11 10 -13 12 -15 14 (5 | -4 | 7 | -6 | 9 | -8)" universe="2"/>
-    <surface coeffs="0.0 0.0 2.0" id="1" type="z-cylinder"/>
-    <surface coeffs="-2.0" id="2" type="z-plane"/>
-    <surface coeffs="2.0" id="3" type="z-plane"/>
-    <surface coeffs="-3.0" id="4" type="x-plane"/>
-    <surface coeffs="3.0" id="5" type="x-plane"/>
-    <surface coeffs="-3.0" id="6" type="y-plane"/>
-    <surface coeffs="3.0" id="7" type="y-plane"/>
-    <surface coeffs="-3.0" id="8" type="z-plane"/>
-    <surface coeffs="3.0" id="9" type="z-plane"/>
-    <surface boundary="vacuum" coeffs="-4.0" id="10" type="x-plane"/>
-    <surface boundary="vacuum" coeffs="4.0" id="11" type="x-plane"/>
-    <surface boundary="vacuum" coeffs="-4.0" id="12" type="y-plane"/>
-    <surface boundary="vacuum" coeffs="4.0" id="13" type="y-plane"/>
-    <surface boundary="vacuum" coeffs="-4.0" id="14" type="z-plane"/>
-    <surface boundary="vacuum" coeffs="4.0" id="15" type="z-plane"/>
+    <surface id="1" type="z-cylinder" coeffs="0.0 0.0 2.0"/>
+    <surface id="2" type="z-plane" coeffs="-2.0"/>
+    <surface id="3" type="z-plane" coeffs="2.0"/>
+    <surface id="4" type="x-plane" coeffs="-3.0"/>
+    <surface id="5" type="x-plane" coeffs="3.0"/>
+    <surface id="6" type="y-plane" coeffs="-3.0"/>
+    <surface id="7" type="y-plane" coeffs="3.0"/>
+    <surface id="8" type="z-plane" coeffs="-3.0"/>
+    <surface id="9" type="z-plane" coeffs="3.0"/>
+    <surface id="10" type="x-plane" boundary="vacuum" coeffs="-4.0"/>
+    <surface id="11" type="x-plane" boundary="vacuum" coeffs="4.0"/>
+    <surface id="12" type="y-plane" boundary="vacuum" coeffs="-4.0"/>
+    <surface id="13" type="y-plane" boundary="vacuum" coeffs="4.0"/>
+    <surface id="14" type="z-plane" boundary="vacuum" coeffs="-4.0"/>
+    <surface id="15" type="z-plane" boundary="vacuum" coeffs="4.0"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
     <particles>100</particles>
     <batches>5</batches>
     <inactive>1</inactive>
-    <source particle="neutron" strength="1.0" type="independent">
+    <source type="independent" strength="1.0" particle="neutron">
       <space type="box">
         <parameters>-2.0 -2.0 -2.0 2.0 2.0 2.0</parameters>
       </space>
diff --git a/tests/regression_tests/surface_source_write/case-04/inputs_true.dat b/tests/regression_tests/surface_source_write/case-04/inputs_true.dat
index ac3c03e37..46701aea7 100644
--- a/tests/regression_tests/surface_source_write/case-04/inputs_true.dat
+++ b/tests/regression_tests/surface_source_write/case-04/inputs_true.dat
@@ -1,47 +1,47 @@
 <?xml version='1.0' encoding='utf-8'?>
 <model>
   <materials>
-    <material depletable="true" id="1">
-      <density units="g/cm3" value="11.0"/>
-      <nuclide ao="0.0004524" name="U234"/>
-      <nuclide ao="0.0506068" name="U235"/>
-      <nuclide ao="0.948709" name="U238"/>
-      <nuclide ao="0.0002318" name="U236"/>
-      <nuclide ao="2.0" name="O16"/>
+    <material id="1" depletable="true">
+      <density value="11.0" units="g/cm3"/>
+      <nuclide name="U234" ao="0.0004524"/>
+      <nuclide name="U235" ao="0.0506068"/>
+      <nuclide name="U238" ao="0.948709"/>
+      <nuclide name="U236" ao="0.0002318"/>
+      <nuclide name="O16" ao="2.0"/>
     </material>
     <material id="2">
-      <density units="g/cm3" value="1.0"/>
-      <nuclide ao="2.0" name="H1"/>
-      <nuclide ao="1.0" name="O16"/>
+      <density value="1.0" units="g/cm3"/>
+      <nuclide name="H1" ao="2.0"/>
+      <nuclide name="O16" ao="1.0"/>
     </material>
   </materials>
   <geometry>
     <cell id="1" material="1" region="-1 2 -3" universe="1"/>
     <cell id="2" material="2" region="1 | -2 | 3" universe="1"/>
-    <cell fill="1" id="3" region="-5 4 -7 6 -9 8" universe="2"/>
+    <cell id="3" fill="1" region="-5 4 -7 6 -9 8" universe="2"/>
     <cell id="4" material="2" region="-11 10 -13 12 -15 14 (5 | -4 | 7 | -6 | 9 | -8)" universe="2"/>
-    <surface coeffs="0.0 0.0 2.0" id="1" type="z-cylinder"/>
-    <surface coeffs="-2.0" id="2" type="z-plane"/>
-    <surface coeffs="2.0" id="3" type="z-plane"/>
-    <surface coeffs="-3.0" id="4" type="x-plane"/>
-    <surface coeffs="3.0" id="5" type="x-plane"/>
-    <surface coeffs="-3.0" id="6" type="y-plane"/>
-    <surface coeffs="3.0" id="7" type="y-plane"/>
-    <surface coeffs="-3.0" id="8" type="z-plane"/>
-    <surface coeffs="3.0" id="9" type="z-plane"/>
-    <surface boundary="vacuum" coeffs="-4.0" id="10" type="x-plane"/>
-    <surface boundary="vacuum" coeffs="4.0" id="11" type="x-plane"/>
-    <surface boundary="vacuum" coeffs="-4.0" id="12" type="y-plane"/>
-    <surface boundary="vacuum" coeffs="4.0" id="13" type="y-plane"/>
-    <surface boundary="vacuum" coeffs="-4.0" id="14" type="z-plane"/>
-    <surface boundary="vacuum" coeffs="4.0" id="15" type="z-plane"/>
+    <surface id="1" type="z-cylinder" coeffs="0.0 0.0 2.0"/>
+    <surface id="2" type="z-plane" coeffs="-2.0"/>
+    <surface id="3" type="z-plane" coeffs="2.0"/>
+    <surface id="4" type="x-plane" coeffs="-3.0"/>
+    <surface id="5" type="x-plane" coeffs="3.0"/>
+    <surface id="6" type="y-plane" coeffs="-3.0"/>
+    <surface id="7" type="y-plane" coeffs="3.0"/>
+    <surface id="8" type="z-plane" coeffs="-3.0"/>
+    <surface id="9" type="z-plane" coeffs="3.0"/>
+    <surface id="10" type="x-plane" boundary="vacuum" coeffs="-4.0"/>
+    <surface id="11" type="x-plane" boundary="vacuum" coeffs="4.0"/>
+    <surface id="12" type="y-plane" boundary="vacuum" coeffs="-4.0"/>
+    <surface id="13" type="y-plane" boundary="vacuum" coeffs="4.0"/>
+    <surface id="14" type="z-plane" boundary="vacuum" coeffs="-4.0"/>
+    <surface id="15" type="z-plane" boundary="vacuum" coeffs="4.0"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
     <particles>100</particles>
     <batches>5</batches>
     <inactive>1</inactive>
-    <source particle="neutron" strength="1.0" type="independent">
+    <source type="independent" strength="1.0" particle="neutron">
       <space type="box">
         <parameters>-2.0 -2.0 -2.0 2.0 2.0 2.0</parameters>
       </space>
diff --git a/tests/regression_tests/surface_source_write/case-05/inputs_true.dat b/tests/regression_tests/surface_source_write/case-05/inputs_true.dat
index 143e85200..c420d797c 100644
--- a/tests/regression_tests/surface_source_write/case-05/inputs_true.dat
+++ b/tests/regression_tests/surface_source_write/case-05/inputs_true.dat
@@ -1,47 +1,47 @@
 <?xml version='1.0' encoding='utf-8'?>
 <model>
   <materials>
-    <material depletable="true" id="1">
-      <density units="g/cm3" value="11.0"/>
-      <nuclide ao="0.0004524" name="U234"/>
-      <nuclide ao="0.0506068" name="U235"/>
-      <nuclide ao="0.948709" name="U238"/>
-      <nuclide ao="0.0002318" name="U236"/>
-      <nuclide ao="2.0" name="O16"/>
+    <material id="1" depletable="true">
+      <density value="11.0" units="g/cm3"/>
+      <nuclide name="U234" ao="0.0004524"/>
+      <nuclide name="U235" ao="0.0506068"/>
+      <nuclide name="U238" ao="0.948709"/>
+      <nuclide name="U236" ao="0.0002318"/>
+      <nuclide name="O16" ao="2.0"/>
     </material>
     <material id="2">
-      <density units="g/cm3" value="1.0"/>
-      <nuclide ao="2.0" name="H1"/>
-      <nuclide ao="1.0" name="O16"/>
+      <density value="1.0" units="g/cm3"/>
+      <nuclide name="H1" ao="2.0"/>
+      <nuclide name="O16" ao="1.0"/>
     </material>
   </materials>
   <geometry>
     <cell id="1" material="1" region="-1 2 -3" universe="1"/>
     <cell id="2" material="2" region="1 | -2 | 3" universe="1"/>
-    <cell fill="1" id="3" region="-5 4 -7 6 -9 8" universe="2"/>
+    <cell id="3" fill="1" region="-5 4 -7 6 -9 8" universe="2"/>
     <cell id="4" material="2" region="-11 10 -13 12 -15 14 (5 | -4 | 7 | -6 | 9 | -8)" universe="2"/>
-    <surface coeffs="0.0 0.0 2.0" id="1" type="z-cylinder"/>
-    <surface coeffs="-2.0" id="2" type="z-plane"/>
-    <surface coeffs="2.0" id="3" type="z-plane"/>
-    <surface coeffs="-3.0" id="4" type="x-plane"/>
-    <surface coeffs="3.0" id="5" type="x-plane"/>
-    <surface coeffs="-3.0" id="6" type="y-plane"/>
-    <surface coeffs="3.0" id="7" type="y-plane"/>
-    <surface coeffs="-3.0" id="8" type="z-plane"/>
-    <surface coeffs="3.0" id="9" type="z-plane"/>
-    <surface boundary="vacuum" coeffs="-4.0" id="10" type="x-plane"/>
-    <surface boundary="vacuum" coeffs="4.0" id="11" type="x-plane"/>
-    <surface boundary="vacuum" coeffs="-4.0" id="12" type="y-plane"/>
-    <surface boundary="vacuum" coeffs="4.0" id="13" type="y-plane"/>
-    <surface boundary="vacuum" coeffs="-4.0" id="14" type="z-plane"/>
-    <surface boundary="vacuum" coeffs="4.0" id="15" type="z-plane"/>
+    <surface id="1" type="z-cylinder" coeffs="0.0 0.0 2.0"/>
+    <surface id="2" type="z-plane" coeffs="-2.0"/>
+    <surface id="3" type="z-plane" coeffs="2.0"/>
+    <surface id="4" type="x-plane" coeffs="-3.0"/>
+    <surface id="5" type="x-plane" coeffs="3.0"/>
+    <surface id="6" type="y-plane" coeffs="-3.0"/>
+    <surface id="7" type="y-plane" coeffs="3.0"/>
+    <surface id="8" type="z-plane" coeffs="-3.0"/>
+    <surface id="9" type="z-plane" coeffs="3.0"/>
+    <surface id="10" type="x-plane" boundary="vacuum" coeffs="-4.0"/>
+    <surface id="11" type="x-plane" boundary="vacuum" coeffs="4.0"/>
+    <surface id="12" type="y-plane" boundary="vacuum" coeffs="-4.0"/>
+    <surface id="13" type="y-plane" boundary="vacuum" coeffs="4.0"/>
+    <surface id="14" type="z-plane" boundary="vacuum" coeffs="-4.0"/>
+    <surface id="15" type="z-plane" boundary="vacuum" coeffs="4.0"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
     <particles>100</particles>
     <batches>5</batches>
     <inactive>1</inactive>
-    <source particle="neutron" strength="1.0" type="independent">
+    <source type="independent" strength="1.0" particle="neutron">
       <space type="box">
         <parameters>-2.0 -2.0 -2.0 2.0 2.0 2.0</parameters>
       </space>
diff --git a/tests/regression_tests/surface_source_write/case-06/inputs_true.dat b/tests/regression_tests/surface_source_write/case-06/inputs_true.dat
index f2dc7ea35..e02d5e90c 100644
--- a/tests/regression_tests/surface_source_write/case-06/inputs_true.dat
+++ b/tests/regression_tests/surface_source_write/case-06/inputs_true.dat
@@ -1,47 +1,47 @@
 <?xml version='1.0' encoding='utf-8'?>
 <model>
   <materials>
-    <material depletable="true" id="1">
-      <density units="g/cm3" value="11.0"/>
-      <nuclide ao="0.0004524" name="U234"/>
-      <nuclide ao="0.0506068" name="U235"/>
-      <nuclide ao="0.948709" name="U238"/>
-      <nuclide ao="0.0002318" name="U236"/>
-      <nuclide ao="2.0" name="O16"/>
+    <material id="1" depletable="true">
+      <density value="11.0" units="g/cm3"/>
+      <nuclide name="U234" ao="0.0004524"/>
+      <nuclide name="U235" ao="0.0506068"/>
+      <nuclide name="U238" ao="0.948709"/>
+      <nuclide name="U236" ao="0.0002318"/>
+      <nuclide name="O16" ao="2.0"/>
     </material>
     <material id="2">
-      <density units="g/cm3" value="1.0"/>
-      <nuclide ao="2.0" name="H1"/>
-      <nuclide ao="1.0" name="O16"/>
+      <density value="1.0" units="g/cm3"/>
+      <nuclide name="H1" ao="2.0"/>
+      <nuclide name="O16" ao="1.0"/>
     </material>
   </materials>
   <geometry>
     <cell id="1" material="1" region="-1 2 -3" universe="1"/>
     <cell id="2" material="2" region="1 | -2 | 3" universe="1"/>
-    <cell fill="1" id="3" region="-5 4 -7 6 -9 8" universe="2"/>
+    <cell id="3" fill="1" region="-5 4 -7 6 -9 8" universe="2"/>
     <cell id="4" material="2" region="-11 10 -13 12 -15 14 (5 | -4 | 7 | -6 | 9 | -8)" universe="2"/>
-    <surface coeffs="0.0 0.0 2.0" id="1" type="z-cylinder"/>
-    <surface coeffs="-2.0" id="2" type="z-plane"/>
-    <surface coeffs="2.0" id="3" type="z-plane"/>
-    <surface coeffs="-3.0" id="4" type="x-plane"/>
-    <surface coeffs="3.0" id="5" type="x-plane"/>
-    <surface coeffs="-3.0" id="6" type="y-plane"/>
-    <surface coeffs="3.0" id="7" type="y-plane"/>
-    <surface coeffs="-3.0" id="8" type="z-plane"/>
-    <surface coeffs="3.0" id="9" type="z-plane"/>
-    <surface boundary="vacuum" coeffs="-4.0" id="10" type="x-plane"/>
-    <surface boundary="vacuum" coeffs="4.0" id="11" type="x-plane"/>
-    <surface boundary="vacuum" coeffs="-4.0" id="12" type="y-plane"/>
-    <surface boundary="vacuum" coeffs="4.0" id="13" type="y-plane"/>
-    <surface boundary="vacuum" coeffs="-4.0" id="14" type="z-plane"/>
-    <surface boundary="vacuum" coeffs="4.0" id="15" type="z-plane"/>
+    <surface id="1" type="z-cylinder" coeffs="0.0 0.0 2.0"/>
+    <surface id="2" type="z-plane" coeffs="-2.0"/>
+    <surface id="3" type="z-plane" coeffs="2.0"/>
+    <surface id="4" type="x-plane" coeffs="-3.0"/>
+    <surface id="5" type="x-plane" coeffs="3.0"/>
+    <surface id="6" type="y-plane" coeffs="-3.0"/>
+    <surface id="7" type="y-plane" coeffs="3.0"/>
+    <surface id="8" type="z-plane" coeffs="-3.0"/>
+    <surface id="9" type="z-plane" coeffs="3.0"/>
+    <surface id="10" type="x-plane" boundary="vacuum" coeffs="-4.0"/>
+    <surface id="11" type="x-plane" boundary="vacuum" coeffs="4.0"/>
+    <surface id="12" type="y-plane" boundary="vacuum" coeffs="-4.0"/>
+    <surface id="13" type="y-plane" boundary="vacuum" coeffs="4.0"/>
+    <surface id="14" type="z-plane" boundary="vacuum" coeffs="-4.0"/>
+    <surface id="15" type="z-plane" boundary="vacuum" coeffs="4.0"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
     <particles>100</particles>
     <batches>5</batches>
     <inactive>1</inactive>
-    <source particle="neutron" strength="1.0" type="independent">
+    <source type="independent" strength="1.0" particle="neutron">
       <space type="box">
         <parameters>-2.0 -2.0 -2.0 2.0 2.0 2.0</parameters>
       </space>
diff --git a/tests/regression_tests/surface_source_write/case-07/inputs_true.dat b/tests/regression_tests/surface_source_write/case-07/inputs_true.dat
index a6107d16f..a4588c8d0 100644
--- a/tests/regression_tests/surface_source_write/case-07/inputs_true.dat
+++ b/tests/regression_tests/surface_source_write/case-07/inputs_true.dat
@@ -1,47 +1,47 @@
 <?xml version='1.0' encoding='utf-8'?>
 <model>
   <materials>
-    <material depletable="true" id="1">
-      <density units="g/cm3" value="11.0"/>
-      <nuclide ao="0.0004524" name="U234"/>
-      <nuclide ao="0.0506068" name="U235"/>
-      <nuclide ao="0.948709" name="U238"/>
-      <nuclide ao="0.0002318" name="U236"/>
-      <nuclide ao="2.0" name="O16"/>
+    <material id="1" depletable="true">
+      <density value="11.0" units="g/cm3"/>
+      <nuclide name="U234" ao="0.0004524"/>
+      <nuclide name="U235" ao="0.0506068"/>
+      <nuclide name="U238" ao="0.948709"/>
+      <nuclide name="U236" ao="0.0002318"/>
+      <nuclide name="O16" ao="2.0"/>
     </material>
     <material id="2">
-      <density units="g/cm3" value="1.0"/>
-      <nuclide ao="2.0" name="H1"/>
-      <nuclide ao="1.0" name="O16"/>
+      <density value="1.0" units="g/cm3"/>
+      <nuclide name="H1" ao="2.0"/>
+      <nuclide name="O16" ao="1.0"/>
     </material>
   </materials>
   <geometry>
     <cell id="1" material="1" region="-1 2 -3" universe="1"/>
     <cell id="2" material="2" region="1 | -2 | 3" universe="1"/>
-    <cell fill="1" id="3" region="-5 4 -7 6 -9 8" universe="2"/>
+    <cell id="3" fill="1" region="-5 4 -7 6 -9 8" universe="2"/>
     <cell id="4" material="2" region="-11 10 -13 12 -15 14 (5 | -4 | 7 | -6 | 9 | -8)" universe="2"/>
-    <surface coeffs="0.0 0.0 2.0" id="1" type="z-cylinder"/>
-    <surface coeffs="-2.0" id="2" type="z-plane"/>
-    <surface coeffs="2.0" id="3" type="z-plane"/>
-    <surface coeffs="-3.0" id="4" type="x-plane"/>
-    <surface coeffs="3.0" id="5" type="x-plane"/>
-    <surface coeffs="-3.0" id="6" type="y-plane"/>
-    <surface coeffs="3.0" id="7" type="y-plane"/>
-    <surface coeffs="-3.0" id="8" type="z-plane"/>
-    <surface coeffs="3.0" id="9" type="z-plane"/>
-    <surface boundary="vacuum" coeffs="-4.0" id="10" type="x-plane"/>
-    <surface boundary="vacuum" coeffs="4.0" id="11" type="x-plane"/>
-    <surface boundary="vacuum" coeffs="-4.0" id="12" type="y-plane"/>
-    <surface boundary="vacuum" coeffs="4.0" id="13" type="y-plane"/>
-    <surface boundary="vacuum" coeffs="-4.0" id="14" type="z-plane"/>
-    <surface boundary="vacuum" coeffs="4.0" id="15" type="z-plane"/>
+    <surface id="1" type="z-cylinder" coeffs="0.0 0.0 2.0"/>
+    <surface id="2" type="z-plane" coeffs="-2.0"/>
+    <surface id="3" type="z-plane" coeffs="2.0"/>
+    <surface id="4" type="x-plane" coeffs="-3.0"/>
+    <surface id="5" type="x-plane" coeffs="3.0"/>
+    <surface id="6" type="y-plane" coeffs="-3.0"/>
+    <surface id="7" type="y-plane" coeffs="3.0"/>
+    <surface id="8" type="z-plane" coeffs="-3.0"/>
+    <surface id="9" type="z-plane" coeffs="3.0"/>
+    <surface id="10" type="x-plane" boundary="vacuum" coeffs="-4.0"/>
+    <surface id="11" type="x-plane" boundary="vacuum" coeffs="4.0"/>
+    <surface id="12" type="y-plane" boundary="vacuum" coeffs="-4.0"/>
+    <surface id="13" type="y-plane" boundary="vacuum" coeffs="4.0"/>
+    <surface id="14" type="z-plane" boundary="vacuum" coeffs="-4.0"/>
+    <surface id="15" type="z-plane" boundary="vacuum" coeffs="4.0"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
     <particles>100</particles>
     <batches>5</batches>
     <inactive>1</inactive>
-    <source particle="neutron" strength="1.0" type="independent">
+    <source type="independent" strength="1.0" particle="neutron">
       <space type="box">
         <parameters>-2.0 -2.0 -2.0 2.0 2.0 2.0</parameters>
       </space>
diff --git a/tests/regression_tests/surface_source_write/case-08/inputs_true.dat b/tests/regression_tests/surface_source_write/case-08/inputs_true.dat
index b87e2b207..ecf3a6a2e 100644
--- a/tests/regression_tests/surface_source_write/case-08/inputs_true.dat
+++ b/tests/regression_tests/surface_source_write/case-08/inputs_true.dat
@@ -1,47 +1,47 @@
 <?xml version='1.0' encoding='utf-8'?>
 <model>
   <materials>
-    <material depletable="true" id="1">
-      <density units="g/cm3" value="11.0"/>
-      <nuclide ao="0.0004524" name="U234"/>
-      <nuclide ao="0.0506068" name="U235"/>
-      <nuclide ao="0.948709" name="U238"/>
-      <nuclide ao="0.0002318" name="U236"/>
-      <nuclide ao="2.0" name="O16"/>
+    <material id="1" depletable="true">
+      <density value="11.0" units="g/cm3"/>
+      <nuclide name="U234" ao="0.0004524"/>
+      <nuclide name="U235" ao="0.0506068"/>
+      <nuclide name="U238" ao="0.948709"/>
+      <nuclide name="U236" ao="0.0002318"/>
+      <nuclide name="O16" ao="2.0"/>
     </material>
     <material id="2">
-      <density units="g/cm3" value="1.0"/>
-      <nuclide ao="2.0" name="H1"/>
-      <nuclide ao="1.0" name="O16"/>
+      <density value="1.0" units="g/cm3"/>
+      <nuclide name="H1" ao="2.0"/>
+      <nuclide name="O16" ao="1.0"/>
     </material>
   </materials>
   <geometry>
     <cell id="1" material="1" region="-1 2 -3" universe="1"/>
     <cell id="2" material="2" region="1 | -2 | 3" universe="1"/>
-    <cell fill="1" id="3" region="-5 4 -7 6 -9 8" universe="2"/>
+    <cell id="3" fill="1" region="-5 4 -7 6 -9 8" universe="2"/>
     <cell id="4" material="2" region="-11 10 -13 12 -15 14 (5 | -4 | 7 | -6 | 9 | -8)" universe="2"/>
-    <surface coeffs="0.0 0.0 2.0" id="1" type="z-cylinder"/>
-    <surface coeffs="-2.0" id="2" type="z-plane"/>
-    <surface coeffs="2.0" id="3" type="z-plane"/>
-    <surface coeffs="-3.0" id="4" type="x-plane"/>
-    <surface coeffs="3.0" id="5" type="x-plane"/>
-    <surface coeffs="-3.0" id="6" type="y-plane"/>
-    <surface coeffs="3.0" id="7" type="y-plane"/>
-    <surface coeffs="-3.0" id="8" type="z-plane"/>
-    <surface coeffs="3.0" id="9" type="z-plane"/>
-    <surface boundary="vacuum" coeffs="-4.0" id="10" type="x-plane"/>
-    <surface boundary="vacuum" coeffs="4.0" id="11" type="x-plane"/>
-    <surface boundary="vacuum" coeffs="-4.0" id="12" type="y-plane"/>
-    <surface boundary="vacuum" coeffs="4.0" id="13" type="y-plane"/>
-    <surface boundary="vacuum" coeffs="-4.0" id="14" type="z-plane"/>
-    <surface boundary="vacuum" coeffs="4.0" id="15" type="z-plane"/>
+    <surface id="1" type="z-cylinder" coeffs="0.0 0.0 2.0"/>
+    <surface id="2" type="z-plane" coeffs="-2.0"/>
+    <surface id="3" type="z-plane" coeffs="2.0"/>
+    <surface id="4" type="x-plane" coeffs="-3.0"/>
+    <surface id="5" type="x-plane" coeffs="3.0"/>
+    <surface id="6" type="y-plane" coeffs="-3.0"/>
+    <surface id="7" type="y-plane" coeffs="3.0"/>
+    <surface id="8" type="z-plane" coeffs="-3.0"/>
+    <surface id="9" type="z-plane" coeffs="3.0"/>
+    <surface id="10" type="x-plane" boundary="vacuum" coeffs="-4.0"/>
+    <surface id="11" type="x-plane" boundary="vacuum" coeffs="4.0"/>
+    <surface id="12" type="y-plane" boundary="vacuum" coeffs="-4.0"/>
+    <surface id="13" type="y-plane" boundary="vacuum" coeffs="4.0"/>
+    <surface id="14" type="z-plane" boundary="vacuum" coeffs="-4.0"/>
+    <surface id="15" type="z-plane" boundary="vacuum" coeffs="4.0"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
     <particles>100</particles>
     <batches>5</batches>
     <inactive>1</inactive>
-    <source particle="neutron" strength="1.0" type="independent">
+    <source type="independent" strength="1.0" particle="neutron">
       <space type="box">
         <parameters>-2.0 -2.0 -2.0 2.0 2.0 2.0</parameters>
       </space>
diff --git a/tests/regression_tests/surface_source_write/case-09/inputs_true.dat b/tests/regression_tests/surface_source_write/case-09/inputs_true.dat
index f4f6ebd87..5d60f9dbe 100644
--- a/tests/regression_tests/surface_source_write/case-09/inputs_true.dat
+++ b/tests/regression_tests/surface_source_write/case-09/inputs_true.dat
@@ -1,47 +1,47 @@
 <?xml version='1.0' encoding='utf-8'?>
 <model>
   <materials>
-    <material depletable="true" id="1">
-      <density units="g/cm3" value="11.0"/>
-      <nuclide ao="0.0004524" name="U234"/>
-      <nuclide ao="0.0506068" name="U235"/>
-      <nuclide ao="0.948709" name="U238"/>
-      <nuclide ao="0.0002318" name="U236"/>
-      <nuclide ao="2.0" name="O16"/>
+    <material id="1" depletable="true">
+      <density value="11.0" units="g/cm3"/>
+      <nuclide name="U234" ao="0.0004524"/>
+      <nuclide name="U235" ao="0.0506068"/>
+      <nuclide name="U238" ao="0.948709"/>
+      <nuclide name="U236" ao="0.0002318"/>
+      <nuclide name="O16" ao="2.0"/>
     </material>
     <material id="2">
-      <density units="g/cm3" value="1.0"/>
-      <nuclide ao="2.0" name="H1"/>
-      <nuclide ao="1.0" name="O16"/>
+      <density value="1.0" units="g/cm3"/>
+      <nuclide name="H1" ao="2.0"/>
+      <nuclide name="O16" ao="1.0"/>
     </material>
   </materials>
   <geometry>
     <cell id="1" material="1" region="-1 2 -3" universe="1"/>
     <cell id="2" material="2" region="1 | -2 | 3" universe="1"/>
-    <cell fill="1" id="3" region="-5 4 -7 6 -9 8" universe="2"/>
+    <cell id="3" fill="1" region="-5 4 -7 6 -9 8" universe="2"/>
     <cell id="4" material="2" region="-11 10 -13 12 -15 14 (5 | -4 | 7 | -6 | 9 | -8)" universe="2"/>
-    <surface coeffs="0.0 0.0 2.0" id="1" type="z-cylinder"/>
-    <surface coeffs="-2.0" id="2" type="z-plane"/>
-    <surface coeffs="2.0" id="3" type="z-plane"/>
-    <surface coeffs="-3.0" id="4" type="x-plane"/>
-    <surface coeffs="3.0" id="5" type="x-plane"/>
-    <surface coeffs="-3.0" id="6" type="y-plane"/>
-    <surface coeffs="3.0" id="7" type="y-plane"/>
-    <surface coeffs="-3.0" id="8" type="z-plane"/>
-    <surface coeffs="3.0" id="9" type="z-plane"/>
-    <surface boundary="vacuum" coeffs="-4.0" id="10" type="x-plane"/>
-    <surface boundary="vacuum" coeffs="4.0" id="11" type="x-plane"/>
-    <surface boundary="vacuum" coeffs="-4.0" id="12" type="y-plane"/>
-    <surface boundary="vacuum" coeffs="4.0" id="13" type="y-plane"/>
-    <surface boundary="vacuum" coeffs="-4.0" id="14" type="z-plane"/>
-    <surface boundary="vacuum" coeffs="4.0" id="15" type="z-plane"/>
+    <surface id="1" type="z-cylinder" coeffs="0.0 0.0 2.0"/>
+    <surface id="2" type="z-plane" coeffs="-2.0"/>
+    <surface id="3" type="z-plane" coeffs="2.0"/>
+    <surface id="4" type="x-plane" coeffs="-3.0"/>
+    <surface id="5" type="x-plane" coeffs="3.0"/>
+    <surface id="6" type="y-plane" coeffs="-3.0"/>
+    <surface id="7" type="y-plane" coeffs="3.0"/>
+    <surface id="8" type="z-plane" coeffs="-3.0"/>
+    <surface id="9" type="z-plane" coeffs="3.0"/>
+    <surface id="10" type="x-plane" boundary="vacuum" coeffs="-4.0"/>
+    <surface id="11" type="x-plane" boundary="vacuum" coeffs="4.0"/>
+    <surface id="12" type="y-plane" boundary="vacuum" coeffs="-4.0"/>
+    <surface id="13" type="y-plane" boundary="vacuum" coeffs="4.0"/>
+    <surface id="14" type="z-plane" boundary="vacuum" coeffs="-4.0"/>
+    <surface id="15" type="z-plane" boundary="vacuum" coeffs="4.0"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
     <particles>100</particles>
     <batches>5</batches>
     <inactive>1</inactive>
-    <source particle="neutron" strength="1.0" type="independent">
+    <source type="independent" strength="1.0" particle="neutron">
       <space type="box">
         <parameters>-2.0 -2.0 -2.0 2.0 2.0 2.0</parameters>
       </space>
diff --git a/tests/regression_tests/surface_source_write/case-10/inputs_true.dat b/tests/regression_tests/surface_source_write/case-10/inputs_true.dat
index 372e5c011..1940826c2 100644
--- a/tests/regression_tests/surface_source_write/case-10/inputs_true.dat
+++ b/tests/regression_tests/surface_source_write/case-10/inputs_true.dat
@@ -1,47 +1,47 @@
 <?xml version='1.0' encoding='utf-8'?>
 <model>
   <materials>
-    <material depletable="true" id="1">
-      <density units="g/cm3" value="11.0"/>
-      <nuclide ao="0.0004524" name="U234"/>
-      <nuclide ao="0.0506068" name="U235"/>
-      <nuclide ao="0.948709" name="U238"/>
-      <nuclide ao="0.0002318" name="U236"/>
-      <nuclide ao="2.0" name="O16"/>
+    <material id="1" depletable="true">
+      <density value="11.0" units="g/cm3"/>
+      <nuclide name="U234" ao="0.0004524"/>
+      <nuclide name="U235" ao="0.0506068"/>
+      <nuclide name="U238" ao="0.948709"/>
+      <nuclide name="U236" ao="0.0002318"/>
+      <nuclide name="O16" ao="2.0"/>
     </material>
     <material id="2">
-      <density units="g/cm3" value="1.0"/>
-      <nuclide ao="2.0" name="H1"/>
-      <nuclide ao="1.0" name="O16"/>
+      <density value="1.0" units="g/cm3"/>
+      <nuclide name="H1" ao="2.0"/>
+      <nuclide name="O16" ao="1.0"/>
     </material>
   </materials>
   <geometry>
     <cell id="1" material="1" region="-1 2 -3" universe="1"/>
     <cell id="2" material="2" region="1 | -2 | 3" universe="1"/>
-    <cell fill="1" id="3" region="-5 4 -7 6 -9 8" universe="2"/>
+    <cell id="3" fill="1" region="-5 4 -7 6 -9 8" universe="2"/>
     <cell id="4" material="2" region="-11 10 -13 12 -15 14 (5 | -4 | 7 | -6 | 9 | -8)" universe="2"/>
-    <surface coeffs="0.0 0.0 2.0" id="1" type="z-cylinder"/>
-    <surface coeffs="-2.0" id="2" type="z-plane"/>
-    <surface coeffs="2.0" id="3" type="z-plane"/>
-    <surface coeffs="-3.0" id="4" type="x-plane"/>
-    <surface coeffs="3.0" id="5" type="x-plane"/>
-    <surface coeffs="-3.0" id="6" type="y-plane"/>
-    <surface coeffs="3.0" id="7" type="y-plane"/>
-    <surface coeffs="-3.0" id="8" type="z-plane"/>
-    <surface coeffs="3.0" id="9" type="z-plane"/>
-    <surface boundary="vacuum" coeffs="-4.0" id="10" type="x-plane"/>
-    <surface boundary="vacuum" coeffs="4.0" id="11" type="x-plane"/>
-    <surface boundary="vacuum" coeffs="-4.0" id="12" type="y-plane"/>
-    <surface boundary="vacuum" coeffs="4.0" id="13" type="y-plane"/>
-    <surface boundary="vacuum" coeffs="-4.0" id="14" type="z-plane"/>
-    <surface boundary="vacuum" coeffs="4.0" id="15" type="z-plane"/>
+    <surface id="1" type="z-cylinder" coeffs="0.0 0.0 2.0"/>
+    <surface id="2" type="z-plane" coeffs="-2.0"/>
+    <surface id="3" type="z-plane" coeffs="2.0"/>
+    <surface id="4" type="x-plane" coeffs="-3.0"/>
+    <surface id="5" type="x-plane" coeffs="3.0"/>
+    <surface id="6" type="y-plane" coeffs="-3.0"/>
+    <surface id="7" type="y-plane" coeffs="3.0"/>
+    <surface id="8" type="z-plane" coeffs="-3.0"/>
+    <surface id="9" type="z-plane" coeffs="3.0"/>
+    <surface id="10" type="x-plane" boundary="vacuum" coeffs="-4.0"/>
+    <surface id="11" type="x-plane" boundary="vacuum" coeffs="4.0"/>
+    <surface id="12" type="y-plane" boundary="vacuum" coeffs="-4.0"/>
+    <surface id="13" type="y-plane" boundary="vacuum" coeffs="4.0"/>
+    <surface id="14" type="z-plane" boundary="vacuum" coeffs="-4.0"/>
+    <surface id="15" type="z-plane" boundary="vacuum" coeffs="4.0"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
     <particles>100</particles>
     <batches>5</batches>
     <inactive>1</inactive>
-    <source particle="neutron" strength="1.0" type="independent">
+    <source type="independent" strength="1.0" particle="neutron">
       <space type="box">
         <parameters>-2.0 -2.0 -2.0 2.0 2.0 2.0</parameters>
       </space>
diff --git a/tests/regression_tests/surface_source_write/case-11/inputs_true.dat b/tests/regression_tests/surface_source_write/case-11/inputs_true.dat
index d5401dc87..a4feff1b1 100644
--- a/tests/regression_tests/surface_source_write/case-11/inputs_true.dat
+++ b/tests/regression_tests/surface_source_write/case-11/inputs_true.dat
@@ -1,47 +1,47 @@
 <?xml version='1.0' encoding='utf-8'?>
 <model>
   <materials>
-    <material depletable="true" id="1">
-      <density units="g/cm3" value="11.0"/>
-      <nuclide ao="0.0004524" name="U234"/>
-      <nuclide ao="0.0506068" name="U235"/>
-      <nuclide ao="0.948709" name="U238"/>
-      <nuclide ao="0.0002318" name="U236"/>
-      <nuclide ao="2.0" name="O16"/>
+    <material id="1" depletable="true">
+      <density value="11.0" units="g/cm3"/>
+      <nuclide name="U234" ao="0.0004524"/>
+      <nuclide name="U235" ao="0.0506068"/>
+      <nuclide name="U238" ao="0.948709"/>
+      <nuclide name="U236" ao="0.0002318"/>
+      <nuclide name="O16" ao="2.0"/>
     </material>
     <material id="2">
-      <density units="g/cm3" value="1.0"/>
-      <nuclide ao="2.0" name="H1"/>
-      <nuclide ao="1.0" name="O16"/>
+      <density value="1.0" units="g/cm3"/>
+      <nuclide name="H1" ao="2.0"/>
+      <nuclide name="O16" ao="1.0"/>
     </material>
   </materials>
   <geometry>
     <cell id="1" material="1" region="-1 2 -3" universe="1"/>
     <cell id="2" material="2" region="1 | -2 | 3" universe="1"/>
-    <cell fill="1" id="3" region="-5 4 -7 6 -9 8" universe="2"/>
+    <cell id="3" fill="1" region="-5 4 -7 6 -9 8" universe="2"/>
     <cell id="4" material="2" region="-11 10 -13 12 -15 14 (5 | -4 | 7 | -6 | 9 | -8)" universe="2"/>
-    <surface coeffs="0.0 0.0 2.0" id="1" type="z-cylinder"/>
-    <surface coeffs="-2.0" id="2" type="z-plane"/>
-    <surface coeffs="2.0" id="3" type="z-plane"/>
-    <surface coeffs="-3.0" id="4" type="x-plane"/>
-    <surface coeffs="3.0" id="5" type="x-plane"/>
-    <surface coeffs="-3.0" id="6" type="y-plane"/>
-    <surface coeffs="3.0" id="7" type="y-plane"/>
-    <surface coeffs="-3.0" id="8" type="z-plane"/>
-    <surface coeffs="3.0" id="9" type="z-plane"/>
-    <surface boundary="vacuum" coeffs="-4.0" id="10" type="x-plane"/>
-    <surface boundary="vacuum" coeffs="4.0" id="11" type="x-plane"/>
-    <surface boundary="vacuum" coeffs="-4.0" id="12" type="y-plane"/>
-    <surface boundary="vacuum" coeffs="4.0" id="13" type="y-plane"/>
-    <surface boundary="vacuum" coeffs="-4.0" id="14" type="z-plane"/>
-    <surface boundary="vacuum" coeffs="4.0" id="15" type="z-plane"/>
+    <surface id="1" type="z-cylinder" coeffs="0.0 0.0 2.0"/>
+    <surface id="2" type="z-plane" coeffs="-2.0"/>
+    <surface id="3" type="z-plane" coeffs="2.0"/>
+    <surface id="4" type="x-plane" coeffs="-3.0"/>
+    <surface id="5" type="x-plane" coeffs="3.0"/>
+    <surface id="6" type="y-plane" coeffs="-3.0"/>
+    <surface id="7" type="y-plane" coeffs="3.0"/>
+    <surface id="8" type="z-plane" coeffs="-3.0"/>
+    <surface id="9" type="z-plane" coeffs="3.0"/>
+    <surface id="10" type="x-plane" boundary="vacuum" coeffs="-4.0"/>
+    <surface id="11" type="x-plane" boundary="vacuum" coeffs="4.0"/>
+    <surface id="12" type="y-plane" boundary="vacuum" coeffs="-4.0"/>
+    <surface id="13" type="y-plane" boundary="vacuum" coeffs="4.0"/>
+    <surface id="14" type="z-plane" boundary="vacuum" coeffs="-4.0"/>
+    <surface id="15" type="z-plane" boundary="vacuum" coeffs="4.0"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
     <particles>100</particles>
     <batches>5</batches>
     <inactive>1</inactive>
-    <source particle="neutron" strength="1.0" type="independent">
+    <source type="independent" strength="1.0" particle="neutron">
       <space type="box">
         <parameters>-2.0 -2.0 -2.0 2.0 2.0 2.0</parameters>
       </space>
diff --git a/tests/regression_tests/surface_source_write/case-12/inputs_true.dat b/tests/regression_tests/surface_source_write/case-12/inputs_true.dat
index cb8f87741..c069f425c 100644
--- a/tests/regression_tests/surface_source_write/case-12/inputs_true.dat
+++ b/tests/regression_tests/surface_source_write/case-12/inputs_true.dat
@@ -1,40 +1,40 @@
 <?xml version='1.0' encoding='utf-8'?>
 <model>
   <materials>
-    <material depletable="true" id="1">
-      <density units="g/cm3" value="11.0"/>
-      <nuclide ao="0.0004524" name="U234"/>
-      <nuclide ao="0.0506068" name="U235"/>
-      <nuclide ao="0.948709" name="U238"/>
-      <nuclide ao="0.0002318" name="U236"/>
-      <nuclide ao="2.0" name="O16"/>
+    <material id="1" depletable="true">
+      <density value="11.0" units="g/cm3"/>
+      <nuclide name="U234" ao="0.0004524"/>
+      <nuclide name="U235" ao="0.0506068"/>
+      <nuclide name="U238" ao="0.948709"/>
+      <nuclide name="U236" ao="0.0002318"/>
+      <nuclide name="O16" ao="2.0"/>
     </material>
     <material id="2">
-      <density units="g/cm3" value="1.0"/>
-      <nuclide ao="2.0" name="H1"/>
-      <nuclide ao="1.0" name="O16"/>
+      <density value="1.0" units="g/cm3"/>
+      <nuclide name="H1" ao="2.0"/>
+      <nuclide name="O16" ao="1.0"/>
     </material>
   </materials>
   <geometry>
     <cell id="1" material="1" region="-1 2 -3" universe="1"/>
     <cell id="2" material="2" region="1 | -2 | 3" universe="1"/>
-    <cell fill="1" id="3" region="-5 4 -7 6 -9 8" universe="2"/>
-    <surface coeffs="0.0 0.0 2.0" id="1" type="z-cylinder"/>
-    <surface coeffs="-2.0" id="2" type="z-plane"/>
-    <surface coeffs="2.0" id="3" type="z-plane"/>
-    <surface boundary="vacuum" coeffs="-3.0" id="4" type="x-plane"/>
-    <surface boundary="vacuum" coeffs="3.0" id="5" type="x-plane"/>
-    <surface boundary="vacuum" coeffs="-3.0" id="6" type="y-plane"/>
-    <surface boundary="vacuum" coeffs="3.0" id="7" type="y-plane"/>
-    <surface boundary="vacuum" coeffs="-3.0" id="8" type="z-plane"/>
-    <surface boundary="vacuum" coeffs="3.0" id="9" type="z-plane"/>
+    <cell id="3" fill="1" region="-5 4 -7 6 -9 8" universe="2"/>
+    <surface id="1" type="z-cylinder" coeffs="0.0 0.0 2.0"/>
+    <surface id="2" type="z-plane" coeffs="-2.0"/>
+    <surface id="3" type="z-plane" coeffs="2.0"/>
+    <surface id="4" type="x-plane" boundary="vacuum" coeffs="-3.0"/>
+    <surface id="5" type="x-plane" boundary="vacuum" coeffs="3.0"/>
+    <surface id="6" type="y-plane" boundary="vacuum" coeffs="-3.0"/>
+    <surface id="7" type="y-plane" boundary="vacuum" coeffs="3.0"/>
+    <surface id="8" type="z-plane" boundary="vacuum" coeffs="-3.0"/>
+    <surface id="9" type="z-plane" boundary="vacuum" coeffs="3.0"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
     <particles>100</particles>
     <batches>5</batches>
     <inactive>1</inactive>
-    <source particle="neutron" strength="1.0" type="independent">
+    <source type="independent" strength="1.0" particle="neutron">
       <space type="box">
         <parameters>-2.0 -2.0 -2.0 2.0 2.0 2.0</parameters>
       </space>
diff --git a/tests/regression_tests/surface_source_write/case-13/inputs_true.dat b/tests/regression_tests/surface_source_write/case-13/inputs_true.dat
index 23bbf0455..2a93fdb4d 100644
--- a/tests/regression_tests/surface_source_write/case-13/inputs_true.dat
+++ b/tests/regression_tests/surface_source_write/case-13/inputs_true.dat
@@ -1,40 +1,40 @@
 <?xml version='1.0' encoding='utf-8'?>
 <model>
   <materials>
-    <material depletable="true" id="1">
-      <density units="g/cm3" value="11.0"/>
-      <nuclide ao="0.0004524" name="U234"/>
-      <nuclide ao="0.0506068" name="U235"/>
-      <nuclide ao="0.948709" name="U238"/>
-      <nuclide ao="0.0002318" name="U236"/>
-      <nuclide ao="2.0" name="O16"/>
+    <material id="1" depletable="true">
+      <density value="11.0" units="g/cm3"/>
+      <nuclide name="U234" ao="0.0004524"/>
+      <nuclide name="U235" ao="0.0506068"/>
+      <nuclide name="U238" ao="0.948709"/>
+      <nuclide name="U236" ao="0.0002318"/>
+      <nuclide name="O16" ao="2.0"/>
     </material>
     <material id="2">
-      <density units="g/cm3" value="1.0"/>
-      <nuclide ao="2.0" name="H1"/>
-      <nuclide ao="1.0" name="O16"/>
+      <density value="1.0" units="g/cm3"/>
+      <nuclide name="H1" ao="2.0"/>
+      <nuclide name="O16" ao="1.0"/>
     </material>
   </materials>
   <geometry>
     <cell id="1" material="1" region="-1 2 -3" universe="1"/>
     <cell id="2" material="2" region="1 | -2 | 3" universe="1"/>
-    <cell fill="1" id="3" region="-5 4 -7 6 -9 8" universe="2"/>
-    <surface coeffs="0.0 0.0 2.0" id="1" type="z-cylinder"/>
-    <surface coeffs="-2.0" id="2" type="z-plane"/>
-    <surface coeffs="2.0" id="3" type="z-plane"/>
-    <surface boundary="vacuum" coeffs="-3.0" id="4" type="x-plane"/>
-    <surface boundary="vacuum" coeffs="3.0" id="5" type="x-plane"/>
-    <surface boundary="vacuum" coeffs="-3.0" id="6" type="y-plane"/>
-    <surface boundary="vacuum" coeffs="3.0" id="7" type="y-plane"/>
-    <surface boundary="vacuum" coeffs="-3.0" id="8" type="z-plane"/>
-    <surface boundary="vacuum" coeffs="3.0" id="9" type="z-plane"/>
+    <cell id="3" fill="1" region="-5 4 -7 6 -9 8" universe="2"/>
+    <surface id="1" type="z-cylinder" coeffs="0.0 0.0 2.0"/>
+    <surface id="2" type="z-plane" coeffs="-2.0"/>
+    <surface id="3" type="z-plane" coeffs="2.0"/>
+    <surface id="4" type="x-plane" boundary="vacuum" coeffs="-3.0"/>
+    <surface id="5" type="x-plane" boundary="vacuum" coeffs="3.0"/>
+    <surface id="6" type="y-plane" boundary="vacuum" coeffs="-3.0"/>
+    <surface id="7" type="y-plane" boundary="vacuum" coeffs="3.0"/>
+    <surface id="8" type="z-plane" boundary="vacuum" coeffs="-3.0"/>
+    <surface id="9" type="z-plane" boundary="vacuum" coeffs="3.0"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
     <particles>100</particles>
     <batches>5</batches>
     <inactive>1</inactive>
-    <source particle="neutron" strength="1.0" type="independent">
+    <source type="independent" strength="1.0" particle="neutron">
       <space type="box">
         <parameters>-2.0 -2.0 -2.0 2.0 2.0 2.0</parameters>
       </space>
diff --git a/tests/regression_tests/surface_source_write/case-14/inputs_true.dat b/tests/regression_tests/surface_source_write/case-14/inputs_true.dat
index 29acd94f2..893f8ddc1 100644
--- a/tests/regression_tests/surface_source_write/case-14/inputs_true.dat
+++ b/tests/regression_tests/surface_source_write/case-14/inputs_true.dat
@@ -1,40 +1,40 @@
 <?xml version='1.0' encoding='utf-8'?>
 <model>
   <materials>
-    <material depletable="true" id="1">
-      <density units="g/cm3" value="11.0"/>
-      <nuclide ao="0.0004524" name="U234"/>
-      <nuclide ao="0.0506068" name="U235"/>
-      <nuclide ao="0.948709" name="U238"/>
-      <nuclide ao="0.0002318" name="U236"/>
-      <nuclide ao="2.0" name="O16"/>
+    <material id="1" depletable="true">
+      <density value="11.0" units="g/cm3"/>
+      <nuclide name="U234" ao="0.0004524"/>
+      <nuclide name="U235" ao="0.0506068"/>
+      <nuclide name="U238" ao="0.948709"/>
+      <nuclide name="U236" ao="0.0002318"/>
+      <nuclide name="O16" ao="2.0"/>
     </material>
     <material id="2">
-      <density units="g/cm3" value="1.0"/>
-      <nuclide ao="2.0" name="H1"/>
-      <nuclide ao="1.0" name="O16"/>
+      <density value="1.0" units="g/cm3"/>
+      <nuclide name="H1" ao="2.0"/>
+      <nuclide name="O16" ao="1.0"/>
     </material>
   </materials>
   <geometry>
     <cell id="1" material="1" region="-1 2 -3" universe="1"/>
     <cell id="2" material="2" region="1 | -2 | 3" universe="1"/>
-    <cell fill="1" id="3" region="-5 4 -7 6 -9 8" universe="2"/>
-    <surface coeffs="0.0 0.0 2.0" id="1" type="z-cylinder"/>
-    <surface coeffs="-2.0" id="2" type="z-plane"/>
-    <surface coeffs="2.0" id="3" type="z-plane"/>
-    <surface boundary="vacuum" coeffs="-3.0" id="4" type="x-plane"/>
-    <surface boundary="vacuum" coeffs="3.0" id="5" type="x-plane"/>
-    <surface boundary="vacuum" coeffs="-3.0" id="6" type="y-plane"/>
-    <surface boundary="vacuum" coeffs="3.0" id="7" type="y-plane"/>
-    <surface boundary="vacuum" coeffs="-3.0" id="8" type="z-plane"/>
-    <surface boundary="vacuum" coeffs="3.0" id="9" type="z-plane"/>
+    <cell id="3" fill="1" region="-5 4 -7 6 -9 8" universe="2"/>
+    <surface id="1" type="z-cylinder" coeffs="0.0 0.0 2.0"/>
+    <surface id="2" type="z-plane" coeffs="-2.0"/>
+    <surface id="3" type="z-plane" coeffs="2.0"/>
+    <surface id="4" type="x-plane" boundary="vacuum" coeffs="-3.0"/>
+    <surface id="5" type="x-plane" boundary="vacuum" coeffs="3.0"/>
+    <surface id="6" type="y-plane" boundary="vacuum" coeffs="-3.0"/>
+    <surface id="7" type="y-plane" boundary="vacuum" coeffs="3.0"/>
+    <surface id="8" type="z-plane" boundary="vacuum" coeffs="-3.0"/>
+    <surface id="9" type="z-plane" boundary="vacuum" coeffs="3.0"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
     <particles>100</particles>
     <batches>5</batches>
     <inactive>1</inactive>
-    <source particle="neutron" strength="1.0" type="independent">
+    <source type="independent" strength="1.0" particle="neutron">
       <space type="box">
         <parameters>-2.0 -2.0 -2.0 2.0 2.0 2.0</parameters>
       </space>
diff --git a/tests/regression_tests/surface_source_write/case-15/inputs_true.dat b/tests/regression_tests/surface_source_write/case-15/inputs_true.dat
index c775f2f52..875a2fb0b 100644
--- a/tests/regression_tests/surface_source_write/case-15/inputs_true.dat
+++ b/tests/regression_tests/surface_source_write/case-15/inputs_true.dat
@@ -1,40 +1,40 @@
 <?xml version='1.0' encoding='utf-8'?>
 <model>
   <materials>
-    <material depletable="true" id="1">
-      <density units="g/cm3" value="11.0"/>
-      <nuclide ao="0.0004524" name="U234"/>
-      <nuclide ao="0.0506068" name="U235"/>
-      <nuclide ao="0.948709" name="U238"/>
-      <nuclide ao="0.0002318" name="U236"/>
-      <nuclide ao="2.0" name="O16"/>
+    <material id="1" depletable="true">
+      <density value="11.0" units="g/cm3"/>
+      <nuclide name="U234" ao="0.0004524"/>
+      <nuclide name="U235" ao="0.0506068"/>
+      <nuclide name="U238" ao="0.948709"/>
+      <nuclide name="U236" ao="0.0002318"/>
+      <nuclide name="O16" ao="2.0"/>
     </material>
     <material id="2">
-      <density units="g/cm3" value="1.0"/>
-      <nuclide ao="2.0" name="H1"/>
-      <nuclide ao="1.0" name="O16"/>
+      <density value="1.0" units="g/cm3"/>
+      <nuclide name="H1" ao="2.0"/>
+      <nuclide name="O16" ao="1.0"/>
     </material>
   </materials>
   <geometry>
     <cell id="1" material="1" region="-1 2 -3" universe="1"/>
     <cell id="2" material="2" region="1 | -2 | 3" universe="1"/>
-    <cell fill="1" id="3" region="-5 4 -7 6 -9 8" universe="2"/>
-    <surface coeffs="0.0 0.0 2.0" id="1" type="z-cylinder"/>
-    <surface coeffs="-2.0" id="2" type="z-plane"/>
-    <surface coeffs="2.0" id="3" type="z-plane"/>
-    <surface boundary="vacuum" coeffs="-3.0" id="4" type="x-plane"/>
-    <surface boundary="vacuum" coeffs="3.0" id="5" type="x-plane"/>
-    <surface boundary="vacuum" coeffs="-3.0" id="6" type="y-plane"/>
-    <surface boundary="vacuum" coeffs="3.0" id="7" type="y-plane"/>
-    <surface boundary="vacuum" coeffs="-3.0" id="8" type="z-plane"/>
-    <surface boundary="vacuum" coeffs="3.0" id="9" type="z-plane"/>
+    <cell id="3" fill="1" region="-5 4 -7 6 -9 8" universe="2"/>
+    <surface id="1" type="z-cylinder" coeffs="0.0 0.0 2.0"/>
+    <surface id="2" type="z-plane" coeffs="-2.0"/>
+    <surface id="3" type="z-plane" coeffs="2.0"/>
+    <surface id="4" type="x-plane" boundary="vacuum" coeffs="-3.0"/>
+    <surface id="5" type="x-plane" boundary="vacuum" coeffs="3.0"/>
+    <surface id="6" type="y-plane" boundary="vacuum" coeffs="-3.0"/>
+    <surface id="7" type="y-plane" boundary="vacuum" coeffs="3.0"/>
+    <surface id="8" type="z-plane" boundary="vacuum" coeffs="-3.0"/>
+    <surface id="9" type="z-plane" boundary="vacuum" coeffs="3.0"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
     <particles>100</particles>
     <batches>5</batches>
     <inactive>1</inactive>
-    <source particle="neutron" strength="1.0" type="independent">
+    <source type="independent" strength="1.0" particle="neutron">
       <space type="box">
         <parameters>-2.0 -2.0 -2.0 2.0 2.0 2.0</parameters>
       </space>
diff --git a/tests/regression_tests/surface_source_write/case-16/inputs_true.dat b/tests/regression_tests/surface_source_write/case-16/inputs_true.dat
index 969a8f31e..347855e90 100644
--- a/tests/regression_tests/surface_source_write/case-16/inputs_true.dat
+++ b/tests/regression_tests/surface_source_write/case-16/inputs_true.dat
@@ -1,40 +1,40 @@
 <?xml version='1.0' encoding='utf-8'?>
 <model>
   <materials>
-    <material depletable="true" id="1">
-      <density units="g/cm3" value="11.0"/>
-      <nuclide ao="0.0004524" name="U234"/>
-      <nuclide ao="0.0506068" name="U235"/>
-      <nuclide ao="0.948709" name="U238"/>
-      <nuclide ao="0.0002318" name="U236"/>
-      <nuclide ao="2.0" name="O16"/>
+    <material id="1" depletable="true">
+      <density value="11.0" units="g/cm3"/>
+      <nuclide name="U234" ao="0.0004524"/>
+      <nuclide name="U235" ao="0.0506068"/>
+      <nuclide name="U238" ao="0.948709"/>
+      <nuclide name="U236" ao="0.0002318"/>
+      <nuclide name="O16" ao="2.0"/>
     </material>
     <material id="2">
-      <density units="g/cm3" value="1.0"/>
-      <nuclide ao="2.0" name="H1"/>
-      <nuclide ao="1.0" name="O16"/>
+      <density value="1.0" units="g/cm3"/>
+      <nuclide name="H1" ao="2.0"/>
+      <nuclide name="O16" ao="1.0"/>
     </material>
   </materials>
   <geometry>
     <cell id="1" material="1" region="-1 2 -3" universe="1"/>
     <cell id="2" material="2" region="1 | -2 | 3" universe="1"/>
-    <cell fill="1" id="3" region="-5 4 -7 6 -9 8" universe="2"/>
-    <surface coeffs="0.0 0.0 2.0" id="1" type="z-cylinder"/>
-    <surface coeffs="-2.0" id="2" type="z-plane"/>
-    <surface coeffs="2.0" id="3" type="z-plane"/>
-    <surface boundary="reflective" coeffs="-3.0" id="4" type="x-plane"/>
-    <surface boundary="reflective" coeffs="3.0" id="5" type="x-plane"/>
-    <surface boundary="reflective" coeffs="-3.0" id="6" type="y-plane"/>
-    <surface boundary="reflective" coeffs="3.0" id="7" type="y-plane"/>
-    <surface boundary="reflective" coeffs="-3.0" id="8" type="z-plane"/>
-    <surface boundary="reflective" coeffs="3.0" id="9" type="z-plane"/>
+    <cell id="3" fill="1" region="-5 4 -7 6 -9 8" universe="2"/>
+    <surface id="1" type="z-cylinder" coeffs="0.0 0.0 2.0"/>
+    <surface id="2" type="z-plane" coeffs="-2.0"/>
+    <surface id="3" type="z-plane" coeffs="2.0"/>
+    <surface id="4" type="x-plane" boundary="reflective" coeffs="-3.0"/>
+    <surface id="5" type="x-plane" boundary="reflective" coeffs="3.0"/>
+    <surface id="6" type="y-plane" boundary="reflective" coeffs="-3.0"/>
+    <surface id="7" type="y-plane" boundary="reflective" coeffs="3.0"/>
+    <surface id="8" type="z-plane" boundary="reflective" coeffs="-3.0"/>
+    <surface id="9" type="z-plane" boundary="reflective" coeffs="3.0"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
     <particles>100</particles>
     <batches>5</batches>
     <inactive>1</inactive>
-    <source particle="neutron" strength="1.0" type="independent">
+    <source type="independent" strength="1.0" particle="neutron">
       <space type="box">
         <parameters>-2.0 -2.0 -2.0 2.0 2.0 2.0</parameters>
       </space>
diff --git a/tests/regression_tests/surface_source_write/case-17/inputs_true.dat b/tests/regression_tests/surface_source_write/case-17/inputs_true.dat
index 0a65db510..95d0a6712 100644
--- a/tests/regression_tests/surface_source_write/case-17/inputs_true.dat
+++ b/tests/regression_tests/surface_source_write/case-17/inputs_true.dat
@@ -1,40 +1,40 @@
 <?xml version='1.0' encoding='utf-8'?>
 <model>
   <materials>
-    <material depletable="true" id="1">
-      <density units="g/cm3" value="11.0"/>
-      <nuclide ao="0.0004524" name="U234"/>
-      <nuclide ao="0.0506068" name="U235"/>
-      <nuclide ao="0.948709" name="U238"/>
-      <nuclide ao="0.0002318" name="U236"/>
-      <nuclide ao="2.0" name="O16"/>
+    <material id="1" depletable="true">
+      <density value="11.0" units="g/cm3"/>
+      <nuclide name="U234" ao="0.0004524"/>
+      <nuclide name="U235" ao="0.0506068"/>
+      <nuclide name="U238" ao="0.948709"/>
+      <nuclide name="U236" ao="0.0002318"/>
+      <nuclide name="O16" ao="2.0"/>
     </material>
     <material id="2">
-      <density units="g/cm3" value="1.0"/>
-      <nuclide ao="2.0" name="H1"/>
-      <nuclide ao="1.0" name="O16"/>
+      <density value="1.0" units="g/cm3"/>
+      <nuclide name="H1" ao="2.0"/>
+      <nuclide name="O16" ao="1.0"/>
     </material>
   </materials>
   <geometry>
     <cell id="1" material="1" region="-1 2 -3" universe="1"/>
     <cell id="2" material="2" region="1 | -2 | 3" universe="1"/>
-    <cell fill="1" id="3" region="-5 4 -7 6 -9 8" universe="2"/>
-    <surface coeffs="0.0 0.0 2.0" id="1" type="z-cylinder"/>
-    <surface coeffs="-2.0" id="2" type="z-plane"/>
-    <surface coeffs="2.0" id="3" type="z-plane"/>
-    <surface boundary="reflective" coeffs="-3.0" id="4" type="x-plane"/>
-    <surface boundary="reflective" coeffs="3.0" id="5" type="x-plane"/>
-    <surface boundary="reflective" coeffs="-3.0" id="6" type="y-plane"/>
-    <surface boundary="reflective" coeffs="3.0" id="7" type="y-plane"/>
-    <surface boundary="reflective" coeffs="-3.0" id="8" type="z-plane"/>
-    <surface boundary="reflective" coeffs="3.0" id="9" type="z-plane"/>
+    <cell id="3" fill="1" region="-5 4 -7 6 -9 8" universe="2"/>
+    <surface id="1" type="z-cylinder" coeffs="0.0 0.0 2.0"/>
+    <surface id="2" type="z-plane" coeffs="-2.0"/>
+    <surface id="3" type="z-plane" coeffs="2.0"/>
+    <surface id="4" type="x-plane" boundary="reflective" coeffs="-3.0"/>
+    <surface id="5" type="x-plane" boundary="reflective" coeffs="3.0"/>
+    <surface id="6" type="y-plane" boundary="reflective" coeffs="-3.0"/>
+    <surface id="7" type="y-plane" boundary="reflective" coeffs="3.0"/>
+    <surface id="8" type="z-plane" boundary="reflective" coeffs="-3.0"/>
+    <surface id="9" type="z-plane" boundary="reflective" coeffs="3.0"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
     <particles>100</particles>
     <batches>5</batches>
     <inactive>1</inactive>
-    <source particle="neutron" strength="1.0" type="independent">
+    <source type="independent" strength="1.0" particle="neutron">
       <space type="box">
         <parameters>-2.0 -2.0 -2.0 2.0 2.0 2.0</parameters>
       </space>
diff --git a/tests/regression_tests/surface_source_write/case-18/inputs_true.dat b/tests/regression_tests/surface_source_write/case-18/inputs_true.dat
index 89df27b47..807c72ae6 100644
--- a/tests/regression_tests/surface_source_write/case-18/inputs_true.dat
+++ b/tests/regression_tests/surface_source_write/case-18/inputs_true.dat
@@ -1,40 +1,40 @@
 <?xml version='1.0' encoding='utf-8'?>
 <model>
   <materials>
-    <material depletable="true" id="1">
-      <density units="g/cm3" value="11.0"/>
-      <nuclide ao="0.0004524" name="U234"/>
-      <nuclide ao="0.0506068" name="U235"/>
-      <nuclide ao="0.948709" name="U238"/>
-      <nuclide ao="0.0002318" name="U236"/>
-      <nuclide ao="2.0" name="O16"/>
+    <material id="1" depletable="true">
+      <density value="11.0" units="g/cm3"/>
+      <nuclide name="U234" ao="0.0004524"/>
+      <nuclide name="U235" ao="0.0506068"/>
+      <nuclide name="U238" ao="0.948709"/>
+      <nuclide name="U236" ao="0.0002318"/>
+      <nuclide name="O16" ao="2.0"/>
     </material>
     <material id="2">
-      <density units="g/cm3" value="1.0"/>
-      <nuclide ao="2.0" name="H1"/>
-      <nuclide ao="1.0" name="O16"/>
+      <density value="1.0" units="g/cm3"/>
+      <nuclide name="H1" ao="2.0"/>
+      <nuclide name="O16" ao="1.0"/>
     </material>
   </materials>
   <geometry>
     <cell id="1" material="1" region="-1 2 -3" universe="1"/>
     <cell id="2" material="2" region="1 | -2 | 3" universe="1"/>
-    <cell fill="1" id="3" region="-5 4 -7 6 -9 8" universe="2"/>
-    <surface coeffs="0.0 0.0 2.0" id="1" type="z-cylinder"/>
-    <surface coeffs="-2.0" id="2" type="z-plane"/>
-    <surface coeffs="2.0" id="3" type="z-plane"/>
-    <surface boundary="reflective" coeffs="-3.0" id="4" type="x-plane"/>
-    <surface boundary="reflective" coeffs="3.0" id="5" type="x-plane"/>
-    <surface boundary="reflective" coeffs="-3.0" id="6" type="y-plane"/>
-    <surface boundary="reflective" coeffs="3.0" id="7" type="y-plane"/>
-    <surface boundary="reflective" coeffs="-3.0" id="8" type="z-plane"/>
-    <surface boundary="reflective" coeffs="3.0" id="9" type="z-plane"/>
+    <cell id="3" fill="1" region="-5 4 -7 6 -9 8" universe="2"/>
+    <surface id="1" type="z-cylinder" coeffs="0.0 0.0 2.0"/>
+    <surface id="2" type="z-plane" coeffs="-2.0"/>
+    <surface id="3" type="z-plane" coeffs="2.0"/>
+    <surface id="4" type="x-plane" boundary="reflective" coeffs="-3.0"/>
+    <surface id="5" type="x-plane" boundary="reflective" coeffs="3.0"/>
+    <surface id="6" type="y-plane" boundary="reflective" coeffs="-3.0"/>
+    <surface id="7" type="y-plane" boundary="reflective" coeffs="3.0"/>
+    <surface id="8" type="z-plane" boundary="reflective" coeffs="-3.0"/>
+    <surface id="9" type="z-plane" boundary="reflective" coeffs="3.0"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
     <particles>100</particles>
     <batches>5</batches>
     <inactive>1</inactive>
-    <source particle="neutron" strength="1.0" type="independent">
+    <source type="independent" strength="1.0" particle="neutron">
       <space type="box">
         <parameters>-2.0 -2.0 -2.0 2.0 2.0 2.0</parameters>
       </space>
diff --git a/tests/regression_tests/surface_source_write/case-19/inputs_true.dat b/tests/regression_tests/surface_source_write/case-19/inputs_true.dat
index 3ea7dbffe..42aa78a09 100644
--- a/tests/regression_tests/surface_source_write/case-19/inputs_true.dat
+++ b/tests/regression_tests/surface_source_write/case-19/inputs_true.dat
@@ -1,40 +1,40 @@
 <?xml version='1.0' encoding='utf-8'?>
 <model>
   <materials>
-    <material depletable="true" id="1">
-      <density units="g/cm3" value="11.0"/>
-      <nuclide ao="0.0004524" name="U234"/>
-      <nuclide ao="0.0506068" name="U235"/>
-      <nuclide ao="0.948709" name="U238"/>
-      <nuclide ao="0.0002318" name="U236"/>
-      <nuclide ao="2.0" name="O16"/>
+    <material id="1" depletable="true">
+      <density value="11.0" units="g/cm3"/>
+      <nuclide name="U234" ao="0.0004524"/>
+      <nuclide name="U235" ao="0.0506068"/>
+      <nuclide name="U238" ao="0.948709"/>
+      <nuclide name="U236" ao="0.0002318"/>
+      <nuclide name="O16" ao="2.0"/>
     </material>
     <material id="2">
-      <density units="g/cm3" value="1.0"/>
-      <nuclide ao="2.0" name="H1"/>
-      <nuclide ao="1.0" name="O16"/>
+      <density value="1.0" units="g/cm3"/>
+      <nuclide name="H1" ao="2.0"/>
+      <nuclide name="O16" ao="1.0"/>
     </material>
   </materials>
   <geometry>
     <cell id="1" material="1" region="-1 2 -3" universe="1"/>
     <cell id="2" material="2" region="1 | -2 | 3" universe="1"/>
-    <cell fill="1" id="3" region="-5 4 -7 6 -9 8" universe="2"/>
-    <surface coeffs="0.0 0.0 2.0" id="1" type="z-cylinder"/>
-    <surface coeffs="-2.0" id="2" type="z-plane"/>
-    <surface coeffs="2.0" id="3" type="z-plane"/>
-    <surface boundary="reflective" coeffs="-3.0" id="4" type="x-plane"/>
-    <surface boundary="reflective" coeffs="3.0" id="5" type="x-plane"/>
-    <surface boundary="reflective" coeffs="-3.0" id="6" type="y-plane"/>
-    <surface boundary="reflective" coeffs="3.0" id="7" type="y-plane"/>
-    <surface boundary="reflective" coeffs="-3.0" id="8" type="z-plane"/>
-    <surface boundary="reflective" coeffs="3.0" id="9" type="z-plane"/>
+    <cell id="3" fill="1" region="-5 4 -7 6 -9 8" universe="2"/>
+    <surface id="1" type="z-cylinder" coeffs="0.0 0.0 2.0"/>
+    <surface id="2" type="z-plane" coeffs="-2.0"/>
+    <surface id="3" type="z-plane" coeffs="2.0"/>
+    <surface id="4" type="x-plane" boundary="reflective" coeffs="-3.0"/>
+    <surface id="5" type="x-plane" boundary="reflective" coeffs="3.0"/>
+    <surface id="6" type="y-plane" boundary="reflective" coeffs="-3.0"/>
+    <surface id="7" type="y-plane" boundary="reflective" coeffs="3.0"/>
+    <surface id="8" type="z-plane" boundary="reflective" coeffs="-3.0"/>
+    <surface id="9" type="z-plane" boundary="reflective" coeffs="3.0"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
     <particles>100</particles>
     <batches>5</batches>
     <inactive>1</inactive>
-    <source particle="neutron" strength="1.0" type="independent">
+    <source type="independent" strength="1.0" particle="neutron">
       <space type="box">
         <parameters>-2.0 -2.0 -2.0 2.0 2.0 2.0</parameters>
       </space>
diff --git a/tests/regression_tests/surface_source_write/case-20/inputs_true.dat b/tests/regression_tests/surface_source_write/case-20/inputs_true.dat
index c3c768a3d..4c7a3f11d 100644
--- a/tests/regression_tests/surface_source_write/case-20/inputs_true.dat
+++ b/tests/regression_tests/surface_source_write/case-20/inputs_true.dat
@@ -1,40 +1,40 @@
 <?xml version='1.0' encoding='utf-8'?>
 <model>
   <materials>
-    <material depletable="true" id="1">
-      <density units="g/cm3" value="11.0"/>
-      <nuclide ao="0.0004524" name="U234"/>
-      <nuclide ao="0.0506068" name="U235"/>
-      <nuclide ao="0.948709" name="U238"/>
-      <nuclide ao="0.0002318" name="U236"/>
-      <nuclide ao="2.0" name="O16"/>
+    <material id="1" depletable="true">
+      <density value="11.0" units="g/cm3"/>
+      <nuclide name="U234" ao="0.0004524"/>
+      <nuclide name="U235" ao="0.0506068"/>
+      <nuclide name="U238" ao="0.948709"/>
+      <nuclide name="U236" ao="0.0002318"/>
+      <nuclide name="O16" ao="2.0"/>
     </material>
     <material id="2">
-      <density units="g/cm3" value="1.0"/>
-      <nuclide ao="2.0" name="H1"/>
-      <nuclide ao="1.0" name="O16"/>
+      <density value="1.0" units="g/cm3"/>
+      <nuclide name="H1" ao="2.0"/>
+      <nuclide name="O16" ao="1.0"/>
     </material>
   </materials>
   <geometry>
     <cell id="1" material="1" region="-1 2 -3" universe="1"/>
     <cell id="2" material="2" region="1 | -2 | 3" universe="1"/>
-    <cell fill="1" id="3" region="4 -5 6 -7 8 -9" universe="2"/>
-    <surface coeffs="0.0 0.0 2.0" id="1" type="z-cylinder"/>
-    <surface coeffs="-2.0" id="2" type="z-plane"/>
-    <surface coeffs="2.0" id="3" type="z-plane"/>
-    <surface boundary="periodic" coeffs="-3.0" id="4" type="z-plane"/>
-    <surface boundary="periodic" coeffs="3.0" id="5" type="z-plane"/>
-    <surface boundary="reflective" coeffs="-3.0" id="6" type="x-plane"/>
-    <surface boundary="reflective" coeffs="3.0" id="7" type="x-plane"/>
-    <surface boundary="reflective" coeffs="-3.0" id="8" type="y-plane"/>
-    <surface boundary="reflective" coeffs="3.0" id="9" type="y-plane"/>
+    <cell id="3" fill="1" region="4 -5 6 -7 8 -9" universe="2"/>
+    <surface id="1" type="z-cylinder" coeffs="0.0 0.0 2.0"/>
+    <surface id="2" type="z-plane" coeffs="-2.0"/>
+    <surface id="3" type="z-plane" coeffs="2.0"/>
+    <surface id="4" type="z-plane" boundary="periodic" coeffs="-3.0"/>
+    <surface id="5" type="z-plane" boundary="periodic" coeffs="3.0"/>
+    <surface id="6" type="x-plane" boundary="reflective" coeffs="-3.0"/>
+    <surface id="7" type="x-plane" boundary="reflective" coeffs="3.0"/>
+    <surface id="8" type="y-plane" boundary="reflective" coeffs="-3.0"/>
+    <surface id="9" type="y-plane" boundary="reflective" coeffs="3.0"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
     <particles>100</particles>
     <batches>5</batches>
     <inactive>1</inactive>
-    <source particle="neutron" strength="1.0" type="independent">
+    <source type="independent" strength="1.0" particle="neutron">
       <space type="box">
         <parameters>-2.0 -2.0 -2.0 2.0 2.0 2.0</parameters>
       </space>
diff --git a/tests/regression_tests/surface_source_write/case-21/inputs_true.dat b/tests/regression_tests/surface_source_write/case-21/inputs_true.dat
index 5dae8374d..71f9aae6a 100644
--- a/tests/regression_tests/surface_source_write/case-21/inputs_true.dat
+++ b/tests/regression_tests/surface_source_write/case-21/inputs_true.dat
@@ -1,40 +1,40 @@
 <?xml version='1.0' encoding='utf-8'?>
 <model>
   <materials>
-    <material depletable="true" id="1">
-      <density units="g/cm3" value="11.0"/>
-      <nuclide ao="0.0004524" name="U234"/>
-      <nuclide ao="0.0506068" name="U235"/>
-      <nuclide ao="0.948709" name="U238"/>
-      <nuclide ao="0.0002318" name="U236"/>
-      <nuclide ao="2.0" name="O16"/>
+    <material id="1" depletable="true">
+      <density value="11.0" units="g/cm3"/>
+      <nuclide name="U234" ao="0.0004524"/>
+      <nuclide name="U235" ao="0.0506068"/>
+      <nuclide name="U238" ao="0.948709"/>
+      <nuclide name="U236" ao="0.0002318"/>
+      <nuclide name="O16" ao="2.0"/>
     </material>
     <material id="2">
-      <density units="g/cm3" value="1.0"/>
-      <nuclide ao="2.0" name="H1"/>
-      <nuclide ao="1.0" name="O16"/>
+      <density value="1.0" units="g/cm3"/>
+      <nuclide name="H1" ao="2.0"/>
+      <nuclide name="O16" ao="1.0"/>
     </material>
   </materials>
   <geometry>
     <cell id="1" material="1" region="-1 2 -3" universe="1"/>
     <cell id="2" material="2" region="1 | -2 | 3" universe="1"/>
-    <cell fill="1" id="3" region="4 -5 6 -7 8 -9" universe="2"/>
-    <surface coeffs="0.0 0.0 2.0" id="1" type="z-cylinder"/>
-    <surface coeffs="-2.0" id="2" type="z-plane"/>
-    <surface coeffs="2.0" id="3" type="z-plane"/>
-    <surface boundary="periodic" coeffs="-3.0" id="4" type="z-plane"/>
-    <surface boundary="periodic" coeffs="3.0" id="5" type="z-plane"/>
-    <surface boundary="reflective" coeffs="-3.0" id="6" type="x-plane"/>
-    <surface boundary="reflective" coeffs="3.0" id="7" type="x-plane"/>
-    <surface boundary="reflective" coeffs="-3.0" id="8" type="y-plane"/>
-    <surface boundary="reflective" coeffs="3.0" id="9" type="y-plane"/>
+    <cell id="3" fill="1" region="4 -5 6 -7 8 -9" universe="2"/>
+    <surface id="1" type="z-cylinder" coeffs="0.0 0.0 2.0"/>
+    <surface id="2" type="z-plane" coeffs="-2.0"/>
+    <surface id="3" type="z-plane" coeffs="2.0"/>
+    <surface id="4" type="z-plane" boundary="periodic" coeffs="-3.0"/>
+    <surface id="5" type="z-plane" boundary="periodic" coeffs="3.0"/>
+    <surface id="6" type="x-plane" boundary="reflective" coeffs="-3.0"/>
+    <surface id="7" type="x-plane" boundary="reflective" coeffs="3.0"/>
+    <surface id="8" type="y-plane" boundary="reflective" coeffs="-3.0"/>
+    <surface id="9" type="y-plane" boundary="reflective" coeffs="3.0"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
     <particles>100</particles>
     <batches>5</batches>
     <inactive>1</inactive>
-    <source particle="neutron" strength="1.0" type="independent">
+    <source type="independent" strength="1.0" particle="neutron">
       <space type="box">
         <parameters>-2.0 -2.0 -2.0 2.0 2.0 2.0</parameters>
       </space>
diff --git a/tests/regression_tests/surface_source_write/case-a01/inputs_true.dat b/tests/regression_tests/surface_source_write/case-a01/inputs_true.dat
index 5cec1b76f..e9840be87 100644
--- a/tests/regression_tests/surface_source_write/case-a01/inputs_true.dat
+++ b/tests/regression_tests/surface_source_write/case-a01/inputs_true.dat
@@ -1,47 +1,47 @@
 <?xml version='1.0' encoding='utf-8'?>
 <model>
   <materials>
-    <material depletable="true" id="1">
-      <density units="g/cm3" value="11.0"/>
-      <nuclide ao="0.0004524" name="U234"/>
-      <nuclide ao="0.0506068" name="U235"/>
-      <nuclide ao="0.948709" name="U238"/>
-      <nuclide ao="0.0002318" name="U236"/>
-      <nuclide ao="2.0" name="O16"/>
+    <material id="1" depletable="true">
+      <density value="11.0" units="g/cm3"/>
+      <nuclide name="U234" ao="0.0004524"/>
+      <nuclide name="U235" ao="0.0506068"/>
+      <nuclide name="U238" ao="0.948709"/>
+      <nuclide name="U236" ao="0.0002318"/>
+      <nuclide name="O16" ao="2.0"/>
     </material>
     <material id="2">
-      <density units="g/cm3" value="1.0"/>
-      <nuclide ao="2.0" name="H1"/>
-      <nuclide ao="1.0" name="O16"/>
+      <density value="1.0" units="g/cm3"/>
+      <nuclide name="H1" ao="2.0"/>
+      <nuclide name="O16" ao="1.0"/>
     </material>
   </materials>
   <geometry>
     <cell id="1" material="1" region="-1 2 -3" universe="1"/>
     <cell id="2" material="2" region="1 | -2 | 3" universe="1"/>
-    <cell fill="1" id="3" region="-5 4 -7 6 -9 8" universe="2"/>
+    <cell id="3" fill="1" region="-5 4 -7 6 -9 8" universe="2"/>
     <cell id="4" material="2" region="-11 10 -13 12 -15 14 (5 | -4 | 7 | -6 | 9 | -8)" universe="2"/>
-    <surface coeffs="0.0 0.0 2.0" id="1" type="z-cylinder"/>
-    <surface coeffs="-2.0" id="2" type="z-plane"/>
-    <surface coeffs="2.0" id="3" type="z-plane"/>
-    <surface coeffs="-3.0" id="4" type="x-plane"/>
-    <surface coeffs="3.0" id="5" type="x-plane"/>
-    <surface coeffs="-3.0" id="6" type="y-plane"/>
-    <surface coeffs="3.0" id="7" type="y-plane"/>
-    <surface coeffs="-3.0" id="8" type="z-plane"/>
-    <surface coeffs="3.0" id="9" type="z-plane"/>
-    <surface boundary="vacuum" coeffs="-4.0" id="10" type="x-plane"/>
-    <surface boundary="vacuum" coeffs="4.0" id="11" type="x-plane"/>
-    <surface boundary="vacuum" coeffs="-4.0" id="12" type="y-plane"/>
-    <surface boundary="vacuum" coeffs="4.0" id="13" type="y-plane"/>
-    <surface boundary="vacuum" coeffs="-4.0" id="14" type="z-plane"/>
-    <surface boundary="vacuum" coeffs="4.0" id="15" type="z-plane"/>
+    <surface id="1" type="z-cylinder" coeffs="0.0 0.0 2.0"/>
+    <surface id="2" type="z-plane" coeffs="-2.0"/>
+    <surface id="3" type="z-plane" coeffs="2.0"/>
+    <surface id="4" type="x-plane" coeffs="-3.0"/>
+    <surface id="5" type="x-plane" coeffs="3.0"/>
+    <surface id="6" type="y-plane" coeffs="-3.0"/>
+    <surface id="7" type="y-plane" coeffs="3.0"/>
+    <surface id="8" type="z-plane" coeffs="-3.0"/>
+    <surface id="9" type="z-plane" coeffs="3.0"/>
+    <surface id="10" type="x-plane" boundary="vacuum" coeffs="-4.0"/>
+    <surface id="11" type="x-plane" boundary="vacuum" coeffs="4.0"/>
+    <surface id="12" type="y-plane" boundary="vacuum" coeffs="-4.0"/>
+    <surface id="13" type="y-plane" boundary="vacuum" coeffs="4.0"/>
+    <surface id="14" type="z-plane" boundary="vacuum" coeffs="-4.0"/>
+    <surface id="15" type="z-plane" boundary="vacuum" coeffs="4.0"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
     <particles>100</particles>
     <batches>5</batches>
     <inactive>1</inactive>
-    <source particle="neutron" strength="1.0" type="independent">
+    <source type="independent" strength="1.0" particle="neutron">
       <space type="box">
         <parameters>-2.0 -2.0 -2.0 2.0 2.0 2.0</parameters>
       </space>
diff --git a/tests/regression_tests/surface_source_write/case-d01/inputs_true.dat b/tests/regression_tests/surface_source_write/case-d01/inputs_true.dat
index b5452080c..04703acfe 100644
--- a/tests/regression_tests/surface_source_write/case-d01/inputs_true.dat
+++ b/tests/regression_tests/surface_source_write/case-d01/inputs_true.dat
@@ -1,26 +1,26 @@
 <?xml version='1.0' encoding='utf-8'?>
 <model>
   <materials>
-    <material depletable="true" id="40" name="no-void fuel">
-      <density units="g/cc" value="11"/>
-      <nuclide ao="1.0" name="U235"/>
+    <material id="40" name="no-void fuel" depletable="true">
+      <density value="11" units="g/cc"/>
+      <nuclide name="U235" ao="1.0"/>
     </material>
     <material id="41" name="water">
-      <density units="g/cc" value="1.0"/>
-      <nuclide ao="2.0" name="H1"/>
-      <nuclide ao="1.0" name="O16"/>
+      <density value="1.0" units="g/cc"/>
+      <nuclide name="H1" ao="2.0"/>
+      <nuclide name="O16" ao="1.0"/>
       <sab name="c_H_in_H2O"/>
     </material>
   </materials>
   <geometry>
-    <dagmc_universe filename="../../dagmc/legacy/dagmc.h5m" id="1"/>
+    <dagmc_universe id="1" filename="../../dagmc/legacy/dagmc.h5m"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
     <particles>100</particles>
     <batches>5</batches>
     <inactive>1</inactive>
-    <source particle="neutron" strength="1.0" type="independent">
+    <source type="independent" strength="1.0" particle="neutron">
       <space type="box">
         <parameters>-4 -4 -20 4 4 20</parameters>
       </space>
diff --git a/tests/regression_tests/surface_source_write/case-d02/inputs_true.dat b/tests/regression_tests/surface_source_write/case-d02/inputs_true.dat
index d6ca4143c..d8b4e6803 100644
--- a/tests/regression_tests/surface_source_write/case-d02/inputs_true.dat
+++ b/tests/regression_tests/surface_source_write/case-d02/inputs_true.dat
@@ -1,26 +1,26 @@
 <?xml version='1.0' encoding='utf-8'?>
 <model>
   <materials>
-    <material depletable="true" id="40" name="no-void fuel">
-      <density units="g/cc" value="11"/>
-      <nuclide ao="1.0" name="U235"/>
+    <material id="40" name="no-void fuel" depletable="true">
+      <density value="11" units="g/cc"/>
+      <nuclide name="U235" ao="1.0"/>
     </material>
     <material id="41" name="water">
-      <density units="g/cc" value="1.0"/>
-      <nuclide ao="2.0" name="H1"/>
-      <nuclide ao="1.0" name="O16"/>
+      <density value="1.0" units="g/cc"/>
+      <nuclide name="H1" ao="2.0"/>
+      <nuclide name="O16" ao="1.0"/>
       <sab name="c_H_in_H2O"/>
     </material>
   </materials>
   <geometry>
-    <dagmc_universe filename="../../dagmc/legacy/dagmc.h5m" id="1"/>
+    <dagmc_universe id="1" filename="../../dagmc/legacy/dagmc.h5m"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
     <particles>100</particles>
     <batches>5</batches>
     <inactive>1</inactive>
-    <source particle="neutron" strength="1.0" type="independent">
+    <source type="independent" strength="1.0" particle="neutron">
       <space type="box">
         <parameters>-4 -4 -20 4 4 20</parameters>
       </space>
diff --git a/tests/regression_tests/surface_source_write/case-d03/inputs_true.dat b/tests/regression_tests/surface_source_write/case-d03/inputs_true.dat
index ba326c978..d769184aa 100644
--- a/tests/regression_tests/surface_source_write/case-d03/inputs_true.dat
+++ b/tests/regression_tests/surface_source_write/case-d03/inputs_true.dat
@@ -1,26 +1,26 @@
 <?xml version='1.0' encoding='utf-8'?>
 <model>
   <materials>
-    <material depletable="true" id="40" name="no-void fuel">
-      <density units="g/cc" value="11"/>
-      <nuclide ao="1.0" name="U235"/>
+    <material id="40" name="no-void fuel" depletable="true">
+      <density value="11" units="g/cc"/>
+      <nuclide name="U235" ao="1.0"/>
     </material>
     <material id="41" name="water">
-      <density units="g/cc" value="1.0"/>
-      <nuclide ao="2.0" name="H1"/>
-      <nuclide ao="1.0" name="O16"/>
+      <density value="1.0" units="g/cc"/>
+      <nuclide name="H1" ao="2.0"/>
+      <nuclide name="O16" ao="1.0"/>
       <sab name="c_H_in_H2O"/>
     </material>
   </materials>
   <geometry>
-    <dagmc_universe filename="../../dagmc/legacy/dagmc.h5m" id="1"/>
+    <dagmc_universe id="1" filename="../../dagmc/legacy/dagmc.h5m"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
     <particles>100</particles>
     <batches>5</batches>
     <inactive>1</inactive>
-    <source particle="neutron" strength="1.0" type="independent">
+    <source type="independent" strength="1.0" particle="neutron">
       <space type="box">
         <parameters>-4 -4 -20 4 4 20</parameters>
       </space>
diff --git a/tests/regression_tests/surface_source_write/case-d04/inputs_true.dat b/tests/regression_tests/surface_source_write/case-d04/inputs_true.dat
index c309dd155..abefc2692 100644
--- a/tests/regression_tests/surface_source_write/case-d04/inputs_true.dat
+++ b/tests/regression_tests/surface_source_write/case-d04/inputs_true.dat
@@ -1,26 +1,26 @@
 <?xml version='1.0' encoding='utf-8'?>
 <model>
   <materials>
-    <material depletable="true" id="40" name="no-void fuel">
-      <density units="g/cc" value="11"/>
-      <nuclide ao="1.0" name="U235"/>
+    <material id="40" name="no-void fuel" depletable="true">
+      <density value="11" units="g/cc"/>
+      <nuclide name="U235" ao="1.0"/>
     </material>
     <material id="41" name="water">
-      <density units="g/cc" value="1.0"/>
-      <nuclide ao="2.0" name="H1"/>
-      <nuclide ao="1.0" name="O16"/>
+      <density value="1.0" units="g/cc"/>
+      <nuclide name="H1" ao="2.0"/>
+      <nuclide name="O16" ao="1.0"/>
       <sab name="c_H_in_H2O"/>
     </material>
   </materials>
   <geometry>
-    <dagmc_universe filename="../../dagmc/legacy/dagmc.h5m" id="1"/>
+    <dagmc_universe id="1" filename="../../dagmc/legacy/dagmc.h5m"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
     <particles>100</particles>
     <batches>5</batches>
     <inactive>1</inactive>
-    <source particle="neutron" strength="1.0" type="independent">
+    <source type="independent" strength="1.0" particle="neutron">
       <space type="box">
         <parameters>-4 -4 -20 4 4 20</parameters>
       </space>
diff --git a/tests/regression_tests/surface_source_write/case-d05/inputs_true.dat b/tests/regression_tests/surface_source_write/case-d05/inputs_true.dat
index c49703f83..8b46b2b4e 100644
--- a/tests/regression_tests/surface_source_write/case-d05/inputs_true.dat
+++ b/tests/regression_tests/surface_source_write/case-d05/inputs_true.dat
@@ -1,26 +1,26 @@
 <?xml version='1.0' encoding='utf-8'?>
 <model>
   <materials>
-    <material depletable="true" id="40" name="no-void fuel">
-      <density units="g/cc" value="11"/>
-      <nuclide ao="1.0" name="U235"/>
+    <material id="40" name="no-void fuel" depletable="true">
+      <density value="11" units="g/cc"/>
+      <nuclide name="U235" ao="1.0"/>
     </material>
     <material id="41" name="water">
-      <density units="g/cc" value="1.0"/>
-      <nuclide ao="2.0" name="H1"/>
-      <nuclide ao="1.0" name="O16"/>
+      <density value="1.0" units="g/cc"/>
+      <nuclide name="H1" ao="2.0"/>
+      <nuclide name="O16" ao="1.0"/>
       <sab name="c_H_in_H2O"/>
     </material>
   </materials>
   <geometry>
-    <dagmc_universe filename="../../dagmc/legacy/dagmc.h5m" id="1"/>
+    <dagmc_universe id="1" filename="../../dagmc/legacy/dagmc.h5m"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
     <particles>100</particles>
     <batches>5</batches>
     <inactive>1</inactive>
-    <source particle="neutron" strength="1.0" type="independent">
+    <source type="independent" strength="1.0" particle="neutron">
       <space type="box">
         <parameters>-4 -4 -20 4 4 20</parameters>
       </space>
diff --git a/tests/regression_tests/surface_source_write/case-d06/inputs_true.dat b/tests/regression_tests/surface_source_write/case-d06/inputs_true.dat
index 48db2c30d..ca52cf455 100644
--- a/tests/regression_tests/surface_source_write/case-d06/inputs_true.dat
+++ b/tests/regression_tests/surface_source_write/case-d06/inputs_true.dat
@@ -1,26 +1,26 @@
 <?xml version='1.0' encoding='utf-8'?>
 <model>
   <materials>
-    <material depletable="true" id="40" name="no-void fuel">
-      <density units="g/cc" value="11"/>
-      <nuclide ao="1.0" name="U235"/>
+    <material id="40" name="no-void fuel" depletable="true">
+      <density value="11" units="g/cc"/>
+      <nuclide name="U235" ao="1.0"/>
     </material>
     <material id="41" name="water">
-      <density units="g/cc" value="1.0"/>
-      <nuclide ao="2.0" name="H1"/>
-      <nuclide ao="1.0" name="O16"/>
+      <density value="1.0" units="g/cc"/>
+      <nuclide name="H1" ao="2.0"/>
+      <nuclide name="O16" ao="1.0"/>
       <sab name="c_H_in_H2O"/>
     </material>
   </materials>
   <geometry>
-    <dagmc_universe filename="../../dagmc/legacy/dagmc.h5m" id="1"/>
+    <dagmc_universe id="1" filename="../../dagmc/legacy/dagmc.h5m"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
     <particles>100</particles>
     <batches>5</batches>
     <inactive>1</inactive>
-    <source particle="neutron" strength="1.0" type="independent">
+    <source type="independent" strength="1.0" particle="neutron">
       <space type="box">
         <parameters>-4 -4 -20 4 4 20</parameters>
       </space>
diff --git a/tests/regression_tests/surface_source_write/case-d07/inputs_true.dat b/tests/regression_tests/surface_source_write/case-d07/inputs_true.dat
index e2897125b..40c439fe6 100644
--- a/tests/regression_tests/surface_source_write/case-d07/inputs_true.dat
+++ b/tests/regression_tests/surface_source_write/case-d07/inputs_true.dat
@@ -1,40 +1,40 @@
 <?xml version='1.0' encoding='utf-8'?>
 <model>
   <materials>
-    <material depletable="true" id="40" name="no-void fuel">
-      <density units="g/cc" value="11"/>
-      <nuclide ao="1.0" name="U235"/>
+    <material id="40" name="no-void fuel" depletable="true">
+      <density value="11" units="g/cc"/>
+      <nuclide name="U235" ao="1.0"/>
     </material>
     <material id="41" name="water">
-      <density units="g/cc" value="1.0"/>
-      <nuclide ao="2.0" name="H1"/>
-      <nuclide ao="1.0" name="O16"/>
+      <density value="1.0" units="g/cc"/>
+      <nuclide name="H1" ao="2.0"/>
+      <nuclide name="O16" ao="1.0"/>
       <sab name="c_H_in_H2O"/>
     </material>
   </materials>
   <geometry>
-    <cell fill="1" id="8" region="101 -102 103 -104 105 -106" universe="2"/>
+    <cell id="8" fill="1" region="101 -102 103 -104 105 -106" universe="2"/>
     <cell id="9" material="41" region="107 -108 109 -110 111 -112 (-101 | 102 | -103 | 104 | -105 | 106)" universe="2"/>
-    <dagmc_universe filename="../../dagmc/legacy/dagmc.h5m" id="1"/>
-    <surface coeffs="-22.0" id="101" type="z-plane"/>
-    <surface coeffs="22.0" id="102" type="z-plane"/>
-    <surface coeffs="-22.0" id="103" type="x-plane"/>
-    <surface coeffs="22.0" id="104" type="x-plane"/>
-    <surface coeffs="-22.0" id="105" type="y-plane"/>
-    <surface coeffs="22.0" id="106" type="y-plane"/>
-    <surface boundary="vacuum" coeffs="-24.0" id="107" type="z-plane"/>
-    <surface boundary="vacuum" coeffs="24.0" id="108" type="z-plane"/>
-    <surface boundary="vacuum" coeffs="-24.0" id="109" type="x-plane"/>
-    <surface boundary="vacuum" coeffs="24.0" id="110" type="x-plane"/>
-    <surface boundary="vacuum" coeffs="-24.0" id="111" type="y-plane"/>
-    <surface boundary="vacuum" coeffs="24.0" id="112" type="y-plane"/>
+    <dagmc_universe id="1" filename="../../dagmc/legacy/dagmc.h5m"/>
+    <surface id="101" type="z-plane" coeffs="-22.0"/>
+    <surface id="102" type="z-plane" coeffs="22.0"/>
+    <surface id="103" type="x-plane" coeffs="-22.0"/>
+    <surface id="104" type="x-plane" coeffs="22.0"/>
+    <surface id="105" type="y-plane" coeffs="-22.0"/>
+    <surface id="106" type="y-plane" coeffs="22.0"/>
+    <surface id="107" type="z-plane" boundary="vacuum" coeffs="-24.0"/>
+    <surface id="108" type="z-plane" boundary="vacuum" coeffs="24.0"/>
+    <surface id="109" type="x-plane" boundary="vacuum" coeffs="-24.0"/>
+    <surface id="110" type="x-plane" boundary="vacuum" coeffs="24.0"/>
+    <surface id="111" type="y-plane" boundary="vacuum" coeffs="-24.0"/>
+    <surface id="112" type="y-plane" boundary="vacuum" coeffs="24.0"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
     <particles>100</particles>
     <batches>5</batches>
     <inactive>1</inactive>
-    <source particle="neutron" strength="1.0" type="independent">
+    <source type="independent" strength="1.0" particle="neutron">
       <space type="box">
         <parameters>-4 -4 -20 4 4 20</parameters>
       </space>
diff --git a/tests/regression_tests/surface_source_write/case-d08/inputs_true.dat b/tests/regression_tests/surface_source_write/case-d08/inputs_true.dat
index 185b8629b..c81d21b97 100644
--- a/tests/regression_tests/surface_source_write/case-d08/inputs_true.dat
+++ b/tests/regression_tests/surface_source_write/case-d08/inputs_true.dat
@@ -1,40 +1,40 @@
 <?xml version='1.0' encoding='utf-8'?>
 <model>
   <materials>
-    <material depletable="true" id="40" name="no-void fuel">
-      <density units="g/cc" value="11"/>
-      <nuclide ao="1.0" name="U235"/>
+    <material id="40" name="no-void fuel" depletable="true">
+      <density value="11" units="g/cc"/>
+      <nuclide name="U235" ao="1.0"/>
     </material>
     <material id="41" name="water">
-      <density units="g/cc" value="1.0"/>
-      <nuclide ao="2.0" name="H1"/>
-      <nuclide ao="1.0" name="O16"/>
+      <density value="1.0" units="g/cc"/>
+      <nuclide name="H1" ao="2.0"/>
+      <nuclide name="O16" ao="1.0"/>
       <sab name="c_H_in_H2O"/>
     </material>
   </materials>
   <geometry>
-    <cell fill="1" id="8" region="101 -102 103 -104 105 -106" universe="2"/>
+    <cell id="8" fill="1" region="101 -102 103 -104 105 -106" universe="2"/>
     <cell id="9" material="41" region="107 -108 109 -110 111 -112 (-101 | 102 | -103 | 104 | -105 | 106)" universe="2"/>
-    <dagmc_universe filename="../../dagmc/legacy/dagmc.h5m" id="1"/>
-    <surface coeffs="-22.0" id="101" type="z-plane"/>
-    <surface coeffs="22.0" id="102" type="z-plane"/>
-    <surface coeffs="-22.0" id="103" type="x-plane"/>
-    <surface coeffs="22.0" id="104" type="x-plane"/>
-    <surface coeffs="-22.0" id="105" type="y-plane"/>
-    <surface coeffs="22.0" id="106" type="y-plane"/>
-    <surface boundary="vacuum" coeffs="-24.0" id="107" type="z-plane"/>
-    <surface boundary="vacuum" coeffs="24.0" id="108" type="z-plane"/>
-    <surface boundary="vacuum" coeffs="-24.0" id="109" type="x-plane"/>
-    <surface boundary="vacuum" coeffs="24.0" id="110" type="x-plane"/>
-    <surface boundary="vacuum" coeffs="-24.0" id="111" type="y-plane"/>
-    <surface boundary="vacuum" coeffs="24.0" id="112" type="y-plane"/>
+    <dagmc_universe id="1" filename="../../dagmc/legacy/dagmc.h5m"/>
+    <surface id="101" type="z-plane" coeffs="-22.0"/>
+    <surface id="102" type="z-plane" coeffs="22.0"/>
+    <surface id="103" type="x-plane" coeffs="-22.0"/>
+    <surface id="104" type="x-plane" coeffs="22.0"/>
+    <surface id="105" type="y-plane" coeffs="-22.0"/>
+    <surface id="106" type="y-plane" coeffs="22.0"/>
+    <surface id="107" type="z-plane" boundary="vacuum" coeffs="-24.0"/>
+    <surface id="108" type="z-plane" boundary="vacuum" coeffs="24.0"/>
+    <surface id="109" type="x-plane" boundary="vacuum" coeffs="-24.0"/>
+    <surface id="110" type="x-plane" boundary="vacuum" coeffs="24.0"/>
+    <surface id="111" type="y-plane" boundary="vacuum" coeffs="-24.0"/>
+    <surface id="112" type="y-plane" boundary="vacuum" coeffs="24.0"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
     <particles>100</particles>
     <batches>5</batches>
     <inactive>1</inactive>
-    <source particle="neutron" strength="1.0" type="independent">
+    <source type="independent" strength="1.0" particle="neutron">
       <space type="box">
         <parameters>-4 -4 -20 4 4 20</parameters>
       </space>
diff --git a/tests/regression_tests/surface_source_write/case-e01/inputs_true.dat b/tests/regression_tests/surface_source_write/case-e01/inputs_true.dat
index ac3c03e37..46701aea7 100644
--- a/tests/regression_tests/surface_source_write/case-e01/inputs_true.dat
+++ b/tests/regression_tests/surface_source_write/case-e01/inputs_true.dat
@@ -1,47 +1,47 @@
 <?xml version='1.0' encoding='utf-8'?>
 <model>
   <materials>
-    <material depletable="true" id="1">
-      <density units="g/cm3" value="11.0"/>
-      <nuclide ao="0.0004524" name="U234"/>
-      <nuclide ao="0.0506068" name="U235"/>
-      <nuclide ao="0.948709" name="U238"/>
-      <nuclide ao="0.0002318" name="U236"/>
-      <nuclide ao="2.0" name="O16"/>
+    <material id="1" depletable="true">
+      <density value="11.0" units="g/cm3"/>
+      <nuclide name="U234" ao="0.0004524"/>
+      <nuclide name="U235" ao="0.0506068"/>
+      <nuclide name="U238" ao="0.948709"/>
+      <nuclide name="U236" ao="0.0002318"/>
+      <nuclide name="O16" ao="2.0"/>
     </material>
     <material id="2">
-      <density units="g/cm3" value="1.0"/>
-      <nuclide ao="2.0" name="H1"/>
-      <nuclide ao="1.0" name="O16"/>
+      <density value="1.0" units="g/cm3"/>
+      <nuclide name="H1" ao="2.0"/>
+      <nuclide name="O16" ao="1.0"/>
     </material>
   </materials>
   <geometry>
     <cell id="1" material="1" region="-1 2 -3" universe="1"/>
     <cell id="2" material="2" region="1 | -2 | 3" universe="1"/>
-    <cell fill="1" id="3" region="-5 4 -7 6 -9 8" universe="2"/>
+    <cell id="3" fill="1" region="-5 4 -7 6 -9 8" universe="2"/>
     <cell id="4" material="2" region="-11 10 -13 12 -15 14 (5 | -4 | 7 | -6 | 9 | -8)" universe="2"/>
-    <surface coeffs="0.0 0.0 2.0" id="1" type="z-cylinder"/>
-    <surface coeffs="-2.0" id="2" type="z-plane"/>
-    <surface coeffs="2.0" id="3" type="z-plane"/>
-    <surface coeffs="-3.0" id="4" type="x-plane"/>
-    <surface coeffs="3.0" id="5" type="x-plane"/>
-    <surface coeffs="-3.0" id="6" type="y-plane"/>
-    <surface coeffs="3.0" id="7" type="y-plane"/>
-    <surface coeffs="-3.0" id="8" type="z-plane"/>
-    <surface coeffs="3.0" id="9" type="z-plane"/>
-    <surface boundary="vacuum" coeffs="-4.0" id="10" type="x-plane"/>
-    <surface boundary="vacuum" coeffs="4.0" id="11" type="x-plane"/>
-    <surface boundary="vacuum" coeffs="-4.0" id="12" type="y-plane"/>
-    <surface boundary="vacuum" coeffs="4.0" id="13" type="y-plane"/>
-    <surface boundary="vacuum" coeffs="-4.0" id="14" type="z-plane"/>
-    <surface boundary="vacuum" coeffs="4.0" id="15" type="z-plane"/>
+    <surface id="1" type="z-cylinder" coeffs="0.0 0.0 2.0"/>
+    <surface id="2" type="z-plane" coeffs="-2.0"/>
+    <surface id="3" type="z-plane" coeffs="2.0"/>
+    <surface id="4" type="x-plane" coeffs="-3.0"/>
+    <surface id="5" type="x-plane" coeffs="3.0"/>
+    <surface id="6" type="y-plane" coeffs="-3.0"/>
+    <surface id="7" type="y-plane" coeffs="3.0"/>
+    <surface id="8" type="z-plane" coeffs="-3.0"/>
+    <surface id="9" type="z-plane" coeffs="3.0"/>
+    <surface id="10" type="x-plane" boundary="vacuum" coeffs="-4.0"/>
+    <surface id="11" type="x-plane" boundary="vacuum" coeffs="4.0"/>
+    <surface id="12" type="y-plane" boundary="vacuum" coeffs="-4.0"/>
+    <surface id="13" type="y-plane" boundary="vacuum" coeffs="4.0"/>
+    <surface id="14" type="z-plane" boundary="vacuum" coeffs="-4.0"/>
+    <surface id="15" type="z-plane" boundary="vacuum" coeffs="4.0"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
     <particles>100</particles>
     <batches>5</batches>
     <inactive>1</inactive>
-    <source particle="neutron" strength="1.0" type="independent">
+    <source type="independent" strength="1.0" particle="neutron">
       <space type="box">
         <parameters>-2.0 -2.0 -2.0 2.0 2.0 2.0</parameters>
       </space>
diff --git a/tests/regression_tests/surface_source_write/case-e02/inputs_true.dat b/tests/regression_tests/surface_source_write/case-e02/inputs_true.dat
index a6107d16f..a4588c8d0 100644
--- a/tests/regression_tests/surface_source_write/case-e02/inputs_true.dat
+++ b/tests/regression_tests/surface_source_write/case-e02/inputs_true.dat
@@ -1,47 +1,47 @@
 <?xml version='1.0' encoding='utf-8'?>
 <model>
   <materials>
-    <material depletable="true" id="1">
-      <density units="g/cm3" value="11.0"/>
-      <nuclide ao="0.0004524" name="U234"/>
-      <nuclide ao="0.0506068" name="U235"/>
-      <nuclide ao="0.948709" name="U238"/>
-      <nuclide ao="0.0002318" name="U236"/>
-      <nuclide ao="2.0" name="O16"/>
+    <material id="1" depletable="true">
+      <density value="11.0" units="g/cm3"/>
+      <nuclide name="U234" ao="0.0004524"/>
+      <nuclide name="U235" ao="0.0506068"/>
+      <nuclide name="U238" ao="0.948709"/>
+      <nuclide name="U236" ao="0.0002318"/>
+      <nuclide name="O16" ao="2.0"/>
     </material>
     <material id="2">
-      <density units="g/cm3" value="1.0"/>
-      <nuclide ao="2.0" name="H1"/>
-      <nuclide ao="1.0" name="O16"/>
+      <density value="1.0" units="g/cm3"/>
+      <nuclide name="H1" ao="2.0"/>
+      <nuclide name="O16" ao="1.0"/>
     </material>
   </materials>
   <geometry>
     <cell id="1" material="1" region="-1 2 -3" universe="1"/>
     <cell id="2" material="2" region="1 | -2 | 3" universe="1"/>
-    <cell fill="1" id="3" region="-5 4 -7 6 -9 8" universe="2"/>
+    <cell id="3" fill="1" region="-5 4 -7 6 -9 8" universe="2"/>
     <cell id="4" material="2" region="-11 10 -13 12 -15 14 (5 | -4 | 7 | -6 | 9 | -8)" universe="2"/>
-    <surface coeffs="0.0 0.0 2.0" id="1" type="z-cylinder"/>
-    <surface coeffs="-2.0" id="2" type="z-plane"/>
-    <surface coeffs="2.0" id="3" type="z-plane"/>
-    <surface coeffs="-3.0" id="4" type="x-plane"/>
-    <surface coeffs="3.0" id="5" type="x-plane"/>
-    <surface coeffs="-3.0" id="6" type="y-plane"/>
-    <surface coeffs="3.0" id="7" type="y-plane"/>
-    <surface coeffs="-3.0" id="8" type="z-plane"/>
-    <surface coeffs="3.0" id="9" type="z-plane"/>
-    <surface boundary="vacuum" coeffs="-4.0" id="10" type="x-plane"/>
-    <surface boundary="vacuum" coeffs="4.0" id="11" type="x-plane"/>
-    <surface boundary="vacuum" coeffs="-4.0" id="12" type="y-plane"/>
-    <surface boundary="vacuum" coeffs="4.0" id="13" type="y-plane"/>
-    <surface boundary="vacuum" coeffs="-4.0" id="14" type="z-plane"/>
-    <surface boundary="vacuum" coeffs="4.0" id="15" type="z-plane"/>
+    <surface id="1" type="z-cylinder" coeffs="0.0 0.0 2.0"/>
+    <surface id="2" type="z-plane" coeffs="-2.0"/>
+    <surface id="3" type="z-plane" coeffs="2.0"/>
+    <surface id="4" type="x-plane" coeffs="-3.0"/>
+    <surface id="5" type="x-plane" coeffs="3.0"/>
+    <surface id="6" type="y-plane" coeffs="-3.0"/>
+    <surface id="7" type="y-plane" coeffs="3.0"/>
+    <surface id="8" type="z-plane" coeffs="-3.0"/>
+    <surface id="9" type="z-plane" coeffs="3.0"/>
+    <surface id="10" type="x-plane" boundary="vacuum" coeffs="-4.0"/>
+    <surface id="11" type="x-plane" boundary="vacuum" coeffs="4.0"/>
+    <surface id="12" type="y-plane" boundary="vacuum" coeffs="-4.0"/>
+    <surface id="13" type="y-plane" boundary="vacuum" coeffs="4.0"/>
+    <surface id="14" type="z-plane" boundary="vacuum" coeffs="-4.0"/>
+    <surface id="15" type="z-plane" boundary="vacuum" coeffs="4.0"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
     <particles>100</particles>
     <batches>5</batches>
     <inactive>1</inactive>
-    <source particle="neutron" strength="1.0" type="independent">
+    <source type="independent" strength="1.0" particle="neutron">
       <space type="box">
         <parameters>-2.0 -2.0 -2.0 2.0 2.0 2.0</parameters>
       </space>
diff --git a/tests/regression_tests/surface_source_write/case-e03/inputs_true.dat b/tests/regression_tests/surface_source_write/case-e03/inputs_true.dat
index 23bbf0455..2a93fdb4d 100644
--- a/tests/regression_tests/surface_source_write/case-e03/inputs_true.dat
+++ b/tests/regression_tests/surface_source_write/case-e03/inputs_true.dat
@@ -1,40 +1,40 @@
 <?xml version='1.0' encoding='utf-8'?>
 <model>
   <materials>
-    <material depletable="true" id="1">
-      <density units="g/cm3" value="11.0"/>
-      <nuclide ao="0.0004524" name="U234"/>
-      <nuclide ao="0.0506068" name="U235"/>
-      <nuclide ao="0.948709" name="U238"/>
-      <nuclide ao="0.0002318" name="U236"/>
-      <nuclide ao="2.0" name="O16"/>
+    <material id="1" depletable="true">
+      <density value="11.0" units="g/cm3"/>
+      <nuclide name="U234" ao="0.0004524"/>
+      <nuclide name="U235" ao="0.0506068"/>
+      <nuclide name="U238" ao="0.948709"/>
+      <nuclide name="U236" ao="0.0002318"/>
+      <nuclide name="O16" ao="2.0"/>
     </material>
     <material id="2">
-      <density units="g/cm3" value="1.0"/>
-      <nuclide ao="2.0" name="H1"/>
-      <nuclide ao="1.0" name="O16"/>
+      <density value="1.0" units="g/cm3"/>
+      <nuclide name="H1" ao="2.0"/>
+      <nuclide name="O16" ao="1.0"/>
     </material>
   </materials>
   <geometry>
     <cell id="1" material="1" region="-1 2 -3" universe="1"/>
     <cell id="2" material="2" region="1 | -2 | 3" universe="1"/>
-    <cell fill="1" id="3" region="-5 4 -7 6 -9 8" universe="2"/>
-    <surface coeffs="0.0 0.0 2.0" id="1" type="z-cylinder"/>
-    <surface coeffs="-2.0" id="2" type="z-plane"/>
-    <surface coeffs="2.0" id="3" type="z-plane"/>
-    <surface boundary="vacuum" coeffs="-3.0" id="4" type="x-plane"/>
-    <surface boundary="vacuum" coeffs="3.0" id="5" type="x-plane"/>
-    <surface boundary="vacuum" coeffs="-3.0" id="6" type="y-plane"/>
-    <surface boundary="vacuum" coeffs="3.0" id="7" type="y-plane"/>
-    <surface boundary="vacuum" coeffs="-3.0" id="8" type="z-plane"/>
-    <surface boundary="vacuum" coeffs="3.0" id="9" type="z-plane"/>
+    <cell id="3" fill="1" region="-5 4 -7 6 -9 8" universe="2"/>
+    <surface id="1" type="z-cylinder" coeffs="0.0 0.0 2.0"/>
+    <surface id="2" type="z-plane" coeffs="-2.0"/>
+    <surface id="3" type="z-plane" coeffs="2.0"/>
+    <surface id="4" type="x-plane" boundary="vacuum" coeffs="-3.0"/>
+    <surface id="5" type="x-plane" boundary="vacuum" coeffs="3.0"/>
+    <surface id="6" type="y-plane" boundary="vacuum" coeffs="-3.0"/>
+    <surface id="7" type="y-plane" boundary="vacuum" coeffs="3.0"/>
+    <surface id="8" type="z-plane" boundary="vacuum" coeffs="-3.0"/>
+    <surface id="9" type="z-plane" boundary="vacuum" coeffs="3.0"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
     <particles>100</particles>
     <batches>5</batches>
     <inactive>1</inactive>
-    <source particle="neutron" strength="1.0" type="independent">
+    <source type="independent" strength="1.0" particle="neutron">
       <space type="box">
         <parameters>-2.0 -2.0 -2.0 2.0 2.0 2.0</parameters>
       </space>
diff --git a/tests/regression_tests/surface_tally/inputs_true.dat b/tests/regression_tests/surface_tally/inputs_true.dat
index 192c2e89f..2b070c5a3 100644
--- a/tests/regression_tests/surface_tally/inputs_true.dat
+++ b/tests/regression_tests/surface_tally/inputs_true.dat
@@ -1,35 +1,35 @@
 <?xml version='1.0' encoding='utf-8'?>
 <model>
   <materials>
-    <material depletable="true" id="1" name="UO2 fuel at 2.4% wt enrichment">
-      <density units="g/cc" value="10.0"/>
-      <nuclide ao="1.0" name="U238"/>
-      <nuclide ao="0.02" name="U235"/>
-      <nuclide ao="2.0" name="O16"/>
+    <material id="1" name="UO2 fuel at 2.4% wt enrichment" depletable="true">
+      <density value="10.0" units="g/cc"/>
+      <nuclide name="U238" ao="1.0"/>
+      <nuclide name="U235" ao="0.02"/>
+      <nuclide name="O16" ao="2.0"/>
     </material>
     <material id="2" name="Borated water">
-      <density units="g/cm3" value="1"/>
-      <nuclide ao="0.0001" name="B10"/>
-      <nuclide ao="2.0" name="H1"/>
-      <nuclide ao="1.0" name="O16"/>
+      <density value="1" units="g/cm3"/>
+      <nuclide name="B10" ao="0.0001"/>
+      <nuclide name="H1" ao="2.0"/>
+      <nuclide name="O16" ao="1.0"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="1" name="fuel" region="-1" universe="1"/>
-    <cell id="2" material="2" name="water" region="1 -3 4 -5" universe="1"/>
-    <cell fill="1" id="3" name="root cell" region="2 -3 4 -5" universe="0"/>
-    <surface coeffs="0 0 1" id="1" name="Fuel OR" type="z-cylinder"/>
-    <surface boundary="vacuum" coeffs="-2" id="2" name="left" type="x-plane"/>
-    <surface boundary="reflective" coeffs="2" id="3" name="right" type="x-plane"/>
-    <surface boundary="reflective" coeffs="-2" id="4" name="bottom" type="y-plane"/>
-    <surface boundary="reflective" coeffs="2" id="5" name="top" type="y-plane"/>
+    <cell id="1" name="fuel" material="1" region="-1" universe="1"/>
+    <cell id="2" name="water" material="2" region="1 -3 4 -5" universe="1"/>
+    <cell id="3" name="root cell" fill="1" region="2 -3 4 -5" universe="0"/>
+    <surface id="1" name="Fuel OR" type="z-cylinder" coeffs="0 0 1"/>
+    <surface id="2" name="left" type="x-plane" boundary="vacuum" coeffs="-2"/>
+    <surface id="3" name="right" type="x-plane" boundary="reflective" coeffs="2"/>
+    <surface id="4" name="bottom" type="y-plane" boundary="reflective" coeffs="-2"/>
+    <surface id="5" name="top" type="y-plane" boundary="reflective" coeffs="2"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
     <particles>1000</particles>
     <batches>10</batches>
     <inactive>0</inactive>
-    <source particle="neutron" strength="1.0" type="independent">
+    <source type="independent" strength="1.0" particle="neutron">
       <space type="box">
         <parameters>-0.62992 -0.62992 -1 0.62992 0.62992 1</parameters>
       </space>
diff --git a/tests/regression_tests/tallies/inputs_true.dat b/tests/regression_tests/tallies/inputs_true.dat
index 2ce36c5df..40829f865 100644
--- a/tests/regression_tests/tallies/inputs_true.dat
+++ b/tests/regression_tests/tallies/inputs_true.dat
@@ -1,40 +1,40 @@
 <?xml version='1.0' encoding='utf-8'?>
 <model>
   <materials>
-    <material depletable="true" id="1" name="UOX fuel">
-      <density units="g/cm3" value="10.062"/>
-      <nuclide ao="4.9476e-06" name="U234"/>
-      <nuclide ao="0.00048218" name="U235"/>
-      <nuclide ao="0.021504" name="U238"/>
-      <nuclide ao="1.0801e-08" name="Xe135"/>
-      <nuclide ao="0.045737" name="O16"/>
+    <material id="1" name="UOX fuel" depletable="true">
+      <density value="10.062" units="g/cm3"/>
+      <nuclide name="U234" ao="4.9476e-06"/>
+      <nuclide name="U235" ao="0.00048218"/>
+      <nuclide name="U238" ao="0.021504"/>
+      <nuclide name="Xe135" ao="1.0801e-08"/>
+      <nuclide name="O16" ao="0.045737"/>
     </material>
     <material id="2" name="Zircaloy">
-      <density units="g/cm3" value="5.77"/>
-      <nuclide ao="0.5145" name="Zr90"/>
-      <nuclide ao="0.1122" name="Zr91"/>
-      <nuclide ao="0.1715" name="Zr92"/>
-      <nuclide ao="0.1738" name="Zr94"/>
-      <nuclide ao="0.028" name="Zr96"/>
+      <density value="5.77" units="g/cm3"/>
+      <nuclide name="Zr90" ao="0.5145"/>
+      <nuclide name="Zr91" ao="0.1122"/>
+      <nuclide name="Zr92" ao="0.1715"/>
+      <nuclide name="Zr94" ao="0.1738"/>
+      <nuclide name="Zr96" ao="0.028"/>
     </material>
     <material id="3" name="Cold borated water">
-      <density units="atom/b-cm" value="0.07416"/>
-      <nuclide ao="2.0" name="H1"/>
-      <nuclide ao="1.0" name="O16"/>
-      <nuclide ao="0.000649" name="B10"/>
-      <nuclide ao="0.002689" name="B11"/>
+      <density value="0.07416" units="atom/b-cm"/>
+      <nuclide name="H1" ao="2.0"/>
+      <nuclide name="O16" ao="1.0"/>
+      <nuclide name="B10" ao="0.000649"/>
+      <nuclide name="B11" ao="0.002689"/>
       <sab name="c_H_in_H2O"/>
     </material>
     <material id="4" name="Hot borated water">
-      <density units="atom/b-cm" value="0.06614"/>
-      <nuclide ao="2.0" name="H1"/>
-      <nuclide ao="1.0" name="O16"/>
-      <nuclide ao="0.000649" name="B10"/>
-      <nuclide ao="0.002689" name="B11"/>
+      <density value="0.06614" units="atom/b-cm"/>
+      <nuclide name="H1" ao="2.0"/>
+      <nuclide name="O16" ao="1.0"/>
+      <nuclide name="B10" ao="0.000649"/>
+      <nuclide name="B11" ao="0.002689"/>
       <sab name="c_H_in_H2O"/>
     </material>
     <material id="5" name="Reactor pressure vessel steel">
-      <density units="g/cm3" value="7.9"/>
+      <density value="7.9" units="g/cm3"/>
       <nuclide name="Fe54" wo="0.05437098"/>
       <nuclide name="Fe56" wo="0.88500663"/>
       <nuclide name="Fe57" wo="0.0208008"/>
@@ -47,7 +47,7 @@
       <nuclide name="Cu63" wo="0.0013696"/>
     </material>
     <material id="6" name="Lower radial reflector">
-      <density units="g/cm3" value="4.32"/>
+      <density value="4.32" units="g/cm3"/>
       <nuclide name="H1" wo="0.0095661"/>
       <nuclide name="O16" wo="0.0759107"/>
       <nuclide name="B10" wo="3.08409e-05"/>
@@ -62,7 +62,7 @@
       <sab name="c_H_in_H2O"/>
     </material>
     <material id="7" name="Upper radial reflector / Top plate region">
-      <density units="g/cm3" value="4.28"/>
+      <density value="4.28" units="g/cm3"/>
       <nuclide name="H1" wo="0.0086117"/>
       <nuclide name="O16" wo="0.0683369"/>
       <nuclide name="B10" wo="2.77638e-05"/>
@@ -77,7 +77,7 @@
       <sab name="c_H_in_H2O"/>
     </material>
     <material id="8" name="Bottom plate region">
-      <density units="g/cm3" value="7.184"/>
+      <density value="7.184" units="g/cm3"/>
       <nuclide name="H1" wo="0.0011505"/>
       <nuclide name="O16" wo="0.0091296"/>
       <nuclide name="B10" wo="3.70915e-06"/>
@@ -92,7 +92,7 @@
       <sab name="c_H_in_H2O"/>
     </material>
     <material id="9" name="Bottom nozzle region">
-      <density units="g/cm3" value="2.53"/>
+      <density value="2.53" units="g/cm3"/>
       <nuclide name="H1" wo="0.0245014"/>
       <nuclide name="O16" wo="0.1944274"/>
       <nuclide name="B10" wo="7.89917e-05"/>
@@ -107,7 +107,7 @@
       <sab name="c_H_in_H2O"/>
     </material>
     <material id="10" name="Top nozzle region">
-      <density units="g/cm3" value="1.746"/>
+      <density value="1.746" units="g/cm3"/>
       <nuclide name="H1" wo="0.035887"/>
       <nuclide name="O16" wo="0.2847761"/>
       <nuclide name="B10" wo="0.000115699"/>
@@ -122,7 +122,7 @@
       <sab name="c_H_in_H2O"/>
     </material>
     <material id="11" name="Top of fuel assemblies">
-      <density units="g/cm3" value="3.044"/>
+      <density value="3.044" units="g/cm3"/>
       <nuclide name="H1" wo="0.0162913"/>
       <nuclide name="O16" wo="0.1292776"/>
       <nuclide name="B10" wo="5.25228e-05"/>
@@ -135,7 +135,7 @@
       <sab name="c_H_in_H2O"/>
     </material>
     <material id="12" name="Bottom of fuel assemblies">
-      <density units="g/cm3" value="1.762"/>
+      <density value="1.762" units="g/cm3"/>
       <nuclide name="H1" wo="0.0292856"/>
       <nuclide name="O16" wo="0.2323919"/>
       <nuclide name="B10" wo="9.44159e-05"/>
@@ -149,8 +149,8 @@
     </material>
   </materials>
   <geometry>
-    <cell fill="200" id="1" region="-6 34 -35" universe="0"/>
-    <cell fill="201" id="2" region="-6 35 -36" universe="0"/>
+    <cell id="1" fill="200" region="-6 34 -35" universe="0"/>
+    <cell id="2" fill="201" region="-6 35 -36" universe="0"/>
     <cell id="3" material="8" region="-7 31 -32" universe="0"/>
     <cell id="4" material="9" region="-5 32 -33" universe="0"/>
     <cell id="5" material="12" region="-5 33 -34" universe="0"/>
@@ -174,9 +174,9 @@
     <cell id="31" material="2" region="3 -4" universe="4"/>
     <cell id="32" material="4" region="4" universe="4"/>
     <cell id="50" material="3" region="34 -35" universe="5"/>
-    <cell fill="100" id="60" region="34 -35" universe="6"/>
+    <cell id="60" fill="100" region="34 -35" universe="6"/>
     <cell id="70" material="4" region="35 -36" universe="7"/>
-    <cell fill="101" id="80" region="35 -36" universe="8"/>
+    <cell id="80" fill="101" region="35 -36" universe="8"/>
     <lattice id="100" name="Fuel assembly (lower half)">
       <pitch>1.26 1.26</pitch>
       <dimension>17 17</dimension>
@@ -277,30 +277,30 @@
 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 
 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 </universes>
     </lattice>
-    <surface coeffs="0.0 0.0 0.41" id="1" type="z-cylinder"/>
-    <surface coeffs="0.0 0.0 0.475" id="2" type="z-cylinder"/>
-    <surface coeffs="0.0 0.0 0.56" id="3" type="z-cylinder"/>
-    <surface coeffs="0.0 0.0 0.62" id="4" type="z-cylinder"/>
-    <surface coeffs="0.0 0.0 187.6" id="5" type="z-cylinder"/>
-    <surface coeffs="0.0 0.0 209.0" id="6" type="z-cylinder"/>
-    <surface coeffs="0.0 0.0 229.0" id="7" type="z-cylinder"/>
-    <surface boundary="vacuum" coeffs="0.0 0.0 249.0" id="8" type="z-cylinder"/>
-    <surface boundary="vacuum" coeffs="-229.0" id="31" type="z-plane"/>
-    <surface coeffs="-199.0" id="32" type="z-plane"/>
-    <surface coeffs="-193.0" id="33" type="z-plane"/>
-    <surface coeffs="-183.0" id="34" type="z-plane"/>
-    <surface coeffs="0.0" id="35" type="z-plane"/>
-    <surface coeffs="183.0" id="36" type="z-plane"/>
-    <surface coeffs="203.0" id="37" type="z-plane"/>
-    <surface coeffs="215.0" id="38" type="z-plane"/>
-    <surface boundary="vacuum" coeffs="223.0" id="39" type="z-plane"/>
+    <surface id="1" type="z-cylinder" coeffs="0.0 0.0 0.41"/>
+    <surface id="2" type="z-cylinder" coeffs="0.0 0.0 0.475"/>
+    <surface id="3" type="z-cylinder" coeffs="0.0 0.0 0.56"/>
+    <surface id="4" type="z-cylinder" coeffs="0.0 0.0 0.62"/>
+    <surface id="5" type="z-cylinder" coeffs="0.0 0.0 187.6"/>
+    <surface id="6" type="z-cylinder" coeffs="0.0 0.0 209.0"/>
+    <surface id="7" type="z-cylinder" coeffs="0.0 0.0 229.0"/>
+    <surface id="8" type="z-cylinder" boundary="vacuum" coeffs="0.0 0.0 249.0"/>
+    <surface id="31" type="z-plane" boundary="vacuum" coeffs="-229.0"/>
+    <surface id="32" type="z-plane" coeffs="-199.0"/>
+    <surface id="33" type="z-plane" coeffs="-193.0"/>
+    <surface id="34" type="z-plane" coeffs="-183.0"/>
+    <surface id="35" type="z-plane" coeffs="0.0"/>
+    <surface id="36" type="z-plane" coeffs="183.0"/>
+    <surface id="37" type="z-plane" coeffs="203.0"/>
+    <surface id="38" type="z-plane" coeffs="215.0"/>
+    <surface id="39" type="z-plane" boundary="vacuum" coeffs="223.0"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
     <particles>400</particles>
     <batches>5</batches>
     <inactive>0</inactive>
-    <source particle="neutron" strength="1.0" type="independent">
+    <source type="independent" strength="1.0" particle="neutron">
       <space type="box">
         <parameters>-160 -160 -183 160 160 183</parameters>
       </space>
@@ -342,7 +342,7 @@
     <filter id="10" type="legendre">
       <order>4</order>
     </filter>
-    <filter cosine="particle" id="11" type="sphericalharmonics">
+    <filter id="11" type="sphericalharmonics" cosine="particle">
       <order>4</order>
     </filter>
     <filter id="12" type="universe">
diff --git a/tests/regression_tests/tally_aggregation/inputs_true.dat b/tests/regression_tests/tally_aggregation/inputs_true.dat
index 9f4f95655..7351b230c 100644
--- a/tests/regression_tests/tally_aggregation/inputs_true.dat
+++ b/tests/regression_tests/tally_aggregation/inputs_true.dat
@@ -1,24 +1,24 @@
 <?xml version='1.0' encoding='utf-8'?>
 <model>
   <materials>
-    <material depletable="true" id="1" name="UO2">
-      <density units="g/cm3" value="10.29769"/>
-      <nuclide ao="4.4843e-06" name="U234"/>
-      <nuclide ao="0.00055815" name="U235"/>
-      <nuclide ao="0.022408" name="U238"/>
-      <nuclide ao="0.045829" name="O16"/>
+    <material id="1" name="UO2" depletable="true">
+      <density value="10.29769" units="g/cm3"/>
+      <nuclide name="U234" ao="4.4843e-06"/>
+      <nuclide name="U235" ao="0.00055815"/>
+      <nuclide name="U238" ao="0.022408"/>
+      <nuclide name="O16" ao="0.045829"/>
     </material>
     <material id="2" name="light water">
-      <density units="g/cm3" value="1.0"/>
-      <nuclide ao="2.0" name="H1"/>
-      <nuclide ao="1.0" name="O16"/>
+      <density value="1.0" units="g/cm3"/>
+      <nuclide name="H1" ao="2.0"/>
+      <nuclide name="O16" ao="1.0"/>
       <sab name="c_H_in_H2O"/>
     </material>
   </materials>
   <geometry>
     <cell id="1" material="1" region="-1" universe="1"/>
     <cell id="2" material="2" region="1" universe="1"/>
-    <cell fill="2" id="3" region="2 -3 4 -5" universe="3"/>
+    <cell id="3" fill="2" region="2 -3 4 -5" universe="3"/>
     <lattice id="2">
       <pitch>1.2 1.2</pitch>
       <outer>1</outer>
@@ -28,11 +28,11 @@
 1 1 
 1 1 </universes>
     </lattice>
-    <surface coeffs="0.0 0.0 0.4" id="1" type="z-cylinder"/>
-    <surface boundary="reflective" coeffs="-1.2" id="2" name="minimum x" type="x-plane"/>
-    <surface boundary="reflective" coeffs="1.2" id="3" name="maximum x" type="x-plane"/>
-    <surface boundary="reflective" coeffs="-1.2" id="4" name="minimum y" type="y-plane"/>
-    <surface boundary="reflective" coeffs="1.2" id="5" name="maximum y" type="y-plane"/>
+    <surface id="1" type="z-cylinder" coeffs="0.0 0.0 0.4"/>
+    <surface id="2" name="minimum x" type="x-plane" boundary="reflective" coeffs="-1.2"/>
+    <surface id="3" name="maximum x" type="x-plane" boundary="reflective" coeffs="1.2"/>
+    <surface id="4" name="minimum y" type="y-plane" boundary="reflective" coeffs="-1.2"/>
+    <surface id="5" name="maximum y" type="y-plane" boundary="reflective" coeffs="1.2"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
diff --git a/tests/regression_tests/tally_arithmetic/inputs_true.dat b/tests/regression_tests/tally_arithmetic/inputs_true.dat
index 7669b4d03..2b5234c34 100644
--- a/tests/regression_tests/tally_arithmetic/inputs_true.dat
+++ b/tests/regression_tests/tally_arithmetic/inputs_true.dat
@@ -1,24 +1,24 @@
 <?xml version='1.0' encoding='utf-8'?>
 <model>
   <materials>
-    <material depletable="true" id="1">
-      <density units="g/cm3" value="10.0"/>
-      <nuclide ao="1.0" name="U234"/>
-      <nuclide ao="4.0" name="U235"/>
-      <nuclide ao="95.0" name="U238"/>
+    <material id="1" depletable="true">
+      <density value="10.0" units="g/cm3"/>
+      <nuclide name="U234" ao="1.0"/>
+      <nuclide name="U235" ao="4.0"/>
+      <nuclide name="U238" ao="95.0"/>
     </material>
     <material id="2" name="light water">
-      <density units="g/cm3" value="1.0"/>
-      <nuclide ao="2.0" name="H1"/>
-      <nuclide ao="1.0" name="O16"/>
+      <density value="1.0" units="g/cm3"/>
+      <nuclide name="H1" ao="2.0"/>
+      <nuclide name="O16" ao="1.0"/>
       <sab name="c_H_in_H2O"/>
     </material>
   </materials>
   <geometry>
     <cell id="1" material="1" region="-1" universe="1"/>
     <cell id="2" material="2" region="1 -2" universe="1"/>
-    <surface coeffs="0.0 0.0 5.0" id="1" type="z-cylinder"/>
-    <surface boundary="vacuum" coeffs="0.0 0.0 10.0" id="2" type="z-cylinder"/>
+    <surface id="1" type="z-cylinder" coeffs="0.0 0.0 5.0"/>
+    <surface id="2" type="z-cylinder" boundary="vacuum" coeffs="0.0 0.0 10.0"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
diff --git a/tests/regression_tests/tally_slice_merge/inputs_true.dat b/tests/regression_tests/tally_slice_merge/inputs_true.dat
index 7159d833a..7a992cc39 100644
--- a/tests/regression_tests/tally_slice_merge/inputs_true.dat
+++ b/tests/regression_tests/tally_slice_merge/inputs_true.dat
@@ -1,40 +1,40 @@
 <?xml version='1.0' encoding='utf-8'?>
 <model>
   <materials>
-    <material depletable="true" id="1" name="UOX fuel">
-      <density units="g/cm3" value="10.062"/>
-      <nuclide ao="4.9476e-06" name="U234"/>
-      <nuclide ao="0.00048218" name="U235"/>
-      <nuclide ao="0.021504" name="U238"/>
-      <nuclide ao="1.0801e-08" name="Xe135"/>
-      <nuclide ao="0.045737" name="O16"/>
+    <material id="1" name="UOX fuel" depletable="true">
+      <density value="10.062" units="g/cm3"/>
+      <nuclide name="U234" ao="4.9476e-06"/>
+      <nuclide name="U235" ao="0.00048218"/>
+      <nuclide name="U238" ao="0.021504"/>
+      <nuclide name="Xe135" ao="1.0801e-08"/>
+      <nuclide name="O16" ao="0.045737"/>
     </material>
     <material id="2" name="Zircaloy">
-      <density units="g/cm3" value="5.77"/>
-      <nuclide ao="0.5145" name="Zr90"/>
-      <nuclide ao="0.1122" name="Zr91"/>
-      <nuclide ao="0.1715" name="Zr92"/>
-      <nuclide ao="0.1738" name="Zr94"/>
-      <nuclide ao="0.028" name="Zr96"/>
+      <density value="5.77" units="g/cm3"/>
+      <nuclide name="Zr90" ao="0.5145"/>
+      <nuclide name="Zr91" ao="0.1122"/>
+      <nuclide name="Zr92" ao="0.1715"/>
+      <nuclide name="Zr94" ao="0.1738"/>
+      <nuclide name="Zr96" ao="0.028"/>
     </material>
     <material id="3" name="Cold borated water">
-      <density units="atom/b-cm" value="0.07416"/>
-      <nuclide ao="2.0" name="H1"/>
-      <nuclide ao="1.0" name="O16"/>
-      <nuclide ao="0.000649" name="B10"/>
-      <nuclide ao="0.002689" name="B11"/>
+      <density value="0.07416" units="atom/b-cm"/>
+      <nuclide name="H1" ao="2.0"/>
+      <nuclide name="O16" ao="1.0"/>
+      <nuclide name="B10" ao="0.000649"/>
+      <nuclide name="B11" ao="0.002689"/>
       <sab name="c_H_in_H2O"/>
     </material>
     <material id="4" name="Hot borated water">
-      <density units="atom/b-cm" value="0.06614"/>
-      <nuclide ao="2.0" name="H1"/>
-      <nuclide ao="1.0" name="O16"/>
-      <nuclide ao="0.000649" name="B10"/>
-      <nuclide ao="0.002689" name="B11"/>
+      <density value="0.06614" units="atom/b-cm"/>
+      <nuclide name="H1" ao="2.0"/>
+      <nuclide name="O16" ao="1.0"/>
+      <nuclide name="B10" ao="0.000649"/>
+      <nuclide name="B11" ao="0.002689"/>
       <sab name="c_H_in_H2O"/>
     </material>
     <material id="5" name="Reactor pressure vessel steel">
-      <density units="g/cm3" value="7.9"/>
+      <density value="7.9" units="g/cm3"/>
       <nuclide name="Fe54" wo="0.05437098"/>
       <nuclide name="Fe56" wo="0.88500663"/>
       <nuclide name="Fe57" wo="0.0208008"/>
@@ -47,7 +47,7 @@
       <nuclide name="Cu63" wo="0.0013696"/>
     </material>
     <material id="6" name="Lower radial reflector">
-      <density units="g/cm3" value="4.32"/>
+      <density value="4.32" units="g/cm3"/>
       <nuclide name="H1" wo="0.0095661"/>
       <nuclide name="O16" wo="0.0759107"/>
       <nuclide name="B10" wo="3.08409e-05"/>
@@ -62,7 +62,7 @@
       <sab name="c_H_in_H2O"/>
     </material>
     <material id="7" name="Upper radial reflector / Top plate region">
-      <density units="g/cm3" value="4.28"/>
+      <density value="4.28" units="g/cm3"/>
       <nuclide name="H1" wo="0.0086117"/>
       <nuclide name="O16" wo="0.0683369"/>
       <nuclide name="B10" wo="2.77638e-05"/>
@@ -77,7 +77,7 @@
       <sab name="c_H_in_H2O"/>
     </material>
     <material id="8" name="Bottom plate region">
-      <density units="g/cm3" value="7.184"/>
+      <density value="7.184" units="g/cm3"/>
       <nuclide name="H1" wo="0.0011505"/>
       <nuclide name="O16" wo="0.0091296"/>
       <nuclide name="B10" wo="3.70915e-06"/>
@@ -92,7 +92,7 @@
       <sab name="c_H_in_H2O"/>
     </material>
     <material id="9" name="Bottom nozzle region">
-      <density units="g/cm3" value="2.53"/>
+      <density value="2.53" units="g/cm3"/>
       <nuclide name="H1" wo="0.0245014"/>
       <nuclide name="O16" wo="0.1944274"/>
       <nuclide name="B10" wo="7.89917e-05"/>
@@ -107,7 +107,7 @@
       <sab name="c_H_in_H2O"/>
     </material>
     <material id="10" name="Top nozzle region">
-      <density units="g/cm3" value="1.746"/>
+      <density value="1.746" units="g/cm3"/>
       <nuclide name="H1" wo="0.035887"/>
       <nuclide name="O16" wo="0.2847761"/>
       <nuclide name="B10" wo="0.000115699"/>
@@ -122,7 +122,7 @@
       <sab name="c_H_in_H2O"/>
     </material>
     <material id="11" name="Top of fuel assemblies">
-      <density units="g/cm3" value="3.044"/>
+      <density value="3.044" units="g/cm3"/>
       <nuclide name="H1" wo="0.0162913"/>
       <nuclide name="O16" wo="0.1292776"/>
       <nuclide name="B10" wo="5.25228e-05"/>
@@ -135,7 +135,7 @@
       <sab name="c_H_in_H2O"/>
     </material>
     <material id="12" name="Bottom of fuel assemblies">
-      <density units="g/cm3" value="1.762"/>
+      <density value="1.762" units="g/cm3"/>
       <nuclide name="H1" wo="0.0292856"/>
       <nuclide name="O16" wo="0.2323919"/>
       <nuclide name="B10" wo="9.44159e-05"/>
@@ -149,8 +149,8 @@
     </material>
   </materials>
   <geometry>
-    <cell fill="200" id="1" region="-6 34 -35" universe="0"/>
-    <cell fill="201" id="2" region="-6 35 -36" universe="0"/>
+    <cell id="1" fill="200" region="-6 34 -35" universe="0"/>
+    <cell id="2" fill="201" region="-6 35 -36" universe="0"/>
     <cell id="3" material="8" region="-7 31 -32" universe="0"/>
     <cell id="4" material="9" region="-5 32 -33" universe="0"/>
     <cell id="5" material="12" region="-5 33 -34" universe="0"/>
@@ -174,9 +174,9 @@
     <cell id="31" material="2" region="3 -4" universe="4"/>
     <cell id="32" material="4" region="4" universe="4"/>
     <cell id="50" material="3" region="34 -35" universe="5"/>
-    <cell fill="100" id="60" region="34 -35" universe="6"/>
+    <cell id="60" fill="100" region="34 -35" universe="6"/>
     <cell id="70" material="4" region="35 -36" universe="7"/>
-    <cell fill="101" id="80" region="35 -36" universe="8"/>
+    <cell id="80" fill="101" region="35 -36" universe="8"/>
     <lattice id="100" name="Fuel assembly (lower half)">
       <pitch>1.26 1.26</pitch>
       <dimension>17 17</dimension>
@@ -277,30 +277,30 @@
 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 
 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 </universes>
     </lattice>
-    <surface coeffs="0.0 0.0 0.41" id="1" type="z-cylinder"/>
-    <surface coeffs="0.0 0.0 0.475" id="2" type="z-cylinder"/>
-    <surface coeffs="0.0 0.0 0.56" id="3" type="z-cylinder"/>
-    <surface coeffs="0.0 0.0 0.62" id="4" type="z-cylinder"/>
-    <surface coeffs="0.0 0.0 187.6" id="5" type="z-cylinder"/>
-    <surface coeffs="0.0 0.0 209.0" id="6" type="z-cylinder"/>
-    <surface coeffs="0.0 0.0 229.0" id="7" type="z-cylinder"/>
-    <surface boundary="vacuum" coeffs="0.0 0.0 249.0" id="8" type="z-cylinder"/>
-    <surface boundary="vacuum" coeffs="-229.0" id="31" type="z-plane"/>
-    <surface coeffs="-199.0" id="32" type="z-plane"/>
-    <surface coeffs="-193.0" id="33" type="z-plane"/>
-    <surface coeffs="-183.0" id="34" type="z-plane"/>
-    <surface coeffs="0.0" id="35" type="z-plane"/>
-    <surface coeffs="183.0" id="36" type="z-plane"/>
-    <surface coeffs="203.0" id="37" type="z-plane"/>
-    <surface coeffs="215.0" id="38" type="z-plane"/>
-    <surface boundary="vacuum" coeffs="223.0" id="39" type="z-plane"/>
+    <surface id="1" type="z-cylinder" coeffs="0.0 0.0 0.41"/>
+    <surface id="2" type="z-cylinder" coeffs="0.0 0.0 0.475"/>
+    <surface id="3" type="z-cylinder" coeffs="0.0 0.0 0.56"/>
+    <surface id="4" type="z-cylinder" coeffs="0.0 0.0 0.62"/>
+    <surface id="5" type="z-cylinder" coeffs="0.0 0.0 187.6"/>
+    <surface id="6" type="z-cylinder" coeffs="0.0 0.0 209.0"/>
+    <surface id="7" type="z-cylinder" coeffs="0.0 0.0 229.0"/>
+    <surface id="8" type="z-cylinder" boundary="vacuum" coeffs="0.0 0.0 249.0"/>
+    <surface id="31" type="z-plane" boundary="vacuum" coeffs="-229.0"/>
+    <surface id="32" type="z-plane" coeffs="-199.0"/>
+    <surface id="33" type="z-plane" coeffs="-193.0"/>
+    <surface id="34" type="z-plane" coeffs="-183.0"/>
+    <surface id="35" type="z-plane" coeffs="0.0"/>
+    <surface id="36" type="z-plane" coeffs="183.0"/>
+    <surface id="37" type="z-plane" coeffs="203.0"/>
+    <surface id="38" type="z-plane" coeffs="215.0"/>
+    <surface id="39" type="z-plane" boundary="vacuum" coeffs="223.0"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
     <particles>100</particles>
     <batches>10</batches>
     <inactive>5</inactive>
-    <source particle="neutron" strength="1.0" type="independent">
+    <source type="independent" strength="1.0" particle="neutron">
       <space type="box">
         <parameters>-160 -160 -183 160 160 183</parameters>
       </space>
diff --git a/tests/regression_tests/time_cutoff/inputs_true.dat b/tests/regression_tests/time_cutoff/inputs_true.dat
index 7d3e94f50..e1102d475 100644
--- a/tests/regression_tests/time_cutoff/inputs_true.dat
+++ b/tests/regression_tests/time_cutoff/inputs_true.dat
@@ -4,13 +4,13 @@
   </materials>
   <geometry>
     <cell id="1" material="void" region="-1" universe="1"/>
-    <surface boundary="vacuum" coeffs="0.0 0.0 0.0 200" id="1" type="sphere"/>
+    <surface id="1" type="sphere" boundary="vacuum" coeffs="0.0 0.0 0.0 200"/>
   </geometry>
   <settings>
     <run_mode>fixed source</run_mode>
     <particles>100</particles>
     <batches>10</batches>
-    <source particle="neutron" strength="1.0" type="independent">
+    <source type="independent" strength="1.0" particle="neutron">
       <space type="point">
         <parameters>0.0 0.0 0.0</parameters>
       </space>
diff --git a/tests/regression_tests/torus/inputs_true.dat b/tests/regression_tests/torus/inputs_true.dat
index a5c7a8d7a..df4af1443 100644
--- a/tests/regression_tests/torus/inputs_true.dat
+++ b/tests/regression_tests/torus/inputs_true.dat
@@ -1,13 +1,13 @@
 <?xml version='1.0' encoding='utf-8'?>
 <model>
   <materials>
-    <material depletable="true" id="1">
-      <density units="g/cm3" value="12.0"/>
-      <nuclide ao="1.0" name="U235"/>
+    <material id="1" depletable="true">
+      <density value="12.0" units="g/cm3"/>
+      <nuclide name="U235" ao="1.0"/>
     </material>
     <material id="2">
-      <density units="g/cm3" value="1.0"/>
-      <nuclide ao="1.0" name="H1"/>
+      <density value="1.0" units="g/cm3"/>
+      <nuclide name="H1" ao="1.0"/>
     </material>
   </materials>
   <geometry>
@@ -15,15 +15,15 @@
     <cell id="2" material="1" region="-3" universe="1"/>
     <cell id="3" material="1" region="-1" universe="1"/>
     <cell id="4" material="2" region="-5 4 -7 6 -9 8 2 3 1" universe="1"/>
-    <surface coeffs="0.0 0.0 0.0 3 1.5 1" id="1" type="z-torus"/>
-    <surface coeffs="6 0.0 0.0 3 1.5 1" id="2" type="x-torus"/>
-    <surface coeffs="6 0.0 0.0 6 1 0.75" id="3" type="y-torus"/>
-    <surface boundary="vacuum" coeffs="-5" id="4" type="x-plane"/>
-    <surface boundary="vacuum" coeffs="14" id="5" type="x-plane"/>
-    <surface boundary="vacuum" coeffs="-5" id="6" type="y-plane"/>
-    <surface boundary="vacuum" coeffs="5" id="7" type="y-plane"/>
-    <surface boundary="vacuum" coeffs="-8" id="8" type="z-plane"/>
-    <surface boundary="vacuum" coeffs="8" id="9" type="z-plane"/>
+    <surface id="1" type="z-torus" coeffs="0.0 0.0 0.0 3 1.5 1"/>
+    <surface id="2" type="x-torus" coeffs="6 0.0 0.0 3 1.5 1"/>
+    <surface id="3" type="y-torus" coeffs="6 0.0 0.0 6 1 0.75"/>
+    <surface id="4" type="x-plane" boundary="vacuum" coeffs="-5"/>
+    <surface id="5" type="x-plane" boundary="vacuum" coeffs="14"/>
+    <surface id="6" type="y-plane" boundary="vacuum" coeffs="-5"/>
+    <surface id="7" type="y-plane" boundary="vacuum" coeffs="5"/>
+    <surface id="8" type="z-plane" boundary="vacuum" coeffs="-8"/>
+    <surface id="9" type="z-plane" boundary="vacuum" coeffs="8"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
diff --git a/tests/regression_tests/torus/large_major/inputs_true.dat b/tests/regression_tests/torus/large_major/inputs_true.dat
index fa7deb29a..513a8c67e 100644
--- a/tests/regression_tests/torus/large_major/inputs_true.dat
+++ b/tests/regression_tests/torus/large_major/inputs_true.dat
@@ -2,27 +2,27 @@
 <model>
   <materials>
     <material id="1">
-      <density units="g/cm3" value="1.0"/>
-      <nuclide ao="1.0" name="W184"/>
+      <density value="1.0" units="g/cm3"/>
+      <nuclide name="W184" ao="1.0"/>
     </material>
     <material id="2">
-      <density units="g/cm3" value="5.0"/>
-      <nuclide ao="1.0" name="Fe56"/>
+      <density value="5.0" units="g/cm3"/>
+      <nuclide name="Fe56" ao="1.0"/>
     </material>
   </materials>
   <geometry>
     <cell id="1" material="void" region="-1" universe="1"/>
     <cell id="2" material="1" region="1 -2" universe="1"/>
     <cell id="3" material="2" region="2 -3" universe="1"/>
-    <surface coeffs="0.0 0.0 0.0 1000.0 30.0 30.0" id="1" type="z-torus"/>
-    <surface coeffs="0.0 0.0 0.0 1000.0 35.0 35.0" id="2" type="z-torus"/>
-    <surface boundary="vacuum" coeffs="0.0 0.0 0.0 1000.0 40.0 40.0" id="3" type="z-torus"/>
+    <surface id="1" type="z-torus" coeffs="0.0 0.0 0.0 1000.0 30.0 30.0"/>
+    <surface id="2" type="z-torus" coeffs="0.0 0.0 0.0 1000.0 35.0 35.0"/>
+    <surface id="3" type="z-torus" boundary="vacuum" coeffs="0.0 0.0 0.0 1000.0 40.0 40.0"/>
   </geometry>
   <settings>
     <run_mode>fixed source</run_mode>
     <particles>1000</particles>
     <batches>10</batches>
-    <source particle="neutron" strength="1.0" type="independent">
+    <source type="independent" strength="1.0" particle="neutron">
       <space type="point">
         <parameters>-1000.0 0 0</parameters>
       </space>
diff --git a/tests/regression_tests/trigger_statepoint_restart/inputs_true.dat b/tests/regression_tests/trigger_statepoint_restart/inputs_true.dat
index 6f0b629eb..01755ad8b 100644
--- a/tests/regression_tests/trigger_statepoint_restart/inputs_true.dat
+++ b/tests/regression_tests/trigger_statepoint_restart/inputs_true.dat
@@ -1,14 +1,14 @@
 <?xml version='1.0' encoding='utf-8'?>
 <model>
   <materials>
-    <material depletable="true" id="1">
-      <density units="g/cm3" value="4.5"/>
-      <nuclide ao="1.0" name="U235"/>
+    <material id="1" depletable="true">
+      <density value="4.5" units="g/cm3"/>
+      <nuclide name="U235" ao="1.0"/>
     </material>
   </materials>
   <geometry>
     <cell id="1" material="1" region="-1" universe="1"/>
-    <surface boundary="vacuum" coeffs="0.0 0.0 0.0 10.0" id="1" type="sphere"/>
+    <surface id="1" type="sphere" boundary="vacuum" coeffs="0.0 0.0 0.0 10.0"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
diff --git a/tests/regression_tests/triso/inputs_true.dat b/tests/regression_tests/triso/inputs_true.dat
index 37f37af78..c96684568 100644
--- a/tests/regression_tests/triso/inputs_true.dat
+++ b/tests/regression_tests/triso/inputs_true.dat
@@ -1,38 +1,38 @@
 <?xml version='1.0' encoding='utf-8'?>
 <model>
   <materials>
-    <material depletable="true" id="1">
-      <density units="g/cm3" value="10.5"/>
-      <nuclide ao="0.14154" name="U235"/>
-      <nuclide ao="0.85846" name="U238"/>
-      <nuclide ao="0.5" name="C0"/>
-      <nuclide ao="1.5" name="O16"/>
+    <material id="1" depletable="true">
+      <density value="10.5" units="g/cm3"/>
+      <nuclide name="U235" ao="0.14154"/>
+      <nuclide name="U238" ao="0.85846"/>
+      <nuclide name="C0" ao="0.5"/>
+      <nuclide name="O16" ao="1.5"/>
     </material>
     <material id="2">
-      <density units="g/cm3" value="1.0"/>
-      <nuclide ao="1.0" name="C0"/>
+      <density value="1.0" units="g/cm3"/>
+      <nuclide name="C0" ao="1.0"/>
       <sab name="c_Graphite"/>
     </material>
     <material id="3">
-      <density units="g/cm3" value="1.9"/>
-      <nuclide ao="1.0" name="C0"/>
+      <density value="1.9" units="g/cm3"/>
+      <nuclide name="C0" ao="1.0"/>
       <sab name="c_Graphite"/>
     </material>
     <material id="4">
-      <density units="g/cm3" value="3.2"/>
-      <nuclide ao="1.0" name="C0"/>
-      <nuclide ao="0.9222968" name="Si28"/>
-      <nuclide ao="0.0468316" name="Si29"/>
-      <nuclide ao="0.0308716" name="Si30"/>
+      <density value="3.2" units="g/cm3"/>
+      <nuclide name="C0" ao="1.0"/>
+      <nuclide name="Si28" ao="0.9222968"/>
+      <nuclide name="Si29" ao="0.0468316"/>
+      <nuclide name="Si30" ao="0.0308716"/>
     </material>
     <material id="5">
-      <density units="g/cm3" value="1.87"/>
-      <nuclide ao="1.0" name="C0"/>
+      <density value="1.87" units="g/cm3"/>
+      <nuclide name="C0" ao="1.0"/>
       <sab name="c_Graphite"/>
     </material>
     <material id="6">
-      <density units="g/cm3" value="1.1995"/>
-      <nuclide ao="1.0" name="C0"/>
+      <density value="1.1995" units="g/cm3"/>
+      <nuclide name="C0" ao="1.0"/>
       <sab name="c_Graphite"/>
     </material>
   </materials>
@@ -42,171 +42,171 @@
     <cell id="3" material="3" region="2 -3" universe="1"/>
     <cell id="4" material="4" region="3 -4" universe="1"/>
     <cell id="5" material="5" region="4" universe="1"/>
-    <cell fill="2" id="6" region="5 -6 7 -8 9 -10" universe="0"/>
-    <cell fill="1" id="107" region="-111" translation="-0.0014062011817633224 -0.015257747167296776 -0.09184766966024316" universe="27"/>
-    <cell fill="1" id="108" region="-112" translation="0.10909902639777394 -0.004179177767328068 -0.046240930185910245" universe="15"/>
-    <cell fill="1" id="109" region="-113" translation="0.13878336652768952 -0.06900710536877097 -0.03848821497485455" universe="10"/>
-    <cell fill="1" id="110" region="-114" translation="-0.19454996680564374 -0.06900710536877097 -0.03848821497485455" universe="11"/>
-    <cell fill="1" id="111" region="-115" translation="-0.09846455191076986 -0.02594038069469251 -0.06155174933292362" universe="18"/>
-    <cell fill="1" id="112" region="-116" translation="-0.09321591784308736 -0.12248857482372477 -0.04999802384282931" universe="14"/>
-    <cell fill="1" id="113" region="-117" translation="0.2028198996079864 0.08501514690643278 0.07431198844628262" universe="22"/>
-    <cell fill="1" id="114" region="-118" translation="-0.13051343372534685 0.08501514690643278 0.07431198844628262" universe="23"/>
-    <cell fill="1" id="115" region="-119" translation="0.03417350410997999 -0.09641153719944834 -0.10112098092715327" universe="5"/>
-    <cell fill="1" id="116" region="-120" translation="0.037913118842446136 0.06870772519039314 -0.10875752039644154" universe="19"/>
-    <cell fill="1" id="117" region="-121" translation="0.07388008140640989 -0.07130227505402231 -0.09782982564187503" universe="6"/>
-    <cell fill="1" id="118" region="-122" translation="0.08897214754414112 0.08694165211410448 0.07587737301598729" universe="3"/>
-    <cell fill="1" id="119" region="-123" translation="-0.03698302711710488 0.1408784014909229 -0.10474284149572705" universe="4"/>
-    <cell fill="1" id="120" region="-124" translation="-0.03698302711710488 -0.19245493184241047 -0.10474284149572705" universe="7"/>
-    <cell fill="1" id="121" region="-125" translation="-0.02428069661424781 0.05168393238830282 0.1302704892646539" universe="17"/>
-    <cell fill="1" id="122" region="-126" translation="-0.02428069661424781 0.05168393238830282 -0.20306284406867936" universe="26"/>
-    <cell fill="1" id="123" region="-127" translation="0.04578051975994746 0.1175901605138544 -0.0038022862212453434" universe="27"/>
-    <cell fill="1" id="124" region="-128" translation="-0.013741908464450836 0.18016577553053154 0.20276897514248216" universe="12"/>
-    <cell fill="1" id="125" region="-129" translation="-0.013741908464450836 -0.15316755780280183 0.20276897514248216" universe="15"/>
-    <cell fill="1" id="126" region="-130" translation="-0.013741908464450836 0.18016577553053154 -0.1305643581908511" universe="21"/>
-    <cell fill="1" id="127" region="-131" translation="-0.013741908464450836 -0.15316755780280183 -0.1305643581908511" universe="24"/>
-    <cell fill="1" id="128" region="-132" translation="0.19334606515602848 0.066228023881572 -0.07131104153532436" universe="19"/>
-    <cell fill="1" id="129" region="-133" translation="-0.13998726817730478 0.066228023881572 -0.07131104153532436" universe="20"/>
-    <cell fill="1" id="130" region="-134" translation="-0.031185656140686913 0.155914746052082 0.15331720509241947" universe="8"/>
-    <cell fill="1" id="131" region="-135" translation="-0.031185656140686913 -0.17741858728125126 0.15331720509241947" universe="11"/>
-    <cell fill="1" id="132" region="-136" translation="-0.031185656140686913 0.155914746052082 -0.1800161282409139" universe="17"/>
-    <cell fill="1" id="133" region="-137" translation="-0.031185656140686913 -0.17741858728125126 -0.1800161282409139" universe="20"/>
-    <cell fill="1" id="134" region="-138" translation="0.08018004492442865 0.016826191928232426 -0.016389596762212966" universe="28"/>
-    <cell fill="1" id="135" region="-139" translation="0.00483733774062417 0.08148156718302602 -0.09280826916311341" universe="7"/>
-    <cell fill="1" id="136" region="-140" translation="0.0978117791120118 -0.06105974469736897 -0.07844553364014112" universe="18"/>
-    <cell fill="1" id="137" region="-141" translation="0.0339716094789545 0.044675266050854034 0.18588381767108564" universe="15"/>
-    <cell fill="1" id="138" region="-142" translation="0.0339716094789545 0.044675266050854034 -0.14744951566224762" universe="24"/>
-    <cell fill="1" id="139" region="-143" translation="0.15974177782488064 -0.11470938473074832 -0.055880627694202434" universe="16"/>
-    <cell fill="1" id="140" region="-144" translation="-0.17359155550845262 -0.11470938473074832 -0.055880627694202434" universe="17"/>
-    <cell fill="1" id="141" region="-145" translation="0.007714449992858363 -0.07841911930069978 0.019169121324834393" universe="19"/>
-    <cell fill="1" id="142" region="-146" translation="-0.09772496056025104 -0.009435582016802613 -0.0973407871549632" universe="7"/>
-    <cell fill="1" id="143" region="-147" translation="-0.08460405234526575 0.18619630211681182 0.10902502186367324" universe="24"/>
-    <cell fill="1" id="144" region="-148" translation="-0.08460405234526575 -0.14713703121652144 0.10902502186367324" universe="27"/>
-    <cell fill="1" id="145" region="-149" translation="0.08530970516294267 -0.09740948712101977 0.031538023054709596" universe="7"/>
-    <cell fill="1" id="146" region="-150" translation="0.002049400245853761 0.10800782833319489 -0.08566939881823532" universe="28"/>
-    <cell fill="1" id="147" region="-151" translation="0.036269774055772475 -0.0034880407315701634 0.08814057857502322" universe="10"/>
-    <cell fill="1" id="148" region="-152" translation="0.012607957648281654 0.08090056062626749 0.0712211465420014" universe="19"/>
-    <cell fill="1" id="149" region="-153" translation="-0.03741489943578313 0.1221086949309545 0.0439406213163509" universe="13"/>
-    <cell fill="1" id="150" region="-154" translation="0.0851566223435044 -0.1191899586548319 -0.07364696787394387" universe="23"/>
-    <cell fill="1" id="151" region="-155" translation="-0.03992848096555457 0.020214072912877246 -0.11315245980004196" universe="29"/>
-    <cell fill="1" id="152" region="-156" translation="-0.050315754084578224 0.017099968565308377 0.056173125204605934" universe="17"/>
-    <cell fill="1" id="153" region="-157" translation="-0.06766398274549851 -0.07303578778642877 0.005410963730880458" universe="22"/>
-    <cell fill="1" id="154" region="-158" translation="0.06408439016382617 0.05853632250550789 0.00432158793112436" universe="13"/>
-    <cell fill="1" id="155" region="-159" translation="-0.013801059755509382 0.20222454587424032 0.19241766819445416" universe="4"/>
-    <cell fill="1" id="156" region="-160" translation="-0.013801059755509382 -0.13110878745909305 0.19241766819445416" universe="7"/>
-    <cell fill="1" id="157" region="-161" translation="-0.013801059755509382 0.20222454587424032 -0.1409156651388792" universe="13"/>
-    <cell fill="1" id="158" region="-162" translation="-0.013801059755509382 -0.13110878745909305 -0.1409156651388792" universe="16"/>
-    <cell fill="1" id="159" region="-163" translation="0.03522733749799645 0.11305459403611595 0.10295023150858529" universe="16"/>
-    <cell fill="1" id="160" region="-164" translation="-0.03831660450870228 -0.09880556873790897 0.08578673946744877" universe="4"/>
-    <cell fill="1" id="161" region="-165" translation="0.03782024089160585 0.07732392719766301 -0.002829721222114334" universe="24"/>
-    <cell fill="1" id="162" region="-166" translation="-0.060112483234699754 -0.06134051474053648 -0.04363492058502072" universe="29"/>
-    <cell fill="1" id="163" region="-167" translation="0.10930502703326198 -0.020465939386398402 0.15848543253913627" universe="18"/>
-    <cell fill="1" id="164" region="-168" translation="0.10930502703326198 -0.020465939386398402 -0.174847900794197" universe="27"/>
-    <cell fill="1" id="165" region="-169" translation="-0.04821581350719811 -0.10913639479587178 -0.11108700962300094" universe="3"/>
-    <cell fill="1" id="166" region="-170" translation="-0.09934364058994583 0.10405480441904197 -0.0241798283786806" universe="5"/>
-    <cell fill="1" id="167" region="-171" translation="0.11425630804159204 0.19090246541367445 -0.06077533762167586" universe="4"/>
-    <cell fill="1" id="168" region="-172" translation="0.11425630804159204 -0.14243086791965892 -0.06077533762167586" universe="7"/>
-    <cell fill="1" id="169" region="-173" translation="0.0217205011905508 0.02506675532845576 0.029520031599966412" universe="6"/>
-    <cell fill="1" id="170" region="-174" translation="0.12543650024083502 0.19371057833811733 -0.04147065769319469" universe="15"/>
-    <cell fill="1" id="171" region="-175" translation="-0.20789683309249835 0.19371057833811733 -0.04147065769319469" universe="16"/>
-    <cell fill="1" id="172" region="-176" translation="0.12543650024083502 -0.13962275499521593 -0.04147065769319469" universe="18"/>
-    <cell fill="1" id="173" region="-177" translation="-0.20789683309249835 -0.13962275499521593 -0.04147065769319469" universe="19"/>
-    <cell fill="1" id="174" region="-178" translation="-0.10385697059087434 -0.07239894918409101 0.047733316833160344" universe="7"/>
-    <cell fill="1" id="175" region="-179" translation="-0.02484533723289073 0.03270050374260325 0.009261180540203251" universe="18"/>
-    <cell fill="1" id="176" region="-180" translation="-0.10535768832641407 -0.10806169784882003 0.009669056668934639" universe="3"/>
-    <cell fill="1" id="177" region="-181" translation="0.20034387531341857 0.02227169438582799 0.18731645229850835" universe="13"/>
-    <cell fill="1" id="178" region="-182" translation="-0.13298945801991469 0.02227169438582799 0.18731645229850835" universe="14"/>
-    <cell fill="1" id="179" region="-183" translation="0.20034387531341857 0.02227169438582799 -0.1460168810348249" universe="22"/>
-    <cell fill="1" id="180" region="-184" translation="-0.13298945801991469 0.02227169438582799 -0.1460168810348249" universe="23"/>
-    <cell fill="1" id="181" region="-185" translation="0.1631199405760454 0.04092483075648701 0.07754240264809376" universe="7"/>
-    <cell fill="1" id="182" region="-186" translation="-0.17021339275728786 0.04092483075648701 0.07754240264809376" universe="8"/>
-    <cell fill="1" id="183" region="-187" translation="0.102073447728939 -0.060687493103351975 0.01519685776716928" universe="20"/>
-    <cell fill="1" id="184" region="-188" translation="0.07991907014916044 0.13595762576986914 -0.09622087197472673" universe="15"/>
-    <cell fill="1" id="185" region="-189" translation="0.07991907014916044 -0.19737570756346412 -0.09622087197472673" universe="18"/>
-    <cell fill="1" id="186" region="-190" translation="0.06943697893246592 0.16968387178879557 0.11988276699391809" universe="13"/>
-    <cell fill="1" id="187" region="-191" translation="0.06943697893246592 -0.1636494615445378 0.11988276699391809" universe="16"/>
-    <cell fill="1" id="188" region="-192" translation="-0.07059889277962383 0.1489570802132021 0.09503214710980579" universe="21"/>
-    <cell fill="1" id="189" region="-193" translation="-0.07059889277962383 -0.18437625312013128 0.09503214710980579" universe="24"/>
-    <cell fill="1" id="190" region="-194" translation="0.010468267263955 0.15608028424842002 -0.00511339431390323" universe="23"/>
-    <cell fill="1" id="191" region="-195" translation="0.010468267263955 -0.17725304908491335 -0.00511339431390323" universe="26"/>
-    <cell fill="1" id="192" region="-196" translation="0.15972123417512762 0.06883522628651784 -0.11009587369358387" universe="27"/>
-    <cell fill="1" id="193" region="-197" translation="-0.17361209915820575 0.06883522628651784 -0.11009587369358387" universe="28"/>
-    <cell fill="1" id="194" region="-198" translation="0.08981179676970563 0.06434186205946246 0.032607233968534766" universe="8"/>
-    <cell fill="1" id="195" region="-199" translation="0.0033702311569031584 0.10040789537086448 0.1867831868031803" universe="20"/>
-    <cell fill="1" id="196" region="-200" translation="0.0033702311569031584 0.10040789537086448 -0.14655014653015297" universe="29"/>
-    <cell fill="1" id="197" region="-201" translation="0.05329895281727448 -0.02881629065525937 0.15193411713913396" universe="12"/>
-    <cell fill="1" id="198" region="-202" translation="0.05329895281727448 -0.02881629065525937 -0.1813992161941993" universe="21"/>
-    <cell fill="1" id="199" region="-203" translation="0.14663786554095865 -0.0001831711922081758 0.173437280372308" universe="6"/>
-    <cell fill="1" id="200" region="-204" translation="-0.18669546779237473 -0.0001831711922081758 0.173437280372308" universe="7"/>
-    <cell fill="1" id="201" region="-205" translation="0.14663786554095865 -0.0001831711922081758 -0.15989605296102538" universe="15"/>
-    <cell fill="1" id="202" region="-206" translation="-0.18669546779237473 -0.0001831711922081758 -0.15989605296102538" universe="16"/>
-    <cell fill="1" id="203" region="-207" translation="0.006886156712931468 0.0325721225173089 -0.10785254014381473" universe="11"/>
-    <cell fill="1" id="204" region="-208" translation="0.05946426530734861 0.17562994884896627 0.11256068342977466" universe="21"/>
-    <cell fill="1" id="205" region="-209" translation="0.05946426530734861 -0.1577033844843671 0.11256068342977466" universe="24"/>
-    <cell fill="1" id="206" region="-210" translation="-0.0745211393530899 0.18602539894086317 0.07061211191996841" universe="5"/>
-    <cell fill="1" id="207" region="-211" translation="-0.0745211393530899 -0.1473079343924702 0.07061211191996841" universe="8"/>
-    <cell fill="1" id="208" region="-212" translation="0.15971361633210523 -0.02416800360737892 0.062334297185282495" universe="28"/>
-    <cell fill="1" id="209" region="-213" translation="-0.17361971700122802 -0.02416800360737892 0.062334297185282495" universe="29"/>
-    <cell fill="1" id="210" region="-214" translation="-0.014191419448261688 0.11114945107218455 0.0903966514577691" universe="10"/>
-    <cell fill="1" id="211" region="-215" translation="0.20641337800388493 -0.04689191572037532 0.03093832014609521" universe="4"/>
-    <cell fill="1" id="212" region="-216" translation="-0.12691995532944833 -0.04689191572037532 0.03093832014609521" universe="5"/>
-    <cell fill="1" id="213" region="-217" translation="0.042925982468302815 0.0705557158479822 -0.09611246805643225" universe="23"/>
-    <cell fill="1" id="214" region="-218" translation="0.09174118398607445 -0.02102680816462299 -0.12074712654412828" universe="19"/>
-    <cell fill="1" id="215" region="-219" translation="0.1871144659776534 0.14219092895822716 0.0030395151604761805" universe="21"/>
-    <cell fill="1" id="216" region="-220" translation="-0.14621886735567996 0.14219092895822716 0.0030395151604761805" universe="22"/>
-    <cell fill="1" id="217" region="-221" translation="0.1871144659776534 -0.1911424043751062 0.0030395151604761805" universe="24"/>
-    <cell fill="1" id="218" region="-222" translation="-0.14621886735567996 -0.1911424043751062 0.0030395151604761805" universe="25"/>
-    <cell fill="1" id="219" region="-223" translation="-0.08858601205119498 -0.05740809172565153 0.0018937978357634888" universe="21"/>
-    <cell fill="1" id="220" region="-224" translation="-0.06956272452538859 -0.03258611645335985 0.1876749617320655" universe="11"/>
-    <cell fill="1" id="221" region="-225" translation="-0.06956272452538859 -0.03258611645335985 -0.14565837160126788" universe="20"/>
-    <cell fill="1" id="222" region="-226" translation="0.06480048668590577 0.08039356693483157 -0.0495807099830502" universe="4"/>
-    <cell fill="1" id="223" region="-227" translation="0.11976882848311299 0.024414887718198774 0.059001075831400684" universe="18"/>
-    <cell fill="1" id="224" region="-228" translation="0.055815690196973966 -0.03866224334773988 0.12934415570493119" universe="8"/>
-    <cell fill="1" id="225" region="-229" translation="0.055815690196973966 -0.03866224334773988 -0.20398917762840219" universe="17"/>
-    <cell fill="1" id="226" region="-230" translation="-0.07057140884385227 -0.033261585924167725 -0.11308117958912334" universe="11"/>
-    <cell fill="1" id="227" region="-231" translation="0.0191891610992464 -0.08777511864372084 0.09496767886953814" universe="5"/>
-    <cell fill="1" id="228" region="-232" translation="0.11357577214048964 -0.07231206070759028 -0.01862315233444045" universe="8"/>
-    <cell fill="1" id="229" region="-233" translation="0.028822870329182626 0.09660360434040871 -0.10994545899370212" universe="21"/>
-    <cell fill="1" id="230" region="-234" translation="-0.030272006016200004 0.04272149160139638 -0.11143715881676097" universe="18"/>
-    <cell fill="1" id="231" region="-235" translation="0.09719339210824351 0.04131007428864286 0.14476192535372884" universe="11"/>
-    <cell fill="1" id="232" region="-236" translation="0.09719339210824351 0.04131007428864286 -0.18857140797960453" universe="20"/>
-    <cell fill="1" id="233" region="-237" translation="0.1075803128789849 -0.02104725713738881 -0.03274843538002781" universe="6"/>
-    <cell fill="1" id="234" region="-238" translation="0.1392019576325615 -0.08814436128642017 -0.11479828495132216" universe="4"/>
-    <cell fill="1" id="235" region="-239" translation="-0.19413137570077177 -0.08814436128642017 -0.11479828495132216" universe="5"/>
-    <cell fill="1" id="236" region="-240" translation="0.10847197677361597 0.1461592302081176 0.08841042383901798" universe="14"/>
-    <cell fill="1" id="237" region="-241" translation="0.10847197677361597 -0.18717410312521576 0.08841042383901798" universe="17"/>
-    <cell fill="1" id="238" region="-242" translation="0.045127058382085194 0.0967807216119615 0.0967653665331849" universe="29"/>
-    <cell fill="1" id="239" region="-243" translation="-0.022464471745497094 0.07259277205138148 0.10785219865057927" universe="12"/>
-    <cell fill="1" id="240" region="-244" translation="0.10606353369903221 0.03928703229725711 0.17228776926768086" universe="17"/>
-    <cell fill="1" id="241" region="-245" translation="0.10606353369903221 0.03928703229725711 -0.1610455640656524" universe="26"/>
-    <cell fill="1" id="242" region="-246" translation="0.14815941963538226 0.11277655887534538 0.03808687169681996" universe="13"/>
-    <cell fill="1" id="243" region="-247" translation="-0.185173913697951 0.11277655887534538 0.03808687169681996" universe="14"/>
-    <cell fill="1" id="244" region="-248" translation="0.15693581669068946 0.10114531834923532 -0.04992356195780889" universe="3"/>
-    <cell fill="1" id="245" region="-249" translation="-0.17639751664264391 0.10114531834923532 -0.04992356195780889" universe="4"/>
-    <cell fill="1" id="246" region="-250" translation="0.13264357875679378 0.10919805128102966 -0.04769549879176793" universe="18"/>
-    <cell fill="1" id="247" region="-251" translation="-0.2006897545765396 0.10919805128102966 -0.04769549879176793" universe="19"/>
-    <cell fill="1" id="248" region="-252" translation="0.13916564434634993 0.13134319648704007 0.07015912178562622" universe="25"/>
-    <cell fill="1" id="249" region="-253" translation="-0.19416768898698333 0.13134319648704007 0.07015912178562622" universe="26"/>
-    <cell fill="1" id="250" region="-254" translation="0.13916564434634993 -0.2019901368462932 0.07015912178562622" universe="28"/>
-    <cell fill="1" id="251" region="-255" translation="-0.19416768898698333 -0.2019901368462932 0.07015912178562622" universe="29"/>
-    <cell fill="1" id="252" region="-256" translation="-0.10026688643231585 0.1564443552698941 0.1751728484794038" universe="4"/>
-    <cell fill="1" id="253" region="-257" translation="-0.10026688643231585 -0.17688897806343928 0.1751728484794038" universe="7"/>
-    <cell fill="1" id="254" region="-258" translation="-0.10026688643231585 0.1564443552698941 -0.15816048485392958" universe="13"/>
-    <cell fill="1" id="255" region="-259" translation="-0.10026688643231585 -0.17688897806343928 -0.15816048485392958" universe="16"/>
-    <cell fill="1" id="256" region="-260" translation="0.16555436030710213 -0.015531455219433332 0.02691614144169241" universe="27"/>
-    <cell fill="1" id="257" region="-261" translation="-0.16777897302623124 -0.015531455219433332 0.02691614144169241" universe="28"/>
-    <cell fill="1" id="258" region="-262" translation="0.152805274648522 0.18166556620660584 0.040488366683789634" universe="12"/>
-    <cell fill="1" id="259" region="-263" translation="-0.18052805868481137 0.18166556620660584 0.040488366683789634" universe="13"/>
-    <cell fill="1" id="260" region="-264" translation="0.152805274648522 -0.15166776712672753 0.040488366683789634" universe="15"/>
-    <cell fill="1" id="261" region="-265" translation="-0.18052805868481137 -0.15166776712672753 0.040488366683789634" universe="16"/>
-    <cell fill="1" id="262" region="-266" translation="0.07231116694829032 0.08785370537091952 0.09997055589943346" universe="7"/>
-    <cell fill="1" id="263" region="-267" translation="-0.10576424362412257 0.09874497232579027 -0.05820080940738992" universe="3"/>
-    <cell fill="1" id="264" region="-268" translation="0.046877953125145755 -0.059492732184222796 -0.055635341857650844" universe="4"/>
-    <cell fill="1" id="265" region="-269" translation="0.1239423066569788 0.14183046274229005 -0.06583818749209458" universe="22"/>
-    <cell fill="1" id="266" region="-270" translation="0.1239423066569788 -0.19150287059104332 -0.06583818749209458" universe="25"/>
-    <cell fill="1" id="267" region="-271" translation="0.0013087859341976982 -0.06327594480884835 -0.05382522074205143" universe="10"/>
-    <cell fill="1" id="268" region="-272" translation="0.11058883669906516 -0.038954175820645864 0.16834558789033005" universe="11"/>
-    <cell fill="1" id="269" region="-273" translation="0.11058883669906516 -0.038954175820645864 -0.16498774544300332" universe="20"/>
-    <cell fill="1" id="270" region="-274" translation="-0.02657010065724863 0.013144978841080679 0.050587944514051575" universe="24"/>
+    <cell id="6" fill="2" region="5 -6 7 -8 9 -10" universe="0"/>
+    <cell id="107" fill="1" region="-111" translation="-0.0014062011817633224 -0.015257747167296776 -0.09184766966024316" universe="27"/>
+    <cell id="108" fill="1" region="-112" translation="0.10909902639777394 -0.004179177767328068 -0.046240930185910245" universe="15"/>
+    <cell id="109" fill="1" region="-113" translation="0.13878336652768952 -0.06900710536877097 -0.03848821497485455" universe="10"/>
+    <cell id="110" fill="1" region="-114" translation="-0.19454996680564374 -0.06900710536877097 -0.03848821497485455" universe="11"/>
+    <cell id="111" fill="1" region="-115" translation="-0.09846455191076986 -0.02594038069469251 -0.06155174933292362" universe="18"/>
+    <cell id="112" fill="1" region="-116" translation="-0.09321591784308736 -0.12248857482372477 -0.04999802384282931" universe="14"/>
+    <cell id="113" fill="1" region="-117" translation="0.2028198996079864 0.08501514690643278 0.07431198844628262" universe="22"/>
+    <cell id="114" fill="1" region="-118" translation="-0.13051343372534685 0.08501514690643278 0.07431198844628262" universe="23"/>
+    <cell id="115" fill="1" region="-119" translation="0.03417350410997999 -0.09641153719944834 -0.10112098092715327" universe="5"/>
+    <cell id="116" fill="1" region="-120" translation="0.037913118842446136 0.06870772519039314 -0.10875752039644154" universe="19"/>
+    <cell id="117" fill="1" region="-121" translation="0.07388008140640989 -0.07130227505402231 -0.09782982564187503" universe="6"/>
+    <cell id="118" fill="1" region="-122" translation="0.08897214754414112 0.08694165211410448 0.07587737301598729" universe="3"/>
+    <cell id="119" fill="1" region="-123" translation="-0.03698302711710488 0.1408784014909229 -0.10474284149572705" universe="4"/>
+    <cell id="120" fill="1" region="-124" translation="-0.03698302711710488 -0.19245493184241047 -0.10474284149572705" universe="7"/>
+    <cell id="121" fill="1" region="-125" translation="-0.02428069661424781 0.05168393238830282 0.1302704892646539" universe="17"/>
+    <cell id="122" fill="1" region="-126" translation="-0.02428069661424781 0.05168393238830282 -0.20306284406867936" universe="26"/>
+    <cell id="123" fill="1" region="-127" translation="0.04578051975994746 0.1175901605138544 -0.0038022862212453434" universe="27"/>
+    <cell id="124" fill="1" region="-128" translation="-0.013741908464450836 0.18016577553053154 0.20276897514248216" universe="12"/>
+    <cell id="125" fill="1" region="-129" translation="-0.013741908464450836 -0.15316755780280183 0.20276897514248216" universe="15"/>
+    <cell id="126" fill="1" region="-130" translation="-0.013741908464450836 0.18016577553053154 -0.1305643581908511" universe="21"/>
+    <cell id="127" fill="1" region="-131" translation="-0.013741908464450836 -0.15316755780280183 -0.1305643581908511" universe="24"/>
+    <cell id="128" fill="1" region="-132" translation="0.19334606515602848 0.066228023881572 -0.07131104153532436" universe="19"/>
+    <cell id="129" fill="1" region="-133" translation="-0.13998726817730478 0.066228023881572 -0.07131104153532436" universe="20"/>
+    <cell id="130" fill="1" region="-134" translation="-0.031185656140686913 0.155914746052082 0.15331720509241947" universe="8"/>
+    <cell id="131" fill="1" region="-135" translation="-0.031185656140686913 -0.17741858728125126 0.15331720509241947" universe="11"/>
+    <cell id="132" fill="1" region="-136" translation="-0.031185656140686913 0.155914746052082 -0.1800161282409139" universe="17"/>
+    <cell id="133" fill="1" region="-137" translation="-0.031185656140686913 -0.17741858728125126 -0.1800161282409139" universe="20"/>
+    <cell id="134" fill="1" region="-138" translation="0.08018004492442865 0.016826191928232426 -0.016389596762212966" universe="28"/>
+    <cell id="135" fill="1" region="-139" translation="0.00483733774062417 0.08148156718302602 -0.09280826916311341" universe="7"/>
+    <cell id="136" fill="1" region="-140" translation="0.0978117791120118 -0.06105974469736897 -0.07844553364014112" universe="18"/>
+    <cell id="137" fill="1" region="-141" translation="0.0339716094789545 0.044675266050854034 0.18588381767108564" universe="15"/>
+    <cell id="138" fill="1" region="-142" translation="0.0339716094789545 0.044675266050854034 -0.14744951566224762" universe="24"/>
+    <cell id="139" fill="1" region="-143" translation="0.15974177782488064 -0.11470938473074832 -0.055880627694202434" universe="16"/>
+    <cell id="140" fill="1" region="-144" translation="-0.17359155550845262 -0.11470938473074832 -0.055880627694202434" universe="17"/>
+    <cell id="141" fill="1" region="-145" translation="0.007714449992858363 -0.07841911930069978 0.019169121324834393" universe="19"/>
+    <cell id="142" fill="1" region="-146" translation="-0.09772496056025104 -0.009435582016802613 -0.0973407871549632" universe="7"/>
+    <cell id="143" fill="1" region="-147" translation="-0.08460405234526575 0.18619630211681182 0.10902502186367324" universe="24"/>
+    <cell id="144" fill="1" region="-148" translation="-0.08460405234526575 -0.14713703121652144 0.10902502186367324" universe="27"/>
+    <cell id="145" fill="1" region="-149" translation="0.08530970516294267 -0.09740948712101977 0.031538023054709596" universe="7"/>
+    <cell id="146" fill="1" region="-150" translation="0.002049400245853761 0.10800782833319489 -0.08566939881823532" universe="28"/>
+    <cell id="147" fill="1" region="-151" translation="0.036269774055772475 -0.0034880407315701634 0.08814057857502322" universe="10"/>
+    <cell id="148" fill="1" region="-152" translation="0.012607957648281654 0.08090056062626749 0.0712211465420014" universe="19"/>
+    <cell id="149" fill="1" region="-153" translation="-0.03741489943578313 0.1221086949309545 0.0439406213163509" universe="13"/>
+    <cell id="150" fill="1" region="-154" translation="0.0851566223435044 -0.1191899586548319 -0.07364696787394387" universe="23"/>
+    <cell id="151" fill="1" region="-155" translation="-0.03992848096555457 0.020214072912877246 -0.11315245980004196" universe="29"/>
+    <cell id="152" fill="1" region="-156" translation="-0.050315754084578224 0.017099968565308377 0.056173125204605934" universe="17"/>
+    <cell id="153" fill="1" region="-157" translation="-0.06766398274549851 -0.07303578778642877 0.005410963730880458" universe="22"/>
+    <cell id="154" fill="1" region="-158" translation="0.06408439016382617 0.05853632250550789 0.00432158793112436" universe="13"/>
+    <cell id="155" fill="1" region="-159" translation="-0.013801059755509382 0.20222454587424032 0.19241766819445416" universe="4"/>
+    <cell id="156" fill="1" region="-160" translation="-0.013801059755509382 -0.13110878745909305 0.19241766819445416" universe="7"/>
+    <cell id="157" fill="1" region="-161" translation="-0.013801059755509382 0.20222454587424032 -0.1409156651388792" universe="13"/>
+    <cell id="158" fill="1" region="-162" translation="-0.013801059755509382 -0.13110878745909305 -0.1409156651388792" universe="16"/>
+    <cell id="159" fill="1" region="-163" translation="0.03522733749799645 0.11305459403611595 0.10295023150858529" universe="16"/>
+    <cell id="160" fill="1" region="-164" translation="-0.03831660450870228 -0.09880556873790897 0.08578673946744877" universe="4"/>
+    <cell id="161" fill="1" region="-165" translation="0.03782024089160585 0.07732392719766301 -0.002829721222114334" universe="24"/>
+    <cell id="162" fill="1" region="-166" translation="-0.060112483234699754 -0.06134051474053648 -0.04363492058502072" universe="29"/>
+    <cell id="163" fill="1" region="-167" translation="0.10930502703326198 -0.020465939386398402 0.15848543253913627" universe="18"/>
+    <cell id="164" fill="1" region="-168" translation="0.10930502703326198 -0.020465939386398402 -0.174847900794197" universe="27"/>
+    <cell id="165" fill="1" region="-169" translation="-0.04821581350719811 -0.10913639479587178 -0.11108700962300094" universe="3"/>
+    <cell id="166" fill="1" region="-170" translation="-0.09934364058994583 0.10405480441904197 -0.0241798283786806" universe="5"/>
+    <cell id="167" fill="1" region="-171" translation="0.11425630804159204 0.19090246541367445 -0.06077533762167586" universe="4"/>
+    <cell id="168" fill="1" region="-172" translation="0.11425630804159204 -0.14243086791965892 -0.06077533762167586" universe="7"/>
+    <cell id="169" fill="1" region="-173" translation="0.0217205011905508 0.02506675532845576 0.029520031599966412" universe="6"/>
+    <cell id="170" fill="1" region="-174" translation="0.12543650024083502 0.19371057833811733 -0.04147065769319469" universe="15"/>
+    <cell id="171" fill="1" region="-175" translation="-0.20789683309249835 0.19371057833811733 -0.04147065769319469" universe="16"/>
+    <cell id="172" fill="1" region="-176" translation="0.12543650024083502 -0.13962275499521593 -0.04147065769319469" universe="18"/>
+    <cell id="173" fill="1" region="-177" translation="-0.20789683309249835 -0.13962275499521593 -0.04147065769319469" universe="19"/>
+    <cell id="174" fill="1" region="-178" translation="-0.10385697059087434 -0.07239894918409101 0.047733316833160344" universe="7"/>
+    <cell id="175" fill="1" region="-179" translation="-0.02484533723289073 0.03270050374260325 0.009261180540203251" universe="18"/>
+    <cell id="176" fill="1" region="-180" translation="-0.10535768832641407 -0.10806169784882003 0.009669056668934639" universe="3"/>
+    <cell id="177" fill="1" region="-181" translation="0.20034387531341857 0.02227169438582799 0.18731645229850835" universe="13"/>
+    <cell id="178" fill="1" region="-182" translation="-0.13298945801991469 0.02227169438582799 0.18731645229850835" universe="14"/>
+    <cell id="179" fill="1" region="-183" translation="0.20034387531341857 0.02227169438582799 -0.1460168810348249" universe="22"/>
+    <cell id="180" fill="1" region="-184" translation="-0.13298945801991469 0.02227169438582799 -0.1460168810348249" universe="23"/>
+    <cell id="181" fill="1" region="-185" translation="0.1631199405760454 0.04092483075648701 0.07754240264809376" universe="7"/>
+    <cell id="182" fill="1" region="-186" translation="-0.17021339275728786 0.04092483075648701 0.07754240264809376" universe="8"/>
+    <cell id="183" fill="1" region="-187" translation="0.102073447728939 -0.060687493103351975 0.01519685776716928" universe="20"/>
+    <cell id="184" fill="1" region="-188" translation="0.07991907014916044 0.13595762576986914 -0.09622087197472673" universe="15"/>
+    <cell id="185" fill="1" region="-189" translation="0.07991907014916044 -0.19737570756346412 -0.09622087197472673" universe="18"/>
+    <cell id="186" fill="1" region="-190" translation="0.06943697893246592 0.16968387178879557 0.11988276699391809" universe="13"/>
+    <cell id="187" fill="1" region="-191" translation="0.06943697893246592 -0.1636494615445378 0.11988276699391809" universe="16"/>
+    <cell id="188" fill="1" region="-192" translation="-0.07059889277962383 0.1489570802132021 0.09503214710980579" universe="21"/>
+    <cell id="189" fill="1" region="-193" translation="-0.07059889277962383 -0.18437625312013128 0.09503214710980579" universe="24"/>
+    <cell id="190" fill="1" region="-194" translation="0.010468267263955 0.15608028424842002 -0.00511339431390323" universe="23"/>
+    <cell id="191" fill="1" region="-195" translation="0.010468267263955 -0.17725304908491335 -0.00511339431390323" universe="26"/>
+    <cell id="192" fill="1" region="-196" translation="0.15972123417512762 0.06883522628651784 -0.11009587369358387" universe="27"/>
+    <cell id="193" fill="1" region="-197" translation="-0.17361209915820575 0.06883522628651784 -0.11009587369358387" universe="28"/>
+    <cell id="194" fill="1" region="-198" translation="0.08981179676970563 0.06434186205946246 0.032607233968534766" universe="8"/>
+    <cell id="195" fill="1" region="-199" translation="0.0033702311569031584 0.10040789537086448 0.1867831868031803" universe="20"/>
+    <cell id="196" fill="1" region="-200" translation="0.0033702311569031584 0.10040789537086448 -0.14655014653015297" universe="29"/>
+    <cell id="197" fill="1" region="-201" translation="0.05329895281727448 -0.02881629065525937 0.15193411713913396" universe="12"/>
+    <cell id="198" fill="1" region="-202" translation="0.05329895281727448 -0.02881629065525937 -0.1813992161941993" universe="21"/>
+    <cell id="199" fill="1" region="-203" translation="0.14663786554095865 -0.0001831711922081758 0.173437280372308" universe="6"/>
+    <cell id="200" fill="1" region="-204" translation="-0.18669546779237473 -0.0001831711922081758 0.173437280372308" universe="7"/>
+    <cell id="201" fill="1" region="-205" translation="0.14663786554095865 -0.0001831711922081758 -0.15989605296102538" universe="15"/>
+    <cell id="202" fill="1" region="-206" translation="-0.18669546779237473 -0.0001831711922081758 -0.15989605296102538" universe="16"/>
+    <cell id="203" fill="1" region="-207" translation="0.006886156712931468 0.0325721225173089 -0.10785254014381473" universe="11"/>
+    <cell id="204" fill="1" region="-208" translation="0.05946426530734861 0.17562994884896627 0.11256068342977466" universe="21"/>
+    <cell id="205" fill="1" region="-209" translation="0.05946426530734861 -0.1577033844843671 0.11256068342977466" universe="24"/>
+    <cell id="206" fill="1" region="-210" translation="-0.0745211393530899 0.18602539894086317 0.07061211191996841" universe="5"/>
+    <cell id="207" fill="1" region="-211" translation="-0.0745211393530899 -0.1473079343924702 0.07061211191996841" universe="8"/>
+    <cell id="208" fill="1" region="-212" translation="0.15971361633210523 -0.02416800360737892 0.062334297185282495" universe="28"/>
+    <cell id="209" fill="1" region="-213" translation="-0.17361971700122802 -0.02416800360737892 0.062334297185282495" universe="29"/>
+    <cell id="210" fill="1" region="-214" translation="-0.014191419448261688 0.11114945107218455 0.0903966514577691" universe="10"/>
+    <cell id="211" fill="1" region="-215" translation="0.20641337800388493 -0.04689191572037532 0.03093832014609521" universe="4"/>
+    <cell id="212" fill="1" region="-216" translation="-0.12691995532944833 -0.04689191572037532 0.03093832014609521" universe="5"/>
+    <cell id="213" fill="1" region="-217" translation="0.042925982468302815 0.0705557158479822 -0.09611246805643225" universe="23"/>
+    <cell id="214" fill="1" region="-218" translation="0.09174118398607445 -0.02102680816462299 -0.12074712654412828" universe="19"/>
+    <cell id="215" fill="1" region="-219" translation="0.1871144659776534 0.14219092895822716 0.0030395151604761805" universe="21"/>
+    <cell id="216" fill="1" region="-220" translation="-0.14621886735567996 0.14219092895822716 0.0030395151604761805" universe="22"/>
+    <cell id="217" fill="1" region="-221" translation="0.1871144659776534 -0.1911424043751062 0.0030395151604761805" universe="24"/>
+    <cell id="218" fill="1" region="-222" translation="-0.14621886735567996 -0.1911424043751062 0.0030395151604761805" universe="25"/>
+    <cell id="219" fill="1" region="-223" translation="-0.08858601205119498 -0.05740809172565153 0.0018937978357634888" universe="21"/>
+    <cell id="220" fill="1" region="-224" translation="-0.06956272452538859 -0.03258611645335985 0.1876749617320655" universe="11"/>
+    <cell id="221" fill="1" region="-225" translation="-0.06956272452538859 -0.03258611645335985 -0.14565837160126788" universe="20"/>
+    <cell id="222" fill="1" region="-226" translation="0.06480048668590577 0.08039356693483157 -0.0495807099830502" universe="4"/>
+    <cell id="223" fill="1" region="-227" translation="0.11976882848311299 0.024414887718198774 0.059001075831400684" universe="18"/>
+    <cell id="224" fill="1" region="-228" translation="0.055815690196973966 -0.03866224334773988 0.12934415570493119" universe="8"/>
+    <cell id="225" fill="1" region="-229" translation="0.055815690196973966 -0.03866224334773988 -0.20398917762840219" universe="17"/>
+    <cell id="226" fill="1" region="-230" translation="-0.07057140884385227 -0.033261585924167725 -0.11308117958912334" universe="11"/>
+    <cell id="227" fill="1" region="-231" translation="0.0191891610992464 -0.08777511864372084 0.09496767886953814" universe="5"/>
+    <cell id="228" fill="1" region="-232" translation="0.11357577214048964 -0.07231206070759028 -0.01862315233444045" universe="8"/>
+    <cell id="229" fill="1" region="-233" translation="0.028822870329182626 0.09660360434040871 -0.10994545899370212" universe="21"/>
+    <cell id="230" fill="1" region="-234" translation="-0.030272006016200004 0.04272149160139638 -0.11143715881676097" universe="18"/>
+    <cell id="231" fill="1" region="-235" translation="0.09719339210824351 0.04131007428864286 0.14476192535372884" universe="11"/>
+    <cell id="232" fill="1" region="-236" translation="0.09719339210824351 0.04131007428864286 -0.18857140797960453" universe="20"/>
+    <cell id="233" fill="1" region="-237" translation="0.1075803128789849 -0.02104725713738881 -0.03274843538002781" universe="6"/>
+    <cell id="234" fill="1" region="-238" translation="0.1392019576325615 -0.08814436128642017 -0.11479828495132216" universe="4"/>
+    <cell id="235" fill="1" region="-239" translation="-0.19413137570077177 -0.08814436128642017 -0.11479828495132216" universe="5"/>
+    <cell id="236" fill="1" region="-240" translation="0.10847197677361597 0.1461592302081176 0.08841042383901798" universe="14"/>
+    <cell id="237" fill="1" region="-241" translation="0.10847197677361597 -0.18717410312521576 0.08841042383901798" universe="17"/>
+    <cell id="238" fill="1" region="-242" translation="0.045127058382085194 0.0967807216119615 0.0967653665331849" universe="29"/>
+    <cell id="239" fill="1" region="-243" translation="-0.022464471745497094 0.07259277205138148 0.10785219865057927" universe="12"/>
+    <cell id="240" fill="1" region="-244" translation="0.10606353369903221 0.03928703229725711 0.17228776926768086" universe="17"/>
+    <cell id="241" fill="1" region="-245" translation="0.10606353369903221 0.03928703229725711 -0.1610455640656524" universe="26"/>
+    <cell id="242" fill="1" region="-246" translation="0.14815941963538226 0.11277655887534538 0.03808687169681996" universe="13"/>
+    <cell id="243" fill="1" region="-247" translation="-0.185173913697951 0.11277655887534538 0.03808687169681996" universe="14"/>
+    <cell id="244" fill="1" region="-248" translation="0.15693581669068946 0.10114531834923532 -0.04992356195780889" universe="3"/>
+    <cell id="245" fill="1" region="-249" translation="-0.17639751664264391 0.10114531834923532 -0.04992356195780889" universe="4"/>
+    <cell id="246" fill="1" region="-250" translation="0.13264357875679378 0.10919805128102966 -0.04769549879176793" universe="18"/>
+    <cell id="247" fill="1" region="-251" translation="-0.2006897545765396 0.10919805128102966 -0.04769549879176793" universe="19"/>
+    <cell id="248" fill="1" region="-252" translation="0.13916564434634993 0.13134319648704007 0.07015912178562622" universe="25"/>
+    <cell id="249" fill="1" region="-253" translation="-0.19416768898698333 0.13134319648704007 0.07015912178562622" universe="26"/>
+    <cell id="250" fill="1" region="-254" translation="0.13916564434634993 -0.2019901368462932 0.07015912178562622" universe="28"/>
+    <cell id="251" fill="1" region="-255" translation="-0.19416768898698333 -0.2019901368462932 0.07015912178562622" universe="29"/>
+    <cell id="252" fill="1" region="-256" translation="-0.10026688643231585 0.1564443552698941 0.1751728484794038" universe="4"/>
+    <cell id="253" fill="1" region="-257" translation="-0.10026688643231585 -0.17688897806343928 0.1751728484794038" universe="7"/>
+    <cell id="254" fill="1" region="-258" translation="-0.10026688643231585 0.1564443552698941 -0.15816048485392958" universe="13"/>
+    <cell id="255" fill="1" region="-259" translation="-0.10026688643231585 -0.17688897806343928 -0.15816048485392958" universe="16"/>
+    <cell id="256" fill="1" region="-260" translation="0.16555436030710213 -0.015531455219433332 0.02691614144169241" universe="27"/>
+    <cell id="257" fill="1" region="-261" translation="-0.16777897302623124 -0.015531455219433332 0.02691614144169241" universe="28"/>
+    <cell id="258" fill="1" region="-262" translation="0.152805274648522 0.18166556620660584 0.040488366683789634" universe="12"/>
+    <cell id="259" fill="1" region="-263" translation="-0.18052805868481137 0.18166556620660584 0.040488366683789634" universe="13"/>
+    <cell id="260" fill="1" region="-264" translation="0.152805274648522 -0.15166776712672753 0.040488366683789634" universe="15"/>
+    <cell id="261" fill="1" region="-265" translation="-0.18052805868481137 -0.15166776712672753 0.040488366683789634" universe="16"/>
+    <cell id="262" fill="1" region="-266" translation="0.07231116694829032 0.08785370537091952 0.09997055589943346" universe="7"/>
+    <cell id="263" fill="1" region="-267" translation="-0.10576424362412257 0.09874497232579027 -0.05820080940738992" universe="3"/>
+    <cell id="264" fill="1" region="-268" translation="0.046877953125145755 -0.059492732184222796 -0.055635341857650844" universe="4"/>
+    <cell id="265" fill="1" region="-269" translation="0.1239423066569788 0.14183046274229005 -0.06583818749209458" universe="22"/>
+    <cell id="266" fill="1" region="-270" translation="0.1239423066569788 -0.19150287059104332 -0.06583818749209458" universe="25"/>
+    <cell id="267" fill="1" region="-271" translation="0.0013087859341976982 -0.06327594480884835 -0.05382522074205143" universe="10"/>
+    <cell id="268" fill="1" region="-272" translation="0.11058883669906516 -0.038954175820645864 0.16834558789033005" universe="11"/>
+    <cell id="269" fill="1" region="-273" translation="0.11058883669906516 -0.038954175820645864 -0.16498774544300332" universe="20"/>
+    <cell id="270" fill="1" region="-274" translation="-0.02657010065724863 0.013144978841080679 0.050587944514051575" universe="24"/>
     <cell id="271" material="6" region="122 169 180 248 267" universe="3"/>
     <cell id="272" material="6" region="123 159 164 171 215 226 238 249 256 268" universe="4"/>
     <cell id="273" material="6" region="119 170 210 216 231 239" universe="5"/>
@@ -253,187 +253,187 @@
 24 25 26 
 21 22 23 </universes>
     </lattice>
-    <surface coeffs="0.0 0.0 0.0 0.02125" id="1" type="sphere"/>
-    <surface coeffs="0.0 0.0 0.0 0.03125" id="2" type="sphere"/>
-    <surface coeffs="0.0 0.0 0.0 0.03475" id="3" type="sphere"/>
-    <surface coeffs="0.0 0.0 0.0 0.03825" id="4" type="sphere"/>
-    <surface boundary="reflective" coeffs="-0.5" id="5" type="x-plane"/>
-    <surface boundary="reflective" coeffs="0.5" id="6" type="x-plane"/>
-    <surface boundary="reflective" coeffs="-0.5" id="7" type="y-plane"/>
-    <surface boundary="reflective" coeffs="0.5" id="8" type="y-plane"/>
-    <surface boundary="reflective" coeffs="-0.5" id="9" type="z-plane"/>
-    <surface boundary="reflective" coeffs="0.5" id="10" type="z-plane"/>
-    <surface coeffs="-0.0014062011817633224 -0.015257747167296776 -0.09184766966024316 0.04225" id="111" type="sphere"/>
-    <surface coeffs="0.10909902639777394 -0.004179177767328068 -0.046240930185910245 0.04225" id="112" type="sphere"/>
-    <surface coeffs="0.13878336652768952 -0.06900710536877097 -0.03848821497485455 0.04225" id="113" type="sphere"/>
-    <surface coeffs="-0.19454996680564374 -0.06900710536877097 -0.03848821497485455 0.04225" id="114" type="sphere"/>
-    <surface coeffs="-0.09846455191076986 -0.02594038069469251 -0.06155174933292362 0.04225" id="115" type="sphere"/>
-    <surface coeffs="-0.09321591784308736 -0.12248857482372477 -0.04999802384282931 0.04225" id="116" type="sphere"/>
-    <surface coeffs="0.2028198996079864 0.08501514690643278 0.07431198844628262 0.04225" id="117" type="sphere"/>
-    <surface coeffs="-0.13051343372534685 0.08501514690643278 0.07431198844628262 0.04225" id="118" type="sphere"/>
-    <surface coeffs="0.03417350410997999 -0.09641153719944834 -0.10112098092715327 0.04225" id="119" type="sphere"/>
-    <surface coeffs="0.037913118842446136 0.06870772519039314 -0.10875752039644154 0.04225" id="120" type="sphere"/>
-    <surface coeffs="0.07388008140640989 -0.07130227505402231 -0.09782982564187503 0.04225" id="121" type="sphere"/>
-    <surface coeffs="0.08897214754414112 0.08694165211410448 0.07587737301598729 0.04225" id="122" type="sphere"/>
-    <surface coeffs="-0.03698302711710488 0.1408784014909229 -0.10474284149572705 0.04225" id="123" type="sphere"/>
-    <surface coeffs="-0.03698302711710488 -0.19245493184241047 -0.10474284149572705 0.04225" id="124" type="sphere"/>
-    <surface coeffs="-0.02428069661424781 0.05168393238830282 0.1302704892646539 0.04225" id="125" type="sphere"/>
-    <surface coeffs="-0.02428069661424781 0.05168393238830282 -0.20306284406867936 0.04225" id="126" type="sphere"/>
-    <surface coeffs="0.04578051975994746 0.1175901605138544 -0.0038022862212453434 0.04225" id="127" type="sphere"/>
-    <surface coeffs="-0.013741908464450836 0.18016577553053154 0.20276897514248216 0.04225" id="128" type="sphere"/>
-    <surface coeffs="-0.013741908464450836 -0.15316755780280183 0.20276897514248216 0.04225" id="129" type="sphere"/>
-    <surface coeffs="-0.013741908464450836 0.18016577553053154 -0.1305643581908511 0.04225" id="130" type="sphere"/>
-    <surface coeffs="-0.013741908464450836 -0.15316755780280183 -0.1305643581908511 0.04225" id="131" type="sphere"/>
-    <surface coeffs="0.19334606515602848 0.066228023881572 -0.07131104153532436 0.04225" id="132" type="sphere"/>
-    <surface coeffs="-0.13998726817730478 0.066228023881572 -0.07131104153532436 0.04225" id="133" type="sphere"/>
-    <surface coeffs="-0.031185656140686913 0.155914746052082 0.15331720509241947 0.04225" id="134" type="sphere"/>
-    <surface coeffs="-0.031185656140686913 -0.17741858728125126 0.15331720509241947 0.04225" id="135" type="sphere"/>
-    <surface coeffs="-0.031185656140686913 0.155914746052082 -0.1800161282409139 0.04225" id="136" type="sphere"/>
-    <surface coeffs="-0.031185656140686913 -0.17741858728125126 -0.1800161282409139 0.04225" id="137" type="sphere"/>
-    <surface coeffs="0.08018004492442865 0.016826191928232426 -0.016389596762212966 0.04225" id="138" type="sphere"/>
-    <surface coeffs="0.00483733774062417 0.08148156718302602 -0.09280826916311341 0.04225" id="139" type="sphere"/>
-    <surface coeffs="0.0978117791120118 -0.06105974469736897 -0.07844553364014112 0.04225" id="140" type="sphere"/>
-    <surface coeffs="0.0339716094789545 0.044675266050854034 0.18588381767108564 0.04225" id="141" type="sphere"/>
-    <surface coeffs="0.0339716094789545 0.044675266050854034 -0.14744951566224762 0.04225" id="142" type="sphere"/>
-    <surface coeffs="0.15974177782488064 -0.11470938473074832 -0.055880627694202434 0.04225" id="143" type="sphere"/>
-    <surface coeffs="-0.17359155550845262 -0.11470938473074832 -0.055880627694202434 0.04225" id="144" type="sphere"/>
-    <surface coeffs="0.007714449992858363 -0.07841911930069978 0.019169121324834393 0.04225" id="145" type="sphere"/>
-    <surface coeffs="-0.09772496056025104 -0.009435582016802613 -0.0973407871549632 0.04225" id="146" type="sphere"/>
-    <surface coeffs="-0.08460405234526575 0.18619630211681182 0.10902502186367324 0.04225" id="147" type="sphere"/>
-    <surface coeffs="-0.08460405234526575 -0.14713703121652144 0.10902502186367324 0.04225" id="148" type="sphere"/>
-    <surface coeffs="0.08530970516294267 -0.09740948712101977 0.031538023054709596 0.04225" id="149" type="sphere"/>
-    <surface coeffs="0.002049400245853761 0.10800782833319489 -0.08566939881823532 0.04225" id="150" type="sphere"/>
-    <surface coeffs="0.036269774055772475 -0.0034880407315701634 0.08814057857502322 0.04225" id="151" type="sphere"/>
-    <surface coeffs="0.012607957648281654 0.08090056062626749 0.0712211465420014 0.04225" id="152" type="sphere"/>
-    <surface coeffs="-0.03741489943578313 0.1221086949309545 0.0439406213163509 0.04225" id="153" type="sphere"/>
-    <surface coeffs="0.0851566223435044 -0.1191899586548319 -0.07364696787394387 0.04225" id="154" type="sphere"/>
-    <surface coeffs="-0.03992848096555457 0.020214072912877246 -0.11315245980004196 0.04225" id="155" type="sphere"/>
-    <surface coeffs="-0.050315754084578224 0.017099968565308377 0.056173125204605934 0.04225" id="156" type="sphere"/>
-    <surface coeffs="-0.06766398274549851 -0.07303578778642877 0.005410963730880458 0.04225" id="157" type="sphere"/>
-    <surface coeffs="0.06408439016382617 0.05853632250550789 0.00432158793112436 0.04225" id="158" type="sphere"/>
-    <surface coeffs="-0.013801059755509382 0.20222454587424032 0.19241766819445416 0.04225" id="159" type="sphere"/>
-    <surface coeffs="-0.013801059755509382 -0.13110878745909305 0.19241766819445416 0.04225" id="160" type="sphere"/>
-    <surface coeffs="-0.013801059755509382 0.20222454587424032 -0.1409156651388792 0.04225" id="161" type="sphere"/>
-    <surface coeffs="-0.013801059755509382 -0.13110878745909305 -0.1409156651388792 0.04225" id="162" type="sphere"/>
-    <surface coeffs="0.03522733749799645 0.11305459403611595 0.10295023150858529 0.04225" id="163" type="sphere"/>
-    <surface coeffs="-0.03831660450870228 -0.09880556873790897 0.08578673946744877 0.04225" id="164" type="sphere"/>
-    <surface coeffs="0.03782024089160585 0.07732392719766301 -0.002829721222114334 0.04225" id="165" type="sphere"/>
-    <surface coeffs="-0.060112483234699754 -0.06134051474053648 -0.04363492058502072 0.04225" id="166" type="sphere"/>
-    <surface coeffs="0.10930502703326198 -0.020465939386398402 0.15848543253913627 0.04225" id="167" type="sphere"/>
-    <surface coeffs="0.10930502703326198 -0.020465939386398402 -0.174847900794197 0.04225" id="168" type="sphere"/>
-    <surface coeffs="-0.04821581350719811 -0.10913639479587178 -0.11108700962300094 0.04225" id="169" type="sphere"/>
-    <surface coeffs="-0.09934364058994583 0.10405480441904197 -0.0241798283786806 0.04225" id="170" type="sphere"/>
-    <surface coeffs="0.11425630804159204 0.19090246541367445 -0.06077533762167586 0.04225" id="171" type="sphere"/>
-    <surface coeffs="0.11425630804159204 -0.14243086791965892 -0.06077533762167586 0.04225" id="172" type="sphere"/>
-    <surface coeffs="0.0217205011905508 0.02506675532845576 0.029520031599966412 0.04225" id="173" type="sphere"/>
-    <surface coeffs="0.12543650024083502 0.19371057833811733 -0.04147065769319469 0.04225" id="174" type="sphere"/>
-    <surface coeffs="-0.20789683309249835 0.19371057833811733 -0.04147065769319469 0.04225" id="175" type="sphere"/>
-    <surface coeffs="0.12543650024083502 -0.13962275499521593 -0.04147065769319469 0.04225" id="176" type="sphere"/>
-    <surface coeffs="-0.20789683309249835 -0.13962275499521593 -0.04147065769319469 0.04225" id="177" type="sphere"/>
-    <surface coeffs="-0.10385697059087434 -0.07239894918409101 0.047733316833160344 0.04225" id="178" type="sphere"/>
-    <surface coeffs="-0.02484533723289073 0.03270050374260325 0.009261180540203251 0.04225" id="179" type="sphere"/>
-    <surface coeffs="-0.10535768832641407 -0.10806169784882003 0.009669056668934639 0.04225" id="180" type="sphere"/>
-    <surface coeffs="0.20034387531341857 0.02227169438582799 0.18731645229850835 0.04225" id="181" type="sphere"/>
-    <surface coeffs="-0.13298945801991469 0.02227169438582799 0.18731645229850835 0.04225" id="182" type="sphere"/>
-    <surface coeffs="0.20034387531341857 0.02227169438582799 -0.1460168810348249 0.04225" id="183" type="sphere"/>
-    <surface coeffs="-0.13298945801991469 0.02227169438582799 -0.1460168810348249 0.04225" id="184" type="sphere"/>
-    <surface coeffs="0.1631199405760454 0.04092483075648701 0.07754240264809376 0.04225" id="185" type="sphere"/>
-    <surface coeffs="-0.17021339275728786 0.04092483075648701 0.07754240264809376 0.04225" id="186" type="sphere"/>
-    <surface coeffs="0.102073447728939 -0.060687493103351975 0.01519685776716928 0.04225" id="187" type="sphere"/>
-    <surface coeffs="0.07991907014916044 0.13595762576986914 -0.09622087197472673 0.04225" id="188" type="sphere"/>
-    <surface coeffs="0.07991907014916044 -0.19737570756346412 -0.09622087197472673 0.04225" id="189" type="sphere"/>
-    <surface coeffs="0.06943697893246592 0.16968387178879557 0.11988276699391809 0.04225" id="190" type="sphere"/>
-    <surface coeffs="0.06943697893246592 -0.1636494615445378 0.11988276699391809 0.04225" id="191" type="sphere"/>
-    <surface coeffs="-0.07059889277962383 0.1489570802132021 0.09503214710980579 0.04225" id="192" type="sphere"/>
-    <surface coeffs="-0.07059889277962383 -0.18437625312013128 0.09503214710980579 0.04225" id="193" type="sphere"/>
-    <surface coeffs="0.010468267263955 0.15608028424842002 -0.00511339431390323 0.04225" id="194" type="sphere"/>
-    <surface coeffs="0.010468267263955 -0.17725304908491335 -0.00511339431390323 0.04225" id="195" type="sphere"/>
-    <surface coeffs="0.15972123417512762 0.06883522628651784 -0.11009587369358387 0.04225" id="196" type="sphere"/>
-    <surface coeffs="-0.17361209915820575 0.06883522628651784 -0.11009587369358387 0.04225" id="197" type="sphere"/>
-    <surface coeffs="0.08981179676970563 0.06434186205946246 0.032607233968534766 0.04225" id="198" type="sphere"/>
-    <surface coeffs="0.0033702311569031584 0.10040789537086448 0.1867831868031803 0.04225" id="199" type="sphere"/>
-    <surface coeffs="0.0033702311569031584 0.10040789537086448 -0.14655014653015297 0.04225" id="200" type="sphere"/>
-    <surface coeffs="0.05329895281727448 -0.02881629065525937 0.15193411713913396 0.04225" id="201" type="sphere"/>
-    <surface coeffs="0.05329895281727448 -0.02881629065525937 -0.1813992161941993 0.04225" id="202" type="sphere"/>
-    <surface coeffs="0.14663786554095865 -0.0001831711922081758 0.173437280372308 0.04225" id="203" type="sphere"/>
-    <surface coeffs="-0.18669546779237473 -0.0001831711922081758 0.173437280372308 0.04225" id="204" type="sphere"/>
-    <surface coeffs="0.14663786554095865 -0.0001831711922081758 -0.15989605296102538 0.04225" id="205" type="sphere"/>
-    <surface coeffs="-0.18669546779237473 -0.0001831711922081758 -0.15989605296102538 0.04225" id="206" type="sphere"/>
-    <surface coeffs="0.006886156712931468 0.0325721225173089 -0.10785254014381473 0.04225" id="207" type="sphere"/>
-    <surface coeffs="0.05946426530734861 0.17562994884896627 0.11256068342977466 0.04225" id="208" type="sphere"/>
-    <surface coeffs="0.05946426530734861 -0.1577033844843671 0.11256068342977466 0.04225" id="209" type="sphere"/>
-    <surface coeffs="-0.0745211393530899 0.18602539894086317 0.07061211191996841 0.04225" id="210" type="sphere"/>
-    <surface coeffs="-0.0745211393530899 -0.1473079343924702 0.07061211191996841 0.04225" id="211" type="sphere"/>
-    <surface coeffs="0.15971361633210523 -0.02416800360737892 0.062334297185282495 0.04225" id="212" type="sphere"/>
-    <surface coeffs="-0.17361971700122802 -0.02416800360737892 0.062334297185282495 0.04225" id="213" type="sphere"/>
-    <surface coeffs="-0.014191419448261688 0.11114945107218455 0.0903966514577691 0.04225" id="214" type="sphere"/>
-    <surface coeffs="0.20641337800388493 -0.04689191572037532 0.03093832014609521 0.04225" id="215" type="sphere"/>
-    <surface coeffs="-0.12691995532944833 -0.04689191572037532 0.03093832014609521 0.04225" id="216" type="sphere"/>
-    <surface coeffs="0.042925982468302815 0.0705557158479822 -0.09611246805643225 0.04225" id="217" type="sphere"/>
-    <surface coeffs="0.09174118398607445 -0.02102680816462299 -0.12074712654412828 0.04225" id="218" type="sphere"/>
-    <surface coeffs="0.1871144659776534 0.14219092895822716 0.0030395151604761805 0.04225" id="219" type="sphere"/>
-    <surface coeffs="-0.14621886735567996 0.14219092895822716 0.0030395151604761805 0.04225" id="220" type="sphere"/>
-    <surface coeffs="0.1871144659776534 -0.1911424043751062 0.0030395151604761805 0.04225" id="221" type="sphere"/>
-    <surface coeffs="-0.14621886735567996 -0.1911424043751062 0.0030395151604761805 0.04225" id="222" type="sphere"/>
-    <surface coeffs="-0.08858601205119498 -0.05740809172565153 0.0018937978357634888 0.04225" id="223" type="sphere"/>
-    <surface coeffs="-0.06956272452538859 -0.03258611645335985 0.1876749617320655 0.04225" id="224" type="sphere"/>
-    <surface coeffs="-0.06956272452538859 -0.03258611645335985 -0.14565837160126788 0.04225" id="225" type="sphere"/>
-    <surface coeffs="0.06480048668590577 0.08039356693483157 -0.0495807099830502 0.04225" id="226" type="sphere"/>
-    <surface coeffs="0.11976882848311299 0.024414887718198774 0.059001075831400684 0.04225" id="227" type="sphere"/>
-    <surface coeffs="0.055815690196973966 -0.03866224334773988 0.12934415570493119 0.04225" id="228" type="sphere"/>
-    <surface coeffs="0.055815690196973966 -0.03866224334773988 -0.20398917762840219 0.04225" id="229" type="sphere"/>
-    <surface coeffs="-0.07057140884385227 -0.033261585924167725 -0.11308117958912334 0.04225" id="230" type="sphere"/>
-    <surface coeffs="0.0191891610992464 -0.08777511864372084 0.09496767886953814 0.04225" id="231" type="sphere"/>
-    <surface coeffs="0.11357577214048964 -0.07231206070759028 -0.01862315233444045 0.04225" id="232" type="sphere"/>
-    <surface coeffs="0.028822870329182626 0.09660360434040871 -0.10994545899370212 0.04225" id="233" type="sphere"/>
-    <surface coeffs="-0.030272006016200004 0.04272149160139638 -0.11143715881676097 0.04225" id="234" type="sphere"/>
-    <surface coeffs="0.09719339210824351 0.04131007428864286 0.14476192535372884 0.04225" id="235" type="sphere"/>
-    <surface coeffs="0.09719339210824351 0.04131007428864286 -0.18857140797960453 0.04225" id="236" type="sphere"/>
-    <surface coeffs="0.1075803128789849 -0.02104725713738881 -0.03274843538002781 0.04225" id="237" type="sphere"/>
-    <surface coeffs="0.1392019576325615 -0.08814436128642017 -0.11479828495132216 0.04225" id="238" type="sphere"/>
-    <surface coeffs="-0.19413137570077177 -0.08814436128642017 -0.11479828495132216 0.04225" id="239" type="sphere"/>
-    <surface coeffs="0.10847197677361597 0.1461592302081176 0.08841042383901798 0.04225" id="240" type="sphere"/>
-    <surface coeffs="0.10847197677361597 -0.18717410312521576 0.08841042383901798 0.04225" id="241" type="sphere"/>
-    <surface coeffs="0.045127058382085194 0.0967807216119615 0.0967653665331849 0.04225" id="242" type="sphere"/>
-    <surface coeffs="-0.022464471745497094 0.07259277205138148 0.10785219865057927 0.04225" id="243" type="sphere"/>
-    <surface coeffs="0.10606353369903221 0.03928703229725711 0.17228776926768086 0.04225" id="244" type="sphere"/>
-    <surface coeffs="0.10606353369903221 0.03928703229725711 -0.1610455640656524 0.04225" id="245" type="sphere"/>
-    <surface coeffs="0.14815941963538226 0.11277655887534538 0.03808687169681996 0.04225" id="246" type="sphere"/>
-    <surface coeffs="-0.185173913697951 0.11277655887534538 0.03808687169681996 0.04225" id="247" type="sphere"/>
-    <surface coeffs="0.15693581669068946 0.10114531834923532 -0.04992356195780889 0.04225" id="248" type="sphere"/>
-    <surface coeffs="-0.17639751664264391 0.10114531834923532 -0.04992356195780889 0.04225" id="249" type="sphere"/>
-    <surface coeffs="0.13264357875679378 0.10919805128102966 -0.04769549879176793 0.04225" id="250" type="sphere"/>
-    <surface coeffs="-0.2006897545765396 0.10919805128102966 -0.04769549879176793 0.04225" id="251" type="sphere"/>
-    <surface coeffs="0.13916564434634993 0.13134319648704007 0.07015912178562622 0.04225" id="252" type="sphere"/>
-    <surface coeffs="-0.19416768898698333 0.13134319648704007 0.07015912178562622 0.04225" id="253" type="sphere"/>
-    <surface coeffs="0.13916564434634993 -0.2019901368462932 0.07015912178562622 0.04225" id="254" type="sphere"/>
-    <surface coeffs="-0.19416768898698333 -0.2019901368462932 0.07015912178562622 0.04225" id="255" type="sphere"/>
-    <surface coeffs="-0.10026688643231585 0.1564443552698941 0.1751728484794038 0.04225" id="256" type="sphere"/>
-    <surface coeffs="-0.10026688643231585 -0.17688897806343928 0.1751728484794038 0.04225" id="257" type="sphere"/>
-    <surface coeffs="-0.10026688643231585 0.1564443552698941 -0.15816048485392958 0.04225" id="258" type="sphere"/>
-    <surface coeffs="-0.10026688643231585 -0.17688897806343928 -0.15816048485392958 0.04225" id="259" type="sphere"/>
-    <surface coeffs="0.16555436030710213 -0.015531455219433332 0.02691614144169241 0.04225" id="260" type="sphere"/>
-    <surface coeffs="-0.16777897302623124 -0.015531455219433332 0.02691614144169241 0.04225" id="261" type="sphere"/>
-    <surface coeffs="0.152805274648522 0.18166556620660584 0.040488366683789634 0.04225" id="262" type="sphere"/>
-    <surface coeffs="-0.18052805868481137 0.18166556620660584 0.040488366683789634 0.04225" id="263" type="sphere"/>
-    <surface coeffs="0.152805274648522 -0.15166776712672753 0.040488366683789634 0.04225" id="264" type="sphere"/>
-    <surface coeffs="-0.18052805868481137 -0.15166776712672753 0.040488366683789634 0.04225" id="265" type="sphere"/>
-    <surface coeffs="0.07231116694829032 0.08785370537091952 0.09997055589943346 0.04225" id="266" type="sphere"/>
-    <surface coeffs="-0.10576424362412257 0.09874497232579027 -0.05820080940738992 0.04225" id="267" type="sphere"/>
-    <surface coeffs="0.046877953125145755 -0.059492732184222796 -0.055635341857650844 0.04225" id="268" type="sphere"/>
-    <surface coeffs="0.1239423066569788 0.14183046274229005 -0.06583818749209458 0.04225" id="269" type="sphere"/>
-    <surface coeffs="0.1239423066569788 -0.19150287059104332 -0.06583818749209458 0.04225" id="270" type="sphere"/>
-    <surface coeffs="0.0013087859341976982 -0.06327594480884835 -0.05382522074205143 0.04225" id="271" type="sphere"/>
-    <surface coeffs="0.11058883669906516 -0.038954175820645864 0.16834558789033005 0.04225" id="272" type="sphere"/>
-    <surface coeffs="0.11058883669906516 -0.038954175820645864 -0.16498774544300332 0.04225" id="273" type="sphere"/>
-    <surface coeffs="-0.02657010065724863 0.013144978841080679 0.050587944514051575 0.04225" id="274" type="sphere"/>
+    <surface id="1" type="sphere" coeffs="0.0 0.0 0.0 0.02125"/>
+    <surface id="2" type="sphere" coeffs="0.0 0.0 0.0 0.03125"/>
+    <surface id="3" type="sphere" coeffs="0.0 0.0 0.0 0.03475"/>
+    <surface id="4" type="sphere" coeffs="0.0 0.0 0.0 0.03825"/>
+    <surface id="5" type="x-plane" boundary="reflective" coeffs="-0.5"/>
+    <surface id="6" type="x-plane" boundary="reflective" coeffs="0.5"/>
+    <surface id="7" type="y-plane" boundary="reflective" coeffs="-0.5"/>
+    <surface id="8" type="y-plane" boundary="reflective" coeffs="0.5"/>
+    <surface id="9" type="z-plane" boundary="reflective" coeffs="-0.5"/>
+    <surface id="10" type="z-plane" boundary="reflective" coeffs="0.5"/>
+    <surface id="111" type="sphere" coeffs="-0.0014062011817633224 -0.015257747167296776 -0.09184766966024316 0.04225"/>
+    <surface id="112" type="sphere" coeffs="0.10909902639777394 -0.004179177767328068 -0.046240930185910245 0.04225"/>
+    <surface id="113" type="sphere" coeffs="0.13878336652768952 -0.06900710536877097 -0.03848821497485455 0.04225"/>
+    <surface id="114" type="sphere" coeffs="-0.19454996680564374 -0.06900710536877097 -0.03848821497485455 0.04225"/>
+    <surface id="115" type="sphere" coeffs="-0.09846455191076986 -0.02594038069469251 -0.06155174933292362 0.04225"/>
+    <surface id="116" type="sphere" coeffs="-0.09321591784308736 -0.12248857482372477 -0.04999802384282931 0.04225"/>
+    <surface id="117" type="sphere" coeffs="0.2028198996079864 0.08501514690643278 0.07431198844628262 0.04225"/>
+    <surface id="118" type="sphere" coeffs="-0.13051343372534685 0.08501514690643278 0.07431198844628262 0.04225"/>
+    <surface id="119" type="sphere" coeffs="0.03417350410997999 -0.09641153719944834 -0.10112098092715327 0.04225"/>
+    <surface id="120" type="sphere" coeffs="0.037913118842446136 0.06870772519039314 -0.10875752039644154 0.04225"/>
+    <surface id="121" type="sphere" coeffs="0.07388008140640989 -0.07130227505402231 -0.09782982564187503 0.04225"/>
+    <surface id="122" type="sphere" coeffs="0.08897214754414112 0.08694165211410448 0.07587737301598729 0.04225"/>
+    <surface id="123" type="sphere" coeffs="-0.03698302711710488 0.1408784014909229 -0.10474284149572705 0.04225"/>
+    <surface id="124" type="sphere" coeffs="-0.03698302711710488 -0.19245493184241047 -0.10474284149572705 0.04225"/>
+    <surface id="125" type="sphere" coeffs="-0.02428069661424781 0.05168393238830282 0.1302704892646539 0.04225"/>
+    <surface id="126" type="sphere" coeffs="-0.02428069661424781 0.05168393238830282 -0.20306284406867936 0.04225"/>
+    <surface id="127" type="sphere" coeffs="0.04578051975994746 0.1175901605138544 -0.0038022862212453434 0.04225"/>
+    <surface id="128" type="sphere" coeffs="-0.013741908464450836 0.18016577553053154 0.20276897514248216 0.04225"/>
+    <surface id="129" type="sphere" coeffs="-0.013741908464450836 -0.15316755780280183 0.20276897514248216 0.04225"/>
+    <surface id="130" type="sphere" coeffs="-0.013741908464450836 0.18016577553053154 -0.1305643581908511 0.04225"/>
+    <surface id="131" type="sphere" coeffs="-0.013741908464450836 -0.15316755780280183 -0.1305643581908511 0.04225"/>
+    <surface id="132" type="sphere" coeffs="0.19334606515602848 0.066228023881572 -0.07131104153532436 0.04225"/>
+    <surface id="133" type="sphere" coeffs="-0.13998726817730478 0.066228023881572 -0.07131104153532436 0.04225"/>
+    <surface id="134" type="sphere" coeffs="-0.031185656140686913 0.155914746052082 0.15331720509241947 0.04225"/>
+    <surface id="135" type="sphere" coeffs="-0.031185656140686913 -0.17741858728125126 0.15331720509241947 0.04225"/>
+    <surface id="136" type="sphere" coeffs="-0.031185656140686913 0.155914746052082 -0.1800161282409139 0.04225"/>
+    <surface id="137" type="sphere" coeffs="-0.031185656140686913 -0.17741858728125126 -0.1800161282409139 0.04225"/>
+    <surface id="138" type="sphere" coeffs="0.08018004492442865 0.016826191928232426 -0.016389596762212966 0.04225"/>
+    <surface id="139" type="sphere" coeffs="0.00483733774062417 0.08148156718302602 -0.09280826916311341 0.04225"/>
+    <surface id="140" type="sphere" coeffs="0.0978117791120118 -0.06105974469736897 -0.07844553364014112 0.04225"/>
+    <surface id="141" type="sphere" coeffs="0.0339716094789545 0.044675266050854034 0.18588381767108564 0.04225"/>
+    <surface id="142" type="sphere" coeffs="0.0339716094789545 0.044675266050854034 -0.14744951566224762 0.04225"/>
+    <surface id="143" type="sphere" coeffs="0.15974177782488064 -0.11470938473074832 -0.055880627694202434 0.04225"/>
+    <surface id="144" type="sphere" coeffs="-0.17359155550845262 -0.11470938473074832 -0.055880627694202434 0.04225"/>
+    <surface id="145" type="sphere" coeffs="0.007714449992858363 -0.07841911930069978 0.019169121324834393 0.04225"/>
+    <surface id="146" type="sphere" coeffs="-0.09772496056025104 -0.009435582016802613 -0.0973407871549632 0.04225"/>
+    <surface id="147" type="sphere" coeffs="-0.08460405234526575 0.18619630211681182 0.10902502186367324 0.04225"/>
+    <surface id="148" type="sphere" coeffs="-0.08460405234526575 -0.14713703121652144 0.10902502186367324 0.04225"/>
+    <surface id="149" type="sphere" coeffs="0.08530970516294267 -0.09740948712101977 0.031538023054709596 0.04225"/>
+    <surface id="150" type="sphere" coeffs="0.002049400245853761 0.10800782833319489 -0.08566939881823532 0.04225"/>
+    <surface id="151" type="sphere" coeffs="0.036269774055772475 -0.0034880407315701634 0.08814057857502322 0.04225"/>
+    <surface id="152" type="sphere" coeffs="0.012607957648281654 0.08090056062626749 0.0712211465420014 0.04225"/>
+    <surface id="153" type="sphere" coeffs="-0.03741489943578313 0.1221086949309545 0.0439406213163509 0.04225"/>
+    <surface id="154" type="sphere" coeffs="0.0851566223435044 -0.1191899586548319 -0.07364696787394387 0.04225"/>
+    <surface id="155" type="sphere" coeffs="-0.03992848096555457 0.020214072912877246 -0.11315245980004196 0.04225"/>
+    <surface id="156" type="sphere" coeffs="-0.050315754084578224 0.017099968565308377 0.056173125204605934 0.04225"/>
+    <surface id="157" type="sphere" coeffs="-0.06766398274549851 -0.07303578778642877 0.005410963730880458 0.04225"/>
+    <surface id="158" type="sphere" coeffs="0.06408439016382617 0.05853632250550789 0.00432158793112436 0.04225"/>
+    <surface id="159" type="sphere" coeffs="-0.013801059755509382 0.20222454587424032 0.19241766819445416 0.04225"/>
+    <surface id="160" type="sphere" coeffs="-0.013801059755509382 -0.13110878745909305 0.19241766819445416 0.04225"/>
+    <surface id="161" type="sphere" coeffs="-0.013801059755509382 0.20222454587424032 -0.1409156651388792 0.04225"/>
+    <surface id="162" type="sphere" coeffs="-0.013801059755509382 -0.13110878745909305 -0.1409156651388792 0.04225"/>
+    <surface id="163" type="sphere" coeffs="0.03522733749799645 0.11305459403611595 0.10295023150858529 0.04225"/>
+    <surface id="164" type="sphere" coeffs="-0.03831660450870228 -0.09880556873790897 0.08578673946744877 0.04225"/>
+    <surface id="165" type="sphere" coeffs="0.03782024089160585 0.07732392719766301 -0.002829721222114334 0.04225"/>
+    <surface id="166" type="sphere" coeffs="-0.060112483234699754 -0.06134051474053648 -0.04363492058502072 0.04225"/>
+    <surface id="167" type="sphere" coeffs="0.10930502703326198 -0.020465939386398402 0.15848543253913627 0.04225"/>
+    <surface id="168" type="sphere" coeffs="0.10930502703326198 -0.020465939386398402 -0.174847900794197 0.04225"/>
+    <surface id="169" type="sphere" coeffs="-0.04821581350719811 -0.10913639479587178 -0.11108700962300094 0.04225"/>
+    <surface id="170" type="sphere" coeffs="-0.09934364058994583 0.10405480441904197 -0.0241798283786806 0.04225"/>
+    <surface id="171" type="sphere" coeffs="0.11425630804159204 0.19090246541367445 -0.06077533762167586 0.04225"/>
+    <surface id="172" type="sphere" coeffs="0.11425630804159204 -0.14243086791965892 -0.06077533762167586 0.04225"/>
+    <surface id="173" type="sphere" coeffs="0.0217205011905508 0.02506675532845576 0.029520031599966412 0.04225"/>
+    <surface id="174" type="sphere" coeffs="0.12543650024083502 0.19371057833811733 -0.04147065769319469 0.04225"/>
+    <surface id="175" type="sphere" coeffs="-0.20789683309249835 0.19371057833811733 -0.04147065769319469 0.04225"/>
+    <surface id="176" type="sphere" coeffs="0.12543650024083502 -0.13962275499521593 -0.04147065769319469 0.04225"/>
+    <surface id="177" type="sphere" coeffs="-0.20789683309249835 -0.13962275499521593 -0.04147065769319469 0.04225"/>
+    <surface id="178" type="sphere" coeffs="-0.10385697059087434 -0.07239894918409101 0.047733316833160344 0.04225"/>
+    <surface id="179" type="sphere" coeffs="-0.02484533723289073 0.03270050374260325 0.009261180540203251 0.04225"/>
+    <surface id="180" type="sphere" coeffs="-0.10535768832641407 -0.10806169784882003 0.009669056668934639 0.04225"/>
+    <surface id="181" type="sphere" coeffs="0.20034387531341857 0.02227169438582799 0.18731645229850835 0.04225"/>
+    <surface id="182" type="sphere" coeffs="-0.13298945801991469 0.02227169438582799 0.18731645229850835 0.04225"/>
+    <surface id="183" type="sphere" coeffs="0.20034387531341857 0.02227169438582799 -0.1460168810348249 0.04225"/>
+    <surface id="184" type="sphere" coeffs="-0.13298945801991469 0.02227169438582799 -0.1460168810348249 0.04225"/>
+    <surface id="185" type="sphere" coeffs="0.1631199405760454 0.04092483075648701 0.07754240264809376 0.04225"/>
+    <surface id="186" type="sphere" coeffs="-0.17021339275728786 0.04092483075648701 0.07754240264809376 0.04225"/>
+    <surface id="187" type="sphere" coeffs="0.102073447728939 -0.060687493103351975 0.01519685776716928 0.04225"/>
+    <surface id="188" type="sphere" coeffs="0.07991907014916044 0.13595762576986914 -0.09622087197472673 0.04225"/>
+    <surface id="189" type="sphere" coeffs="0.07991907014916044 -0.19737570756346412 -0.09622087197472673 0.04225"/>
+    <surface id="190" type="sphere" coeffs="0.06943697893246592 0.16968387178879557 0.11988276699391809 0.04225"/>
+    <surface id="191" type="sphere" coeffs="0.06943697893246592 -0.1636494615445378 0.11988276699391809 0.04225"/>
+    <surface id="192" type="sphere" coeffs="-0.07059889277962383 0.1489570802132021 0.09503214710980579 0.04225"/>
+    <surface id="193" type="sphere" coeffs="-0.07059889277962383 -0.18437625312013128 0.09503214710980579 0.04225"/>
+    <surface id="194" type="sphere" coeffs="0.010468267263955 0.15608028424842002 -0.00511339431390323 0.04225"/>
+    <surface id="195" type="sphere" coeffs="0.010468267263955 -0.17725304908491335 -0.00511339431390323 0.04225"/>
+    <surface id="196" type="sphere" coeffs="0.15972123417512762 0.06883522628651784 -0.11009587369358387 0.04225"/>
+    <surface id="197" type="sphere" coeffs="-0.17361209915820575 0.06883522628651784 -0.11009587369358387 0.04225"/>
+    <surface id="198" type="sphere" coeffs="0.08981179676970563 0.06434186205946246 0.032607233968534766 0.04225"/>
+    <surface id="199" type="sphere" coeffs="0.0033702311569031584 0.10040789537086448 0.1867831868031803 0.04225"/>
+    <surface id="200" type="sphere" coeffs="0.0033702311569031584 0.10040789537086448 -0.14655014653015297 0.04225"/>
+    <surface id="201" type="sphere" coeffs="0.05329895281727448 -0.02881629065525937 0.15193411713913396 0.04225"/>
+    <surface id="202" type="sphere" coeffs="0.05329895281727448 -0.02881629065525937 -0.1813992161941993 0.04225"/>
+    <surface id="203" type="sphere" coeffs="0.14663786554095865 -0.0001831711922081758 0.173437280372308 0.04225"/>
+    <surface id="204" type="sphere" coeffs="-0.18669546779237473 -0.0001831711922081758 0.173437280372308 0.04225"/>
+    <surface id="205" type="sphere" coeffs="0.14663786554095865 -0.0001831711922081758 -0.15989605296102538 0.04225"/>
+    <surface id="206" type="sphere" coeffs="-0.18669546779237473 -0.0001831711922081758 -0.15989605296102538 0.04225"/>
+    <surface id="207" type="sphere" coeffs="0.006886156712931468 0.0325721225173089 -0.10785254014381473 0.04225"/>
+    <surface id="208" type="sphere" coeffs="0.05946426530734861 0.17562994884896627 0.11256068342977466 0.04225"/>
+    <surface id="209" type="sphere" coeffs="0.05946426530734861 -0.1577033844843671 0.11256068342977466 0.04225"/>
+    <surface id="210" type="sphere" coeffs="-0.0745211393530899 0.18602539894086317 0.07061211191996841 0.04225"/>
+    <surface id="211" type="sphere" coeffs="-0.0745211393530899 -0.1473079343924702 0.07061211191996841 0.04225"/>
+    <surface id="212" type="sphere" coeffs="0.15971361633210523 -0.02416800360737892 0.062334297185282495 0.04225"/>
+    <surface id="213" type="sphere" coeffs="-0.17361971700122802 -0.02416800360737892 0.062334297185282495 0.04225"/>
+    <surface id="214" type="sphere" coeffs="-0.014191419448261688 0.11114945107218455 0.0903966514577691 0.04225"/>
+    <surface id="215" type="sphere" coeffs="0.20641337800388493 -0.04689191572037532 0.03093832014609521 0.04225"/>
+    <surface id="216" type="sphere" coeffs="-0.12691995532944833 -0.04689191572037532 0.03093832014609521 0.04225"/>
+    <surface id="217" type="sphere" coeffs="0.042925982468302815 0.0705557158479822 -0.09611246805643225 0.04225"/>
+    <surface id="218" type="sphere" coeffs="0.09174118398607445 -0.02102680816462299 -0.12074712654412828 0.04225"/>
+    <surface id="219" type="sphere" coeffs="0.1871144659776534 0.14219092895822716 0.0030395151604761805 0.04225"/>
+    <surface id="220" type="sphere" coeffs="-0.14621886735567996 0.14219092895822716 0.0030395151604761805 0.04225"/>
+    <surface id="221" type="sphere" coeffs="0.1871144659776534 -0.1911424043751062 0.0030395151604761805 0.04225"/>
+    <surface id="222" type="sphere" coeffs="-0.14621886735567996 -0.1911424043751062 0.0030395151604761805 0.04225"/>
+    <surface id="223" type="sphere" coeffs="-0.08858601205119498 -0.05740809172565153 0.0018937978357634888 0.04225"/>
+    <surface id="224" type="sphere" coeffs="-0.06956272452538859 -0.03258611645335985 0.1876749617320655 0.04225"/>
+    <surface id="225" type="sphere" coeffs="-0.06956272452538859 -0.03258611645335985 -0.14565837160126788 0.04225"/>
+    <surface id="226" type="sphere" coeffs="0.06480048668590577 0.08039356693483157 -0.0495807099830502 0.04225"/>
+    <surface id="227" type="sphere" coeffs="0.11976882848311299 0.024414887718198774 0.059001075831400684 0.04225"/>
+    <surface id="228" type="sphere" coeffs="0.055815690196973966 -0.03866224334773988 0.12934415570493119 0.04225"/>
+    <surface id="229" type="sphere" coeffs="0.055815690196973966 -0.03866224334773988 -0.20398917762840219 0.04225"/>
+    <surface id="230" type="sphere" coeffs="-0.07057140884385227 -0.033261585924167725 -0.11308117958912334 0.04225"/>
+    <surface id="231" type="sphere" coeffs="0.0191891610992464 -0.08777511864372084 0.09496767886953814 0.04225"/>
+    <surface id="232" type="sphere" coeffs="0.11357577214048964 -0.07231206070759028 -0.01862315233444045 0.04225"/>
+    <surface id="233" type="sphere" coeffs="0.028822870329182626 0.09660360434040871 -0.10994545899370212 0.04225"/>
+    <surface id="234" type="sphere" coeffs="-0.030272006016200004 0.04272149160139638 -0.11143715881676097 0.04225"/>
+    <surface id="235" type="sphere" coeffs="0.09719339210824351 0.04131007428864286 0.14476192535372884 0.04225"/>
+    <surface id="236" type="sphere" coeffs="0.09719339210824351 0.04131007428864286 -0.18857140797960453 0.04225"/>
+    <surface id="237" type="sphere" coeffs="0.1075803128789849 -0.02104725713738881 -0.03274843538002781 0.04225"/>
+    <surface id="238" type="sphere" coeffs="0.1392019576325615 -0.08814436128642017 -0.11479828495132216 0.04225"/>
+    <surface id="239" type="sphere" coeffs="-0.19413137570077177 -0.08814436128642017 -0.11479828495132216 0.04225"/>
+    <surface id="240" type="sphere" coeffs="0.10847197677361597 0.1461592302081176 0.08841042383901798 0.04225"/>
+    <surface id="241" type="sphere" coeffs="0.10847197677361597 -0.18717410312521576 0.08841042383901798 0.04225"/>
+    <surface id="242" type="sphere" coeffs="0.045127058382085194 0.0967807216119615 0.0967653665331849 0.04225"/>
+    <surface id="243" type="sphere" coeffs="-0.022464471745497094 0.07259277205138148 0.10785219865057927 0.04225"/>
+    <surface id="244" type="sphere" coeffs="0.10606353369903221 0.03928703229725711 0.17228776926768086 0.04225"/>
+    <surface id="245" type="sphere" coeffs="0.10606353369903221 0.03928703229725711 -0.1610455640656524 0.04225"/>
+    <surface id="246" type="sphere" coeffs="0.14815941963538226 0.11277655887534538 0.03808687169681996 0.04225"/>
+    <surface id="247" type="sphere" coeffs="-0.185173913697951 0.11277655887534538 0.03808687169681996 0.04225"/>
+    <surface id="248" type="sphere" coeffs="0.15693581669068946 0.10114531834923532 -0.04992356195780889 0.04225"/>
+    <surface id="249" type="sphere" coeffs="-0.17639751664264391 0.10114531834923532 -0.04992356195780889 0.04225"/>
+    <surface id="250" type="sphere" coeffs="0.13264357875679378 0.10919805128102966 -0.04769549879176793 0.04225"/>
+    <surface id="251" type="sphere" coeffs="-0.2006897545765396 0.10919805128102966 -0.04769549879176793 0.04225"/>
+    <surface id="252" type="sphere" coeffs="0.13916564434634993 0.13134319648704007 0.07015912178562622 0.04225"/>
+    <surface id="253" type="sphere" coeffs="-0.19416768898698333 0.13134319648704007 0.07015912178562622 0.04225"/>
+    <surface id="254" type="sphere" coeffs="0.13916564434634993 -0.2019901368462932 0.07015912178562622 0.04225"/>
+    <surface id="255" type="sphere" coeffs="-0.19416768898698333 -0.2019901368462932 0.07015912178562622 0.04225"/>
+    <surface id="256" type="sphere" coeffs="-0.10026688643231585 0.1564443552698941 0.1751728484794038 0.04225"/>
+    <surface id="257" type="sphere" coeffs="-0.10026688643231585 -0.17688897806343928 0.1751728484794038 0.04225"/>
+    <surface id="258" type="sphere" coeffs="-0.10026688643231585 0.1564443552698941 -0.15816048485392958 0.04225"/>
+    <surface id="259" type="sphere" coeffs="-0.10026688643231585 -0.17688897806343928 -0.15816048485392958 0.04225"/>
+    <surface id="260" type="sphere" coeffs="0.16555436030710213 -0.015531455219433332 0.02691614144169241 0.04225"/>
+    <surface id="261" type="sphere" coeffs="-0.16777897302623124 -0.015531455219433332 0.02691614144169241 0.04225"/>
+    <surface id="262" type="sphere" coeffs="0.152805274648522 0.18166556620660584 0.040488366683789634 0.04225"/>
+    <surface id="263" type="sphere" coeffs="-0.18052805868481137 0.18166556620660584 0.040488366683789634 0.04225"/>
+    <surface id="264" type="sphere" coeffs="0.152805274648522 -0.15166776712672753 0.040488366683789634 0.04225"/>
+    <surface id="265" type="sphere" coeffs="-0.18052805868481137 -0.15166776712672753 0.040488366683789634 0.04225"/>
+    <surface id="266" type="sphere" coeffs="0.07231116694829032 0.08785370537091952 0.09997055589943346 0.04225"/>
+    <surface id="267" type="sphere" coeffs="-0.10576424362412257 0.09874497232579027 -0.05820080940738992 0.04225"/>
+    <surface id="268" type="sphere" coeffs="0.046877953125145755 -0.059492732184222796 -0.055635341857650844 0.04225"/>
+    <surface id="269" type="sphere" coeffs="0.1239423066569788 0.14183046274229005 -0.06583818749209458 0.04225"/>
+    <surface id="270" type="sphere" coeffs="0.1239423066569788 -0.19150287059104332 -0.06583818749209458 0.04225"/>
+    <surface id="271" type="sphere" coeffs="0.0013087859341976982 -0.06327594480884835 -0.05382522074205143 0.04225"/>
+    <surface id="272" type="sphere" coeffs="0.11058883669906516 -0.038954175820645864 0.16834558789033005 0.04225"/>
+    <surface id="273" type="sphere" coeffs="0.11058883669906516 -0.038954175820645864 -0.16498774544300332 0.04225"/>
+    <surface id="274" type="sphere" coeffs="-0.02657010065724863 0.013144978841080679 0.050587944514051575 0.04225"/>
   </geometry>
   <settings>
     <run_mode>eigenvalue</run_mode>
     <particles>100</particles>
     <batches>4</batches>
     <inactive>0</inactive>
-    <source particle="neutron" strength="1.0" type="independent">
+    <source type="independent" strength="1.0" particle="neutron">
       <space type="point">
         <parameters>0.0 0.0 0.0</parameters>
       </space>
diff --git a/tests/regression_tests/unstructured_mesh/inputs_true.dat b/tests/regression_tests/unstructured_mesh/inputs_true.dat
index 07486d3e0..e7a485b4d 100644
--- a/tests/regression_tests/unstructured_mesh/inputs_true.dat
+++ b/tests/regression_tests/unstructured_mesh/inputs_true.dat
@@ -1,54 +1,54 @@
 <?xml version='1.0' encoding='utf-8'?>
 <model>
   <materials>
-    <material depletable="true" id="1" name="fuel">
-      <density units="g/cc" value="4.5"/>
-      <nuclide ao="1.0" name="U235"/>
+    <material id="1" name="fuel" depletable="true">
+      <density value="4.5" units="g/cc"/>
+      <nuclide name="U235" ao="1.0"/>
     </material>
     <material id="2" name="zircaloy">
-      <density units="g/cc" value="5.77"/>
-      <nuclide ao="0.5145" name="Zr90"/>
-      <nuclide ao="0.1122" name="Zr91"/>
-      <nuclide ao="0.1715" name="Zr92"/>
-      <nuclide ao="0.1738" name="Zr94"/>
-      <nuclide ao="0.028" name="Zr96"/>
+      <density value="5.77" units="g/cc"/>
+      <nuclide name="Zr90" ao="0.5145"/>
+      <nuclide name="Zr91" ao="0.1122"/>
+      <nuclide name="Zr92" ao="0.1715"/>
+      <nuclide name="Zr94" ao="0.1738"/>
+      <nuclide name="Zr96" ao="0.028"/>
     </material>
     <material id="3" name="water">
-      <density units="atom/b-cm" value="0.07416"/>
-      <nuclide ao="2.0" name="H1"/>
-      <nuclide ao="1.0" name="O16"/>
+      <density value="0.07416" units="atom/b-cm"/>
+      <nuclide name="H1" ao="2.0"/>
+      <nuclide name="O16" ao="1.0"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="1" name="fuel" region="1 -2 3 -4 5 -6" universe="1"/>
-    <cell id="2" material="2" name="clad" region="(-1 | 2 | -3 | 4 | -5 | 6) (7 -8 9 -10 11 -12)" universe="1"/>
-    <cell id="3" material="3" name="water" region="(-7 | 8 | -9 | 10 | -11 | 12) (13 -14 15 -16 17 -18)" universe="1"/>
-    <surface coeffs="-5.0" id="1" name="minimum x" type="x-plane"/>
-    <surface coeffs="5.0" id="2" name="maximum x" type="x-plane"/>
-    <surface coeffs="-5.0" id="3" name="minimum y" type="y-plane"/>
-    <surface coeffs="5.0" id="4" name="maximum y" type="y-plane"/>
-    <surface coeffs="-5.0" id="5" name="minimum z" type="z-plane"/>
-    <surface coeffs="5.0" id="6" name="maximum z" type="z-plane"/>
-    <surface coeffs="-6.0" id="7" name="minimum x" type="x-plane"/>
-    <surface coeffs="6.0" id="8" name="maximum x" type="x-plane"/>
-    <surface coeffs="-6.0" id="9" name="minimum y" type="y-plane"/>
-    <surface coeffs="6.0" id="10" name="maximum y" type="y-plane"/>
-    <surface coeffs="-6.0" id="11" name="minimum z" type="z-plane"/>
-    <surface coeffs="6.0" id="12" name="maximum z" type="z-plane"/>
-    <surface boundary="vacuum" coeffs="-10.0" id="13" name="minimum x" type="x-plane"/>
-    <surface boundary="vacuum" coeffs="10.0" id="14" name="maximum x" type="x-plane"/>
-    <surface boundary="vacuum" coeffs="-10.0" id="15" name="minimum y" type="y-plane"/>
-    <surface boundary="vacuum" coeffs="10.0" id="16" name="maximum y" type="y-plane"/>
-    <surface boundary="vacuum" coeffs="-10.0" id="17" name="minimum z" type="z-plane"/>
-    <surface boundary="vacuum" coeffs="10.0" id="18" name="maximum z" type="z-plane"/>
+    <cell id="1" name="fuel" material="1" region="1 -2 3 -4 5 -6" universe="1"/>
+    <cell id="2" name="clad" material="2" region="(-1 | 2 | -3 | 4 | -5 | 6) (7 -8 9 -10 11 -12)" universe="1"/>
+    <cell id="3" name="water" material="3" region="(-7 | 8 | -9 | 10 | -11 | 12) (13 -14 15 -16 17 -18)" universe="1"/>
+    <surface id="1" name="minimum x" type="x-plane" coeffs="-5.0"/>
+    <surface id="2" name="maximum x" type="x-plane" coeffs="5.0"/>
+    <surface id="3" name="minimum y" type="y-plane" coeffs="-5.0"/>
+    <surface id="4" name="maximum y" type="y-plane" coeffs="5.0"/>
+    <surface id="5" name="minimum z" type="z-plane" coeffs="-5.0"/>
+    <surface id="6" name="maximum z" type="z-plane" coeffs="5.0"/>
+    <surface id="7" name="minimum x" type="x-plane" coeffs="-6.0"/>
+    <surface id="8" name="maximum x" type="x-plane" coeffs="6.0"/>
+    <surface id="9" name="minimum y" type="y-plane" coeffs="-6.0"/>
+    <surface id="10" name="maximum y" type="y-plane" coeffs="6.0"/>
+    <surface id="11" name="minimum z" type="z-plane" coeffs="-6.0"/>
+    <surface id="12" name="maximum z" type="z-plane" coeffs="6.0"/>
+    <surface id="13" name="minimum x" type="x-plane" boundary="vacuum" coeffs="-10.0"/>
+    <surface id="14" name="maximum x" type="x-plane" boundary="vacuum" coeffs="10.0"/>
+    <surface id="15" name="minimum y" type="y-plane" boundary="vacuum" coeffs="-10.0"/>
+    <surface id="16" name="maximum y" type="y-plane" boundary="vacuum" coeffs="10.0"/>
+    <surface id="17" name="minimum z" type="z-plane" boundary="vacuum" coeffs="-10.0"/>
+    <surface id="18" name="maximum z" type="z-plane" boundary="vacuum" coeffs="10.0"/>
   </geometry>
   <settings>
     <run_mode>fixed source</run_mode>
     <particles>1000</particles>
     <batches>10</batches>
-    <source particle="neutron" strength="1.0" type="independent">
-      <space origin="0.0 0.0 0.0" type="spherical">
-        <r parameters="0.0 0.0" type="uniform"/>
+    <source type="independent" strength="1.0" particle="neutron">
+      <space type="spherical" origin="0.0 0.0 0.0">
+        <r type="uniform" parameters="0.0 0.0"/>
         <cos_theta type="discrete">
           <parameters>1.0 1.0</parameters>
         </cos_theta>
@@ -67,7 +67,7 @@
       <lower_left>-10.0 -10.0 -10.0</lower_left>
       <upper_right>10.0 10.0 10.0</upper_right>
     </mesh>
-    <mesh id="2" library="libmesh" type="unstructured">
+    <mesh id="2" type="unstructured" library="libmesh">
       <filename>test_mesh_hexes.e</filename>
     </mesh>
     <filter id="1" type="mesh">
diff --git a/tests/regression_tests/unstructured_mesh/inputs_true0.dat b/tests/regression_tests/unstructured_mesh/inputs_true0.dat
index c6b28d890..2508c25b3 100644
--- a/tests/regression_tests/unstructured_mesh/inputs_true0.dat
+++ b/tests/regression_tests/unstructured_mesh/inputs_true0.dat
@@ -1,54 +1,54 @@
 <?xml version='1.0' encoding='utf-8'?>
 <model>
   <materials>
-    <material depletable="true" id="1" name="fuel">
-      <density units="g/cc" value="4.5"/>
-      <nuclide ao="1.0" name="U235"/>
+    <material id="1" name="fuel" depletable="true">
+      <density value="4.5" units="g/cc"/>
+      <nuclide name="U235" ao="1.0"/>
     </material>
     <material id="2" name="zircaloy">
-      <density units="g/cc" value="5.77"/>
-      <nuclide ao="0.5145" name="Zr90"/>
-      <nuclide ao="0.1122" name="Zr91"/>
-      <nuclide ao="0.1715" name="Zr92"/>
-      <nuclide ao="0.1738" name="Zr94"/>
-      <nuclide ao="0.028" name="Zr96"/>
+      <density value="5.77" units="g/cc"/>
+      <nuclide name="Zr90" ao="0.5145"/>
+      <nuclide name="Zr91" ao="0.1122"/>
+      <nuclide name="Zr92" ao="0.1715"/>
+      <nuclide name="Zr94" ao="0.1738"/>
+      <nuclide name="Zr96" ao="0.028"/>
     </material>
     <material id="3" name="water">
-      <density units="atom/b-cm" value="0.07416"/>
-      <nuclide ao="2.0" name="H1"/>
-      <nuclide ao="1.0" name="O16"/>
+      <density value="0.07416" units="atom/b-cm"/>
+      <nuclide name="H1" ao="2.0"/>
+      <nuclide name="O16" ao="1.0"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="1" name="fuel" region="1 -2 3 -4 5 -6" universe="1"/>
-    <cell id="2" material="2" name="clad" region="(-1 | 2 | -3 | 4 | -5 | 6) (7 -8 9 -10 11 -12)" universe="1"/>
-    <cell id="3" material="3" name="water" region="(-7 | 8 | -9 | 10 | -11 | 12) (13 -14 15 -16 17 -18)" universe="1"/>
-    <surface coeffs="-5.0" id="1" name="minimum x" type="x-plane"/>
-    <surface coeffs="5.0" id="2" name="maximum x" type="x-plane"/>
-    <surface coeffs="-5.0" id="3" name="minimum y" type="y-plane"/>
-    <surface coeffs="5.0" id="4" name="maximum y" type="y-plane"/>
-    <surface coeffs="-5.0" id="5" name="minimum z" type="z-plane"/>
-    <surface coeffs="5.0" id="6" name="maximum z" type="z-plane"/>
-    <surface coeffs="-6.0" id="7" name="minimum x" type="x-plane"/>
-    <surface coeffs="6.0" id="8" name="maximum x" type="x-plane"/>
-    <surface coeffs="-6.0" id="9" name="minimum y" type="y-plane"/>
-    <surface coeffs="6.0" id="10" name="maximum y" type="y-plane"/>
-    <surface coeffs="-6.0" id="11" name="minimum z" type="z-plane"/>
-    <surface coeffs="6.0" id="12" name="maximum z" type="z-plane"/>
-    <surface boundary="vacuum" coeffs="-15.0" id="13" name="minimum x" type="x-plane"/>
-    <surface boundary="vacuum" coeffs="15.0" id="14" name="maximum x" type="x-plane"/>
-    <surface boundary="vacuum" coeffs="-15.0" id="15" name="minimum y" type="y-plane"/>
-    <surface boundary="vacuum" coeffs="15.0" id="16" name="maximum y" type="y-plane"/>
-    <surface boundary="vacuum" coeffs="-15.0" id="17" name="minimum z" type="z-plane"/>
-    <surface boundary="vacuum" coeffs="15.0" id="18" name="maximum z" type="z-plane"/>
+    <cell id="1" name="fuel" material="1" region="1 -2 3 -4 5 -6" universe="1"/>
+    <cell id="2" name="clad" material="2" region="(-1 | 2 | -3 | 4 | -5 | 6) (7 -8 9 -10 11 -12)" universe="1"/>
+    <cell id="3" name="water" material="3" region="(-7 | 8 | -9 | 10 | -11 | 12) (13 -14 15 -16 17 -18)" universe="1"/>
+    <surface id="1" name="minimum x" type="x-plane" coeffs="-5.0"/>
+    <surface id="2" name="maximum x" type="x-plane" coeffs="5.0"/>
+    <surface id="3" name="minimum y" type="y-plane" coeffs="-5.0"/>
+    <surface id="4" name="maximum y" type="y-plane" coeffs="5.0"/>
+    <surface id="5" name="minimum z" type="z-plane" coeffs="-5.0"/>
+    <surface id="6" name="maximum z" type="z-plane" coeffs="5.0"/>
+    <surface id="7" name="minimum x" type="x-plane" coeffs="-6.0"/>
+    <surface id="8" name="maximum x" type="x-plane" coeffs="6.0"/>
+    <surface id="9" name="minimum y" type="y-plane" coeffs="-6.0"/>
+    <surface id="10" name="maximum y" type="y-plane" coeffs="6.0"/>
+    <surface id="11" name="minimum z" type="z-plane" coeffs="-6.0"/>
+    <surface id="12" name="maximum z" type="z-plane" coeffs="6.0"/>
+    <surface id="13" name="minimum x" type="x-plane" boundary="vacuum" coeffs="-15.0"/>
+    <surface id="14" name="maximum x" type="x-plane" boundary="vacuum" coeffs="15.0"/>
+    <surface id="15" name="minimum y" type="y-plane" boundary="vacuum" coeffs="-15.0"/>
+    <surface id="16" name="maximum y" type="y-plane" boundary="vacuum" coeffs="15.0"/>
+    <surface id="17" name="minimum z" type="z-plane" boundary="vacuum" coeffs="-15.0"/>
+    <surface id="18" name="maximum z" type="z-plane" boundary="vacuum" coeffs="15.0"/>
   </geometry>
   <settings>
     <run_mode>fixed source</run_mode>
     <particles>1000</particles>
     <batches>10</batches>
-    <source particle="neutron" strength="1.0" type="independent">
-      <space origin="0.0 0.0 0.0" type="spherical">
-        <r parameters="0.0 0.0" type="uniform"/>
+    <source type="independent" strength="1.0" particle="neutron">
+      <space type="spherical" origin="0.0 0.0 0.0">
+        <r type="uniform" parameters="0.0 0.0"/>
         <cos_theta type="discrete">
           <parameters>1.0 1.0</parameters>
         </cos_theta>
@@ -67,7 +67,7 @@
       <lower_left>-10.0 -10.0 -10.0</lower_left>
       <upper_right>10.0 10.0 10.0</upper_right>
     </mesh>
-    <mesh id="2" library="libmesh" type="unstructured">
+    <mesh id="2" type="unstructured" library="libmesh">
       <filename>test_mesh_tets_w_holes.e</filename>
     </mesh>
     <filter id="1" type="mesh">
diff --git a/tests/regression_tests/unstructured_mesh/inputs_true1.dat b/tests/regression_tests/unstructured_mesh/inputs_true1.dat
index 40183c89b..04bbdb4b2 100644
--- a/tests/regression_tests/unstructured_mesh/inputs_true1.dat
+++ b/tests/regression_tests/unstructured_mesh/inputs_true1.dat
@@ -1,54 +1,54 @@
 <?xml version='1.0' encoding='utf-8'?>
 <model>
   <materials>
-    <material depletable="true" id="1" name="fuel">
-      <density units="g/cc" value="4.5"/>
-      <nuclide ao="1.0" name="U235"/>
+    <material id="1" name="fuel" depletable="true">
+      <density value="4.5" units="g/cc"/>
+      <nuclide name="U235" ao="1.0"/>
     </material>
     <material id="2" name="zircaloy">
-      <density units="g/cc" value="5.77"/>
-      <nuclide ao="0.5145" name="Zr90"/>
-      <nuclide ao="0.1122" name="Zr91"/>
-      <nuclide ao="0.1715" name="Zr92"/>
-      <nuclide ao="0.1738" name="Zr94"/>
-      <nuclide ao="0.028" name="Zr96"/>
+      <density value="5.77" units="g/cc"/>
+      <nuclide name="Zr90" ao="0.5145"/>
+      <nuclide name="Zr91" ao="0.1122"/>
+      <nuclide name="Zr92" ao="0.1715"/>
+      <nuclide name="Zr94" ao="0.1738"/>
+      <nuclide name="Zr96" ao="0.028"/>
     </material>
     <material id="3" name="water">
-      <density units="atom/b-cm" value="0.07416"/>
-      <nuclide ao="2.0" name="H1"/>
-      <nuclide ao="1.0" name="O16"/>
+      <density value="0.07416" units="atom/b-cm"/>
+      <nuclide name="H1" ao="2.0"/>
+      <nuclide name="O16" ao="1.0"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="1" name="fuel" region="1 -2 3 -4 5 -6" universe="1"/>
-    <cell id="2" material="2" name="clad" region="(-1 | 2 | -3 | 4 | -5 | 6) (7 -8 9 -10 11 -12)" universe="1"/>
-    <cell id="3" material="3" name="water" region="(-7 | 8 | -9 | 10 | -11 | 12) (13 -14 15 -16 17 -18)" universe="1"/>
-    <surface coeffs="-5.0" id="1" name="minimum x" type="x-plane"/>
-    <surface coeffs="5.0" id="2" name="maximum x" type="x-plane"/>
-    <surface coeffs="-5.0" id="3" name="minimum y" type="y-plane"/>
-    <surface coeffs="5.0" id="4" name="maximum y" type="y-plane"/>
-    <surface coeffs="-5.0" id="5" name="minimum z" type="z-plane"/>
-    <surface coeffs="5.0" id="6" name="maximum z" type="z-plane"/>
-    <surface coeffs="-6.0" id="7" name="minimum x" type="x-plane"/>
-    <surface coeffs="6.0" id="8" name="maximum x" type="x-plane"/>
-    <surface coeffs="-6.0" id="9" name="minimum y" type="y-plane"/>
-    <surface coeffs="6.0" id="10" name="maximum y" type="y-plane"/>
-    <surface coeffs="-6.0" id="11" name="minimum z" type="z-plane"/>
-    <surface coeffs="6.0" id="12" name="maximum z" type="z-plane"/>
-    <surface boundary="vacuum" coeffs="-15.0" id="13" name="minimum x" type="x-plane"/>
-    <surface boundary="vacuum" coeffs="15.0" id="14" name="maximum x" type="x-plane"/>
-    <surface boundary="vacuum" coeffs="-15.0" id="15" name="minimum y" type="y-plane"/>
-    <surface boundary="vacuum" coeffs="15.0" id="16" name="maximum y" type="y-plane"/>
-    <surface boundary="vacuum" coeffs="-15.0" id="17" name="minimum z" type="z-plane"/>
-    <surface boundary="vacuum" coeffs="15.0" id="18" name="maximum z" type="z-plane"/>
+    <cell id="1" name="fuel" material="1" region="1 -2 3 -4 5 -6" universe="1"/>
+    <cell id="2" name="clad" material="2" region="(-1 | 2 | -3 | 4 | -5 | 6) (7 -8 9 -10 11 -12)" universe="1"/>
+    <cell id="3" name="water" material="3" region="(-7 | 8 | -9 | 10 | -11 | 12) (13 -14 15 -16 17 -18)" universe="1"/>
+    <surface id="1" name="minimum x" type="x-plane" coeffs="-5.0"/>
+    <surface id="2" name="maximum x" type="x-plane" coeffs="5.0"/>
+    <surface id="3" name="minimum y" type="y-plane" coeffs="-5.0"/>
+    <surface id="4" name="maximum y" type="y-plane" coeffs="5.0"/>
+    <surface id="5" name="minimum z" type="z-plane" coeffs="-5.0"/>
+    <surface id="6" name="maximum z" type="z-plane" coeffs="5.0"/>
+    <surface id="7" name="minimum x" type="x-plane" coeffs="-6.0"/>
+    <surface id="8" name="maximum x" type="x-plane" coeffs="6.0"/>
+    <surface id="9" name="minimum y" type="y-plane" coeffs="-6.0"/>
+    <surface id="10" name="maximum y" type="y-plane" coeffs="6.0"/>
+    <surface id="11" name="minimum z" type="z-plane" coeffs="-6.0"/>
+    <surface id="12" name="maximum z" type="z-plane" coeffs="6.0"/>
+    <surface id="13" name="minimum x" type="x-plane" boundary="vacuum" coeffs="-15.0"/>
+    <surface id="14" name="maximum x" type="x-plane" boundary="vacuum" coeffs="15.0"/>
+    <surface id="15" name="minimum y" type="y-plane" boundary="vacuum" coeffs="-15.0"/>
+    <surface id="16" name="maximum y" type="y-plane" boundary="vacuum" coeffs="15.0"/>
+    <surface id="17" name="minimum z" type="z-plane" boundary="vacuum" coeffs="-15.0"/>
+    <surface id="18" name="maximum z" type="z-plane" boundary="vacuum" coeffs="15.0"/>
   </geometry>
   <settings>
     <run_mode>fixed source</run_mode>
     <particles>1000</particles>
     <batches>10</batches>
-    <source particle="neutron" strength="1.0" type="independent">
-      <space origin="0.0 0.0 0.0" type="spherical">
-        <r parameters="0.0 0.0" type="uniform"/>
+    <source type="independent" strength="1.0" particle="neutron">
+      <space type="spherical" origin="0.0 0.0 0.0">
+        <r type="uniform" parameters="0.0 0.0"/>
         <cos_theta type="discrete">
           <parameters>1.0 1.0</parameters>
         </cos_theta>
@@ -67,7 +67,7 @@
       <lower_left>-10.0 -10.0 -10.0</lower_left>
       <upper_right>10.0 10.0 10.0</upper_right>
     </mesh>
-    <mesh id="2" library="libmesh" type="unstructured">
+    <mesh id="2" type="unstructured" library="libmesh">
       <filename>test_mesh_tets.e</filename>
     </mesh>
     <filter id="1" type="mesh">
diff --git a/tests/regression_tests/unstructured_mesh/inputs_true10.dat b/tests/regression_tests/unstructured_mesh/inputs_true10.dat
index 81dfbdc52..169f0a6b4 100644
--- a/tests/regression_tests/unstructured_mesh/inputs_true10.dat
+++ b/tests/regression_tests/unstructured_mesh/inputs_true10.dat
@@ -1,54 +1,54 @@
 <?xml version='1.0' encoding='utf-8'?>
 <model>
   <materials>
-    <material depletable="true" id="1" name="fuel">
-      <density units="g/cc" value="4.5"/>
-      <nuclide ao="1.0" name="U235"/>
+    <material id="1" name="fuel" depletable="true">
+      <density value="4.5" units="g/cc"/>
+      <nuclide name="U235" ao="1.0"/>
     </material>
     <material id="2" name="zircaloy">
-      <density units="g/cc" value="5.77"/>
-      <nuclide ao="0.5145" name="Zr90"/>
-      <nuclide ao="0.1122" name="Zr91"/>
-      <nuclide ao="0.1715" name="Zr92"/>
-      <nuclide ao="0.1738" name="Zr94"/>
-      <nuclide ao="0.028" name="Zr96"/>
+      <density value="5.77" units="g/cc"/>
+      <nuclide name="Zr90" ao="0.5145"/>
+      <nuclide name="Zr91" ao="0.1122"/>
+      <nuclide name="Zr92" ao="0.1715"/>
+      <nuclide name="Zr94" ao="0.1738"/>
+      <nuclide name="Zr96" ao="0.028"/>
     </material>
     <material id="3" name="water">
-      <density units="atom/b-cm" value="0.07416"/>
-      <nuclide ao="2.0" name="H1"/>
-      <nuclide ao="1.0" name="O16"/>
+      <density value="0.07416" units="atom/b-cm"/>
+      <nuclide name="H1" ao="2.0"/>
+      <nuclide name="O16" ao="1.0"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="1" name="fuel" region="1 -2 3 -4 5 -6" universe="1"/>
-    <cell id="2" material="2" name="clad" region="(-1 | 2 | -3 | 4 | -5 | 6) (7 -8 9 -10 11 -12)" universe="1"/>
-    <cell id="3" material="3" name="water" region="(-7 | 8 | -9 | 10 | -11 | 12) (13 -14 15 -16 17 -18)" universe="1"/>
-    <surface coeffs="-5.0" id="1" name="minimum x" type="x-plane"/>
-    <surface coeffs="5.0" id="2" name="maximum x" type="x-plane"/>
-    <surface coeffs="-5.0" id="3" name="minimum y" type="y-plane"/>
-    <surface coeffs="5.0" id="4" name="maximum y" type="y-plane"/>
-    <surface coeffs="-5.0" id="5" name="minimum z" type="z-plane"/>
-    <surface coeffs="5.0" id="6" name="maximum z" type="z-plane"/>
-    <surface coeffs="-6.0" id="7" name="minimum x" type="x-plane"/>
-    <surface coeffs="6.0" id="8" name="maximum x" type="x-plane"/>
-    <surface coeffs="-6.0" id="9" name="minimum y" type="y-plane"/>
-    <surface coeffs="6.0" id="10" name="maximum y" type="y-plane"/>
-    <surface coeffs="-6.0" id="11" name="minimum z" type="z-plane"/>
-    <surface coeffs="6.0" id="12" name="maximum z" type="z-plane"/>
-    <surface boundary="vacuum" coeffs="-10.0" id="13" name="minimum x" type="x-plane"/>
-    <surface boundary="vacuum" coeffs="10.0" id="14" name="maximum x" type="x-plane"/>
-    <surface boundary="vacuum" coeffs="-10.0" id="15" name="minimum y" type="y-plane"/>
-    <surface boundary="vacuum" coeffs="10.0" id="16" name="maximum y" type="y-plane"/>
-    <surface boundary="vacuum" coeffs="-10.0" id="17" name="minimum z" type="z-plane"/>
-    <surface boundary="vacuum" coeffs="10.0" id="18" name="maximum z" type="z-plane"/>
+    <cell id="1" name="fuel" material="1" region="1 -2 3 -4 5 -6" universe="1"/>
+    <cell id="2" name="clad" material="2" region="(-1 | 2 | -3 | 4 | -5 | 6) (7 -8 9 -10 11 -12)" universe="1"/>
+    <cell id="3" name="water" material="3" region="(-7 | 8 | -9 | 10 | -11 | 12) (13 -14 15 -16 17 -18)" universe="1"/>
+    <surface id="1" name="minimum x" type="x-plane" coeffs="-5.0"/>
+    <surface id="2" name="maximum x" type="x-plane" coeffs="5.0"/>
+    <surface id="3" name="minimum y" type="y-plane" coeffs="-5.0"/>
+    <surface id="4" name="maximum y" type="y-plane" coeffs="5.0"/>
+    <surface id="5" name="minimum z" type="z-plane" coeffs="-5.0"/>
+    <surface id="6" name="maximum z" type="z-plane" coeffs="5.0"/>
+    <surface id="7" name="minimum x" type="x-plane" coeffs="-6.0"/>
+    <surface id="8" name="maximum x" type="x-plane" coeffs="6.0"/>
+    <surface id="9" name="minimum y" type="y-plane" coeffs="-6.0"/>
+    <surface id="10" name="maximum y" type="y-plane" coeffs="6.0"/>
+    <surface id="11" name="minimum z" type="z-plane" coeffs="-6.0"/>
+    <surface id="12" name="maximum z" type="z-plane" coeffs="6.0"/>
+    <surface id="13" name="minimum x" type="x-plane" boundary="vacuum" coeffs="-10.0"/>
+    <surface id="14" name="maximum x" type="x-plane" boundary="vacuum" coeffs="10.0"/>
+    <surface id="15" name="minimum y" type="y-plane" boundary="vacuum" coeffs="-10.0"/>
+    <surface id="16" name="maximum y" type="y-plane" boundary="vacuum" coeffs="10.0"/>
+    <surface id="17" name="minimum z" type="z-plane" boundary="vacuum" coeffs="-10.0"/>
+    <surface id="18" name="maximum z" type="z-plane" boundary="vacuum" coeffs="10.0"/>
   </geometry>
   <settings>
     <run_mode>fixed source</run_mode>
     <particles>1000</particles>
     <batches>10</batches>
-    <source particle="neutron" strength="1.0" type="independent">
-      <space origin="0.0 0.0 0.0" type="spherical">
-        <r parameters="0.0 0.0" type="uniform"/>
+    <source type="independent" strength="1.0" particle="neutron">
+      <space type="spherical" origin="0.0 0.0 0.0">
+        <r type="uniform" parameters="0.0 0.0"/>
         <cos_theta type="discrete">
           <parameters>1.0 1.0</parameters>
         </cos_theta>
@@ -67,7 +67,7 @@
       <lower_left>-10.0 -10.0 -10.0</lower_left>
       <upper_right>10.0 10.0 10.0</upper_right>
     </mesh>
-    <mesh id="2" library="moab" options="MAX_DEPTH=15;PLANE_SET=2" type="unstructured">
+    <mesh id="2" type="unstructured" library="moab" options="MAX_DEPTH=15;PLANE_SET=2">
       <filename>test_mesh_tets_w_holes.e</filename>
     </mesh>
     <filter id="1" type="mesh">
diff --git a/tests/regression_tests/unstructured_mesh/inputs_true11.dat b/tests/regression_tests/unstructured_mesh/inputs_true11.dat
index b224a3ebc..8163750ca 100644
--- a/tests/regression_tests/unstructured_mesh/inputs_true11.dat
+++ b/tests/regression_tests/unstructured_mesh/inputs_true11.dat
@@ -1,54 +1,54 @@
 <?xml version='1.0' encoding='utf-8'?>
 <model>
   <materials>
-    <material depletable="true" id="1" name="fuel">
-      <density units="g/cc" value="4.5"/>
-      <nuclide ao="1.0" name="U235"/>
+    <material id="1" name="fuel" depletable="true">
+      <density value="4.5" units="g/cc"/>
+      <nuclide name="U235" ao="1.0"/>
     </material>
     <material id="2" name="zircaloy">
-      <density units="g/cc" value="5.77"/>
-      <nuclide ao="0.5145" name="Zr90"/>
-      <nuclide ao="0.1122" name="Zr91"/>
-      <nuclide ao="0.1715" name="Zr92"/>
-      <nuclide ao="0.1738" name="Zr94"/>
-      <nuclide ao="0.028" name="Zr96"/>
+      <density value="5.77" units="g/cc"/>
+      <nuclide name="Zr90" ao="0.5145"/>
+      <nuclide name="Zr91" ao="0.1122"/>
+      <nuclide name="Zr92" ao="0.1715"/>
+      <nuclide name="Zr94" ao="0.1738"/>
+      <nuclide name="Zr96" ao="0.028"/>
     </material>
     <material id="3" name="water">
-      <density units="atom/b-cm" value="0.07416"/>
-      <nuclide ao="2.0" name="H1"/>
-      <nuclide ao="1.0" name="O16"/>
+      <density value="0.07416" units="atom/b-cm"/>
+      <nuclide name="H1" ao="2.0"/>
+      <nuclide name="O16" ao="1.0"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="1" name="fuel" region="1 -2 3 -4 5 -6" universe="1"/>
-    <cell id="2" material="2" name="clad" region="(-1 | 2 | -3 | 4 | -5 | 6) (7 -8 9 -10 11 -12)" universe="1"/>
-    <cell id="3" material="3" name="water" region="(-7 | 8 | -9 | 10 | -11 | 12) (13 -14 15 -16 17 -18)" universe="1"/>
-    <surface coeffs="-5.0" id="1" name="minimum x" type="x-plane"/>
-    <surface coeffs="5.0" id="2" name="maximum x" type="x-plane"/>
-    <surface coeffs="-5.0" id="3" name="minimum y" type="y-plane"/>
-    <surface coeffs="5.0" id="4" name="maximum y" type="y-plane"/>
-    <surface coeffs="-5.0" id="5" name="minimum z" type="z-plane"/>
-    <surface coeffs="5.0" id="6" name="maximum z" type="z-plane"/>
-    <surface coeffs="-6.0" id="7" name="minimum x" type="x-plane"/>
-    <surface coeffs="6.0" id="8" name="maximum x" type="x-plane"/>
-    <surface coeffs="-6.0" id="9" name="minimum y" type="y-plane"/>
-    <surface coeffs="6.0" id="10" name="maximum y" type="y-plane"/>
-    <surface coeffs="-6.0" id="11" name="minimum z" type="z-plane"/>
-    <surface coeffs="6.0" id="12" name="maximum z" type="z-plane"/>
-    <surface boundary="vacuum" coeffs="-10.0" id="13" name="minimum x" type="x-plane"/>
-    <surface boundary="vacuum" coeffs="10.0" id="14" name="maximum x" type="x-plane"/>
-    <surface boundary="vacuum" coeffs="-10.0" id="15" name="minimum y" type="y-plane"/>
-    <surface boundary="vacuum" coeffs="10.0" id="16" name="maximum y" type="y-plane"/>
-    <surface boundary="vacuum" coeffs="-10.0" id="17" name="minimum z" type="z-plane"/>
-    <surface boundary="vacuum" coeffs="10.0" id="18" name="maximum z" type="z-plane"/>
+    <cell id="1" name="fuel" material="1" region="1 -2 3 -4 5 -6" universe="1"/>
+    <cell id="2" name="clad" material="2" region="(-1 | 2 | -3 | 4 | -5 | 6) (7 -8 9 -10 11 -12)" universe="1"/>
+    <cell id="3" name="water" material="3" region="(-7 | 8 | -9 | 10 | -11 | 12) (13 -14 15 -16 17 -18)" universe="1"/>
+    <surface id="1" name="minimum x" type="x-plane" coeffs="-5.0"/>
+    <surface id="2" name="maximum x" type="x-plane" coeffs="5.0"/>
+    <surface id="3" name="minimum y" type="y-plane" coeffs="-5.0"/>
+    <surface id="4" name="maximum y" type="y-plane" coeffs="5.0"/>
+    <surface id="5" name="minimum z" type="z-plane" coeffs="-5.0"/>
+    <surface id="6" name="maximum z" type="z-plane" coeffs="5.0"/>
+    <surface id="7" name="minimum x" type="x-plane" coeffs="-6.0"/>
+    <surface id="8" name="maximum x" type="x-plane" coeffs="6.0"/>
+    <surface id="9" name="minimum y" type="y-plane" coeffs="-6.0"/>
+    <surface id="10" name="maximum y" type="y-plane" coeffs="6.0"/>
+    <surface id="11" name="minimum z" type="z-plane" coeffs="-6.0"/>
+    <surface id="12" name="maximum z" type="z-plane" coeffs="6.0"/>
+    <surface id="13" name="minimum x" type="x-plane" boundary="vacuum" coeffs="-10.0"/>
+    <surface id="14" name="maximum x" type="x-plane" boundary="vacuum" coeffs="10.0"/>
+    <surface id="15" name="minimum y" type="y-plane" boundary="vacuum" coeffs="-10.0"/>
+    <surface id="16" name="maximum y" type="y-plane" boundary="vacuum" coeffs="10.0"/>
+    <surface id="17" name="minimum z" type="z-plane" boundary="vacuum" coeffs="-10.0"/>
+    <surface id="18" name="maximum z" type="z-plane" boundary="vacuum" coeffs="10.0"/>
   </geometry>
   <settings>
     <run_mode>fixed source</run_mode>
     <particles>1000</particles>
     <batches>10</batches>
-    <source particle="neutron" strength="1.0" type="independent">
-      <space origin="0.0 0.0 0.0" type="spherical">
-        <r parameters="0.0 0.0" type="uniform"/>
+    <source type="independent" strength="1.0" particle="neutron">
+      <space type="spherical" origin="0.0 0.0 0.0">
+        <r type="uniform" parameters="0.0 0.0"/>
         <cos_theta type="discrete">
           <parameters>1.0 1.0</parameters>
         </cos_theta>
@@ -67,7 +67,7 @@
       <lower_left>-10.0 -10.0 -10.0</lower_left>
       <upper_right>10.0 10.0 10.0</upper_right>
     </mesh>
-    <mesh id="2" library="moab" options="MAX_DEPTH=15;PLANE_SET=2" type="unstructured">
+    <mesh id="2" type="unstructured" library="moab" options="MAX_DEPTH=15;PLANE_SET=2">
       <filename>test_mesh_tets.e</filename>
     </mesh>
     <filter id="1" type="mesh">
diff --git a/tests/regression_tests/unstructured_mesh/inputs_true12.dat b/tests/regression_tests/unstructured_mesh/inputs_true12.dat
index a18aee627..be0655e98 100644
--- a/tests/regression_tests/unstructured_mesh/inputs_true12.dat
+++ b/tests/regression_tests/unstructured_mesh/inputs_true12.dat
@@ -1,54 +1,54 @@
 <?xml version='1.0' encoding='utf-8'?>
 <model>
   <materials>
-    <material depletable="true" id="1" name="fuel">
-      <density units="g/cc" value="4.5"/>
-      <nuclide ao="1.0" name="U235"/>
+    <material id="1" name="fuel" depletable="true">
+      <density value="4.5" units="g/cc"/>
+      <nuclide name="U235" ao="1.0"/>
     </material>
     <material id="2" name="zircaloy">
-      <density units="g/cc" value="5.77"/>
-      <nuclide ao="0.5145" name="Zr90"/>
-      <nuclide ao="0.1122" name="Zr91"/>
-      <nuclide ao="0.1715" name="Zr92"/>
-      <nuclide ao="0.1738" name="Zr94"/>
-      <nuclide ao="0.028" name="Zr96"/>
+      <density value="5.77" units="g/cc"/>
+      <nuclide name="Zr90" ao="0.5145"/>
+      <nuclide name="Zr91" ao="0.1122"/>
+      <nuclide name="Zr92" ao="0.1715"/>
+      <nuclide name="Zr94" ao="0.1738"/>
+      <nuclide name="Zr96" ao="0.028"/>
     </material>
     <material id="3" name="water">
-      <density units="atom/b-cm" value="0.07416"/>
-      <nuclide ao="2.0" name="H1"/>
-      <nuclide ao="1.0" name="O16"/>
+      <density value="0.07416" units="atom/b-cm"/>
+      <nuclide name="H1" ao="2.0"/>
+      <nuclide name="O16" ao="1.0"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="1" name="fuel" region="1 -2 3 -4 5 -6" universe="1"/>
-    <cell id="2" material="2" name="clad" region="(-1 | 2 | -3 | 4 | -5 | 6) (7 -8 9 -10 11 -12)" universe="1"/>
-    <cell id="3" material="3" name="water" region="(-7 | 8 | -9 | 10 | -11 | 12) (13 -14 15 -16 17 -18)" universe="1"/>
-    <surface coeffs="-5.0" id="1" name="minimum x" type="x-plane"/>
-    <surface coeffs="5.0" id="2" name="maximum x" type="x-plane"/>
-    <surface coeffs="-5.0" id="3" name="minimum y" type="y-plane"/>
-    <surface coeffs="5.0" id="4" name="maximum y" type="y-plane"/>
-    <surface coeffs="-5.0" id="5" name="minimum z" type="z-plane"/>
-    <surface coeffs="5.0" id="6" name="maximum z" type="z-plane"/>
-    <surface coeffs="-6.0" id="7" name="minimum x" type="x-plane"/>
-    <surface coeffs="6.0" id="8" name="maximum x" type="x-plane"/>
-    <surface coeffs="-6.0" id="9" name="minimum y" type="y-plane"/>
-    <surface coeffs="6.0" id="10" name="maximum y" type="y-plane"/>
-    <surface coeffs="-6.0" id="11" name="minimum z" type="z-plane"/>
-    <surface coeffs="6.0" id="12" name="maximum z" type="z-plane"/>
-    <surface boundary="vacuum" coeffs="-15.0" id="13" name="minimum x" type="x-plane"/>
-    <surface boundary="vacuum" coeffs="15.0" id="14" name="maximum x" type="x-plane"/>
-    <surface boundary="vacuum" coeffs="-15.0" id="15" name="minimum y" type="y-plane"/>
-    <surface boundary="vacuum" coeffs="15.0" id="16" name="maximum y" type="y-plane"/>
-    <surface boundary="vacuum" coeffs="-15.0" id="17" name="minimum z" type="z-plane"/>
-    <surface boundary="vacuum" coeffs="15.0" id="18" name="maximum z" type="z-plane"/>
+    <cell id="1" name="fuel" material="1" region="1 -2 3 -4 5 -6" universe="1"/>
+    <cell id="2" name="clad" material="2" region="(-1 | 2 | -3 | 4 | -5 | 6) (7 -8 9 -10 11 -12)" universe="1"/>
+    <cell id="3" name="water" material="3" region="(-7 | 8 | -9 | 10 | -11 | 12) (13 -14 15 -16 17 -18)" universe="1"/>
+    <surface id="1" name="minimum x" type="x-plane" coeffs="-5.0"/>
+    <surface id="2" name="maximum x" type="x-plane" coeffs="5.0"/>
+    <surface id="3" name="minimum y" type="y-plane" coeffs="-5.0"/>
+    <surface id="4" name="maximum y" type="y-plane" coeffs="5.0"/>
+    <surface id="5" name="minimum z" type="z-plane" coeffs="-5.0"/>
+    <surface id="6" name="maximum z" type="z-plane" coeffs="5.0"/>
+    <surface id="7" name="minimum x" type="x-plane" coeffs="-6.0"/>
+    <surface id="8" name="maximum x" type="x-plane" coeffs="6.0"/>
+    <surface id="9" name="minimum y" type="y-plane" coeffs="-6.0"/>
+    <surface id="10" name="maximum y" type="y-plane" coeffs="6.0"/>
+    <surface id="11" name="minimum z" type="z-plane" coeffs="-6.0"/>
+    <surface id="12" name="maximum z" type="z-plane" coeffs="6.0"/>
+    <surface id="13" name="minimum x" type="x-plane" boundary="vacuum" coeffs="-15.0"/>
+    <surface id="14" name="maximum x" type="x-plane" boundary="vacuum" coeffs="15.0"/>
+    <surface id="15" name="minimum y" type="y-plane" boundary="vacuum" coeffs="-15.0"/>
+    <surface id="16" name="maximum y" type="y-plane" boundary="vacuum" coeffs="15.0"/>
+    <surface id="17" name="minimum z" type="z-plane" boundary="vacuum" coeffs="-15.0"/>
+    <surface id="18" name="maximum z" type="z-plane" boundary="vacuum" coeffs="15.0"/>
   </geometry>
   <settings>
     <run_mode>fixed source</run_mode>
     <particles>1000</particles>
     <batches>10</batches>
-    <source particle="neutron" strength="1.0" type="independent">
-      <space origin="0.0 0.0 0.0" type="spherical">
-        <r parameters="0.0 0.0" type="uniform"/>
+    <source type="independent" strength="1.0" particle="neutron">
+      <space type="spherical" origin="0.0 0.0 0.0">
+        <r type="uniform" parameters="0.0 0.0"/>
         <cos_theta type="discrete">
           <parameters>1.0 1.0</parameters>
         </cos_theta>
@@ -67,7 +67,7 @@
       <lower_left>-10.0 -10.0 -10.0</lower_left>
       <upper_right>10.0 10.0 10.0</upper_right>
     </mesh>
-    <mesh id="2" library="moab" options="MAX_DEPTH=15;PLANE_SET=2" type="unstructured">
+    <mesh id="2" type="unstructured" library="moab" options="MAX_DEPTH=15;PLANE_SET=2">
       <filename>test_mesh_tets_w_holes.e</filename>
     </mesh>
     <filter id="1" type="mesh">
diff --git a/tests/regression_tests/unstructured_mesh/inputs_true13.dat b/tests/regression_tests/unstructured_mesh/inputs_true13.dat
index 0e9123c90..42c0cc122 100644
--- a/tests/regression_tests/unstructured_mesh/inputs_true13.dat
+++ b/tests/regression_tests/unstructured_mesh/inputs_true13.dat
@@ -1,54 +1,54 @@
 <?xml version='1.0' encoding='utf-8'?>
 <model>
   <materials>
-    <material depletable="true" id="1" name="fuel">
-      <density units="g/cc" value="4.5"/>
-      <nuclide ao="1.0" name="U235"/>
+    <material id="1" name="fuel" depletable="true">
+      <density value="4.5" units="g/cc"/>
+      <nuclide name="U235" ao="1.0"/>
     </material>
     <material id="2" name="zircaloy">
-      <density units="g/cc" value="5.77"/>
-      <nuclide ao="0.5145" name="Zr90"/>
-      <nuclide ao="0.1122" name="Zr91"/>
-      <nuclide ao="0.1715" name="Zr92"/>
-      <nuclide ao="0.1738" name="Zr94"/>
-      <nuclide ao="0.028" name="Zr96"/>
+      <density value="5.77" units="g/cc"/>
+      <nuclide name="Zr90" ao="0.5145"/>
+      <nuclide name="Zr91" ao="0.1122"/>
+      <nuclide name="Zr92" ao="0.1715"/>
+      <nuclide name="Zr94" ao="0.1738"/>
+      <nuclide name="Zr96" ao="0.028"/>
     </material>
     <material id="3" name="water">
-      <density units="atom/b-cm" value="0.07416"/>
-      <nuclide ao="2.0" name="H1"/>
-      <nuclide ao="1.0" name="O16"/>
+      <density value="0.07416" units="atom/b-cm"/>
+      <nuclide name="H1" ao="2.0"/>
+      <nuclide name="O16" ao="1.0"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="1" name="fuel" region="1 -2 3 -4 5 -6" universe="1"/>
-    <cell id="2" material="2" name="clad" region="(-1 | 2 | -3 | 4 | -5 | 6) (7 -8 9 -10 11 -12)" universe="1"/>
-    <cell id="3" material="3" name="water" region="(-7 | 8 | -9 | 10 | -11 | 12) (13 -14 15 -16 17 -18)" universe="1"/>
-    <surface coeffs="-5.0" id="1" name="minimum x" type="x-plane"/>
-    <surface coeffs="5.0" id="2" name="maximum x" type="x-plane"/>
-    <surface coeffs="-5.0" id="3" name="minimum y" type="y-plane"/>
-    <surface coeffs="5.0" id="4" name="maximum y" type="y-plane"/>
-    <surface coeffs="-5.0" id="5" name="minimum z" type="z-plane"/>
-    <surface coeffs="5.0" id="6" name="maximum z" type="z-plane"/>
-    <surface coeffs="-6.0" id="7" name="minimum x" type="x-plane"/>
-    <surface coeffs="6.0" id="8" name="maximum x" type="x-plane"/>
-    <surface coeffs="-6.0" id="9" name="minimum y" type="y-plane"/>
-    <surface coeffs="6.0" id="10" name="maximum y" type="y-plane"/>
-    <surface coeffs="-6.0" id="11" name="minimum z" type="z-plane"/>
-    <surface coeffs="6.0" id="12" name="maximum z" type="z-plane"/>
-    <surface boundary="vacuum" coeffs="-15.0" id="13" name="minimum x" type="x-plane"/>
-    <surface boundary="vacuum" coeffs="15.0" id="14" name="maximum x" type="x-plane"/>
-    <surface boundary="vacuum" coeffs="-15.0" id="15" name="minimum y" type="y-plane"/>
-    <surface boundary="vacuum" coeffs="15.0" id="16" name="maximum y" type="y-plane"/>
-    <surface boundary="vacuum" coeffs="-15.0" id="17" name="minimum z" type="z-plane"/>
-    <surface boundary="vacuum" coeffs="15.0" id="18" name="maximum z" type="z-plane"/>
+    <cell id="1" name="fuel" material="1" region="1 -2 3 -4 5 -6" universe="1"/>
+    <cell id="2" name="clad" material="2" region="(-1 | 2 | -3 | 4 | -5 | 6) (7 -8 9 -10 11 -12)" universe="1"/>
+    <cell id="3" name="water" material="3" region="(-7 | 8 | -9 | 10 | -11 | 12) (13 -14 15 -16 17 -18)" universe="1"/>
+    <surface id="1" name="minimum x" type="x-plane" coeffs="-5.0"/>
+    <surface id="2" name="maximum x" type="x-plane" coeffs="5.0"/>
+    <surface id="3" name="minimum y" type="y-plane" coeffs="-5.0"/>
+    <surface id="4" name="maximum y" type="y-plane" coeffs="5.0"/>
+    <surface id="5" name="minimum z" type="z-plane" coeffs="-5.0"/>
+    <surface id="6" name="maximum z" type="z-plane" coeffs="5.0"/>
+    <surface id="7" name="minimum x" type="x-plane" coeffs="-6.0"/>
+    <surface id="8" name="maximum x" type="x-plane" coeffs="6.0"/>
+    <surface id="9" name="minimum y" type="y-plane" coeffs="-6.0"/>
+    <surface id="10" name="maximum y" type="y-plane" coeffs="6.0"/>
+    <surface id="11" name="minimum z" type="z-plane" coeffs="-6.0"/>
+    <surface id="12" name="maximum z" type="z-plane" coeffs="6.0"/>
+    <surface id="13" name="minimum x" type="x-plane" boundary="vacuum" coeffs="-15.0"/>
+    <surface id="14" name="maximum x" type="x-plane" boundary="vacuum" coeffs="15.0"/>
+    <surface id="15" name="minimum y" type="y-plane" boundary="vacuum" coeffs="-15.0"/>
+    <surface id="16" name="maximum y" type="y-plane" boundary="vacuum" coeffs="15.0"/>
+    <surface id="17" name="minimum z" type="z-plane" boundary="vacuum" coeffs="-15.0"/>
+    <surface id="18" name="maximum z" type="z-plane" boundary="vacuum" coeffs="15.0"/>
   </geometry>
   <settings>
     <run_mode>fixed source</run_mode>
     <particles>1000</particles>
     <batches>10</batches>
-    <source particle="neutron" strength="1.0" type="independent">
-      <space origin="0.0 0.0 0.0" type="spherical">
-        <r parameters="0.0 0.0" type="uniform"/>
+    <source type="independent" strength="1.0" particle="neutron">
+      <space type="spherical" origin="0.0 0.0 0.0">
+        <r type="uniform" parameters="0.0 0.0"/>
         <cos_theta type="discrete">
           <parameters>1.0 1.0</parameters>
         </cos_theta>
@@ -67,7 +67,7 @@
       <lower_left>-10.0 -10.0 -10.0</lower_left>
       <upper_right>10.0 10.0 10.0</upper_right>
     </mesh>
-    <mesh id="2" library="moab" options="MAX_DEPTH=15;PLANE_SET=2" type="unstructured">
+    <mesh id="2" type="unstructured" library="moab" options="MAX_DEPTH=15;PLANE_SET=2">
       <filename>test_mesh_tets.e</filename>
     </mesh>
     <filter id="1" type="mesh">
diff --git a/tests/regression_tests/unstructured_mesh/inputs_true14.dat b/tests/regression_tests/unstructured_mesh/inputs_true14.dat
index 9d4db4904..a27c7445d 100644
--- a/tests/regression_tests/unstructured_mesh/inputs_true14.dat
+++ b/tests/regression_tests/unstructured_mesh/inputs_true14.dat
@@ -1,54 +1,54 @@
 <?xml version='1.0' encoding='utf-8'?>
 <model>
   <materials>
-    <material depletable="true" id="1" name="fuel">
-      <density units="g/cc" value="4.5"/>
-      <nuclide ao="1.0" name="U235"/>
+    <material id="1" name="fuel" depletable="true">
+      <density value="4.5" units="g/cc"/>
+      <nuclide name="U235" ao="1.0"/>
     </material>
     <material id="2" name="zircaloy">
-      <density units="g/cc" value="5.77"/>
-      <nuclide ao="0.5145" name="Zr90"/>
-      <nuclide ao="0.1122" name="Zr91"/>
-      <nuclide ao="0.1715" name="Zr92"/>
-      <nuclide ao="0.1738" name="Zr94"/>
-      <nuclide ao="0.028" name="Zr96"/>
+      <density value="5.77" units="g/cc"/>
+      <nuclide name="Zr90" ao="0.5145"/>
+      <nuclide name="Zr91" ao="0.1122"/>
+      <nuclide name="Zr92" ao="0.1715"/>
+      <nuclide name="Zr94" ao="0.1738"/>
+      <nuclide name="Zr96" ao="0.028"/>
     </material>
     <material id="3" name="water">
-      <density units="atom/b-cm" value="0.07416"/>
-      <nuclide ao="2.0" name="H1"/>
-      <nuclide ao="1.0" name="O16"/>
+      <density value="0.07416" units="atom/b-cm"/>
+      <nuclide name="H1" ao="2.0"/>
+      <nuclide name="O16" ao="1.0"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="1" name="fuel" region="1 -2 3 -4 5 -6" universe="1"/>
-    <cell id="2" material="2" name="clad" region="(-1 | 2 | -3 | 4 | -5 | 6) (7 -8 9 -10 11 -12)" universe="1"/>
-    <cell id="3" material="3" name="water" region="(-7 | 8 | -9 | 10 | -11 | 12) (13 -14 15 -16 17 -18)" universe="1"/>
-    <surface coeffs="-5.0" id="1" name="minimum x" type="x-plane"/>
-    <surface coeffs="5.0" id="2" name="maximum x" type="x-plane"/>
-    <surface coeffs="-5.0" id="3" name="minimum y" type="y-plane"/>
-    <surface coeffs="5.0" id="4" name="maximum y" type="y-plane"/>
-    <surface coeffs="-5.0" id="5" name="minimum z" type="z-plane"/>
-    <surface coeffs="5.0" id="6" name="maximum z" type="z-plane"/>
-    <surface coeffs="-6.0" id="7" name="minimum x" type="x-plane"/>
-    <surface coeffs="6.0" id="8" name="maximum x" type="x-plane"/>
-    <surface coeffs="-6.0" id="9" name="minimum y" type="y-plane"/>
-    <surface coeffs="6.0" id="10" name="maximum y" type="y-plane"/>
-    <surface coeffs="-6.0" id="11" name="minimum z" type="z-plane"/>
-    <surface coeffs="6.0" id="12" name="maximum z" type="z-plane"/>
-    <surface boundary="vacuum" coeffs="-10.0" id="13" name="minimum x" type="x-plane"/>
-    <surface boundary="vacuum" coeffs="10.0" id="14" name="maximum x" type="x-plane"/>
-    <surface boundary="vacuum" coeffs="-10.0" id="15" name="minimum y" type="y-plane"/>
-    <surface boundary="vacuum" coeffs="10.0" id="16" name="maximum y" type="y-plane"/>
-    <surface boundary="vacuum" coeffs="-10.0" id="17" name="minimum z" type="z-plane"/>
-    <surface boundary="vacuum" coeffs="10.0" id="18" name="maximum z" type="z-plane"/>
+    <cell id="1" name="fuel" material="1" region="1 -2 3 -4 5 -6" universe="1"/>
+    <cell id="2" name="clad" material="2" region="(-1 | 2 | -3 | 4 | -5 | 6) (7 -8 9 -10 11 -12)" universe="1"/>
+    <cell id="3" name="water" material="3" region="(-7 | 8 | -9 | 10 | -11 | 12) (13 -14 15 -16 17 -18)" universe="1"/>
+    <surface id="1" name="minimum x" type="x-plane" coeffs="-5.0"/>
+    <surface id="2" name="maximum x" type="x-plane" coeffs="5.0"/>
+    <surface id="3" name="minimum y" type="y-plane" coeffs="-5.0"/>
+    <surface id="4" name="maximum y" type="y-plane" coeffs="5.0"/>
+    <surface id="5" name="minimum z" type="z-plane" coeffs="-5.0"/>
+    <surface id="6" name="maximum z" type="z-plane" coeffs="5.0"/>
+    <surface id="7" name="minimum x" type="x-plane" coeffs="-6.0"/>
+    <surface id="8" name="maximum x" type="x-plane" coeffs="6.0"/>
+    <surface id="9" name="minimum y" type="y-plane" coeffs="-6.0"/>
+    <surface id="10" name="maximum y" type="y-plane" coeffs="6.0"/>
+    <surface id="11" name="minimum z" type="z-plane" coeffs="-6.0"/>
+    <surface id="12" name="maximum z" type="z-plane" coeffs="6.0"/>
+    <surface id="13" name="minimum x" type="x-plane" boundary="vacuum" coeffs="-10.0"/>
+    <surface id="14" name="maximum x" type="x-plane" boundary="vacuum" coeffs="10.0"/>
+    <surface id="15" name="minimum y" type="y-plane" boundary="vacuum" coeffs="-10.0"/>
+    <surface id="16" name="maximum y" type="y-plane" boundary="vacuum" coeffs="10.0"/>
+    <surface id="17" name="minimum z" type="z-plane" boundary="vacuum" coeffs="-10.0"/>
+    <surface id="18" name="maximum z" type="z-plane" boundary="vacuum" coeffs="10.0"/>
   </geometry>
   <settings>
     <run_mode>fixed source</run_mode>
     <particles>1000</particles>
     <batches>10</batches>
-    <source particle="neutron" strength="1.0" type="independent">
-      <space origin="0.0 0.0 0.0" type="spherical">
-        <r parameters="0.0 0.0" type="uniform"/>
+    <source type="independent" strength="1.0" particle="neutron">
+      <space type="spherical" origin="0.0 0.0 0.0">
+        <r type="uniform" parameters="0.0 0.0"/>
         <cos_theta type="discrete">
           <parameters>1.0 1.0</parameters>
         </cos_theta>
@@ -67,7 +67,7 @@
       <lower_left>-10.0 -10.0 -10.0</lower_left>
       <upper_right>10.0 10.0 10.0</upper_right>
     </mesh>
-    <mesh id="2" library="moab" options="MAX_DEPTH=15;PLANE_SET=2" type="unstructured">
+    <mesh id="2" type="unstructured" library="moab" options="MAX_DEPTH=15;PLANE_SET=2">
       <filename>test_mesh_tets_w_holes.e</filename>
     </mesh>
     <filter id="1" type="mesh">
diff --git a/tests/regression_tests/unstructured_mesh/inputs_true15.dat b/tests/regression_tests/unstructured_mesh/inputs_true15.dat
index eab97b952..c69bd15d0 100644
--- a/tests/regression_tests/unstructured_mesh/inputs_true15.dat
+++ b/tests/regression_tests/unstructured_mesh/inputs_true15.dat
@@ -1,54 +1,54 @@
 <?xml version='1.0' encoding='utf-8'?>
 <model>
   <materials>
-    <material depletable="true" id="1" name="fuel">
-      <density units="g/cc" value="4.5"/>
-      <nuclide ao="1.0" name="U235"/>
+    <material id="1" name="fuel" depletable="true">
+      <density value="4.5" units="g/cc"/>
+      <nuclide name="U235" ao="1.0"/>
     </material>
     <material id="2" name="zircaloy">
-      <density units="g/cc" value="5.77"/>
-      <nuclide ao="0.5145" name="Zr90"/>
-      <nuclide ao="0.1122" name="Zr91"/>
-      <nuclide ao="0.1715" name="Zr92"/>
-      <nuclide ao="0.1738" name="Zr94"/>
-      <nuclide ao="0.028" name="Zr96"/>
+      <density value="5.77" units="g/cc"/>
+      <nuclide name="Zr90" ao="0.5145"/>
+      <nuclide name="Zr91" ao="0.1122"/>
+      <nuclide name="Zr92" ao="0.1715"/>
+      <nuclide name="Zr94" ao="0.1738"/>
+      <nuclide name="Zr96" ao="0.028"/>
     </material>
     <material id="3" name="water">
-      <density units="atom/b-cm" value="0.07416"/>
-      <nuclide ao="2.0" name="H1"/>
-      <nuclide ao="1.0" name="O16"/>
+      <density value="0.07416" units="atom/b-cm"/>
+      <nuclide name="H1" ao="2.0"/>
+      <nuclide name="O16" ao="1.0"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="1" name="fuel" region="1 -2 3 -4 5 -6" universe="1"/>
-    <cell id="2" material="2" name="clad" region="(-1 | 2 | -3 | 4 | -5 | 6) (7 -8 9 -10 11 -12)" universe="1"/>
-    <cell id="3" material="3" name="water" region="(-7 | 8 | -9 | 10 | -11 | 12) (13 -14 15 -16 17 -18)" universe="1"/>
-    <surface coeffs="-5.0" id="1" name="minimum x" type="x-plane"/>
-    <surface coeffs="5.0" id="2" name="maximum x" type="x-plane"/>
-    <surface coeffs="-5.0" id="3" name="minimum y" type="y-plane"/>
-    <surface coeffs="5.0" id="4" name="maximum y" type="y-plane"/>
-    <surface coeffs="-5.0" id="5" name="minimum z" type="z-plane"/>
-    <surface coeffs="5.0" id="6" name="maximum z" type="z-plane"/>
-    <surface coeffs="-6.0" id="7" name="minimum x" type="x-plane"/>
-    <surface coeffs="6.0" id="8" name="maximum x" type="x-plane"/>
-    <surface coeffs="-6.0" id="9" name="minimum y" type="y-plane"/>
-    <surface coeffs="6.0" id="10" name="maximum y" type="y-plane"/>
-    <surface coeffs="-6.0" id="11" name="minimum z" type="z-plane"/>
-    <surface coeffs="6.0" id="12" name="maximum z" type="z-plane"/>
-    <surface boundary="vacuum" coeffs="-10.0" id="13" name="minimum x" type="x-plane"/>
-    <surface boundary="vacuum" coeffs="10.0" id="14" name="maximum x" type="x-plane"/>
-    <surface boundary="vacuum" coeffs="-10.0" id="15" name="minimum y" type="y-plane"/>
-    <surface boundary="vacuum" coeffs="10.0" id="16" name="maximum y" type="y-plane"/>
-    <surface boundary="vacuum" coeffs="-10.0" id="17" name="minimum z" type="z-plane"/>
-    <surface boundary="vacuum" coeffs="10.0" id="18" name="maximum z" type="z-plane"/>
+    <cell id="1" name="fuel" material="1" region="1 -2 3 -4 5 -6" universe="1"/>
+    <cell id="2" name="clad" material="2" region="(-1 | 2 | -3 | 4 | -5 | 6) (7 -8 9 -10 11 -12)" universe="1"/>
+    <cell id="3" name="water" material="3" region="(-7 | 8 | -9 | 10 | -11 | 12) (13 -14 15 -16 17 -18)" universe="1"/>
+    <surface id="1" name="minimum x" type="x-plane" coeffs="-5.0"/>
+    <surface id="2" name="maximum x" type="x-plane" coeffs="5.0"/>
+    <surface id="3" name="minimum y" type="y-plane" coeffs="-5.0"/>
+    <surface id="4" name="maximum y" type="y-plane" coeffs="5.0"/>
+    <surface id="5" name="minimum z" type="z-plane" coeffs="-5.0"/>
+    <surface id="6" name="maximum z" type="z-plane" coeffs="5.0"/>
+    <surface id="7" name="minimum x" type="x-plane" coeffs="-6.0"/>
+    <surface id="8" name="maximum x" type="x-plane" coeffs="6.0"/>
+    <surface id="9" name="minimum y" type="y-plane" coeffs="-6.0"/>
+    <surface id="10" name="maximum y" type="y-plane" coeffs="6.0"/>
+    <surface id="11" name="minimum z" type="z-plane" coeffs="-6.0"/>
+    <surface id="12" name="maximum z" type="z-plane" coeffs="6.0"/>
+    <surface id="13" name="minimum x" type="x-plane" boundary="vacuum" coeffs="-10.0"/>
+    <surface id="14" name="maximum x" type="x-plane" boundary="vacuum" coeffs="10.0"/>
+    <surface id="15" name="minimum y" type="y-plane" boundary="vacuum" coeffs="-10.0"/>
+    <surface id="16" name="maximum y" type="y-plane" boundary="vacuum" coeffs="10.0"/>
+    <surface id="17" name="minimum z" type="z-plane" boundary="vacuum" coeffs="-10.0"/>
+    <surface id="18" name="maximum z" type="z-plane" boundary="vacuum" coeffs="10.0"/>
   </geometry>
   <settings>
     <run_mode>fixed source</run_mode>
     <particles>1000</particles>
     <batches>10</batches>
-    <source particle="neutron" strength="1.0" type="independent">
-      <space origin="0.0 0.0 0.0" type="spherical">
-        <r parameters="0.0 0.0" type="uniform"/>
+    <source type="independent" strength="1.0" particle="neutron">
+      <space type="spherical" origin="0.0 0.0 0.0">
+        <r type="uniform" parameters="0.0 0.0"/>
         <cos_theta type="discrete">
           <parameters>1.0 1.0</parameters>
         </cos_theta>
@@ -67,7 +67,7 @@
       <lower_left>-10.0 -10.0 -10.0</lower_left>
       <upper_right>10.0 10.0 10.0</upper_right>
     </mesh>
-    <mesh id="2" library="moab" options="MAX_DEPTH=15;PLANE_SET=2" type="unstructured">
+    <mesh id="2" type="unstructured" library="moab" options="MAX_DEPTH=15;PLANE_SET=2">
       <filename>test_mesh_tets.e</filename>
     </mesh>
     <filter id="1" type="mesh">
diff --git a/tests/regression_tests/unstructured_mesh/inputs_true2.dat b/tests/regression_tests/unstructured_mesh/inputs_true2.dat
index 3521ac7b8..ba9d477b5 100644
--- a/tests/regression_tests/unstructured_mesh/inputs_true2.dat
+++ b/tests/regression_tests/unstructured_mesh/inputs_true2.dat
@@ -1,54 +1,54 @@
 <?xml version='1.0' encoding='utf-8'?>
 <model>
   <materials>
-    <material depletable="true" id="1" name="fuel">
-      <density units="g/cc" value="4.5"/>
-      <nuclide ao="1.0" name="U235"/>
+    <material id="1" name="fuel" depletable="true">
+      <density value="4.5" units="g/cc"/>
+      <nuclide name="U235" ao="1.0"/>
     </material>
     <material id="2" name="zircaloy">
-      <density units="g/cc" value="5.77"/>
-      <nuclide ao="0.5145" name="Zr90"/>
-      <nuclide ao="0.1122" name="Zr91"/>
-      <nuclide ao="0.1715" name="Zr92"/>
-      <nuclide ao="0.1738" name="Zr94"/>
-      <nuclide ao="0.028" name="Zr96"/>
+      <density value="5.77" units="g/cc"/>
+      <nuclide name="Zr90" ao="0.5145"/>
+      <nuclide name="Zr91" ao="0.1122"/>
+      <nuclide name="Zr92" ao="0.1715"/>
+      <nuclide name="Zr94" ao="0.1738"/>
+      <nuclide name="Zr96" ao="0.028"/>
     </material>
     <material id="3" name="water">
-      <density units="atom/b-cm" value="0.07416"/>
-      <nuclide ao="2.0" name="H1"/>
-      <nuclide ao="1.0" name="O16"/>
+      <density value="0.07416" units="atom/b-cm"/>
+      <nuclide name="H1" ao="2.0"/>
+      <nuclide name="O16" ao="1.0"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="1" name="fuel" region="1 -2 3 -4 5 -6" universe="1"/>
-    <cell id="2" material="2" name="clad" region="(-1 | 2 | -3 | 4 | -5 | 6) (7 -8 9 -10 11 -12)" universe="1"/>
-    <cell id="3" material="3" name="water" region="(-7 | 8 | -9 | 10 | -11 | 12) (13 -14 15 -16 17 -18)" universe="1"/>
-    <surface coeffs="-5.0" id="1" name="minimum x" type="x-plane"/>
-    <surface coeffs="5.0" id="2" name="maximum x" type="x-plane"/>
-    <surface coeffs="-5.0" id="3" name="minimum y" type="y-plane"/>
-    <surface coeffs="5.0" id="4" name="maximum y" type="y-plane"/>
-    <surface coeffs="-5.0" id="5" name="minimum z" type="z-plane"/>
-    <surface coeffs="5.0" id="6" name="maximum z" type="z-plane"/>
-    <surface coeffs="-6.0" id="7" name="minimum x" type="x-plane"/>
-    <surface coeffs="6.0" id="8" name="maximum x" type="x-plane"/>
-    <surface coeffs="-6.0" id="9" name="minimum y" type="y-plane"/>
-    <surface coeffs="6.0" id="10" name="maximum y" type="y-plane"/>
-    <surface coeffs="-6.0" id="11" name="minimum z" type="z-plane"/>
-    <surface coeffs="6.0" id="12" name="maximum z" type="z-plane"/>
-    <surface boundary="vacuum" coeffs="-10.0" id="13" name="minimum x" type="x-plane"/>
-    <surface boundary="vacuum" coeffs="10.0" id="14" name="maximum x" type="x-plane"/>
-    <surface boundary="vacuum" coeffs="-10.0" id="15" name="minimum y" type="y-plane"/>
-    <surface boundary="vacuum" coeffs="10.0" id="16" name="maximum y" type="y-plane"/>
-    <surface boundary="vacuum" coeffs="-10.0" id="17" name="minimum z" type="z-plane"/>
-    <surface boundary="vacuum" coeffs="10.0" id="18" name="maximum z" type="z-plane"/>
+    <cell id="1" name="fuel" material="1" region="1 -2 3 -4 5 -6" universe="1"/>
+    <cell id="2" name="clad" material="2" region="(-1 | 2 | -3 | 4 | -5 | 6) (7 -8 9 -10 11 -12)" universe="1"/>
+    <cell id="3" name="water" material="3" region="(-7 | 8 | -9 | 10 | -11 | 12) (13 -14 15 -16 17 -18)" universe="1"/>
+    <surface id="1" name="minimum x" type="x-plane" coeffs="-5.0"/>
+    <surface id="2" name="maximum x" type="x-plane" coeffs="5.0"/>
+    <surface id="3" name="minimum y" type="y-plane" coeffs="-5.0"/>
+    <surface id="4" name="maximum y" type="y-plane" coeffs="5.0"/>
+    <surface id="5" name="minimum z" type="z-plane" coeffs="-5.0"/>
+    <surface id="6" name="maximum z" type="z-plane" coeffs="5.0"/>
+    <surface id="7" name="minimum x" type="x-plane" coeffs="-6.0"/>
+    <surface id="8" name="maximum x" type="x-plane" coeffs="6.0"/>
+    <surface id="9" name="minimum y" type="y-plane" coeffs="-6.0"/>
+    <surface id="10" name="maximum y" type="y-plane" coeffs="6.0"/>
+    <surface id="11" name="minimum z" type="z-plane" coeffs="-6.0"/>
+    <surface id="12" name="maximum z" type="z-plane" coeffs="6.0"/>
+    <surface id="13" name="minimum x" type="x-plane" boundary="vacuum" coeffs="-10.0"/>
+    <surface id="14" name="maximum x" type="x-plane" boundary="vacuum" coeffs="10.0"/>
+    <surface id="15" name="minimum y" type="y-plane" boundary="vacuum" coeffs="-10.0"/>
+    <surface id="16" name="maximum y" type="y-plane" boundary="vacuum" coeffs="10.0"/>
+    <surface id="17" name="minimum z" type="z-plane" boundary="vacuum" coeffs="-10.0"/>
+    <surface id="18" name="maximum z" type="z-plane" boundary="vacuum" coeffs="10.0"/>
   </geometry>
   <settings>
     <run_mode>fixed source</run_mode>
     <particles>1000</particles>
     <batches>10</batches>
-    <source particle="neutron" strength="1.0" type="independent">
-      <space origin="0.0 0.0 0.0" type="spherical">
-        <r parameters="0.0 0.0" type="uniform"/>
+    <source type="independent" strength="1.0" particle="neutron">
+      <space type="spherical" origin="0.0 0.0 0.0">
+        <r type="uniform" parameters="0.0 0.0"/>
         <cos_theta type="discrete">
           <parameters>1.0 1.0</parameters>
         </cos_theta>
@@ -67,7 +67,7 @@
       <lower_left>-10.0 -10.0 -10.0</lower_left>
       <upper_right>10.0 10.0 10.0</upper_right>
     </mesh>
-    <mesh id="2" library="libmesh" type="unstructured">
+    <mesh id="2" type="unstructured" library="libmesh">
       <filename>test_mesh_tets_w_holes.e</filename>
     </mesh>
     <filter id="1" type="mesh">
diff --git a/tests/regression_tests/unstructured_mesh/inputs_true3.dat b/tests/regression_tests/unstructured_mesh/inputs_true3.dat
index a376b401d..d840bfa09 100644
--- a/tests/regression_tests/unstructured_mesh/inputs_true3.dat
+++ b/tests/regression_tests/unstructured_mesh/inputs_true3.dat
@@ -1,54 +1,54 @@
 <?xml version='1.0' encoding='utf-8'?>
 <model>
   <materials>
-    <material depletable="true" id="1" name="fuel">
-      <density units="g/cc" value="4.5"/>
-      <nuclide ao="1.0" name="U235"/>
+    <material id="1" name="fuel" depletable="true">
+      <density value="4.5" units="g/cc"/>
+      <nuclide name="U235" ao="1.0"/>
     </material>
     <material id="2" name="zircaloy">
-      <density units="g/cc" value="5.77"/>
-      <nuclide ao="0.5145" name="Zr90"/>
-      <nuclide ao="0.1122" name="Zr91"/>
-      <nuclide ao="0.1715" name="Zr92"/>
-      <nuclide ao="0.1738" name="Zr94"/>
-      <nuclide ao="0.028" name="Zr96"/>
+      <density value="5.77" units="g/cc"/>
+      <nuclide name="Zr90" ao="0.5145"/>
+      <nuclide name="Zr91" ao="0.1122"/>
+      <nuclide name="Zr92" ao="0.1715"/>
+      <nuclide name="Zr94" ao="0.1738"/>
+      <nuclide name="Zr96" ao="0.028"/>
     </material>
     <material id="3" name="water">
-      <density units="atom/b-cm" value="0.07416"/>
-      <nuclide ao="2.0" name="H1"/>
-      <nuclide ao="1.0" name="O16"/>
+      <density value="0.07416" units="atom/b-cm"/>
+      <nuclide name="H1" ao="2.0"/>
+      <nuclide name="O16" ao="1.0"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="1" name="fuel" region="1 -2 3 -4 5 -6" universe="1"/>
-    <cell id="2" material="2" name="clad" region="(-1 | 2 | -3 | 4 | -5 | 6) (7 -8 9 -10 11 -12)" universe="1"/>
-    <cell id="3" material="3" name="water" region="(-7 | 8 | -9 | 10 | -11 | 12) (13 -14 15 -16 17 -18)" universe="1"/>
-    <surface coeffs="-5.0" id="1" name="minimum x" type="x-plane"/>
-    <surface coeffs="5.0" id="2" name="maximum x" type="x-plane"/>
-    <surface coeffs="-5.0" id="3" name="minimum y" type="y-plane"/>
-    <surface coeffs="5.0" id="4" name="maximum y" type="y-plane"/>
-    <surface coeffs="-5.0" id="5" name="minimum z" type="z-plane"/>
-    <surface coeffs="5.0" id="6" name="maximum z" type="z-plane"/>
-    <surface coeffs="-6.0" id="7" name="minimum x" type="x-plane"/>
-    <surface coeffs="6.0" id="8" name="maximum x" type="x-plane"/>
-    <surface coeffs="-6.0" id="9" name="minimum y" type="y-plane"/>
-    <surface coeffs="6.0" id="10" name="maximum y" type="y-plane"/>
-    <surface coeffs="-6.0" id="11" name="minimum z" type="z-plane"/>
-    <surface coeffs="6.0" id="12" name="maximum z" type="z-plane"/>
-    <surface boundary="vacuum" coeffs="-10.0" id="13" name="minimum x" type="x-plane"/>
-    <surface boundary="vacuum" coeffs="10.0" id="14" name="maximum x" type="x-plane"/>
-    <surface boundary="vacuum" coeffs="-10.0" id="15" name="minimum y" type="y-plane"/>
-    <surface boundary="vacuum" coeffs="10.0" id="16" name="maximum y" type="y-plane"/>
-    <surface boundary="vacuum" coeffs="-10.0" id="17" name="minimum z" type="z-plane"/>
-    <surface boundary="vacuum" coeffs="10.0" id="18" name="maximum z" type="z-plane"/>
+    <cell id="1" name="fuel" material="1" region="1 -2 3 -4 5 -6" universe="1"/>
+    <cell id="2" name="clad" material="2" region="(-1 | 2 | -3 | 4 | -5 | 6) (7 -8 9 -10 11 -12)" universe="1"/>
+    <cell id="3" name="water" material="3" region="(-7 | 8 | -9 | 10 | -11 | 12) (13 -14 15 -16 17 -18)" universe="1"/>
+    <surface id="1" name="minimum x" type="x-plane" coeffs="-5.0"/>
+    <surface id="2" name="maximum x" type="x-plane" coeffs="5.0"/>
+    <surface id="3" name="minimum y" type="y-plane" coeffs="-5.0"/>
+    <surface id="4" name="maximum y" type="y-plane" coeffs="5.0"/>
+    <surface id="5" name="minimum z" type="z-plane" coeffs="-5.0"/>
+    <surface id="6" name="maximum z" type="z-plane" coeffs="5.0"/>
+    <surface id="7" name="minimum x" type="x-plane" coeffs="-6.0"/>
+    <surface id="8" name="maximum x" type="x-plane" coeffs="6.0"/>
+    <surface id="9" name="minimum y" type="y-plane" coeffs="-6.0"/>
+    <surface id="10" name="maximum y" type="y-plane" coeffs="6.0"/>
+    <surface id="11" name="minimum z" type="z-plane" coeffs="-6.0"/>
+    <surface id="12" name="maximum z" type="z-plane" coeffs="6.0"/>
+    <surface id="13" name="minimum x" type="x-plane" boundary="vacuum" coeffs="-10.0"/>
+    <surface id="14" name="maximum x" type="x-plane" boundary="vacuum" coeffs="10.0"/>
+    <surface id="15" name="minimum y" type="y-plane" boundary="vacuum" coeffs="-10.0"/>
+    <surface id="16" name="maximum y" type="y-plane" boundary="vacuum" coeffs="10.0"/>
+    <surface id="17" name="minimum z" type="z-plane" boundary="vacuum" coeffs="-10.0"/>
+    <surface id="18" name="maximum z" type="z-plane" boundary="vacuum" coeffs="10.0"/>
   </geometry>
   <settings>
     <run_mode>fixed source</run_mode>
     <particles>1000</particles>
     <batches>10</batches>
-    <source particle="neutron" strength="1.0" type="independent">
-      <space origin="0.0 0.0 0.0" type="spherical">
-        <r parameters="0.0 0.0" type="uniform"/>
+    <source type="independent" strength="1.0" particle="neutron">
+      <space type="spherical" origin="0.0 0.0 0.0">
+        <r type="uniform" parameters="0.0 0.0"/>
         <cos_theta type="discrete">
           <parameters>1.0 1.0</parameters>
         </cos_theta>
@@ -67,7 +67,7 @@
       <lower_left>-10.0 -10.0 -10.0</lower_left>
       <upper_right>10.0 10.0 10.0</upper_right>
     </mesh>
-    <mesh id="2" library="libmesh" type="unstructured">
+    <mesh id="2" type="unstructured" library="libmesh">
       <filename>test_mesh_tets.e</filename>
     </mesh>
     <filter id="1" type="mesh">
diff --git a/tests/regression_tests/unstructured_mesh/inputs_true4.dat b/tests/regression_tests/unstructured_mesh/inputs_true4.dat
index 843632fdd..db8e37177 100644
--- a/tests/regression_tests/unstructured_mesh/inputs_true4.dat
+++ b/tests/regression_tests/unstructured_mesh/inputs_true4.dat
@@ -1,54 +1,54 @@
 <?xml version='1.0' encoding='utf-8'?>
 <model>
   <materials>
-    <material depletable="true" id="13" name="fuel">
-      <density units="g/cc" value="4.5"/>
-      <nuclide ao="1.0" name="U235"/>
+    <material id="1" name="fuel" depletable="true">
+      <density value="4.5" units="g/cc"/>
+      <nuclide name="U235" ao="1.0"/>
     </material>
-    <material id="14" name="zircaloy">
-      <density units="g/cc" value="5.77"/>
-      <nuclide ao="0.5145" name="Zr90"/>
-      <nuclide ao="0.1122" name="Zr91"/>
-      <nuclide ao="0.1715" name="Zr92"/>
-      <nuclide ao="0.1738" name="Zr94"/>
-      <nuclide ao="0.028" name="Zr96"/>
+    <material id="2" name="zircaloy">
+      <density value="5.77" units="g/cc"/>
+      <nuclide name="Zr90" ao="0.5145"/>
+      <nuclide name="Zr91" ao="0.1122"/>
+      <nuclide name="Zr92" ao="0.1715"/>
+      <nuclide name="Zr94" ao="0.1738"/>
+      <nuclide name="Zr96" ao="0.028"/>
     </material>
-    <material id="15" name="water">
-      <density units="atom/b-cm" value="0.07416"/>
-      <nuclide ao="2.0" name="H1"/>
-      <nuclide ao="1.0" name="O16"/>
+    <material id="3" name="water">
+      <density value="0.07416" units="atom/b-cm"/>
+      <nuclide name="H1" ao="2.0"/>
+      <nuclide name="O16" ao="1.0"/>
     </material>
   </materials>
   <geometry>
-    <cell id="13" material="13" name="fuel" region="73 -74 75 -76 77 -78" universe="5"/>
-    <cell id="14" material="14" name="clad" region="(-73 | 74 | -75 | 76 | -77 | 78) (79 -80 81 -82 83 -84)" universe="5"/>
-    <cell id="15" material="15" name="water" region="(-79 | 80 | -81 | 82 | -83 | 84) (85 -86 87 -88 89 -90)" universe="5"/>
-    <surface coeffs="-5.0" id="73" name="minimum x" type="x-plane"/>
-    <surface coeffs="5.0" id="74" name="maximum x" type="x-plane"/>
-    <surface coeffs="-5.0" id="75" name="minimum y" type="y-plane"/>
-    <surface coeffs="5.0" id="76" name="maximum y" type="y-plane"/>
-    <surface coeffs="-5.0" id="77" name="minimum z" type="z-plane"/>
-    <surface coeffs="5.0" id="78" name="maximum z" type="z-plane"/>
-    <surface coeffs="-6.0" id="79" name="minimum x" type="x-plane"/>
-    <surface coeffs="6.0" id="80" name="maximum x" type="x-plane"/>
-    <surface coeffs="-6.0" id="81" name="minimum y" type="y-plane"/>
-    <surface coeffs="6.0" id="82" name="maximum y" type="y-plane"/>
-    <surface coeffs="-6.0" id="83" name="minimum z" type="z-plane"/>
-    <surface coeffs="6.0" id="84" name="maximum z" type="z-plane"/>
-    <surface boundary="vacuum" coeffs="-15" id="85" name="minimum x" type="x-plane"/>
-    <surface boundary="vacuum" coeffs="15" id="86" name="maximum x" type="x-plane"/>
-    <surface boundary="vacuum" coeffs="-15" id="87" name="minimum y" type="y-plane"/>
-    <surface boundary="vacuum" coeffs="15" id="88" name="maximum y" type="y-plane"/>
-    <surface boundary="vacuum" coeffs="-15" id="89" name="minimum z" type="z-plane"/>
-    <surface boundary="vacuum" coeffs="15" id="90" name="maximum z" type="z-plane"/>
+    <cell id="1" name="fuel" material="1" region="1 -2 3 -4 5 -6" universe="1"/>
+    <cell id="2" name="clad" material="2" region="(-1 | 2 | -3 | 4 | -5 | 6) (7 -8 9 -10 11 -12)" universe="1"/>
+    <cell id="3" name="water" material="3" region="(-7 | 8 | -9 | 10 | -11 | 12) (13 -14 15 -16 17 -18)" universe="1"/>
+    <surface id="1" name="minimum x" type="x-plane" coeffs="-5.0"/>
+    <surface id="2" name="maximum x" type="x-plane" coeffs="5.0"/>
+    <surface id="3" name="minimum y" type="y-plane" coeffs="-5.0"/>
+    <surface id="4" name="maximum y" type="y-plane" coeffs="5.0"/>
+    <surface id="5" name="minimum z" type="z-plane" coeffs="-5.0"/>
+    <surface id="6" name="maximum z" type="z-plane" coeffs="5.0"/>
+    <surface id="7" name="minimum x" type="x-plane" coeffs="-6.0"/>
+    <surface id="8" name="maximum x" type="x-plane" coeffs="6.0"/>
+    <surface id="9" name="minimum y" type="y-plane" coeffs="-6.0"/>
+    <surface id="10" name="maximum y" type="y-plane" coeffs="6.0"/>
+    <surface id="11" name="minimum z" type="z-plane" coeffs="-6.0"/>
+    <surface id="12" name="maximum z" type="z-plane" coeffs="6.0"/>
+    <surface id="13" name="minimum x" type="x-plane" boundary="vacuum" coeffs="-15.0"/>
+    <surface id="14" name="maximum x" type="x-plane" boundary="vacuum" coeffs="15.0"/>
+    <surface id="15" name="minimum y" type="y-plane" boundary="vacuum" coeffs="-15.0"/>
+    <surface id="16" name="maximum y" type="y-plane" boundary="vacuum" coeffs="15.0"/>
+    <surface id="17" name="minimum z" type="z-plane" boundary="vacuum" coeffs="-15.0"/>
+    <surface id="18" name="maximum z" type="z-plane" boundary="vacuum" coeffs="15.0"/>
   </geometry>
   <settings>
     <run_mode>fixed source</run_mode>
-    <particles>100</particles>
+    <particles>1000</particles>
     <batches>10</batches>
-    <source strength="1.0">
-      <space origin="0.0 0.0 0.0" type="spherical">
-        <r parameters="0.0 0.0" type="uniform"/>
+    <source type="independent" strength="1.0" particle="neutron">
+      <space type="spherical" origin="0.0 0.0 0.0">
+        <r type="uniform" parameters="0.0 0.0"/>
         <cos_theta type="discrete">
           <parameters>1.0 1.0</parameters>
         </cos_theta>
@@ -56,34 +56,33 @@
           <parameters>0.0 1.0</parameters>
         </phi>
       </space>
-      <angle reference_uvw="-1.0 0.0 0.0" type="monodirectional"/>
       <energy type="discrete">
         <parameters>15000000.0 1.0</parameters>
       </energy>
     </source>
   </settings>
   <tallies>
-    <mesh id="9">
+    <mesh id="1">
       <dimension>10 10 10</dimension>
       <lower_left>-10.0 -10.0 -10.0</lower_left>
       <upper_right>10.0 10.0 10.0</upper_right>
     </mesh>
-    <mesh id="10" library="moab" type="unstructured">
-      <filename>test_mesh_tets_w_holes.exo</filename>
+    <mesh id="2" type="unstructured" library="libmesh">
+      <filename>test_mesh_tets_w_holes.e</filename>
     </mesh>
-    <filter id="9" type="mesh">
-      <bins>9</bins>
+    <filter id="1" type="mesh">
+      <bins>1</bins>
     </filter>
-    <filter id="10" type="mesh">
-      <bins>10</bins>
+    <filter id="2" type="mesh">
+      <bins>2</bins>
     </filter>
-    <tally id="9" name="regular mesh tally">
-      <filters>9</filters>
+    <tally id="1" name="regular mesh tally">
+      <filters>1</filters>
       <scores>flux</scores>
       <estimator>tracklength</estimator>
     </tally>
-    <tally id="10" name="unstructured mesh tally">
-      <filters>10</filters>
+    <tally id="2" name="unstructured mesh tally">
+      <filters>2</filters>
       <scores>flux</scores>
       <estimator>tracklength</estimator>
     </tally>
diff --git a/tests/regression_tests/unstructured_mesh/inputs_true5.dat b/tests/regression_tests/unstructured_mesh/inputs_true5.dat
index dc9129d98..b2bbc7e16 100644
--- a/tests/regression_tests/unstructured_mesh/inputs_true5.dat
+++ b/tests/regression_tests/unstructured_mesh/inputs_true5.dat
@@ -1,54 +1,54 @@
 <?xml version='1.0' encoding='utf-8'?>
 <model>
   <materials>
-    <material depletable="true" id="16" name="fuel">
-      <density units="g/cc" value="4.5"/>
-      <nuclide ao="1.0" name="U235"/>
+    <material id="1" name="fuel" depletable="true">
+      <density value="4.5" units="g/cc"/>
+      <nuclide name="U235" ao="1.0"/>
     </material>
-    <material id="17" name="zircaloy">
-      <density units="g/cc" value="5.77"/>
-      <nuclide ao="0.5145" name="Zr90"/>
-      <nuclide ao="0.1122" name="Zr91"/>
-      <nuclide ao="0.1715" name="Zr92"/>
-      <nuclide ao="0.1738" name="Zr94"/>
-      <nuclide ao="0.028" name="Zr96"/>
+    <material id="2" name="zircaloy">
+      <density value="5.77" units="g/cc"/>
+      <nuclide name="Zr90" ao="0.5145"/>
+      <nuclide name="Zr91" ao="0.1122"/>
+      <nuclide name="Zr92" ao="0.1715"/>
+      <nuclide name="Zr94" ao="0.1738"/>
+      <nuclide name="Zr96" ao="0.028"/>
     </material>
-    <material id="18" name="water">
-      <density units="atom/b-cm" value="0.07416"/>
-      <nuclide ao="2.0" name="H1"/>
-      <nuclide ao="1.0" name="O16"/>
+    <material id="3" name="water">
+      <density value="0.07416" units="atom/b-cm"/>
+      <nuclide name="H1" ao="2.0"/>
+      <nuclide name="O16" ao="1.0"/>
     </material>
   </materials>
   <geometry>
-    <cell id="16" material="16" name="fuel" region="91 -92 93 -94 95 -96" universe="6"/>
-    <cell id="17" material="17" name="clad" region="(-91 | 92 | -93 | 94 | -95 | 96) (97 -98 99 -100 101 -102)" universe="6"/>
-    <cell id="18" material="18" name="water" region="(-97 | 98 | -99 | 100 | -101 | 102) (103 -104 105 -106 107 -108)" universe="6"/>
-    <surface coeffs="-5.0" id="91" name="minimum x" type="x-plane"/>
-    <surface coeffs="5.0" id="92" name="maximum x" type="x-plane"/>
-    <surface coeffs="-5.0" id="93" name="minimum y" type="y-plane"/>
-    <surface coeffs="5.0" id="94" name="maximum y" type="y-plane"/>
-    <surface coeffs="-5.0" id="95" name="minimum z" type="z-plane"/>
-    <surface coeffs="5.0" id="96" name="maximum z" type="z-plane"/>
-    <surface coeffs="-6.0" id="97" name="minimum x" type="x-plane"/>
-    <surface coeffs="6.0" id="98" name="maximum x" type="x-plane"/>
-    <surface coeffs="-6.0" id="99" name="minimum y" type="y-plane"/>
-    <surface coeffs="6.0" id="100" name="maximum y" type="y-plane"/>
-    <surface coeffs="-6.0" id="101" name="minimum z" type="z-plane"/>
-    <surface coeffs="6.0" id="102" name="maximum z" type="z-plane"/>
-    <surface boundary="vacuum" coeffs="-15" id="103" name="minimum x" type="x-plane"/>
-    <surface boundary="vacuum" coeffs="15" id="104" name="maximum x" type="x-plane"/>
-    <surface boundary="vacuum" coeffs="-15" id="105" name="minimum y" type="y-plane"/>
-    <surface boundary="vacuum" coeffs="15" id="106" name="maximum y" type="y-plane"/>
-    <surface boundary="vacuum" coeffs="-15" id="107" name="minimum z" type="z-plane"/>
-    <surface boundary="vacuum" coeffs="15" id="108" name="maximum z" type="z-plane"/>
+    <cell id="1" name="fuel" material="1" region="1 -2 3 -4 5 -6" universe="1"/>
+    <cell id="2" name="clad" material="2" region="(-1 | 2 | -3 | 4 | -5 | 6) (7 -8 9 -10 11 -12)" universe="1"/>
+    <cell id="3" name="water" material="3" region="(-7 | 8 | -9 | 10 | -11 | 12) (13 -14 15 -16 17 -18)" universe="1"/>
+    <surface id="1" name="minimum x" type="x-plane" coeffs="-5.0"/>
+    <surface id="2" name="maximum x" type="x-plane" coeffs="5.0"/>
+    <surface id="3" name="minimum y" type="y-plane" coeffs="-5.0"/>
+    <surface id="4" name="maximum y" type="y-plane" coeffs="5.0"/>
+    <surface id="5" name="minimum z" type="z-plane" coeffs="-5.0"/>
+    <surface id="6" name="maximum z" type="z-plane" coeffs="5.0"/>
+    <surface id="7" name="minimum x" type="x-plane" coeffs="-6.0"/>
+    <surface id="8" name="maximum x" type="x-plane" coeffs="6.0"/>
+    <surface id="9" name="minimum y" type="y-plane" coeffs="-6.0"/>
+    <surface id="10" name="maximum y" type="y-plane" coeffs="6.0"/>
+    <surface id="11" name="minimum z" type="z-plane" coeffs="-6.0"/>
+    <surface id="12" name="maximum z" type="z-plane" coeffs="6.0"/>
+    <surface id="13" name="minimum x" type="x-plane" boundary="vacuum" coeffs="-15.0"/>
+    <surface id="14" name="maximum x" type="x-plane" boundary="vacuum" coeffs="15.0"/>
+    <surface id="15" name="minimum y" type="y-plane" boundary="vacuum" coeffs="-15.0"/>
+    <surface id="16" name="maximum y" type="y-plane" boundary="vacuum" coeffs="15.0"/>
+    <surface id="17" name="minimum z" type="z-plane" boundary="vacuum" coeffs="-15.0"/>
+    <surface id="18" name="maximum z" type="z-plane" boundary="vacuum" coeffs="15.0"/>
   </geometry>
   <settings>
     <run_mode>fixed source</run_mode>
-    <particles>100</particles>
+    <particles>1000</particles>
     <batches>10</batches>
-    <source strength="1.0">
-      <space origin="0.0 0.0 0.0" type="spherical">
-        <r parameters="0.0 0.0" type="uniform"/>
+    <source type="independent" strength="1.0" particle="neutron">
+      <space type="spherical" origin="0.0 0.0 0.0">
+        <r type="uniform" parameters="0.0 0.0"/>
         <cos_theta type="discrete">
           <parameters>1.0 1.0</parameters>
         </cos_theta>
@@ -56,34 +56,33 @@
           <parameters>0.0 1.0</parameters>
         </phi>
       </space>
-      <angle reference_uvw="-1.0 0.0 0.0" type="monodirectional"/>
       <energy type="discrete">
         <parameters>15000000.0 1.0</parameters>
       </energy>
     </source>
   </settings>
   <tallies>
-    <mesh id="11">
+    <mesh id="1">
       <dimension>10 10 10</dimension>
       <lower_left>-10.0 -10.0 -10.0</lower_left>
       <upper_right>10.0 10.0 10.0</upper_right>
     </mesh>
-    <mesh id="12" library="moab" type="unstructured">
-      <filename>test_mesh_tets.exo</filename>
+    <mesh id="2" type="unstructured" library="libmesh">
+      <filename>test_mesh_tets.e</filename>
     </mesh>
-    <filter id="11" type="mesh">
-      <bins>11</bins>
+    <filter id="1" type="mesh">
+      <bins>1</bins>
     </filter>
-    <filter id="12" type="mesh">
-      <bins>12</bins>
+    <filter id="2" type="mesh">
+      <bins>2</bins>
     </filter>
-    <tally id="11" name="regular mesh tally">
-      <filters>11</filters>
+    <tally id="1" name="regular mesh tally">
+      <filters>1</filters>
       <scores>flux</scores>
       <estimator>tracklength</estimator>
     </tally>
-    <tally id="12" name="unstructured mesh tally">
-      <filters>12</filters>
+    <tally id="2" name="unstructured mesh tally">
+      <filters>2</filters>
       <scores>flux</scores>
       <estimator>tracklength</estimator>
     </tally>
diff --git a/tests/regression_tests/unstructured_mesh/inputs_true6.dat b/tests/regression_tests/unstructured_mesh/inputs_true6.dat
index 82bc30703..d6ad0d98d 100644
--- a/tests/regression_tests/unstructured_mesh/inputs_true6.dat
+++ b/tests/regression_tests/unstructured_mesh/inputs_true6.dat
@@ -1,54 +1,54 @@
 <?xml version='1.0' encoding='utf-8'?>
 <model>
   <materials>
-    <material depletable="true" id="19" name="fuel">
-      <density units="g/cc" value="4.5"/>
-      <nuclide ao="1.0" name="U235"/>
+    <material id="1" name="fuel" depletable="true">
+      <density value="4.5" units="g/cc"/>
+      <nuclide name="U235" ao="1.0"/>
     </material>
-    <material id="20" name="zircaloy">
-      <density units="g/cc" value="5.77"/>
-      <nuclide ao="0.5145" name="Zr90"/>
-      <nuclide ao="0.1122" name="Zr91"/>
-      <nuclide ao="0.1715" name="Zr92"/>
-      <nuclide ao="0.1738" name="Zr94"/>
-      <nuclide ao="0.028" name="Zr96"/>
+    <material id="2" name="zircaloy">
+      <density value="5.77" units="g/cc"/>
+      <nuclide name="Zr90" ao="0.5145"/>
+      <nuclide name="Zr91" ao="0.1122"/>
+      <nuclide name="Zr92" ao="0.1715"/>
+      <nuclide name="Zr94" ao="0.1738"/>
+      <nuclide name="Zr96" ao="0.028"/>
     </material>
-    <material id="21" name="water">
-      <density units="atom/b-cm" value="0.07416"/>
-      <nuclide ao="2.0" name="H1"/>
-      <nuclide ao="1.0" name="O16"/>
+    <material id="3" name="water">
+      <density value="0.07416" units="atom/b-cm"/>
+      <nuclide name="H1" ao="2.0"/>
+      <nuclide name="O16" ao="1.0"/>
     </material>
   </materials>
   <geometry>
-    <cell id="19" material="19" name="fuel" region="109 -110 111 -112 113 -114" universe="7"/>
-    <cell id="20" material="20" name="clad" region="(-109 | 110 | -111 | 112 | -113 | 114) (115 -116 117 -118 119 -120)" universe="7"/>
-    <cell id="21" material="21" name="water" region="(-115 | 116 | -117 | 118 | -119 | 120) (121 -122 123 -124 125 -126)" universe="7"/>
-    <surface coeffs="-5.0" id="109" name="minimum x" type="x-plane"/>
-    <surface coeffs="5.0" id="110" name="maximum x" type="x-plane"/>
-    <surface coeffs="-5.0" id="111" name="minimum y" type="y-plane"/>
-    <surface coeffs="5.0" id="112" name="maximum y" type="y-plane"/>
-    <surface coeffs="-5.0" id="113" name="minimum z" type="z-plane"/>
-    <surface coeffs="5.0" id="114" name="maximum z" type="z-plane"/>
-    <surface coeffs="-6.0" id="115" name="minimum x" type="x-plane"/>
-    <surface coeffs="6.0" id="116" name="maximum x" type="x-plane"/>
-    <surface coeffs="-6.0" id="117" name="minimum y" type="y-plane"/>
-    <surface coeffs="6.0" id="118" name="maximum y" type="y-plane"/>
-    <surface coeffs="-6.0" id="119" name="minimum z" type="z-plane"/>
-    <surface coeffs="6.0" id="120" name="maximum z" type="z-plane"/>
-    <surface boundary="vacuum" coeffs="-10" id="121" name="minimum x" type="x-plane"/>
-    <surface boundary="vacuum" coeffs="10" id="122" name="maximum x" type="x-plane"/>
-    <surface boundary="vacuum" coeffs="-10" id="123" name="minimum y" type="y-plane"/>
-    <surface boundary="vacuum" coeffs="10" id="124" name="maximum y" type="y-plane"/>
-    <surface boundary="vacuum" coeffs="-10" id="125" name="minimum z" type="z-plane"/>
-    <surface boundary="vacuum" coeffs="10" id="126" name="maximum z" type="z-plane"/>
+    <cell id="1" name="fuel" material="1" region="1 -2 3 -4 5 -6" universe="1"/>
+    <cell id="2" name="clad" material="2" region="(-1 | 2 | -3 | 4 | -5 | 6) (7 -8 9 -10 11 -12)" universe="1"/>
+    <cell id="3" name="water" material="3" region="(-7 | 8 | -9 | 10 | -11 | 12) (13 -14 15 -16 17 -18)" universe="1"/>
+    <surface id="1" name="minimum x" type="x-plane" coeffs="-5.0"/>
+    <surface id="2" name="maximum x" type="x-plane" coeffs="5.0"/>
+    <surface id="3" name="minimum y" type="y-plane" coeffs="-5.0"/>
+    <surface id="4" name="maximum y" type="y-plane" coeffs="5.0"/>
+    <surface id="5" name="minimum z" type="z-plane" coeffs="-5.0"/>
+    <surface id="6" name="maximum z" type="z-plane" coeffs="5.0"/>
+    <surface id="7" name="minimum x" type="x-plane" coeffs="-6.0"/>
+    <surface id="8" name="maximum x" type="x-plane" coeffs="6.0"/>
+    <surface id="9" name="minimum y" type="y-plane" coeffs="-6.0"/>
+    <surface id="10" name="maximum y" type="y-plane" coeffs="6.0"/>
+    <surface id="11" name="minimum z" type="z-plane" coeffs="-6.0"/>
+    <surface id="12" name="maximum z" type="z-plane" coeffs="6.0"/>
+    <surface id="13" name="minimum x" type="x-plane" boundary="vacuum" coeffs="-10.0"/>
+    <surface id="14" name="maximum x" type="x-plane" boundary="vacuum" coeffs="10.0"/>
+    <surface id="15" name="minimum y" type="y-plane" boundary="vacuum" coeffs="-10.0"/>
+    <surface id="16" name="maximum y" type="y-plane" boundary="vacuum" coeffs="10.0"/>
+    <surface id="17" name="minimum z" type="z-plane" boundary="vacuum" coeffs="-10.0"/>
+    <surface id="18" name="maximum z" type="z-plane" boundary="vacuum" coeffs="10.0"/>
   </geometry>
   <settings>
     <run_mode>fixed source</run_mode>
-    <particles>100</particles>
+    <particles>1000</particles>
     <batches>10</batches>
-    <source strength="1.0">
-      <space origin="0.0 0.0 0.0" type="spherical">
-        <r parameters="0.0 0.0" type="uniform"/>
+    <source type="independent" strength="1.0" particle="neutron">
+      <space type="spherical" origin="0.0 0.0 0.0">
+        <r type="uniform" parameters="0.0 0.0"/>
         <cos_theta type="discrete">
           <parameters>1.0 1.0</parameters>
         </cos_theta>
@@ -56,34 +56,33 @@
           <parameters>0.0 1.0</parameters>
         </phi>
       </space>
-      <angle reference_uvw="-1.0 0.0 0.0" type="monodirectional"/>
       <energy type="discrete">
         <parameters>15000000.0 1.0</parameters>
       </energy>
     </source>
   </settings>
   <tallies>
-    <mesh id="13">
+    <mesh id="1">
       <dimension>10 10 10</dimension>
       <lower_left>-10.0 -10.0 -10.0</lower_left>
       <upper_right>10.0 10.0 10.0</upper_right>
     </mesh>
-    <mesh id="14" library="moab" type="unstructured">
-      <filename>test_mesh_tets_w_holes.exo</filename>
+    <mesh id="2" type="unstructured" library="libmesh">
+      <filename>test_mesh_tets_w_holes.e</filename>
     </mesh>
-    <filter id="13" type="mesh">
-      <bins>13</bins>
+    <filter id="1" type="mesh">
+      <bins>1</bins>
     </filter>
-    <filter id="14" type="mesh">
-      <bins>14</bins>
+    <filter id="2" type="mesh">
+      <bins>2</bins>
     </filter>
-    <tally id="13" name="regular mesh tally">
-      <filters>13</filters>
+    <tally id="1" name="regular mesh tally">
+      <filters>1</filters>
       <scores>flux</scores>
       <estimator>tracklength</estimator>
     </tally>
-    <tally id="14" name="unstructured mesh tally">
-      <filters>14</filters>
+    <tally id="2" name="unstructured mesh tally">
+      <filters>2</filters>
       <scores>flux</scores>
       <estimator>tracklength</estimator>
     </tally>
diff --git a/tests/regression_tests/unstructured_mesh/inputs_true7.dat b/tests/regression_tests/unstructured_mesh/inputs_true7.dat
index b982c40d0..924790a8c 100644
--- a/tests/regression_tests/unstructured_mesh/inputs_true7.dat
+++ b/tests/regression_tests/unstructured_mesh/inputs_true7.dat
@@ -1,54 +1,54 @@
 <?xml version='1.0' encoding='utf-8'?>
 <model>
   <materials>
-    <material depletable="true" id="22" name="fuel">
-      <density units="g/cc" value="4.5"/>
-      <nuclide ao="1.0" name="U235"/>
+    <material id="1" name="fuel" depletable="true">
+      <density value="4.5" units="g/cc"/>
+      <nuclide name="U235" ao="1.0"/>
     </material>
-    <material id="23" name="zircaloy">
-      <density units="g/cc" value="5.77"/>
-      <nuclide ao="0.5145" name="Zr90"/>
-      <nuclide ao="0.1122" name="Zr91"/>
-      <nuclide ao="0.1715" name="Zr92"/>
-      <nuclide ao="0.1738" name="Zr94"/>
-      <nuclide ao="0.028" name="Zr96"/>
+    <material id="2" name="zircaloy">
+      <density value="5.77" units="g/cc"/>
+      <nuclide name="Zr90" ao="0.5145"/>
+      <nuclide name="Zr91" ao="0.1122"/>
+      <nuclide name="Zr92" ao="0.1715"/>
+      <nuclide name="Zr94" ao="0.1738"/>
+      <nuclide name="Zr96" ao="0.028"/>
     </material>
-    <material id="24" name="water">
-      <density units="atom/b-cm" value="0.07416"/>
-      <nuclide ao="2.0" name="H1"/>
-      <nuclide ao="1.0" name="O16"/>
+    <material id="3" name="water">
+      <density value="0.07416" units="atom/b-cm"/>
+      <nuclide name="H1" ao="2.0"/>
+      <nuclide name="O16" ao="1.0"/>
     </material>
   </materials>
   <geometry>
-    <cell id="22" material="22" name="fuel" region="127 -128 129 -130 131 -132" universe="8"/>
-    <cell id="23" material="23" name="clad" region="(-127 | 128 | -129 | 130 | -131 | 132) (133 -134 135 -136 137 -138)" universe="8"/>
-    <cell id="24" material="24" name="water" region="(-133 | 134 | -135 | 136 | -137 | 138) (139 -140 141 -142 143 -144)" universe="8"/>
-    <surface coeffs="-5.0" id="127" name="minimum x" type="x-plane"/>
-    <surface coeffs="5.0" id="128" name="maximum x" type="x-plane"/>
-    <surface coeffs="-5.0" id="129" name="minimum y" type="y-plane"/>
-    <surface coeffs="5.0" id="130" name="maximum y" type="y-plane"/>
-    <surface coeffs="-5.0" id="131" name="minimum z" type="z-plane"/>
-    <surface coeffs="5.0" id="132" name="maximum z" type="z-plane"/>
-    <surface coeffs="-6.0" id="133" name="minimum x" type="x-plane"/>
-    <surface coeffs="6.0" id="134" name="maximum x" type="x-plane"/>
-    <surface coeffs="-6.0" id="135" name="minimum y" type="y-plane"/>
-    <surface coeffs="6.0" id="136" name="maximum y" type="y-plane"/>
-    <surface coeffs="-6.0" id="137" name="minimum z" type="z-plane"/>
-    <surface coeffs="6.0" id="138" name="maximum z" type="z-plane"/>
-    <surface boundary="vacuum" coeffs="-10" id="139" name="minimum x" type="x-plane"/>
-    <surface boundary="vacuum" coeffs="10" id="140" name="maximum x" type="x-plane"/>
-    <surface boundary="vacuum" coeffs="-10" id="141" name="minimum y" type="y-plane"/>
-    <surface boundary="vacuum" coeffs="10" id="142" name="maximum y" type="y-plane"/>
-    <surface boundary="vacuum" coeffs="-10" id="143" name="minimum z" type="z-plane"/>
-    <surface boundary="vacuum" coeffs="10" id="144" name="maximum z" type="z-plane"/>
+    <cell id="1" name="fuel" material="1" region="1 -2 3 -4 5 -6" universe="1"/>
+    <cell id="2" name="clad" material="2" region="(-1 | 2 | -3 | 4 | -5 | 6) (7 -8 9 -10 11 -12)" universe="1"/>
+    <cell id="3" name="water" material="3" region="(-7 | 8 | -9 | 10 | -11 | 12) (13 -14 15 -16 17 -18)" universe="1"/>
+    <surface id="1" name="minimum x" type="x-plane" coeffs="-5.0"/>
+    <surface id="2" name="maximum x" type="x-plane" coeffs="5.0"/>
+    <surface id="3" name="minimum y" type="y-plane" coeffs="-5.0"/>
+    <surface id="4" name="maximum y" type="y-plane" coeffs="5.0"/>
+    <surface id="5" name="minimum z" type="z-plane" coeffs="-5.0"/>
+    <surface id="6" name="maximum z" type="z-plane" coeffs="5.0"/>
+    <surface id="7" name="minimum x" type="x-plane" coeffs="-6.0"/>
+    <surface id="8" name="maximum x" type="x-plane" coeffs="6.0"/>
+    <surface id="9" name="minimum y" type="y-plane" coeffs="-6.0"/>
+    <surface id="10" name="maximum y" type="y-plane" coeffs="6.0"/>
+    <surface id="11" name="minimum z" type="z-plane" coeffs="-6.0"/>
+    <surface id="12" name="maximum z" type="z-plane" coeffs="6.0"/>
+    <surface id="13" name="minimum x" type="x-plane" boundary="vacuum" coeffs="-10.0"/>
+    <surface id="14" name="maximum x" type="x-plane" boundary="vacuum" coeffs="10.0"/>
+    <surface id="15" name="minimum y" type="y-plane" boundary="vacuum" coeffs="-10.0"/>
+    <surface id="16" name="maximum y" type="y-plane" boundary="vacuum" coeffs="10.0"/>
+    <surface id="17" name="minimum z" type="z-plane" boundary="vacuum" coeffs="-10.0"/>
+    <surface id="18" name="maximum z" type="z-plane" boundary="vacuum" coeffs="10.0"/>
   </geometry>
   <settings>
     <run_mode>fixed source</run_mode>
-    <particles>100</particles>
+    <particles>1000</particles>
     <batches>10</batches>
-    <source strength="1.0">
-      <space origin="0.0 0.0 0.0" type="spherical">
-        <r parameters="0.0 0.0" type="uniform"/>
+    <source type="independent" strength="1.0" particle="neutron">
+      <space type="spherical" origin="0.0 0.0 0.0">
+        <r type="uniform" parameters="0.0 0.0"/>
         <cos_theta type="discrete">
           <parameters>1.0 1.0</parameters>
         </cos_theta>
@@ -56,34 +56,33 @@
           <parameters>0.0 1.0</parameters>
         </phi>
       </space>
-      <angle reference_uvw="-1.0 0.0 0.0" type="monodirectional"/>
       <energy type="discrete">
         <parameters>15000000.0 1.0</parameters>
       </energy>
     </source>
   </settings>
   <tallies>
-    <mesh id="15">
+    <mesh id="1">
       <dimension>10 10 10</dimension>
       <lower_left>-10.0 -10.0 -10.0</lower_left>
       <upper_right>10.0 10.0 10.0</upper_right>
     </mesh>
-    <mesh id="16" library="moab" type="unstructured">
-      <filename>test_mesh_tets.exo</filename>
+    <mesh id="2" type="unstructured" library="libmesh">
+      <filename>test_mesh_tets.e</filename>
     </mesh>
-    <filter id="15" type="mesh">
-      <bins>15</bins>
+    <filter id="1" type="mesh">
+      <bins>1</bins>
     </filter>
-    <filter id="16" type="mesh">
-      <bins>16</bins>
+    <filter id="2" type="mesh">
+      <bins>2</bins>
     </filter>
-    <tally id="15" name="regular mesh tally">
-      <filters>15</filters>
+    <tally id="1" name="regular mesh tally">
+      <filters>1</filters>
       <scores>flux</scores>
       <estimator>tracklength</estimator>
     </tally>
-    <tally id="16" name="unstructured mesh tally">
-      <filters>16</filters>
+    <tally id="2" name="unstructured mesh tally">
+      <filters>2</filters>
       <scores>flux</scores>
       <estimator>tracklength</estimator>
     </tally>
diff --git a/tests/regression_tests/unstructured_mesh/inputs_true8.dat b/tests/regression_tests/unstructured_mesh/inputs_true8.dat
index 7994e1add..c04beb211 100644
--- a/tests/regression_tests/unstructured_mesh/inputs_true8.dat
+++ b/tests/regression_tests/unstructured_mesh/inputs_true8.dat
@@ -1,54 +1,54 @@
 <?xml version='1.0' encoding='utf-8'?>
 <model>
   <materials>
-    <material depletable="true" id="1" name="fuel">
-      <density units="g/cc" value="4.5"/>
-      <nuclide ao="1.0" name="U235"/>
+    <material id="1" name="fuel" depletable="true">
+      <density value="4.5" units="g/cc"/>
+      <nuclide name="U235" ao="1.0"/>
     </material>
     <material id="2" name="zircaloy">
-      <density units="g/cc" value="5.77"/>
-      <nuclide ao="0.5145" name="Zr90"/>
-      <nuclide ao="0.1122" name="Zr91"/>
-      <nuclide ao="0.1715" name="Zr92"/>
-      <nuclide ao="0.1738" name="Zr94"/>
-      <nuclide ao="0.028" name="Zr96"/>
+      <density value="5.77" units="g/cc"/>
+      <nuclide name="Zr90" ao="0.5145"/>
+      <nuclide name="Zr91" ao="0.1122"/>
+      <nuclide name="Zr92" ao="0.1715"/>
+      <nuclide name="Zr94" ao="0.1738"/>
+      <nuclide name="Zr96" ao="0.028"/>
     </material>
     <material id="3" name="water">
-      <density units="atom/b-cm" value="0.07416"/>
-      <nuclide ao="2.0" name="H1"/>
-      <nuclide ao="1.0" name="O16"/>
+      <density value="0.07416" units="atom/b-cm"/>
+      <nuclide name="H1" ao="2.0"/>
+      <nuclide name="O16" ao="1.0"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="1" name="fuel" region="1 -2 3 -4 5 -6" universe="1"/>
-    <cell id="2" material="2" name="clad" region="(-1 | 2 | -3 | 4 | -5 | 6) (7 -8 9 -10 11 -12)" universe="1"/>
-    <cell id="3" material="3" name="water" region="(-7 | 8 | -9 | 10 | -11 | 12) (13 -14 15 -16 17 -18)" universe="1"/>
-    <surface coeffs="-5.0" id="1" name="minimum x" type="x-plane"/>
-    <surface coeffs="5.0" id="2" name="maximum x" type="x-plane"/>
-    <surface coeffs="-5.0" id="3" name="minimum y" type="y-plane"/>
-    <surface coeffs="5.0" id="4" name="maximum y" type="y-plane"/>
-    <surface coeffs="-5.0" id="5" name="minimum z" type="z-plane"/>
-    <surface coeffs="5.0" id="6" name="maximum z" type="z-plane"/>
-    <surface coeffs="-6.0" id="7" name="minimum x" type="x-plane"/>
-    <surface coeffs="6.0" id="8" name="maximum x" type="x-plane"/>
-    <surface coeffs="-6.0" id="9" name="minimum y" type="y-plane"/>
-    <surface coeffs="6.0" id="10" name="maximum y" type="y-plane"/>
-    <surface coeffs="-6.0" id="11" name="minimum z" type="z-plane"/>
-    <surface coeffs="6.0" id="12" name="maximum z" type="z-plane"/>
-    <surface boundary="vacuum" coeffs="-15.0" id="13" name="minimum x" type="x-plane"/>
-    <surface boundary="vacuum" coeffs="15.0" id="14" name="maximum x" type="x-plane"/>
-    <surface boundary="vacuum" coeffs="-15.0" id="15" name="minimum y" type="y-plane"/>
-    <surface boundary="vacuum" coeffs="15.0" id="16" name="maximum y" type="y-plane"/>
-    <surface boundary="vacuum" coeffs="-15.0" id="17" name="minimum z" type="z-plane"/>
-    <surface boundary="vacuum" coeffs="15.0" id="18" name="maximum z" type="z-plane"/>
+    <cell id="1" name="fuel" material="1" region="1 -2 3 -4 5 -6" universe="1"/>
+    <cell id="2" name="clad" material="2" region="(-1 | 2 | -3 | 4 | -5 | 6) (7 -8 9 -10 11 -12)" universe="1"/>
+    <cell id="3" name="water" material="3" region="(-7 | 8 | -9 | 10 | -11 | 12) (13 -14 15 -16 17 -18)" universe="1"/>
+    <surface id="1" name="minimum x" type="x-plane" coeffs="-5.0"/>
+    <surface id="2" name="maximum x" type="x-plane" coeffs="5.0"/>
+    <surface id="3" name="minimum y" type="y-plane" coeffs="-5.0"/>
+    <surface id="4" name="maximum y" type="y-plane" coeffs="5.0"/>
+    <surface id="5" name="minimum z" type="z-plane" coeffs="-5.0"/>
+    <surface id="6" name="maximum z" type="z-plane" coeffs="5.0"/>
+    <surface id="7" name="minimum x" type="x-plane" coeffs="-6.0"/>
+    <surface id="8" name="maximum x" type="x-plane" coeffs="6.0"/>
+    <surface id="9" name="minimum y" type="y-plane" coeffs="-6.0"/>
+    <surface id="10" name="maximum y" type="y-plane" coeffs="6.0"/>
+    <surface id="11" name="minimum z" type="z-plane" coeffs="-6.0"/>
+    <surface id="12" name="maximum z" type="z-plane" coeffs="6.0"/>
+    <surface id="13" name="minimum x" type="x-plane" boundary="vacuum" coeffs="-15.0"/>
+    <surface id="14" name="maximum x" type="x-plane" boundary="vacuum" coeffs="15.0"/>
+    <surface id="15" name="minimum y" type="y-plane" boundary="vacuum" coeffs="-15.0"/>
+    <surface id="16" name="maximum y" type="y-plane" boundary="vacuum" coeffs="15.0"/>
+    <surface id="17" name="minimum z" type="z-plane" boundary="vacuum" coeffs="-15.0"/>
+    <surface id="18" name="maximum z" type="z-plane" boundary="vacuum" coeffs="15.0"/>
   </geometry>
   <settings>
     <run_mode>fixed source</run_mode>
     <particles>1000</particles>
     <batches>10</batches>
-    <source particle="neutron" strength="1.0" type="independent">
-      <space origin="0.0 0.0 0.0" type="spherical">
-        <r parameters="0.0 0.0" type="uniform"/>
+    <source type="independent" strength="1.0" particle="neutron">
+      <space type="spherical" origin="0.0 0.0 0.0">
+        <r type="uniform" parameters="0.0 0.0"/>
         <cos_theta type="discrete">
           <parameters>1.0 1.0</parameters>
         </cos_theta>
@@ -67,7 +67,7 @@
       <lower_left>-10.0 -10.0 -10.0</lower_left>
       <upper_right>10.0 10.0 10.0</upper_right>
     </mesh>
-    <mesh id="2" library="moab" options="MAX_DEPTH=15;PLANE_SET=2" type="unstructured">
+    <mesh id="2" type="unstructured" library="moab" options="MAX_DEPTH=15;PLANE_SET=2">
       <filename>test_mesh_tets_w_holes.e</filename>
     </mesh>
     <filter id="1" type="mesh">
diff --git a/tests/regression_tests/unstructured_mesh/inputs_true9.dat b/tests/regression_tests/unstructured_mesh/inputs_true9.dat
index 4fff123d7..111898ff2 100644
--- a/tests/regression_tests/unstructured_mesh/inputs_true9.dat
+++ b/tests/regression_tests/unstructured_mesh/inputs_true9.dat
@@ -1,54 +1,54 @@
 <?xml version='1.0' encoding='utf-8'?>
 <model>
   <materials>
-    <material depletable="true" id="1" name="fuel">
-      <density units="g/cc" value="4.5"/>
-      <nuclide ao="1.0" name="U235"/>
+    <material id="1" name="fuel" depletable="true">
+      <density value="4.5" units="g/cc"/>
+      <nuclide name="U235" ao="1.0"/>
     </material>
     <material id="2" name="zircaloy">
-      <density units="g/cc" value="5.77"/>
-      <nuclide ao="0.5145" name="Zr90"/>
-      <nuclide ao="0.1122" name="Zr91"/>
-      <nuclide ao="0.1715" name="Zr92"/>
-      <nuclide ao="0.1738" name="Zr94"/>
-      <nuclide ao="0.028" name="Zr96"/>
+      <density value="5.77" units="g/cc"/>
+      <nuclide name="Zr90" ao="0.5145"/>
+      <nuclide name="Zr91" ao="0.1122"/>
+      <nuclide name="Zr92" ao="0.1715"/>
+      <nuclide name="Zr94" ao="0.1738"/>
+      <nuclide name="Zr96" ao="0.028"/>
     </material>
     <material id="3" name="water">
-      <density units="atom/b-cm" value="0.07416"/>
-      <nuclide ao="2.0" name="H1"/>
-      <nuclide ao="1.0" name="O16"/>
+      <density value="0.07416" units="atom/b-cm"/>
+      <nuclide name="H1" ao="2.0"/>
+      <nuclide name="O16" ao="1.0"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="1" name="fuel" region="1 -2 3 -4 5 -6" universe="1"/>
-    <cell id="2" material="2" name="clad" region="(-1 | 2 | -3 | 4 | -5 | 6) (7 -8 9 -10 11 -12)" universe="1"/>
-    <cell id="3" material="3" name="water" region="(-7 | 8 | -9 | 10 | -11 | 12) (13 -14 15 -16 17 -18)" universe="1"/>
-    <surface coeffs="-5.0" id="1" name="minimum x" type="x-plane"/>
-    <surface coeffs="5.0" id="2" name="maximum x" type="x-plane"/>
-    <surface coeffs="-5.0" id="3" name="minimum y" type="y-plane"/>
-    <surface coeffs="5.0" id="4" name="maximum y" type="y-plane"/>
-    <surface coeffs="-5.0" id="5" name="minimum z" type="z-plane"/>
-    <surface coeffs="5.0" id="6" name="maximum z" type="z-plane"/>
-    <surface coeffs="-6.0" id="7" name="minimum x" type="x-plane"/>
-    <surface coeffs="6.0" id="8" name="maximum x" type="x-plane"/>
-    <surface coeffs="-6.0" id="9" name="minimum y" type="y-plane"/>
-    <surface coeffs="6.0" id="10" name="maximum y" type="y-plane"/>
-    <surface coeffs="-6.0" id="11" name="minimum z" type="z-plane"/>
-    <surface coeffs="6.0" id="12" name="maximum z" type="z-plane"/>
-    <surface boundary="vacuum" coeffs="-15.0" id="13" name="minimum x" type="x-plane"/>
-    <surface boundary="vacuum" coeffs="15.0" id="14" name="maximum x" type="x-plane"/>
-    <surface boundary="vacuum" coeffs="-15.0" id="15" name="minimum y" type="y-plane"/>
-    <surface boundary="vacuum" coeffs="15.0" id="16" name="maximum y" type="y-plane"/>
-    <surface boundary="vacuum" coeffs="-15.0" id="17" name="minimum z" type="z-plane"/>
-    <surface boundary="vacuum" coeffs="15.0" id="18" name="maximum z" type="z-plane"/>
+    <cell id="1" name="fuel" material="1" region="1 -2 3 -4 5 -6" universe="1"/>
+    <cell id="2" name="clad" material="2" region="(-1 | 2 | -3 | 4 | -5 | 6) (7 -8 9 -10 11 -12)" universe="1"/>
+    <cell id="3" name="water" material="3" region="(-7 | 8 | -9 | 10 | -11 | 12) (13 -14 15 -16 17 -18)" universe="1"/>
+    <surface id="1" name="minimum x" type="x-plane" coeffs="-5.0"/>
+    <surface id="2" name="maximum x" type="x-plane" coeffs="5.0"/>
+    <surface id="3" name="minimum y" type="y-plane" coeffs="-5.0"/>
+    <surface id="4" name="maximum y" type="y-plane" coeffs="5.0"/>
+    <surface id="5" name="minimum z" type="z-plane" coeffs="-5.0"/>
+    <surface id="6" name="maximum z" type="z-plane" coeffs="5.0"/>
+    <surface id="7" name="minimum x" type="x-plane" coeffs="-6.0"/>
+    <surface id="8" name="maximum x" type="x-plane" coeffs="6.0"/>
+    <surface id="9" name="minimum y" type="y-plane" coeffs="-6.0"/>
+    <surface id="10" name="maximum y" type="y-plane" coeffs="6.0"/>
+    <surface id="11" name="minimum z" type="z-plane" coeffs="-6.0"/>
+    <surface id="12" name="maximum z" type="z-plane" coeffs="6.0"/>
+    <surface id="13" name="minimum x" type="x-plane" boundary="vacuum" coeffs="-15.0"/>
+    <surface id="14" name="maximum x" type="x-plane" boundary="vacuum" coeffs="15.0"/>
+    <surface id="15" name="minimum y" type="y-plane" boundary="vacuum" coeffs="-15.0"/>
+    <surface id="16" name="maximum y" type="y-plane" boundary="vacuum" coeffs="15.0"/>
+    <surface id="17" name="minimum z" type="z-plane" boundary="vacuum" coeffs="-15.0"/>
+    <surface id="18" name="maximum z" type="z-plane" boundary="vacuum" coeffs="15.0"/>
   </geometry>
   <settings>
     <run_mode>fixed source</run_mode>
     <particles>1000</particles>
     <batches>10</batches>
-    <source particle="neutron" strength="1.0" type="independent">
-      <space origin="0.0 0.0 0.0" type="spherical">
-        <r parameters="0.0 0.0" type="uniform"/>
+    <source type="independent" strength="1.0" particle="neutron">
+      <space type="spherical" origin="0.0 0.0 0.0">
+        <r type="uniform" parameters="0.0 0.0"/>
         <cos_theta type="discrete">
           <parameters>1.0 1.0</parameters>
         </cos_theta>
@@ -67,7 +67,7 @@
       <lower_left>-10.0 -10.0 -10.0</lower_left>
       <upper_right>10.0 10.0 10.0</upper_right>
     </mesh>
-    <mesh id="2" library="moab" options="MAX_DEPTH=15;PLANE_SET=2" type="unstructured">
+    <mesh id="2" type="unstructured" library="moab" options="MAX_DEPTH=15;PLANE_SET=2">
       <filename>test_mesh_tets.e</filename>
     </mesh>
     <filter id="1" type="mesh">
diff --git a/tests/regression_tests/void/inputs_true.dat b/tests/regression_tests/void/inputs_true.dat
index 7fee0779e..cd2d14206 100644
--- a/tests/regression_tests/void/inputs_true.dat
+++ b/tests/regression_tests/void/inputs_true.dat
@@ -2,8 +2,8 @@
 <model>
   <materials>
     <material id="1">
-      <density units="g/cm3" value="7.14"/>
-      <nuclide ao="1.0" name="Zn64"/>
+      <density value="7.14" units="g/cm3"/>
+      <nuclide name="Zn64" ao="1.0"/>
     </material>
   </materials>
   <geometry>
@@ -58,62 +58,62 @@
     <cell id="49" material="1" region="48 -49" universe="1"/>
     <cell id="50" material="void" region="49 -50" universe="1"/>
     <cell id="51" material="1" region="50" universe="1"/>
-    <surface coeffs="0.0 0.0 0.0 1.0" id="1" type="sphere"/>
-    <surface coeffs="0.0 0.0 0.0 3.020408163265306" id="2" type="sphere"/>
-    <surface coeffs="0.0 0.0 0.0 5.040816326530612" id="3" type="sphere"/>
-    <surface coeffs="0.0 0.0 0.0 7.061224489795918" id="4" type="sphere"/>
-    <surface coeffs="0.0 0.0 0.0 9.081632653061224" id="5" type="sphere"/>
-    <surface coeffs="0.0 0.0 0.0 11.102040816326529" id="6" type="sphere"/>
-    <surface coeffs="0.0 0.0 0.0 13.122448979591836" id="7" type="sphere"/>
-    <surface coeffs="0.0 0.0 0.0 15.142857142857142" id="8" type="sphere"/>
-    <surface coeffs="0.0 0.0 0.0 17.163265306122447" id="9" type="sphere"/>
-    <surface coeffs="0.0 0.0 0.0 19.183673469387752" id="10" type="sphere"/>
-    <surface coeffs="0.0 0.0 0.0 21.204081632653057" id="11" type="sphere"/>
-    <surface coeffs="0.0 0.0 0.0 23.224489795918366" id="12" type="sphere"/>
-    <surface coeffs="0.0 0.0 0.0 25.24489795918367" id="13" type="sphere"/>
-    <surface coeffs="0.0 0.0 0.0 27.265306122448976" id="14" type="sphere"/>
-    <surface coeffs="0.0 0.0 0.0 29.285714285714285" id="15" type="sphere"/>
-    <surface coeffs="0.0 0.0 0.0 31.30612244897959" id="16" type="sphere"/>
-    <surface coeffs="0.0 0.0 0.0 33.326530612244895" id="17" type="sphere"/>
-    <surface coeffs="0.0 0.0 0.0 35.3469387755102" id="18" type="sphere"/>
-    <surface coeffs="0.0 0.0 0.0 37.367346938775505" id="19" type="sphere"/>
-    <surface coeffs="0.0 0.0 0.0 39.38775510204081" id="20" type="sphere"/>
-    <surface coeffs="0.0 0.0 0.0 41.408163265306115" id="21" type="sphere"/>
-    <surface coeffs="0.0 0.0 0.0 43.42857142857142" id="22" type="sphere"/>
-    <surface coeffs="0.0 0.0 0.0 45.44897959183673" id="23" type="sphere"/>
-    <surface coeffs="0.0 0.0 0.0 47.469387755102034" id="24" type="sphere"/>
-    <surface coeffs="0.0 0.0 0.0 49.48979591836734" id="25" type="sphere"/>
-    <surface coeffs="0.0 0.0 0.0 51.51020408163265" id="26" type="sphere"/>
-    <surface coeffs="0.0 0.0 0.0 53.53061224489795" id="27" type="sphere"/>
-    <surface coeffs="0.0 0.0 0.0 55.55102040816326" id="28" type="sphere"/>
-    <surface coeffs="0.0 0.0 0.0 57.57142857142857" id="29" type="sphere"/>
-    <surface coeffs="0.0 0.0 0.0 59.59183673469387" id="30" type="sphere"/>
-    <surface coeffs="0.0 0.0 0.0 61.61224489795918" id="31" type="sphere"/>
-    <surface coeffs="0.0 0.0 0.0 63.63265306122448" id="32" type="sphere"/>
-    <surface coeffs="0.0 0.0 0.0 65.65306122448979" id="33" type="sphere"/>
-    <surface coeffs="0.0 0.0 0.0 67.67346938775509" id="34" type="sphere"/>
-    <surface coeffs="0.0 0.0 0.0 69.6938775510204" id="35" type="sphere"/>
-    <surface coeffs="0.0 0.0 0.0 71.71428571428571" id="36" type="sphere"/>
-    <surface coeffs="0.0 0.0 0.0 73.73469387755101" id="37" type="sphere"/>
-    <surface coeffs="0.0 0.0 0.0 75.75510204081633" id="38" type="sphere"/>
-    <surface coeffs="0.0 0.0 0.0 77.77551020408163" id="39" type="sphere"/>
-    <surface coeffs="0.0 0.0 0.0 79.79591836734693" id="40" type="sphere"/>
-    <surface coeffs="0.0 0.0 0.0 81.81632653061223" id="41" type="sphere"/>
-    <surface coeffs="0.0 0.0 0.0 83.83673469387755" id="42" type="sphere"/>
-    <surface coeffs="0.0 0.0 0.0 85.85714285714285" id="43" type="sphere"/>
-    <surface coeffs="0.0 0.0 0.0 87.87755102040815" id="44" type="sphere"/>
-    <surface coeffs="0.0 0.0 0.0 89.89795918367346" id="45" type="sphere"/>
-    <surface coeffs="0.0 0.0 0.0 91.91836734693877" id="46" type="sphere"/>
-    <surface coeffs="0.0 0.0 0.0 93.93877551020407" id="47" type="sphere"/>
-    <surface coeffs="0.0 0.0 0.0 95.95918367346938" id="48" type="sphere"/>
-    <surface coeffs="0.0 0.0 0.0 97.97959183673468" id="49" type="sphere"/>
-    <surface boundary="vacuum" coeffs="0.0 0.0 0.0 100.0" id="50" type="sphere"/>
+    <surface id="1" type="sphere" coeffs="0.0 0.0 0.0 1.0"/>
+    <surface id="2" type="sphere" coeffs="0.0 0.0 0.0 3.020408163265306"/>
+    <surface id="3" type="sphere" coeffs="0.0 0.0 0.0 5.040816326530612"/>
+    <surface id="4" type="sphere" coeffs="0.0 0.0 0.0 7.061224489795918"/>
+    <surface id="5" type="sphere" coeffs="0.0 0.0 0.0 9.081632653061224"/>
+    <surface id="6" type="sphere" coeffs="0.0 0.0 0.0 11.102040816326529"/>
+    <surface id="7" type="sphere" coeffs="0.0 0.0 0.0 13.122448979591836"/>
+    <surface id="8" type="sphere" coeffs="0.0 0.0 0.0 15.142857142857142"/>
+    <surface id="9" type="sphere" coeffs="0.0 0.0 0.0 17.163265306122447"/>
+    <surface id="10" type="sphere" coeffs="0.0 0.0 0.0 19.183673469387752"/>
+    <surface id="11" type="sphere" coeffs="0.0 0.0 0.0 21.204081632653057"/>
+    <surface id="12" type="sphere" coeffs="0.0 0.0 0.0 23.224489795918366"/>
+    <surface id="13" type="sphere" coeffs="0.0 0.0 0.0 25.24489795918367"/>
+    <surface id="14" type="sphere" coeffs="0.0 0.0 0.0 27.265306122448976"/>
+    <surface id="15" type="sphere" coeffs="0.0 0.0 0.0 29.285714285714285"/>
+    <surface id="16" type="sphere" coeffs="0.0 0.0 0.0 31.30612244897959"/>
+    <surface id="17" type="sphere" coeffs="0.0 0.0 0.0 33.326530612244895"/>
+    <surface id="18" type="sphere" coeffs="0.0 0.0 0.0 35.3469387755102"/>
+    <surface id="19" type="sphere" coeffs="0.0 0.0 0.0 37.367346938775505"/>
+    <surface id="20" type="sphere" coeffs="0.0 0.0 0.0 39.38775510204081"/>
+    <surface id="21" type="sphere" coeffs="0.0 0.0 0.0 41.408163265306115"/>
+    <surface id="22" type="sphere" coeffs="0.0 0.0 0.0 43.42857142857142"/>
+    <surface id="23" type="sphere" coeffs="0.0 0.0 0.0 45.44897959183673"/>
+    <surface id="24" type="sphere" coeffs="0.0 0.0 0.0 47.469387755102034"/>
+    <surface id="25" type="sphere" coeffs="0.0 0.0 0.0 49.48979591836734"/>
+    <surface id="26" type="sphere" coeffs="0.0 0.0 0.0 51.51020408163265"/>
+    <surface id="27" type="sphere" coeffs="0.0 0.0 0.0 53.53061224489795"/>
+    <surface id="28" type="sphere" coeffs="0.0 0.0 0.0 55.55102040816326"/>
+    <surface id="29" type="sphere" coeffs="0.0 0.0 0.0 57.57142857142857"/>
+    <surface id="30" type="sphere" coeffs="0.0 0.0 0.0 59.59183673469387"/>
+    <surface id="31" type="sphere" coeffs="0.0 0.0 0.0 61.61224489795918"/>
+    <surface id="32" type="sphere" coeffs="0.0 0.0 0.0 63.63265306122448"/>
+    <surface id="33" type="sphere" coeffs="0.0 0.0 0.0 65.65306122448979"/>
+    <surface id="34" type="sphere" coeffs="0.0 0.0 0.0 67.67346938775509"/>
+    <surface id="35" type="sphere" coeffs="0.0 0.0 0.0 69.6938775510204"/>
+    <surface id="36" type="sphere" coeffs="0.0 0.0 0.0 71.71428571428571"/>
+    <surface id="37" type="sphere" coeffs="0.0 0.0 0.0 73.73469387755101"/>
+    <surface id="38" type="sphere" coeffs="0.0 0.0 0.0 75.75510204081633"/>
+    <surface id="39" type="sphere" coeffs="0.0 0.0 0.0 77.77551020408163"/>
+    <surface id="40" type="sphere" coeffs="0.0 0.0 0.0 79.79591836734693"/>
+    <surface id="41" type="sphere" coeffs="0.0 0.0 0.0 81.81632653061223"/>
+    <surface id="42" type="sphere" coeffs="0.0 0.0 0.0 83.83673469387755"/>
+    <surface id="43" type="sphere" coeffs="0.0 0.0 0.0 85.85714285714285"/>
+    <surface id="44" type="sphere" coeffs="0.0 0.0 0.0 87.87755102040815"/>
+    <surface id="45" type="sphere" coeffs="0.0 0.0 0.0 89.89795918367346"/>
+    <surface id="46" type="sphere" coeffs="0.0 0.0 0.0 91.91836734693877"/>
+    <surface id="47" type="sphere" coeffs="0.0 0.0 0.0 93.93877551020407"/>
+    <surface id="48" type="sphere" coeffs="0.0 0.0 0.0 95.95918367346938"/>
+    <surface id="49" type="sphere" coeffs="0.0 0.0 0.0 97.97959183673468"/>
+    <surface id="50" type="sphere" boundary="vacuum" coeffs="0.0 0.0 0.0 100.0"/>
   </geometry>
   <settings>
     <run_mode>fixed source</run_mode>
     <particles>1000</particles>
     <batches>3</batches>
-    <source particle="neutron" strength="1.0" type="independent">
+    <source type="independent" strength="1.0" particle="neutron">
       <space type="point">
         <parameters>0.0 0.0 0.0</parameters>
       </space>
diff --git a/tests/regression_tests/volume_calc/inputs_true.dat b/tests/regression_tests/volume_calc/inputs_true.dat
index e3a8162e3..ed7024c57 100644
--- a/tests/regression_tests/volume_calc/inputs_true.dat
+++ b/tests/regression_tests/volume_calc/inputs_true.dat
@@ -2,27 +2,27 @@
 <model>
   <materials>
     <material id="1">
-      <density units="g/cc" value="1.0"/>
-      <nuclide ao="2.0" name="H1"/>
-      <nuclide ao="1.0" name="O16"/>
-      <nuclide ao="0.0001" name="B10"/>
+      <density value="1.0" units="g/cc"/>
+      <nuclide name="H1" ao="2.0"/>
+      <nuclide name="O16" ao="1.0"/>
+      <nuclide name="B10" ao="0.0001"/>
       <sab name="c_H_in_H2O"/>
     </material>
-    <material depletable="true" id="2">
-      <density units="g/cc" value="4.5"/>
-      <nuclide ao="1.0" name="U235"/>
-      <nuclide ao="0.1" name="Mo99"/>
+    <material id="2" depletable="true">
+      <density value="4.5" units="g/cc"/>
+      <nuclide name="U235" ao="1.0"/>
+      <nuclide name="Mo99" ao="0.1"/>
     </material>
   </materials>
   <geometry>
     <cell id="1" material="2" region="-1 -3 5" universe="0"/>
     <cell id="2" material="1" region="-2 3" universe="0"/>
     <cell id="3" material="1" region="-4 -3" universe="0"/>
-    <surface boundary="vacuum" coeffs="0.0 0.0 1.0" id="1" type="z-cylinder"/>
-    <surface boundary="vacuum" coeffs="0.0 0.0 5.0 1.0" id="2" type="sphere"/>
-    <surface coeffs="5.0" id="3" type="z-plane"/>
-    <surface boundary="vacuum" coeffs="0.0 0.0 -5.0 1.0" id="4" type="sphere"/>
-    <surface coeffs="-5.0" id="5" type="z-plane"/>
+    <surface id="1" type="z-cylinder" boundary="vacuum" coeffs="0.0 0.0 1.0"/>
+    <surface id="2" type="sphere" boundary="vacuum" coeffs="0.0 0.0 5.0 1.0"/>
+    <surface id="3" type="z-plane" coeffs="5.0"/>
+    <surface id="4" type="sphere" boundary="vacuum" coeffs="0.0 0.0 -5.0 1.0"/>
+    <surface id="5" type="z-plane" coeffs="-5.0"/>
   </geometry>
   <settings>
     <run_mode>volume</run_mode>
@@ -53,7 +53,7 @@
       <samples>100</samples>
       <lower_left>-1.0 -1.0 -6.0</lower_left>
       <upper_right>1.0 1.0 6.0</upper_right>
-      <threshold threshold="0.1" type="std_dev"/>
+      <threshold type="std_dev" threshold="0.1"/>
     </volume_calc>
     <volume_calc>
       <domain_type>material</domain_type>
@@ -61,7 +61,7 @@
       <samples>100</samples>
       <lower_left>-1.0 -1.0 -6.0</lower_left>
       <upper_right>1.0 1.0 6.0</upper_right>
-      <threshold threshold="0.1" type="rel_err"/>
+      <threshold type="rel_err" threshold="0.1"/>
     </volume_calc>
     <volume_calc>
       <domain_type>cell</domain_type>
@@ -69,7 +69,7 @@
       <samples>100</samples>
       <lower_left>-1.0 -1.0 -6.0</lower_left>
       <upper_right>1.0 1.0 6.0</upper_right>
-      <threshold threshold="0.05" type="variance"/>
+      <threshold type="variance" threshold="0.05"/>
     </volume_calc>
   </settings>
   </model>
diff --git a/tests/regression_tests/volume_calc/inputs_true_mg.dat b/tests/regression_tests/volume_calc/inputs_true_mg.dat
index 2ace5cd3c..127566084 100644
--- a/tests/regression_tests/volume_calc/inputs_true_mg.dat
+++ b/tests/regression_tests/volume_calc/inputs_true_mg.dat
@@ -3,26 +3,26 @@
   <materials>
     <cross_sections>mg_lib.h5</cross_sections>
     <material id="1">
-      <density units="g/cc" value="1.0"/>
-      <nuclide ao="2.0" name="H1"/>
-      <nuclide ao="1.0" name="O16"/>
-      <nuclide ao="0.0001" name="B10"/>
+      <density value="1.0" units="g/cc"/>
+      <nuclide name="H1" ao="2.0"/>
+      <nuclide name="O16" ao="1.0"/>
+      <nuclide name="B10" ao="0.0001"/>
     </material>
-    <material depletable="true" id="2">
-      <density units="g/cc" value="4.5"/>
-      <nuclide ao="1.0" name="U235"/>
-      <nuclide ao="0.1" name="Mo99"/>
+    <material id="2" depletable="true">
+      <density value="4.5" units="g/cc"/>
+      <nuclide name="U235" ao="1.0"/>
+      <nuclide name="Mo99" ao="0.1"/>
     </material>
   </materials>
   <geometry>
     <cell id="1" material="2" region="-1 -3 5" universe="0"/>
     <cell id="2" material="1" region="-2 3" universe="0"/>
     <cell id="3" material="1" region="-4 -3" universe="0"/>
-    <surface boundary="vacuum" coeffs="0.0 0.0 1.0" id="1" type="z-cylinder"/>
-    <surface boundary="vacuum" coeffs="0.0 0.0 5.0 1.0" id="2" type="sphere"/>
-    <surface coeffs="5.0" id="3" type="z-plane"/>
-    <surface boundary="vacuum" coeffs="0.0 0.0 -5.0 1.0" id="4" type="sphere"/>
-    <surface coeffs="-5.0" id="5" type="z-plane"/>
+    <surface id="1" type="z-cylinder" boundary="vacuum" coeffs="0.0 0.0 1.0"/>
+    <surface id="2" type="sphere" boundary="vacuum" coeffs="0.0 0.0 5.0 1.0"/>
+    <surface id="3" type="z-plane" coeffs="5.0"/>
+    <surface id="4" type="sphere" boundary="vacuum" coeffs="0.0 0.0 -5.0 1.0"/>
+    <surface id="5" type="z-plane" coeffs="-5.0"/>
   </geometry>
   <settings>
     <run_mode>volume</run_mode>
@@ -54,7 +54,7 @@
       <samples>100</samples>
       <lower_left>-1.0 -1.0 -6.0</lower_left>
       <upper_right>1.0 1.0 6.0</upper_right>
-      <threshold threshold="0.1" type="std_dev"/>
+      <threshold type="std_dev" threshold="0.1"/>
     </volume_calc>
     <volume_calc>
       <domain_type>material</domain_type>
@@ -62,7 +62,7 @@
       <samples>100</samples>
       <lower_left>-1.0 -1.0 -6.0</lower_left>
       <upper_right>1.0 1.0 6.0</upper_right>
-      <threshold threshold="0.1" type="rel_err"/>
+      <threshold type="rel_err" threshold="0.1"/>
     </volume_calc>
     <volume_calc>
       <domain_type>cell</domain_type>
@@ -70,7 +70,7 @@
       <samples>100</samples>
       <lower_left>-1.0 -1.0 -6.0</lower_left>
       <upper_right>1.0 1.0 6.0</upper_right>
-      <threshold threshold="0.05" type="variance"/>
+      <threshold type="variance" threshold="0.05"/>
     </volume_calc>
   </settings>
   </model>
diff --git a/tests/regression_tests/weightwindows/inputs_true.dat b/tests/regression_tests/weightwindows/inputs_true.dat
index 91fec4af9..eb9393179 100644
--- a/tests/regression_tests/weightwindows/inputs_true.dat
+++ b/tests/regression_tests/weightwindows/inputs_true.dat
@@ -2,39 +2,39 @@
 <model>
   <materials>
     <material id="1">
-      <density units="g/cc" value="2.3"/>
-      <nuclide ao="0.168018676" name="H1"/>
-      <nuclide ao="1.93244e-05" name="H2"/>
-      <nuclide ao="0.561814465" name="O16"/>
-      <nuclide ao="0.00021401" name="O17"/>
-      <nuclide ao="0.021365" name="Na23"/>
-      <nuclide ao="0.021343" name="Al27"/>
-      <nuclide ao="0.187439342" name="Si28"/>
-      <nuclide ao="0.009517714" name="Si29"/>
-      <nuclide ao="0.006273944" name="Si30"/>
-      <nuclide ao="0.018026179" name="Ca40"/>
-      <nuclide ao="0.00012031" name="Ca42"/>
-      <nuclide ao="2.51033e-05" name="Ca43"/>
-      <nuclide ao="0.000387892" name="Ca44"/>
-      <nuclide ao="7.438e-07" name="Ca46"/>
-      <nuclide ao="3.47727e-05" name="Ca48"/>
-      <nuclide ao="0.000248179" name="Fe54"/>
-      <nuclide ao="0.003895875" name="Fe56"/>
-      <nuclide ao="8.99727e-05" name="Fe57"/>
-      <nuclide ao="1.19737e-05" name="Fe58"/>
+      <density value="2.3" units="g/cc"/>
+      <nuclide name="H1" ao="0.168018676"/>
+      <nuclide name="H2" ao="1.93244e-05"/>
+      <nuclide name="O16" ao="0.561814465"/>
+      <nuclide name="O17" ao="0.00021401"/>
+      <nuclide name="Na23" ao="0.021365"/>
+      <nuclide name="Al27" ao="0.021343"/>
+      <nuclide name="Si28" ao="0.187439342"/>
+      <nuclide name="Si29" ao="0.009517714"/>
+      <nuclide name="Si30" ao="0.006273944"/>
+      <nuclide name="Ca40" ao="0.018026179"/>
+      <nuclide name="Ca42" ao="0.00012031"/>
+      <nuclide name="Ca43" ao="2.51033e-05"/>
+      <nuclide name="Ca44" ao="0.000387892"/>
+      <nuclide name="Ca46" ao="7.438e-07"/>
+      <nuclide name="Ca48" ao="3.47727e-05"/>
+      <nuclide name="Fe54" ao="0.000248179"/>
+      <nuclide name="Fe56" ao="0.003895875"/>
+      <nuclide name="Fe57" ao="8.99727e-05"/>
+      <nuclide name="Fe58" ao="1.19737e-05"/>
     </material>
   </materials>
   <geometry>
     <cell id="1" material="1" region="-1" universe="1"/>
     <cell id="2" material="void" region="1 -2" universe="1"/>
-    <surface coeffs="0.0 0.0 0.0 240" id="1" type="sphere"/>
-    <surface boundary="vacuum" coeffs="0.0 0.0 0.0 250" id="2" type="sphere"/>
+    <surface id="1" type="sphere" coeffs="0.0 0.0 0.0 240"/>
+    <surface id="2" type="sphere" boundary="vacuum" coeffs="0.0 0.0 0.0 250"/>
   </geometry>
   <settings>
     <run_mode>fixed source</run_mode>
     <particles>200</particles>
     <batches>2</batches>
-    <source particle="neutron" strength="1.0" type="independent">
+    <source type="independent" strength="1.0" particle="neutron">
       <space type="point">
         <parameters>0.001 0.001 0.001</parameters>
       </space>
diff --git a/tests/regression_tests/weightwindows_fw_cadis/inputs_true.dat b/tests/regression_tests/weightwindows_fw_cadis/inputs_true.dat
index 586bbb120..448b4b145 100644
--- a/tests/regression_tests/weightwindows_fw_cadis/inputs_true.dat
+++ b/tests/regression_tests/weightwindows_fw_cadis/inputs_true.dat
@@ -3,24 +3,24 @@
   <materials>
     <cross_sections>mgxs.h5</cross_sections>
     <material id="1" name="source">
-      <density units="macro" value="1.0"/>
+      <density value="1.0" units="macro"/>
       <macroscopic name="source"/>
     </material>
     <material id="2" name="void">
-      <density units="macro" value="1.0"/>
+      <density value="1.0" units="macro"/>
       <macroscopic name="void"/>
     </material>
     <material id="3" name="absorber">
-      <density units="macro" value="1.0"/>
+      <density value="1.0" units="macro"/>
       <macroscopic name="absorber"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="1" name="infinite source region" universe="1"/>
-    <cell id="2" material="2" name="infinite void region" universe="2"/>
-    <cell id="3" material="3" name="infinite absorber region" universe="3"/>
-    <cell fill="4" id="4" universe="5"/>
-    <cell fill="5" id="5" name="full domain" region="1 -2 3 -4 5 -6" universe="6"/>
+    <cell id="1" name="infinite source region" material="1" universe="1"/>
+    <cell id="2" name="infinite void region" material="2" universe="2"/>
+    <cell id="3" name="infinite absorber region" material="3" universe="3"/>
+    <cell id="4" fill="4" universe="5"/>
+    <cell id="5" name="full domain" fill="5" region="1 -2 3 -4 5 -6" universe="6"/>
     <lattice id="4">
       <pitch>2.5 2.5 2.5</pitch>
       <dimension>12 12 12</dimension>
@@ -182,19 +182,19 @@
 3 3 3 3 3 3 3 3 3 3 3 3 
 3 3 3 3 3 3 3 3 3 3 3 3 </universes>
     </lattice>
-    <surface boundary="reflective" coeffs="0.0" id="1" type="x-plane"/>
-    <surface boundary="vacuum" coeffs="30.0" id="2" type="x-plane"/>
-    <surface boundary="reflective" coeffs="0.0" id="3" type="y-plane"/>
-    <surface boundary="vacuum" coeffs="30.0" id="4" type="y-plane"/>
-    <surface boundary="reflective" coeffs="0.0" id="5" type="z-plane"/>
-    <surface boundary="vacuum" coeffs="30.0" id="6" type="z-plane"/>
+    <surface id="1" type="x-plane" boundary="reflective" coeffs="0.0"/>
+    <surface id="2" type="x-plane" boundary="vacuum" coeffs="30.0"/>
+    <surface id="3" type="y-plane" boundary="reflective" coeffs="0.0"/>
+    <surface id="4" type="y-plane" boundary="vacuum" coeffs="30.0"/>
+    <surface id="5" type="z-plane" boundary="reflective" coeffs="0.0"/>
+    <surface id="6" type="z-plane" boundary="vacuum" coeffs="30.0"/>
   </geometry>
   <settings>
     <run_mode>fixed source</run_mode>
     <particles>90</particles>
     <batches>10</batches>
     <inactive>5</inactive>
-    <source particle="neutron" strength="3.14" type="independent">
+    <source type="independent" strength="3.14" particle="neutron">
       <energy type="discrete">
         <parameters>100.0 1.0</parameters>
       </energy>
@@ -222,7 +222,7 @@
     <random_ray>
       <distance_active>500.0</distance_active>
       <distance_inactive>100.0</distance_inactive>
-      <source particle="neutron" strength="1.0" type="independent">
+      <source type="independent" strength="1.0" particle="neutron">
         <space type="box">
           <parameters>0.0 0.0 0.0 30.0 30.0 30.0</parameters>
         </space>
diff --git a/tests/regression_tests/weightwindows_fw_cadis_mesh/flat/inputs_true.dat b/tests/regression_tests/weightwindows_fw_cadis_mesh/flat/inputs_true.dat
index ffb2ac112..d82aa6fae 100644
--- a/tests/regression_tests/weightwindows_fw_cadis_mesh/flat/inputs_true.dat
+++ b/tests/regression_tests/weightwindows_fw_cadis_mesh/flat/inputs_true.dat
@@ -3,24 +3,24 @@
   <materials>
     <cross_sections>mgxs.h5</cross_sections>
     <material id="1" name="source">
-      <density units="macro" value="1.0"/>
+      <density value="1.0" units="macro"/>
       <macroscopic name="source"/>
     </material>
     <material id="2" name="void">
-      <density units="macro" value="1.0"/>
+      <density value="1.0" units="macro"/>
       <macroscopic name="void"/>
     </material>
     <material id="3" name="absorber">
-      <density units="macro" value="1.0"/>
+      <density value="1.0" units="macro"/>
       <macroscopic name="absorber"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="1" name="infinite source region" universe="1"/>
-    <cell id="2" material="2" name="infinite void region" universe="2"/>
-    <cell id="3" material="3" name="infinite absorber region" universe="3"/>
-    <cell fill="4" id="4" universe="5"/>
-    <cell fill="5" id="5" name="full domain" region="1 -2 3 -4 5 -6" universe="6"/>
+    <cell id="1" name="infinite source region" material="1" universe="1"/>
+    <cell id="2" name="infinite void region" material="2" universe="2"/>
+    <cell id="3" name="infinite absorber region" material="3" universe="3"/>
+    <cell id="4" fill="4" universe="5"/>
+    <cell id="5" name="full domain" fill="5" region="1 -2 3 -4 5 -6" universe="6"/>
     <lattice id="4">
       <pitch>2.5 2.5 2.5</pitch>
       <dimension>12 12 12</dimension>
@@ -182,19 +182,19 @@
 3 3 3 3 3 3 3 3 3 3 3 3 
 3 3 3 3 3 3 3 3 3 3 3 3 </universes>
     </lattice>
-    <surface boundary="reflective" coeffs="0.0" id="1" type="x-plane"/>
-    <surface boundary="vacuum" coeffs="30.0" id="2" type="x-plane"/>
-    <surface boundary="reflective" coeffs="0.0" id="3" type="y-plane"/>
-    <surface boundary="vacuum" coeffs="30.0" id="4" type="y-plane"/>
-    <surface boundary="reflective" coeffs="0.0" id="5" type="z-plane"/>
-    <surface boundary="vacuum" coeffs="30.0" id="6" type="z-plane"/>
+    <surface id="1" type="x-plane" boundary="reflective" coeffs="0.0"/>
+    <surface id="2" type="x-plane" boundary="vacuum" coeffs="30.0"/>
+    <surface id="3" type="y-plane" boundary="reflective" coeffs="0.0"/>
+    <surface id="4" type="y-plane" boundary="vacuum" coeffs="30.0"/>
+    <surface id="5" type="z-plane" boundary="reflective" coeffs="0.0"/>
+    <surface id="6" type="z-plane" boundary="vacuum" coeffs="30.0"/>
   </geometry>
   <settings>
     <run_mode>fixed source</run_mode>
     <particles>750</particles>
     <batches>30</batches>
     <inactive>20</inactive>
-    <source particle="neutron" strength="3.14" type="independent">
+    <source type="independent" strength="3.14" particle="neutron">
       <energy type="discrete">
         <parameters>100.0 1.0</parameters>
       </energy>
@@ -222,7 +222,7 @@
     <random_ray>
       <distance_active>500.0</distance_active>
       <distance_inactive>100.0</distance_inactive>
-      <source particle="neutron" strength="1.0" type="independent">
+      <source type="independent" strength="1.0" particle="neutron">
         <space type="box">
           <parameters>0.0 0.0 0.0 30.0 30.0 30.0</parameters>
         </space>
diff --git a/tests/regression_tests/weightwindows_fw_cadis_mesh/linear/inputs_true.dat b/tests/regression_tests/weightwindows_fw_cadis_mesh/linear/inputs_true.dat
index 6aa91ca79..9e4b21d27 100644
--- a/tests/regression_tests/weightwindows_fw_cadis_mesh/linear/inputs_true.dat
+++ b/tests/regression_tests/weightwindows_fw_cadis_mesh/linear/inputs_true.dat
@@ -3,24 +3,24 @@
   <materials>
     <cross_sections>mgxs.h5</cross_sections>
     <material id="1" name="source">
-      <density units="macro" value="1.0"/>
+      <density value="1.0" units="macro"/>
       <macroscopic name="source"/>
     </material>
     <material id="2" name="void">
-      <density units="macro" value="1.0"/>
+      <density value="1.0" units="macro"/>
       <macroscopic name="void"/>
     </material>
     <material id="3" name="absorber">
-      <density units="macro" value="1.0"/>
+      <density value="1.0" units="macro"/>
       <macroscopic name="absorber"/>
     </material>
   </materials>
   <geometry>
-    <cell id="1" material="1" name="infinite source region" universe="1"/>
-    <cell id="2" material="2" name="infinite void region" universe="2"/>
-    <cell id="3" material="3" name="infinite absorber region" universe="3"/>
-    <cell fill="4" id="4" universe="5"/>
-    <cell fill="5" id="5" name="full domain" region="1 -2 3 -4 5 -6" universe="6"/>
+    <cell id="1" name="infinite source region" material="1" universe="1"/>
+    <cell id="2" name="infinite void region" material="2" universe="2"/>
+    <cell id="3" name="infinite absorber region" material="3" universe="3"/>
+    <cell id="4" fill="4" universe="5"/>
+    <cell id="5" name="full domain" fill="5" region="1 -2 3 -4 5 -6" universe="6"/>
     <lattice id="4">
       <pitch>2.5 2.5 2.5</pitch>
       <dimension>12 12 12</dimension>
@@ -182,19 +182,19 @@
 3 3 3 3 3 3 3 3 3 3 3 3 
 3 3 3 3 3 3 3 3 3 3 3 3 </universes>
     </lattice>
-    <surface boundary="reflective" coeffs="0.0" id="1" type="x-plane"/>
-    <surface boundary="vacuum" coeffs="30.0" id="2" type="x-plane"/>
-    <surface boundary="reflective" coeffs="0.0" id="3" type="y-plane"/>
-    <surface boundary="vacuum" coeffs="30.0" id="4" type="y-plane"/>
-    <surface boundary="reflective" coeffs="0.0" id="5" type="z-plane"/>
-    <surface boundary="vacuum" coeffs="30.0" id="6" type="z-plane"/>
+    <surface id="1" type="x-plane" boundary="reflective" coeffs="0.0"/>
+    <surface id="2" type="x-plane" boundary="vacuum" coeffs="30.0"/>
+    <surface id="3" type="y-plane" boundary="reflective" coeffs="0.0"/>
+    <surface id="4" type="y-plane" boundary="vacuum" coeffs="30.0"/>
+    <surface id="5" type="z-plane" boundary="reflective" coeffs="0.0"/>
+    <surface id="6" type="z-plane" boundary="vacuum" coeffs="30.0"/>
   </geometry>
   <settings>
     <run_mode>fixed source</run_mode>
     <particles>750</particles>
     <batches>30</batches>
     <inactive>20</inactive>
-    <source particle="neutron" strength="3.14" type="independent">
+    <source type="independent" strength="3.14" particle="neutron">
       <energy type="discrete">
         <parameters>100.0 1.0</parameters>
       </energy>
@@ -222,7 +222,7 @@
     <random_ray>
       <distance_active>500.0</distance_active>
       <distance_inactive>100.0</distance_inactive>
-      <source particle="neutron" strength="1.0" type="independent">
+      <source type="independent" strength="1.0" particle="neutron">
         <space type="box">
           <parameters>0.0 0.0 0.0 30.0 30.0 30.0</parameters>
         </space>

From e36c0aef2f9603cec8ad3b171b7667ed9ab773ff Mon Sep 17 00:00:00 2001
From: Boris Polania <boris.polania@gmail.com>
Date: Fri, 8 Aug 2025 07:09:24 -0700
Subject: [PATCH 093/203] Add stat:sum field to MCPL files for proper weight
 normalization (#3522)

Co-authored-by: Paul Romano <paul.k.romano@gmail.com>
---
 include/openmc/mcpl_interface.h             |  13 ++-
 src/mcpl_interface.cpp                      |  36 +++++++
 tests/cpp_unit_tests/CMakeLists.txt         |   1 +
 tests/cpp_unit_tests/test_mcpl_stat_sum.cpp | 108 ++++++++++++++++++++
 tests/unit_tests/test_mcpl_stat_sum.py      |  69 +++++++++++++
 5 files changed, 225 insertions(+), 2 deletions(-)
 create mode 100644 tests/cpp_unit_tests/test_mcpl_stat_sum.cpp
 create mode 100644 tests/unit_tests/test_mcpl_stat_sum.py

diff --git a/include/openmc/mcpl_interface.h b/include/openmc/mcpl_interface.h
index f7323e10a..a76d72e64 100644
--- a/include/openmc/mcpl_interface.h
+++ b/include/openmc/mcpl_interface.h
@@ -19,8 +19,17 @@ namespace openmc {
 //! \return  Vector of source sites
 vector<SourceSite> mcpl_source_sites(std::string path);
 
-//! Write an MCPL source file
-//
+//! Write an MCPL source file with stat:sum metadata
+//!
+//! This function writes particle data to an MCPL file. For MCPL >= 2.1.0,
+//! it includes a stat:sum field (key: "openmc_np1") containing the total
+//! number of source particles, which is essential for proper file merging
+//! and weight normalization when using MCPL files with McStas/McXtrace.
+//!
+//! The stat:sum field follows the crash-safety pattern:
+//! - Initially set to -1 when opening (indicates incomplete file)
+//! - Updated with actual particle count before closing
+//!
 //! \param[in] filename     Path to MCPL file
 //! \param[in] source_bank  Vector of SourceSites to write to file for this
 //!                         MPI rank.
diff --git a/src/mcpl_interface.cpp b/src/mcpl_interface.cpp
index 13915c3b8..b8e780710 100644
--- a/src/mcpl_interface.cpp
+++ b/src/mcpl_interface.cpp
@@ -67,6 +67,8 @@ using mcpl_hdr_set_srcname_fpt = void (*)(
 using mcpl_add_particle_fpt = void (*)(
   mcpl_outfile_t* outfile_handle, const mcpl_particle_repr_t* particle);
 using mcpl_close_outfile_fpt = void (*)(mcpl_outfile_t* outfile_handle);
+using mcpl_hdr_add_stat_sum_fpt = void (*)(
+  mcpl_outfile_t* outfile_handle, const char* key, double value);
 
 namespace openmc {
 
@@ -110,6 +112,7 @@ struct McplApi {
   mcpl_hdr_set_srcname_fpt hdr_set_srcname;
   mcpl_add_particle_fpt add_particle;
   mcpl_close_outfile_fpt close_outfile;
+  mcpl_hdr_add_stat_sum_fpt hdr_add_stat_sum;
 
   explicit McplApi(LibraryHandleType lib_handle)
   {
@@ -147,6 +150,15 @@ struct McplApi {
       load_symbol_platform("mcpl_add_particle"));
     close_outfile = reinterpret_cast<mcpl_close_outfile_fpt>(
       load_symbol_platform("mcpl_close_outfile"));
+
+    // Try to load mcpl_hdr_add_stat_sum (available in MCPL >= 2.1.0)
+    // Set to nullptr if not available for graceful fallback
+    try {
+      hdr_add_stat_sum = reinterpret_cast<mcpl_hdr_add_stat_sum_fpt>(
+        load_symbol_platform("mcpl_hdr_add_stat_sum"));
+    } catch (const std::runtime_error&) {
+      hdr_add_stat_sum = nullptr;
+    }
   }
 };
 
@@ -498,12 +510,36 @@ void write_mcpl_source_point(const char* filename, span<SourceSite> source_bank,
         "OpenMC {}.{}.{}", VERSION_MAJOR, VERSION_MINOR, VERSION_RELEASE);
     }
     g_mcpl_api->hdr_set_srcname(file_id, src_line.c_str());
+
+    // Initialize stat:sum with -1 to indicate incomplete file (issue #3514)
+    // This follows MCPL >= 2.1.0 convention for tracking simulation statistics
+    // The -1 value indicates "not available" if file creation is interrupted
+    if (g_mcpl_api->hdr_add_stat_sum) {
+      // Using key "openmc_np1" following tkittel's recommendation
+      // Initial value of -1 prevents misleading values in case of crashes
+      g_mcpl_api->hdr_add_stat_sum(file_id, "openmc_np1", -1.0);
+    }
   }
 
   write_mcpl_source_bank_internal(file_id, source_bank, bank_index);
 
   if (mpi::master) {
     if (file_id) {
+      // Update stat:sum with actual particle count before closing (issue #3514)
+      // This represents the original number of source particles in the
+      // simulation (not the number of particles in the file)
+      if (g_mcpl_api->hdr_add_stat_sum) {
+        // Calculate total source particles from active batches
+        // Per issue #3514: this should be the original number of source
+        // particles, not the number written to the file
+        int64_t total_source_particles =
+          static_cast<int64_t>(settings::n_batches - settings::n_inactive) *
+          settings::gen_per_batch * settings::n_particles;
+        // Update with actual count - this overwrites the initial -1 value
+        g_mcpl_api->hdr_add_stat_sum(
+          file_id, "openmc_np1", static_cast<double>(total_source_particles));
+      }
+
       g_mcpl_api->close_outfile(file_id);
     }
   }
diff --git a/tests/cpp_unit_tests/CMakeLists.txt b/tests/cpp_unit_tests/CMakeLists.txt
index f0f5f2853..8fedc2daa 100644
--- a/tests/cpp_unit_tests/CMakeLists.txt
+++ b/tests/cpp_unit_tests/CMakeLists.txt
@@ -4,6 +4,7 @@ set(TEST_NAMES
   test_tally
   test_interpolate
   test_math
+  test_mcpl_stat_sum
   # Add additional unit test files here
 )
 
diff --git a/tests/cpp_unit_tests/test_mcpl_stat_sum.cpp b/tests/cpp_unit_tests/test_mcpl_stat_sum.cpp
new file mode 100644
index 000000000..909830e03
--- /dev/null
+++ b/tests/cpp_unit_tests/test_mcpl_stat_sum.cpp
@@ -0,0 +1,108 @@
+#include <catch2/catch_test_macros.hpp>
+#include <cstdio>
+#include <string>
+#include <vector>
+
+#include "openmc/bank.h"
+#include "openmc/mcpl_interface.h"
+
+// Test the MCPL stat:sum functionality (issue #3514)
+TEST_CASE("MCPL stat:sum field")
+{
+  // Check if MCPL interface is available
+  if (!openmc::is_mcpl_interface_available()) {
+    SKIP("MCPL library not available");
+  }
+
+  SECTION("stat:sum field is written to MCPL files")
+  {
+    // Create a temporary filename
+    std::string filename = "test_stat_sum.mcpl";
+
+    // Create some test particles
+    std::vector<openmc::SourceSite> source_bank(100);
+    std::vector<int64_t> bank_index = {0, 100}; // 100 particles total
+
+    // Initialize test particles
+    for (int i = 0; i < 100; ++i) {
+      source_bank[i].particle = openmc::ParticleType::neutron;
+      source_bank[i].r = {i * 0.1, i * 0.2, i * 0.3};
+      source_bank[i].u = {0.0, 0.0, 1.0};
+      source_bank[i].E = 2.0e6; // 2 MeV
+      source_bank[i].time = 0.0;
+      source_bank[i].wgt = 1.0;
+    }
+
+    // Write the MCPL file
+    openmc::write_mcpl_source_point(filename.c_str(), source_bank, bank_index);
+
+    // Verify the file was created
+    FILE* f = std::fopen(filename.c_str(), "r");
+    REQUIRE(f != nullptr);
+    std::fclose(f);
+
+    // Read the file back to check stat:sum
+    // Note: This would require mcpl_open_file and checking the header
+    // Since we can't easily read MCPL headers in C++ without the full MCPL API,
+    // we rely on the Python test to verify the actual content
+
+    // Clean up
+    std::remove(filename.c_str());
+  }
+
+  SECTION("stat:sum uses correct particle count")
+  {
+    std::string filename = "test_count.mcpl";
+
+    // Test with different particle counts
+    std::vector<int> test_counts = {1, 10, 100, 1000};
+
+    for (int count : test_counts) {
+      std::vector<openmc::SourceSite> source_bank(count);
+      std::vector<int64_t> bank_index = {0, count};
+
+      // Initialize particles
+      for (int i = 0; i < count; ++i) {
+        source_bank[i].particle = openmc::ParticleType::neutron;
+        source_bank[i].r = {0.0, 0.0, 0.0};
+        source_bank[i].u = {0.0, 0.0, 1.0};
+        source_bank[i].E = 1.0e6;
+        source_bank[i].time = 0.0;
+        source_bank[i].wgt = 1.0;
+      }
+
+      // Write MCPL file
+      openmc::write_mcpl_source_point(
+        filename.c_str(), source_bank, bank_index);
+
+      // The stat:sum should equal count (verified by Python test)
+      // Here we just verify the file was created successfully
+      FILE* f = std::fopen(filename.c_str(), "r");
+      REQUIRE(f != nullptr);
+      std::fclose(f);
+
+      // Clean up
+      std::remove(filename.c_str());
+    }
+  }
+
+  SECTION("stat:sum handles empty particle bank")
+  {
+    std::string filename = "test_empty.mcpl";
+
+    // Create empty particle bank
+    std::vector<openmc::SourceSite> source_bank;
+    std::vector<int64_t> bank_index = {0};
+
+    // This should still create a valid MCPL file with stat:sum = 0
+    openmc::write_mcpl_source_point(filename.c_str(), source_bank, bank_index);
+
+    // Verify file was created
+    FILE* f = std::fopen(filename.c_str(), "r");
+    REQUIRE(f != nullptr);
+    std::fclose(f);
+
+    // Clean up
+    std::remove(filename.c_str());
+  }
+}
diff --git a/tests/unit_tests/test_mcpl_stat_sum.py b/tests/unit_tests/test_mcpl_stat_sum.py
new file mode 100644
index 000000000..b69192956
--- /dev/null
+++ b/tests/unit_tests/test_mcpl_stat_sum.py
@@ -0,0 +1,69 @@
+"""Test for MCPL stat:sum functionality"""
+
+from pathlib import Path
+import shutil
+
+import pytest
+import openmc
+
+
+@pytest.mark.skipif(shutil.which("mcpl-config") is None, reason="MCPL is not available.")
+def test_mcpl_stat_sum_field(run_in_tmpdir):
+    """Test that MCPL files contain proper stat:sum field with particle count.
+
+    This test verifies that when OpenMC creates MCPL source files, they contain
+    the stat:sum field. Since MCPL functions are not exposed in the Python API,
+    this test creates an actual OpenMC simulation to generate MCPL files and
+    then checks their content.
+    """
+
+    mcpl = pytest.importorskip("mcpl")
+
+    # Create a minimal working model that will generate MCPL files
+    model = openmc.examples.pwr_pin_cell()
+    model.settings.batches = 5
+    model.settings.inactive = 2
+    model.settings.particles = 1000
+    model.settings.sourcepoint = {'mcpl': True, 'separate': True}
+
+    # Run a short simulation to generate MCPL files
+    model.run(output=False)
+
+    # Find the generated MCPL file (from the last batch)
+    mcpl_file = Path('source.5.mcpl')
+    assert mcpl_file.exists(), "No MCPL files were generated"
+
+    # Open and verify the stat:sum field exists
+    with mcpl.MCPLFile(mcpl_file) as f:
+        # Check if stat:sum field exists using convenience property
+        if hasattr(f, 'stat_sum'):
+            # Use the convenience .stat_sum property directly
+            stat_sum_dict = f.stat_sum
+            assert 'openmc_np1' in stat_sum_dict, "openmc_np1 key not found in stat_sum"
+            stat_sum_value = int(stat_sum_dict['openmc_np1'])
+        else:
+            # Fallback to checking comments for older MCPL versions
+            comments = f.comments
+
+            # Check for stat:sum in comments (MCPL stores these as comments)
+            stat_sum_value = None
+
+            for comment in comments:
+                if 'stat:sum:openmc_np1' in comment:
+                    # Extract the value
+                    parts = comment.split(':')
+                    if len(parts) >= 4:
+                        stat_sum_value = int(parts[3].strip())
+                    break
+            else:
+                pytest.skip("stat:sum field not found - may be running with MCPL < 2.1.0")
+
+    # Verify the stat:sum value is reasonable
+    assert stat_sum_value != -1, "stat:sum was not updated from initial -1 value"
+
+    # In eigenvalue mode, active batches generate source particles
+    active_batches = model.settings.batches - model.settings.inactive  # 3 active batches
+    expected_particles = active_batches * model.settings.particles     # 3000 total
+
+    assert stat_sum_value == expected_particles, \
+        f"stat:sum value {stat_sum_value} doesn't match expected {expected_particles}"

From a11021cd07bf43b2ea3070222cd916a737b6ed80 Mon Sep 17 00:00:00 2001
From: GuySten <62616591+GuySten@users.noreply.github.com>
Date: Fri, 8 Aug 2025 20:47:55 +0300
Subject: [PATCH 094/203] Consistent XML parsing using functions from _xml
 module (#3517)

Co-authored-by: Paul Romano <paul.k.romano@gmail.com>
---
 openmc/_xml.py               |  14 ++--
 openmc/cell.py               |  22 +++---
 openmc/dagmc.py              |   8 +-
 openmc/data/library.py       |  10 +--
 openmc/deplete/chain.py      |   3 +-
 openmc/deplete/nuclide.py    |  34 +++++----
 openmc/filter.py             |  49 ++++++-------
 openmc/filter_expansion.py   |  31 ++++----
 openmc/lattice.py            |  21 +++---
 openmc/material.py           |  43 ++++++-----
 openmc/mesh.py               |  42 +++++------
 openmc/plots.py              | 137 +++++++++++++++++------------------
 openmc/settings.py           |  55 +++++++-------
 openmc/source.py             |  12 +--
 openmc/stats/multivariate.py |  34 ++++-----
 openmc/stats/univariate.py   |  25 +++----
 openmc/surface.py            |  13 ++--
 openmc/tallies.py            |  35 +++++----
 openmc/tally_derivative.py   |   9 ++-
 openmc/trigger.py            |  11 +--
 openmc/volume.py             |  11 +--
 openmc/weight_windows.py     |  15 ++--
 22 files changed, 313 insertions(+), 321 deletions(-)

diff --git a/openmc/_xml.py b/openmc/_xml.py
index 05412128d..758d80525 100644
--- a/openmc/_xml.py
+++ b/openmc/_xml.py
@@ -64,8 +64,8 @@ def get_text(elem, name, default=None):
 
 
 
-def get_elem_tuple(elem, name, dtype=int):
-    """Helper function to get a tuple of values from an elem
+def get_elem_list(elem, name, dtype=int):
+    """Helper function to get a list of values from an elem
 
     Parameters
     ----------
@@ -78,9 +78,9 @@ def get_elem_tuple(elem, name, dtype=int):
 
     Returns
     -------
-    tuple of dtype
-        Data read from the tuple
+    list of dtype
+        Data read from the list
     """
-    subelem = elem.find(name)
-    if subelem is not None:
-        return tuple([dtype(x) for x in subelem.text.split()])
+    text = get_text(elem, name)
+    if text is not None:
+        return [dtype(x) for x in text.split()]
diff --git a/openmc/cell.py b/openmc/cell.py
index cd0573e8b..672afe095 100644
--- a/openmc/cell.py
+++ b/openmc/cell.py
@@ -8,7 +8,7 @@ from uncertainties import UFloat
 
 import openmc
 import openmc.checkvalue as cv
-from ._xml import get_text
+from ._xml import get_elem_list, get_text
 from .mixin import IDManagerMixin
 from .plots import add_plot_params
 from .region import Region, Complement
@@ -689,9 +689,8 @@ class Cell(IDManagerMixin):
         c = cls(cell_id, name)
 
         # Assign material/distributed materials or fill
-        mat_text = get_text(elem, 'material')
-        if mat_text is not None:
-            mat_ids = mat_text.split()
+        mat_ids = get_elem_list(elem, 'material', str)
+        if mat_ids is not None:
             if len(mat_ids) > 1:
                 c.fill = [materials[i] for i in mat_ids]
             else:
@@ -706,19 +705,18 @@ class Cell(IDManagerMixin):
             c.region = Region.from_expression(region, surfaces)
 
         # Check for other attributes
-        t = get_text(elem, 'temperature')
-        if t is not None:
-            if ' ' in t:
-                c.temperature = [float(t_i) for t_i in t.split()]
+        temperature = get_elem_list(elem, 'temperature', float)
+        if temperature is not None:
+            if len(temperature) > 1:
+                c.temperature = temperature
             else:
-                c.temperature = float(t)
+                c.temperature = temperature[0]
         v = get_text(elem, 'volume')
         if v is not None:
             c.volume = float(v)
         for key in ('temperature', 'rotation', 'translation'):
-            value = get_text(elem, key)
-            if value is not None:
-                values = [float(x) for x in value.split()]
+            values = get_elem_list(elem, key, float)
+            if values is not None:
                 if key == 'rotation' and len(values) == 9:
                     values = np.array(values).reshape(3, 3)
                 setattr(c, key, values)
diff --git a/openmc/dagmc.py b/openmc/dagmc.py
index 2486f7516..d1265be26 100644
--- a/openmc/dagmc.py
+++ b/openmc/dagmc.py
@@ -8,7 +8,7 @@ import warnings
 
 import openmc
 import openmc.checkvalue as cv
-from ._xml import get_text
+from ._xml import get_elem_list, get_text
 from .checkvalue import check_type, check_value
 from .surface import _BOUNDARY_TYPES
 from .bounding_box import BoundingBox
@@ -468,8 +468,8 @@ class DAGMCUniverse(openmc.UniverseBase):
         if name is not None:
             out.name = name
 
-        out.auto_geom_ids = bool(elem.get('auto_geom_ids'))
-        out.auto_mat_ids = bool(elem.get('auto_mat_ids'))
+        out.auto_geom_ids = bool(get_text(elem, "auto_geom_ids"))
+        out.auto_mat_ids = bool(get_text(elem, "auto_mat_ids"))
 
         el_mat_override = elem.find('material_overrides')
         if el_mat_override is not None:
@@ -480,7 +480,7 @@ class DAGMCUniverse(openmc.UniverseBase):
             out._material_overrides = {}
             for elem in el_mat_override.findall('cell_override'):
                 cell_id = int(get_text(elem, 'id'))
-                mat_ids = get_text(elem, 'material_ids').split(' ')
+                mat_ids = get_elem_list(elem, "material_ids", str) or []
                 mat_objs = [mats[mat_id] for mat_id in mat_ids]
                 out._material_overrides[cell_id] = mat_objs
 
diff --git a/openmc/data/library.py b/openmc/data/library.py
index bec538c06..b49757b0d 100644
--- a/openmc/data/library.py
+++ b/openmc/data/library.py
@@ -5,7 +5,7 @@ import h5py
 import lxml.etree as ET
 
 import openmc
-from openmc._xml import clean_indentation
+from openmc._xml import get_elem_list, get_text, clean_indentation
 
 
 class DataLibrary(list):
@@ -172,9 +172,9 @@ class DataLibrary(list):
             directory = os.path.dirname(path)
 
         for lib_element in root.findall('library'):
-            filename = os.path.join(directory, lib_element.attrib['path'])
-            filetype = lib_element.attrib['type']
-            materials = lib_element.attrib['materials'].split()
+            filename = os.path.join(directory, get_text(lib_element, "path"))
+            filetype = get_text(lib_element, "type")
+            materials = get_elem_list(lib_element, "materials", str) or []
             library = {'path': filename, 'type': filetype,
                        'materials': materials}
             data.libraries.append(library)
@@ -182,7 +182,7 @@ class DataLibrary(list):
         # get depletion chain data
         dep_node = root.find("depletion_chain")
         if dep_node is not None:
-            filename = os.path.join(directory, dep_node.attrib['path'])
+            filename = os.path.join(directory, get_text(dep_node, "path"))
             library = {'path': filename, 'type': 'depletion_chain',
                        'materials': []}
             data.libraries.append(library)
diff --git a/openmc/deplete/chain.py b/openmc/deplete/chain.py
index 8e24f716b..f1a23317f 100644
--- a/openmc/deplete/chain.py
+++ b/openmc/deplete/chain.py
@@ -22,6 +22,7 @@ from openmc.checkvalue import check_type, check_greater_than, PathLike
 from openmc.data import gnds_name, zam
 from openmc.exceptions import DataError
 from .nuclide import FissionYieldDistribution, Nuclide
+from .._xml import get_text
 import openmc.data
 
 
@@ -553,7 +554,7 @@ class Chain:
         root = ET.parse(str(filename))
 
         for i, nuclide_elem in enumerate(root.findall('nuclide')):
-            this_q = fission_q.get(nuclide_elem.get("name"))
+            this_q = fission_q.get(get_text(nuclide_elem, "name"))
 
             nuc = Nuclide.from_xml(nuclide_elem, root, this_q)
             chain.add_nuclide(nuc)
diff --git a/openmc/deplete/nuclide.py b/openmc/deplete/nuclide.py
index 60e3e5317..958814834 100644
--- a/openmc/deplete/nuclide.py
+++ b/openmc/deplete/nuclide.py
@@ -14,6 +14,7 @@ import numpy as np
 
 from openmc.checkvalue import check_type
 from openmc.stats import Univariate
+from .._xml import get_elem_list, get_text
 
 __all__ = [
     "DecayTuple", "ReactionTuple", "Nuclide", "FissionYield",
@@ -225,38 +226,39 @@ class Nuclide:
 
         """
         nuc = cls()
-        nuc.name = element.get('name')
+        nuc.name = get_text(element, "name")
 
         # Check for half-life
-        if 'half_life' in element.attrib:
-            nuc.half_life = float(element.get('half_life'))
-            nuc.decay_energy = float(element.get('decay_energy', '0'))
+        half_life = get_text(element, "half_life")
+        if half_life is not None:
+            nuc.half_life = float(half_life)
+            nuc.decay_energy = float(get_text(element, "decay_energy", 0.0))
 
         # Check for decay paths
         for decay_elem in element.iter('decay'):
-            d_type = decay_elem.get('type')
-            target = decay_elem.get('target')
+            d_type = get_text(decay_elem, "type")
+            target = get_text(decay_elem, "target")
             if target is not None and target.lower() == "nothing":
                 target = None
-            branching_ratio = float(decay_elem.get('branching_ratio'))
+            branching_ratio = float(get_text(decay_elem, "branching_ratio"))
             nuc.decay_modes.append(DecayTuple(d_type, target, branching_ratio))
 
         # Check for sources
         for src_elem in element.iter('source'):
-            particle = src_elem.get('particle')
+            particle = get_text(src_elem, "particle")
             distribution = Univariate.from_xml_element(src_elem)
             nuc.sources[particle] = distribution
 
         # Check for reaction paths
         for reaction_elem in element.iter('reaction'):
-            r_type = reaction_elem.get('type')
-            Q = float(reaction_elem.get('Q', '0'))
-            branching_ratio = float(reaction_elem.get('branching_ratio', '1'))
+            r_type = get_text(reaction_elem, "type")
+            Q = float(get_text(reaction_elem, "Q", 0.0))
+            branching_ratio = float(get_text(reaction_elem, "branching_ratio", 1.0))
 
             # If the type is not fission, get target and Q value, otherwise
             # just set null values
             if r_type != 'fission':
-                target = reaction_elem.get('target')
+                target = get_text(reaction_elem, "target")
                 if target is not None and target.lower() == "nothing":
                     target = None
             else:
@@ -271,7 +273,7 @@ class Nuclide:
         fpy_elem = element.find('neutron_fission_yields')
         if fpy_elem is not None:
             # Check for use of FPY from other nuclide
-            parent = fpy_elem.get('parent')
+            parent = get_text(fpy_elem, "parent")
             if parent is not None:
                 assert root is not None
                 fpy_elem = root.find(
@@ -529,9 +531,9 @@ class FissionYieldDistribution(Mapping):
         """
         all_yields = {}
         for yield_elem in element.iter("fission_yields"):
-            energy = float(yield_elem.get("energy"))
-            products = yield_elem.find("products").text.split()
-            yields = map(float, yield_elem.find("data").text.split())
+            energy = float(get_text(yield_elem, "energy"))
+            products = get_elem_list(yield_elem, "products", str) or []
+            yields = get_elem_list(yield_elem, "data", float) or []
             # Get a map of products to their corresponding yield
             all_yields[energy] = dict(zip(products, yields))
 
diff --git a/openmc/filter.py b/openmc/filter.py
index 53fec898f..6a666d2a0 100644
--- a/openmc/filter.py
+++ b/openmc/filter.py
@@ -17,7 +17,7 @@ from .material import Material
 from .mixin import IDManagerMixin
 from .surface import Surface
 from .universe import UniverseBase
-from ._xml import get_text
+from ._xml import get_elem_list, get_text
 
 
 _FILTER_TYPES = (
@@ -259,17 +259,15 @@ class Filter(IDManagerMixin, metaclass=FilterMeta):
             Filter object
 
         """
-        filter_type = elem.get('type')
-        if filter_type is None:
-            filter_type = elem.find('type').text
+        filter_type = get_text(elem, "type")
 
         # If the filter type matches this class's short_name, then
         # there is no overridden from_xml_element method
         if filter_type == cls.short_name.lower():
             # Get bins from element -- the default here works for any filters
             # that just store a list of bins that can be represented as integers
-            filter_id = int(elem.get('id'))
-            bins = [int(x) for x in get_text(elem, 'bins').split()]
+            filter_id = int(get_text(elem, "id"))
+            bins = get_elem_list(elem, "bins", int) or []
             return cls(bins, filter_id=filter_id)
 
         # Search through all subclasses and find the one matching the HDF5
@@ -701,8 +699,8 @@ class CellInstanceFilter(Filter):
 
     @classmethod
     def from_xml_element(cls, elem, **kwargs):
-        filter_id = int(elem.get('id'))
-        bins = [int(x) for x in get_text(elem, 'bins').split()]
+        filter_id = int(get_text(elem, "id"))
+        bins = get_elem_list(elem, "bins", int) or []
         cell_instances = list(zip(bins[::2], bins[1::2]))
         return cls(cell_instances, filter_id=filter_id)
 
@@ -784,8 +782,8 @@ class ParticleFilter(Filter):
 
     @classmethod
     def from_xml_element(cls, elem, **kwargs):
-        filter_id = int(elem.get('id'))
-        bins = get_text(elem, 'bins').split()
+        filter_id = int(get_text(elem, "id"))
+        bins = get_elem_list(elem, "bins", str) or []
         return cls(bins, filter_id=filter_id)
 
 
@@ -1004,12 +1002,12 @@ class MeshFilter(Filter):
     def from_xml_element(cls, elem: ET.Element, **kwargs) -> MeshFilter:
         mesh_id = int(get_text(elem, 'bins'))
         mesh_obj = kwargs['meshes'][mesh_id]
-        filter_id = int(elem.get('id'))
+        filter_id = int(get_text(elem, "id"))
         out = cls(mesh_obj, filter_id=filter_id)
 
-        translation = elem.get('translation')
+        translation = get_elem_list(elem, "translation", float) or []
         if translation:
-            out.translation = [float(x) for x in translation.split()]
+            out.translation = translation
         return out
 
 
@@ -1149,16 +1147,16 @@ class MeshMaterialFilter(MeshFilter):
 
     @classmethod
     def from_xml_element(cls, elem: ET.Element, **kwargs) -> MeshMaterialFilter:
-        filter_id = int(elem.get('id'))
-        mesh_id = int(elem.get('mesh'))
+        filter_id = int(get_text(elem, "id"))
+        mesh_id = int(get_text(elem, "mesh"))
         mesh_obj = kwargs['meshes'][mesh_id]
-        bins = [int(x) for x in get_text(elem, 'bins').split()]
+        bins = get_elem_list(elem, "bins", int) or []
         bins = list(zip(bins[::2], bins[1::2]))
         out = cls(mesh_obj, bins, filter_id=filter_id)
 
-        translation = elem.get('translation')
+        translation = get_elem_list(elem, "translation", float) or []
         if translation:
-            out.translation = [float(x) for x in translation.split()]
+            out.translation = translation
         return out
 
     @classmethod
@@ -1557,8 +1555,8 @@ class RealFilter(Filter):
 
     @classmethod
     def from_xml_element(cls, elem, **kwargs):
-        filter_id = int(elem.get('id'))
-        bins = [float(x) for x in get_text(elem, 'bins').split()]
+        filter_id = int(get_text(elem, "id"))
+        bins = get_elem_list(elem, "bins", float) or []
         return cls(bins, filter_id=filter_id)
 
 
@@ -2447,12 +2445,13 @@ class EnergyFunctionFilter(Filter):
 
     @classmethod
     def from_xml_element(cls, elem, **kwargs):
-        filter_id = int(elem.get('id'))
-        energy = [float(x) for x in get_text(elem, 'energy').split()]
-        y = [float(x) for x in get_text(elem, 'y').split()]
+        filter_id = int(get_text(elem, "id"))
+        energy = get_elem_list(elem, "energy", float) or []
+        y = get_elem_list(elem, "y", float) or []
         out = cls(energy, y, filter_id=filter_id)
-        if elem.find('interpolation') is not None:
-            out.interpolation = elem.find('interpolation').text
+        interpolation = get_text(elem, "interpolation")
+        if interpolation is not None:
+            out.interpolation = interpolation
         return out
 
     def can_merge(self, other):
diff --git a/openmc/filter_expansion.py b/openmc/filter_expansion.py
index cdb2f20e0..b79c8fc79 100644
--- a/openmc/filter_expansion.py
+++ b/openmc/filter_expansion.py
@@ -4,6 +4,7 @@ import lxml.etree as ET
 
 import openmc.checkvalue as cv
 from .filter import Filter
+from ._xml import get_text
 
 
 class ExpansionFilter(Filter):
@@ -49,8 +50,8 @@ class ExpansionFilter(Filter):
 
     @classmethod
     def from_xml_element(cls, elem, **kwargs):
-        filter_id = int(elem.get('id'))
-        order = int(elem.find('order').text)
+        filter_id = int(get_text(elem, "id"))
+        order = int(get_text(elem, "order"))
         return cls(order, filter_id=filter_id)
 
     def merge(self, other):
@@ -263,11 +264,11 @@ class SpatialLegendreFilter(ExpansionFilter):
 
     @classmethod
     def from_xml_element(cls, elem, **kwargs):
-        filter_id = int(elem.get('id'))
-        order = int(elem.find('order').text)
-        axis = elem.find('axis').text
-        minimum = float(elem.find('min').text)
-        maximum = float(elem.find('max').text)
+        filter_id = int(get_text(elem, "id"))
+        order = int(get_text(elem, "order"))
+        axis = get_text(elem, "axis")
+        minimum = float(get_text(elem, "min"))
+        maximum = float(get_text(elem, "max"))
         return cls(order, axis, minimum, maximum, filter_id=filter_id)
 
 
@@ -362,10 +363,10 @@ class SphericalHarmonicsFilter(ExpansionFilter):
 
     @classmethod
     def from_xml_element(cls, elem, **kwargs):
-        filter_id = int(elem.get('id'))
-        order = int(elem.find('order').text)
+        filter_id = int(get_text(elem, "id"))
+        order = int(get_text(elem, "order"))
         filter = cls(order, filter_id=filter_id)
-        filter.cosine = elem.get('cosine')
+        filter.cosine = get_text(elem, "cosine")
         return filter
 
 
@@ -518,11 +519,11 @@ class ZernikeFilter(ExpansionFilter):
 
     @classmethod
     def from_xml_element(cls, elem, **kwargs):
-        filter_id = int(elem.get('id'))
-        order = int(elem.find('order').text)
-        x = float(elem.find('x').text)
-        y = float(elem.find('y').text)
-        r = float(elem.find('r').text)
+        filter_id = int(get_text(elem, "id"))
+        order = int(get_text(elem, "order"))
+        x = float(get_text(elem, "x"))
+        y = float(get_text(elem, "y"))
+        r = float(get_text(elem, "r"))
         return cls(order, x, y, r, filter_id=filter_id)
 
 
diff --git a/openmc/lattice.py b/openmc/lattice.py
index 518068560..f0e8b40b0 100644
--- a/openmc/lattice.py
+++ b/openmc/lattice.py
@@ -10,7 +10,7 @@ import numpy as np
 
 import openmc
 import openmc.checkvalue as cv
-from ._xml import get_text
+from ._xml import get_elem_list, get_text
 from .mixin import IDManagerMixin
 
 
@@ -959,18 +959,17 @@ class RectLattice(Lattice):
         lat_id = int(get_text(elem, 'id'))
         name = get_text(elem, 'name')
         lat = cls(lat_id, name)
-        lat.lower_left = [float(i)
-                          for i in get_text(elem, 'lower_left').split()]
-        lat.pitch = [float(i) for i in get_text(elem, 'pitch').split()]
+        lat.lower_left = get_elem_list(elem, "lower_left", float)
+        lat.pitch = get_elem_list(elem, "pitch", float)
         outer = get_text(elem, 'outer')
         if outer is not None:
             lat.outer = get_universe(int(outer))
 
         # Get array of universes
-        dimension = get_text(elem, 'dimension').split()
+        dimension = get_elem_list(elem, 'dimension', int)
         shape = np.array(dimension, dtype=int)[::-1]
-        uarray = np.array([get_universe(int(i)) for i in
-                           get_text(elem, 'universes').split()])
+        universes = get_elem_list(elem, 'universes', int)
+        uarray = np.array([get_universe(u) for u in universes])
         uarray.shape = shape
         lat.universes = uarray
         return lat
@@ -1530,8 +1529,8 @@ class HexLattice(Lattice):
         lat_id = int(get_text(elem, 'id'))
         name = get_text(elem, 'name')
         lat = cls(lat_id, name)
-        lat.center = [float(i) for i in get_text(elem, 'center').split()]
-        lat.pitch = [float(i) for i in get_text(elem, 'pitch').split()]
+        lat.center = get_elem_list(elem, "center", float)
+        lat.pitch = get_elem_list(elem, "pitch", float)
         lat.orientation = get_text(elem, 'orientation', 'y')
         outer = get_text(elem, 'outer')
         if outer is not None:
@@ -1548,8 +1547,8 @@ class HexLattice(Lattice):
             univs = [deepcopy(univs) for i in range(n_axial)]
 
         # Get flat array of universes
-        uarray = np.array([get_universe(int(i)) for i in
-                           get_text(elem, 'universes').split()])
+        universes = get_elem_list(elem, "universes", int)
+        uarray = np.array([get_universe(u) for u in universes])
 
         # Fill nested lists
         j = 0
diff --git a/openmc/material.py b/openmc/material.py
index db67b709c..0afe5b670 100644
--- a/openmc/material.py
+++ b/openmc/material.py
@@ -17,7 +17,7 @@ import h5py
 import openmc
 import openmc.data
 import openmc.checkvalue as cv
-from ._xml import clean_indentation
+from ._xml import clean_indentation, get_elem_list, get_text
 from .mixin import IDManagerMixin
 from .utility_funcs import input_path
 from . import waste
@@ -1672,50 +1672,55 @@ class Material(IDManagerMixin):
             Material generated from XML element
 
         """
-        mat_id = int(elem.get('id'))
+        mat_id = int(get_text(elem, 'id'))
+
         # Add NCrystal material from cfg string
-        if "cfg" in elem.attrib:
-            cfg = elem.get("cfg")
+        cfg = get_text(elem, "cfg")
+        if cfg is not None:
             return Material.from_ncrystal(cfg, material_id=mat_id)
 
         mat = cls(mat_id)
-        mat.name = elem.get('name')
+        mat.name = get_text(elem, 'name')
 
-        if "temperature" in elem.attrib:
-            mat.temperature = float(elem.get("temperature"))
+        temperature = get_text(elem, "temperature")
+        if temperature is not None:
+            mat.temperature = float(temperature)
 
-        if 'volume' in elem.attrib:
-            mat.volume = float(elem.get('volume'))
+        volume = get_text(elem, "volume")
+        if volume is not None:
+            mat.volume = float(volume)
 
         # Get each nuclide
         for nuclide in elem.findall('nuclide'):
-            name = nuclide.attrib['name']
+            name = get_text(nuclide, "name")
             if 'ao' in nuclide.attrib:
                 mat.add_nuclide(name, float(nuclide.attrib['ao']))
             elif 'wo' in nuclide.attrib:
                 mat.add_nuclide(name, float(nuclide.attrib['wo']), 'wo')
 
         # Get depletable attribute
-        mat.depletable = elem.get('depletable') in ('true', '1')
+        depletable = get_text(elem, "depletable")
+        mat.depletable = depletable in ('true', '1')
 
         # Get each S(a,b) table
         for sab in elem.findall('sab'):
-            fraction = float(sab.get('fraction', 1.0))
-            mat.add_s_alpha_beta(sab.get('name'), fraction)
+            fraction = float(get_text(sab, "fraction", 1.0))
+            name = get_text(sab, "name")
+            mat.add_s_alpha_beta(name, fraction)
 
         # Get total material density
         density = elem.find('density')
-        units = density.get('units')
+        units = get_text(density, "units")
         if units == 'sum':
             mat.set_density(units)
         else:
-            value = float(density.get('value'))
+            value = float(get_text(density, 'value'))
             mat.set_density(units, value)
 
         # Check for isotropic scattering nuclides
-        isotropic = elem.find('isotropic')
+        isotropic = get_elem_list(elem, "isotropic", str)
         if isotropic is not None:
-            mat.isotropic = isotropic.text.split()
+            mat.isotropic = isotropic
 
         return mat
 
@@ -1982,9 +1987,9 @@ class Materials(cv.CheckedList):
             materials.append(Material.from_xml_element(material))
 
         # Check for cross sections settings
-        xs = elem.find('cross_sections')
+        xs = get_text(elem, "cross_sections")
         if xs is not None:
-            materials.cross_sections = xs.text
+            materials.cross_sections = xs
 
         return materials
 
diff --git a/openmc/mesh.py b/openmc/mesh.py
index 339702884..2e9abd1b6 100644
--- a/openmc/mesh.py
+++ b/openmc/mesh.py
@@ -16,7 +16,7 @@ import openmc
 import openmc.checkvalue as cv
 from openmc.checkvalue import PathLike
 from openmc.utility_funcs import change_directory
-from ._xml import get_text
+from ._xml import get_elem_list, get_text
 from .mixin import IDManagerMixin
 from .surface import _BOUNDARY_TYPES
 from .utility_funcs import input_path
@@ -1187,21 +1187,21 @@ class RegularMesh(StructuredMesh):
         mesh_id = int(get_text(elem, 'id'))
         mesh = cls(mesh_id=mesh_id)
 
-        dimension = get_text(elem, 'dimension')
+        dimension = get_elem_list(elem, "dimension", int)
         if dimension is not None:
-            mesh.dimension = [int(x) for x in dimension.split()]
+            mesh.dimension = dimension
 
-        lower_left = get_text(elem, 'lower_left')
+        lower_left = get_elem_list(elem, "lower_left", float)
         if lower_left is not None:
-            mesh.lower_left = [float(x) for x in lower_left.split()]
+            mesh.lower_left = lower_left
 
-        upper_right = get_text(elem, 'upper_right')
+        upper_right = get_elem_list(elem, "upper_right", float)
         if upper_right is not None:
-            mesh.upper_right = [float(x) for x in upper_right.split()]
+            mesh.upper_right = upper_right
 
-        width = get_text(elem, 'width')
+        width = get_elem_list(elem, "width", float)
         if width is not None:
-            mesh.width = [float(x) for x in width.split()]
+            mesh.width = width
 
         return mesh
 
@@ -1507,9 +1507,9 @@ class RectilinearMesh(StructuredMesh):
         """
         mesh_id = int(get_text(elem, 'id'))
         mesh = cls(mesh_id=mesh_id)
-        mesh.x_grid = [float(x) for x in get_text(elem, 'x_grid').split()]
-        mesh.y_grid = [float(y) for y in get_text(elem, 'y_grid').split()]
-        mesh.z_grid = [float(z) for z in get_text(elem, 'z_grid').split()]
+        mesh.x_grid = get_elem_list(elem, "x_grid", float)
+        mesh.y_grid = get_elem_list(elem, "y_grid", float)
+        mesh.z_grid = get_elem_list(elem, "z_grid", float)
 
         return mesh
 
@@ -1923,10 +1923,10 @@ class CylindricalMesh(StructuredMesh):
 
         mesh_id = int(get_text(elem, 'id'))
         mesh = cls(
-            r_grid = [float(x) for x in get_text(elem, "r_grid").split()],
-            phi_grid = [float(x) for x in get_text(elem, "phi_grid").split()],
-            z_grid = [float(x) for x in get_text(elem, "z_grid").split()],
-            origin = [float(x) for x in get_text(elem, "origin", default=[0., 0., 0.]).split()],
+            r_grid = get_elem_list(elem, "r_grid", float),
+            phi_grid = get_elem_list(elem, "phi_grid", float),
+            z_grid = get_elem_list(elem, "z_grid", float),
+            origin = get_elem_list(elem, "origin", float) or [0., 0., 0.],
             mesh_id=mesh_id,
         )
 
@@ -2296,10 +2296,10 @@ class SphericalMesh(StructuredMesh):
         mesh_id = int(get_text(elem, 'id'))
         mesh = cls(
             mesh_id=mesh_id,
-            r_grid = [float(x) for x in get_text(elem, "r_grid").split()],
-            theta_grid = [float(x) for x in get_text(elem, "theta_grid").split()],
-            phi_grid = [float(x) for x in get_text(elem, "phi_grid").split()],
-            origin = [float(x) for x in get_text(elem, "origin", default=[0., 0., 0.]).split()],
+            r_grid = get_elem_list(elem, "r_grid", float),
+            theta_grid = get_elem_list(elem, "theta_grid", float),
+            phi_grid = get_elem_list(elem, "phi_grid", float),
+            origin = get_elem_list(elem, "origin", float) or [0., 0., 0.],
         )
 
         return mesh
@@ -2842,7 +2842,7 @@ class UnstructuredMesh(MeshBase):
         filename = get_text(elem, 'filename')
         library = get_text(elem, 'library')
         length_multiplier = float(get_text(elem, 'length_multiplier', 1.0))
-        options = elem.get('options')
+        options = get_text(elem, "options")
 
         return cls(filename, library, mesh_id, '', length_multiplier, options)
 
diff --git a/openmc/plots.py b/openmc/plots.py
index 34dde84e4..072a9a319 100644
--- a/openmc/plots.py
+++ b/openmc/plots.py
@@ -10,7 +10,7 @@ import openmc
 import openmc.checkvalue as cv
 from openmc.checkvalue import PathLike
 
-from ._xml import clean_indentation, get_elem_tuple, get_text
+from ._xml import clean_indentation, get_elem_list, get_text
 from .mixin import IDManagerMixin
 
 _BASES = {'xy', 'xz', 'yz'}
@@ -944,64 +944,61 @@ class Plot(PlotBase):
             Plot object
 
         """
-        plot_id = int(elem.get("id"))
+        plot_id = int(get_text(elem, "id"))
         name = get_text(elem, 'name', '')
         plot = cls(plot_id, name)
         if "filename" in elem.keys():
-            plot.filename = elem.get("filename")
-        plot.color_by = elem.get("color_by")
-        plot.type = elem.get("type")
+            plot.filename = get_text(elem, "filename")
+        plot.color_by = get_text(elem, "color_by")
+        plot.type = get_text(elem, "type")
         if plot.type == 'slice':
-            plot.basis = elem.get("basis")
+            plot.basis = get_text(elem, "basis")
 
-        plot.origin = get_elem_tuple(elem, "origin", float)
-        plot.width = get_elem_tuple(elem, "width", float)
-        plot.pixels = get_elem_tuple(elem, "pixels")
-        plot._background = get_elem_tuple(elem, "background")
+        plot.origin = tuple(get_elem_list(elem, "origin", float))
+        plot.width = tuple(get_elem_list(elem, "width", float))
+        plot.pixels = tuple(get_elem_list(elem, "pixels"))
+        background = get_elem_list(elem, "background")
+        if background is not None:
+            plot._background = tuple(background)
 
         # Set plot colors
         colors = {}
         for color_elem in elem.findall("color"):
-            uid = int(color_elem.get("id"))
-            colors[uid] = tuple([int(x)
-                                for x in color_elem.get("rgb").split()])
+            uid = int(get_text(color_elem, "id"))
+            colors[uid] = tuple(get_elem_list(color_elem, "rgb", int))
         plot.colors = colors
 
         # Set masking information
         mask_elem = elem.find("mask")
         if mask_elem is not None:
-            plot.mask_components = [
-                int(x) for x in mask_elem.get("components").split()]
-            background = mask_elem.get("background")
+            plot.mask_components = get_elem_list(mask_elem, "components", int)
+            background = get_elem_list(mask_elem, "background", int)
             if background is not None:
-                plot.mask_background = tuple(
-                    [int(x) for x in background.split()])
+                plot.mask_background = tuple(background)
 
         # show overlaps
-        overlap_elem = elem.find("show_overlaps")
-        if overlap_elem is not None:
-            plot.show_overlaps = (overlap_elem.text in ('true', '1'))
-        overlap_color = get_elem_tuple(elem, "overlap_color")
+        overlap = get_text(elem, "show_overlaps")
+        if overlap is not None:
+            plot.show_overlaps = (overlap in ('true', '1'))
+        overlap_color = get_elem_list(elem, "overlap_color", int)
         if overlap_color is not None:
-            plot.overlap_color = overlap_color
+            plot.overlap_color = tuple(overlap_color)
 
         # Set universe level
-        level = elem.find("level")
+        level = get_text(elem, "level")
         if level is not None:
-            plot.level = int(level.text)
+            plot.level = int(level)
 
         # Set meshlines
         mesh_elem = elem.find("meshlines")
         if mesh_elem is not None:
-            meshlines = {'type': mesh_elem.get('meshtype')}
+            meshlines = {'type': get_text(mesh_elem, "meshtype")}
             if 'id' in mesh_elem.keys():
-                meshlines['id'] = int(mesh_elem.get('id'))
+                meshlines['id'] = int(get_text(mesh_elem, "id"))
             if 'linewidth' in mesh_elem.keys():
-                meshlines['linewidth'] = int(mesh_elem.get('linewidth'))
+                meshlines['linewidth'] = int(get_text(mesh_elem, "linewidth"))
             if 'color' in mesh_elem.keys():
-                meshlines['color'] = tuple(
-                    [int(x) for x in mesh_elem.get('color').split()]
-                )
+                meshlines['color'] = tuple(get_elem_list(mesh_elem, "color", int))
             plot.meshlines = meshlines
 
         return plot
@@ -1259,38 +1256,39 @@ class RayTracePlot(PlotBase):
         None
         """
 
-        if "filename" in elem.keys():
-            self.filename = elem.get("filename")
-        self.color_by = elem.get("color_by")
+        filename = get_text(elem, "filename")
+        if filename is not None:
+            self.filename = filename
+        self.color_by = get_text(elem, "color_by")
 
-        horizontal_fov = elem.find("horizontal_field_of_view")
+        horizontal_fov = get_text(elem, "horizontal_field_of_view")
         if horizontal_fov is not None:
-            self.horizontal_field_of_view = float(horizontal_fov.text)
+            self.horizontal_field_of_view = float(horizontal_fov)
 
-        if (tmp := elem.find("orthographic_width")) is not None:
-            self.orthographic_width = float(tmp)
+        orthographic_width = get_text(elem, "orthographic_width")
+        if orthographic_width is not None:
+            self.orthographic_width = float(orthographic_width)
 
-        self.pixels = get_elem_tuple(elem, "pixels")
-        self.camera_position = get_elem_tuple(elem, "camera_position", float)
-        self.look_at = get_elem_tuple(elem, "look_at", float)
+        self.pixels = tuple(get_elem_list(elem, "pixels", int))
+        self.camera_position = tuple(get_elem_list(elem, "camera_position", float))
+        self.look_at = tuple(get_elem_list(elem, "look_at", float))
 
-        if elem.find("background") is not None:
-            self.background = get_elem_tuple(elem, "background")
+        background = get_elem_list(elem, "background", int)
+        if background is not None:
+            self.background = tuple(background)
 
         # Set masking information
         if (mask_elem := elem.find("mask")) is not None:
-            mask_components = [int(x)
-                               for x in mask_elem.get("components").split()]
+            mask_components = get_elem_list(mask_elem, "components", int)
             # TODO: set mask components(needs geometry information)
-            background = mask_elem.get("background")
+            background = get_elem_list(mask_elem, "background", int)
             if background is not None:
-                self.mask_background = tuple(
-                    [int(x) for x in background.split()])
+                self.mask_background = tuple(background)
 
         # Set universe level
-        level = elem.find("level")
+        level = get_text(elem, "level")
         if level is not None:
-            self.level = int(level.text)
+            self.level = int(level)
 
 
 class WireframeRayTracePlot(RayTracePlot):
@@ -1515,7 +1513,7 @@ class WireframeRayTracePlot(RayTracePlot):
 
         """
 
-        plot_id = int(elem.get("id"))
+        plot_id = int(get_text(elem, "id"))
         plot_name = get_text(elem, 'name', '')
         plot = cls(plot_id, plot_name)
         plot.type = "wireframe_raytrace"
@@ -1523,19 +1521,18 @@ class WireframeRayTracePlot(RayTracePlot):
         plot._read_xml_attributes(elem)
 
         # Attempt to get wireframe thickness.May not be present
-        wireframe_thickness = elem.find("wireframe_thickness")
+        wireframe_thickness = get_text(elem, "wireframe_thickness")
         if wireframe_thickness is not None:
-            plot.wireframe_thickness = int(wireframe_thickness.text)
-        wireframe_color = elem.get("wireframe_color")
+            plot.wireframe_thickness = int(wireframe_thickness)
+        wireframe_color = get_elem_list(elem, "wireframe_color", int)
         if wireframe_color:
-            plot.wireframe_color = [int(item) for item in wireframe_color]
+            plot.wireframe_color = wireframe_color
 
         # Set plot colors
         for color_elem in elem.findall("color"):
-            uid = int(color_elem.get("id"))
-            plot.colors[uid] = tuple(int(i)
-                                     for i in get_text(color_elem, 'rgb').split())
-            plot.xs[uid] = float(color_elem.get("xs"))
+            uid = int(get_text(color_elem, "id"))
+            plot.colors[uid] = tuple(get_elem_list(color_elem, "rgb", int))
+            plot.xs[uid] = float(get_text(color_elem, "xs"))
 
         return plot
 
@@ -1693,15 +1690,17 @@ class SolidRayTracePlot(RayTracePlot):
 
     def _read_phong_attributes(self, elem):
         """Read attributes specific to the Phong plot from an XML element"""
-        if elem.find('light_position') is not None:
-            self.light_position = get_elem_tuple(elem, 'light_position', float)
+        light_position = get_elem_list(elem, 'light_position', float)
+        if light_position is not None:
+            self.light_position = tuple(light_position)
 
-        diffuse_fraction = elem.find('diffuse_fraction')
+        diffuse_fraction = get_text(elem, "diffuse_fraction")
         if diffuse_fraction is not None:
-            self.diffuse_fraction = float(diffuse_fraction.text)
+            self.diffuse_fraction = float(diffuse_fraction)
 
-        if elem.find('opaque_ids') is not None:
-            self.opaque_domains = list(get_elem_tuple(elem, 'opaque_ids', int))
+        opaque_domains = get_elem_list(elem, 'opaque_ids', int)
+        if opaque_domains is not None:
+            self.opaque_domains = opaque_domains
 
     @classmethod
     def from_xml_element(cls, elem):
@@ -1719,7 +1718,7 @@ class SolidRayTracePlot(RayTracePlot):
 
         """
 
-        plot_id = int(elem.get("id"))
+        plot_id = int(get_text(elem, "id"))
         plot_name = get_text(elem, 'name', '')
         plot = cls(plot_id, plot_name)
         plot.type = "solid_raytrace"
@@ -1729,8 +1728,8 @@ class SolidRayTracePlot(RayTracePlot):
 
         # Set plot colors
         for color_elem in elem.findall("color"):
-            uid = color_elem.get("id")
-            plot.colors[uid] = get_elem_tuple(color_elem, "rgb")
+            uid = get_text(color_elem, "id")
+            plot.colors[uid] = tuple(get_elem_list(color_elem, "rgb", int))
 
         return plot
 
@@ -1897,7 +1896,7 @@ class Plots(cv.CheckedList):
         # Generate each plot
         plots = cls()
         for e in elem.findall('plot'):
-            plot_type = e.get('type')
+            plot_type = get_text(e, "type")
             if plot_type == 'wireframe_raytrace':
                 plots.append(WireframeRayTracePlot.from_xml_element(e))
             elif plot_type == 'solid_raytrace':
diff --git a/openmc/settings.py b/openmc/settings.py
index 327faf544..ce3743ff5 100644
--- a/openmc/settings.py
+++ b/openmc/settings.py
@@ -11,7 +11,7 @@ import openmc
 import openmc.checkvalue as cv
 from openmc.checkvalue import PathLike
 from openmc.stats.multivariate import MeshSpatial
-from ._xml import clean_indentation, get_text
+from ._xml import clean_indentation, get_elem_list, get_text
 from .mesh import _read_meshes, RegularMesh, MeshBase
 from .source import SourceBase, MeshSource, IndependentSource
 from .utility_funcs import input_path
@@ -1791,23 +1791,21 @@ class Settings:
     def _statepoint_from_xml_element(self, root):
         elem = root.find('state_point')
         if elem is not None:
-            text = get_text(elem, 'batches')
-            if text is not None:
-                self.statepoint['batches'] = [int(x) for x in text.split()]
+            batches = get_elem_list(elem, "batches", int)
+            if batches is not None:
+                self.statepoint['batches'] = batches
 
     def _sourcepoint_from_xml_element(self, root):
         elem = root.find('source_point')
         if elem is not None:
             for key in ('separate', 'write', 'overwrite_latest', 'batches', 'mcpl'):
-                value = get_text(elem, key)
-                if value is not None:
-                    if key in ('separate', 'write', 'mcpl'):
-                        value = value in ('true', '1')
-                    elif key == 'overwrite_latest':
-                        value = value in ('true', '1')
+                if key in ('separate', 'write', 'mcpl', 'overwrite_latest'):
+                    value = get_text(elem, key) in ('true', '1')
+                    if key == 'overwrite_latest':
                         key = 'overwrite'
-                    else:
-                        value = [int(x) for x in value.split()]
+                else:
+                    value = get_elem_list(elem, key, int)
+                if value is not None:
                     self.sourcepoint[key] = value
 
     def _surf_source_read_from_xml_element(self, root):
@@ -1824,11 +1822,12 @@ class Settings:
         if elem is None:
             return
         for key in ('surface_ids', 'max_particles', 'max_source_files', 'mcpl', 'cell', 'cellto', 'cellfrom'):
-            value = get_text(elem, key)
+            if key == 'surface_ids':
+                value = get_elem_list(elem, key, int)
+            else:
+                value = get_text(elem, key)
             if value is not None:
-                if key == 'surface_ids':
-                    value = [int(x) for x in value.split()]
-                elif key == 'mcpl':
+                if key == 'mcpl':
                     value = value in ('true', '1')
                 elif key in ('max_particles', 'max_source_files', 'cell', 'cellfrom', 'cellto'):
                     value = int(value)
@@ -1958,22 +1957,21 @@ class Settings:
         text = get_text(root, 'temperature_method')
         if text is not None:
             self.temperature['method'] = text
-        text = get_text(root, 'temperature_range')
+        text = get_elem_list(root, "temperature_range", float)
         if text is not None:
-            self.temperature['range'] = [float(x) for x in text.split()]
+            self.temperature['range'] = text
         text = get_text(root, 'temperature_multipole')
         if text is not None:
             self.temperature['multipole'] = text in ('true', '1')
 
     def _trace_from_xml_element(self, root):
-        text = get_text(root, 'trace')
+        text = get_elem_list(root, "trace", int)
         if text is not None:
-            self.trace = [int(x) for x in text.split()]
+            self.trace = text
 
     def _track_from_xml_element(self, root):
-        text = get_text(root, 'track')
-        if text is not None:
-            values = [int(x) for x in text.split()]
+        values = get_elem_list(root, "track", int)
+        if values is not None:
             self.track = list(zip(values[::3], values[1::3], values[2::3]))
 
     def _ufs_mesh_from_xml_element(self, root, meshes):
@@ -1990,14 +1988,15 @@ class Settings:
         if elem is not None:
             keys = ('enable', 'method', 'energy_min', 'energy_max', 'nuclides')
             for key in keys:
-                value = get_text(elem, key)
+                if key == 'nuclides':
+                    value = get_elem_list(elem, key, str)
+                else:
+                    value = get_text(elem, key)
                 if value is not None:
                     if key == 'enable':
                         value = value in ('true', '1')
                     elif key in ('energy_min', 'energy_max'):
                         value = float(value)
-                    elif key == 'nuclides':
-                        value = value.split()
                     self.resonance_scattering[key] = value
 
     def _create_fission_neutrons_from_xml_element(self, root):
@@ -2109,8 +2108,8 @@ class Settings:
                         mesh = MeshBase.from_xml_element(mesh_elem)
                         domains = []
                         for domain_elem in mesh_elem.findall('domain'):
-                            domain_id = int(domain_elem.get('id'))
-                            domain_type = domain_elem.get('type')
+                            domain_id = int(get_text(domain_elem, "id"))
+                            domain_type = get_text(domain_elem, "type")
                             if domain_type == 'material':
                                 domain = openmc.Material(domain_id)
                             elif domain_type == 'cell':
diff --git a/openmc/source.py b/openmc/source.py
index 87e734e9a..c463ccb27 100644
--- a/openmc/source.py
+++ b/openmc/source.py
@@ -18,7 +18,7 @@ import openmc.checkvalue as cv
 from openmc.checkvalue import PathLike
 from openmc.stats.multivariate import UnitSphere, Spatial
 from openmc.stats.univariate import Univariate
-from ._xml import get_text
+from ._xml import get_elem_list, get_text
 from .mesh import MeshBase, StructuredMesh, UnstructuredMesh
 from .utility_funcs import input_path
 
@@ -210,7 +210,7 @@ class SourceBase(ABC):
         constraints = {}
         domain_type = get_text(elem, "domain_type")
         if domain_type is not None:
-            domain_ids = [int(x) for x in get_text(elem, "domain_ids").split()]
+            domain_ids = get_elem_list(elem, "domain_ids", int)
 
             # Instantiate some throw-away domains that are used by the
             # constructor to assign IDs
@@ -224,13 +224,13 @@ class SourceBase(ABC):
                     domains = [openmc.Universe(uid) for uid in domain_ids]
             constraints['domains'] = domains
 
-        time_bounds = get_text(elem, "time_bounds")
+        time_bounds = get_elem_list(elem, "time_bounds", float)
         if time_bounds is not None:
-            constraints['time_bounds'] = [float(x) for x in time_bounds.split()]
+            constraints['time_bounds'] = time_bounds
 
-        energy_bounds = get_text(elem, "energy_bounds")
+        energy_bounds = get_elem_list(elem, "energy_bounds", float)
         if energy_bounds is not None:
-            constraints['energy_bounds'] = [float(x) for x in energy_bounds.split()]
+            constraints['energy_bounds'] = energy_bounds
 
         fissionable = get_text(elem, "fissionable")
         if fissionable is not None:
diff --git a/openmc/stats/multivariate.py b/openmc/stats/multivariate.py
index cd474fa9b..222d2d18a 100644
--- a/openmc/stats/multivariate.py
+++ b/openmc/stats/multivariate.py
@@ -10,7 +10,7 @@ import numpy as np
 
 import openmc
 import openmc.checkvalue as cv
-from .._xml import get_text
+from .._xml import get_elem_list, get_text
 from ..mesh import MeshBase
 from .univariate import PowerLaw, Uniform, Univariate
 
@@ -152,9 +152,9 @@ class PolarAzimuthal(UnitSphere):
 
         """
         mu_phi = cls()
-        uvw = get_text(elem, 'reference_uvw')
+        uvw = get_elem_list(elem, "reference_uvw", float)
         if uvw is not None:
-            mu_phi.reference_uvw = [float(x) for x in uvw.split()]
+            mu_phi.reference_uvw = uvw
         mu_phi.mu = Univariate.from_xml_element(elem.find('mu'))
         mu_phi.phi = Univariate.from_xml_element(elem.find('phi'))
         return mu_phi
@@ -246,9 +246,9 @@ class Monodirectional(UnitSphere):
 
         """
         monodirectional = cls()
-        uvw = get_text(elem, 'reference_uvw')
+        uvw = get_elem_list(elem, "reference_uvw", float)
         if uvw is not None:
-            monodirectional.reference_uvw = [float(x) for x in uvw.split()]
+            monodirectional.reference_uvw = uvw
         return monodirectional
 
 
@@ -504,7 +504,7 @@ class SphericalIndependent(Spatial):
         r = Univariate.from_xml_element(elem.find('r'))
         cos_theta = Univariate.from_xml_element(elem.find('cos_theta'))
         phi = Univariate.from_xml_element(elem.find('phi'))
-        origin = [float(x) for x in elem.get('origin').split()]
+        origin = get_elem_list(elem, "origin", float)
         return cls(r, cos_theta, phi, origin=origin)
 
 
@@ -626,7 +626,7 @@ class CylindricalIndependent(Spatial):
         r = Univariate.from_xml_element(elem.find('r'))
         phi = Univariate.from_xml_element(elem.find('phi'))
         z = Univariate.from_xml_element(elem.find('z'))
-        origin = [float(x) for x in elem.get('origin').split()]
+        origin = get_elem_list(elem, "origin", float)
         return cls(r, phi, z, origin=origin)
 
 
@@ -743,18 +743,14 @@ class MeshSpatial(Spatial):
 
         """
 
-        mesh_id = int(elem.get('mesh_id'))
+        mesh_id = int(get_text(elem, "mesh_id"))
 
         # check if this mesh has been read in from another location already
         if mesh_id not in meshes:
             raise ValueError(f'Could not locate mesh with ID "{mesh_id}"')
 
-        volume_normalized = elem.get("volume_normalized")
         volume_normalized = get_text(elem, 'volume_normalized').lower() == 'true'
-        strengths = get_text(elem, 'strengths')
-        if strengths is not None:
-            strengths = [float(b) for b in get_text(elem, 'strengths').split()]
-
+        strengths = get_elem_list(elem, 'strengths', float)
         return cls(meshes[mesh_id], strengths, volume_normalized)
 
 
@@ -860,12 +856,10 @@ class PointCloud(Spatial):
 
 
         """
-        coord_data = get_text(elem, 'coords')
-        positions = np.array([float(b) for b in coord_data.split()]).reshape((-1, 3))
+        coord_data = get_elem_list(elem, 'coords', float)
+        positions = np.array(coord_data).reshape((-1, 3))
 
-        strengths = get_text(elem, 'strengths')
-        if strengths is not None:
-            strengths = [float(b) for b in strengths.split()]
+        strengths = get_elem_list(elem, 'strengths', float)
 
         return cls(positions, strengths)
 
@@ -979,7 +973,7 @@ class Box(Spatial):
 
         """
         only_fissionable = get_text(elem, 'type') == 'fission'
-        params = [float(x) for x in get_text(elem, 'parameters').split()]
+        params = get_elem_list(elem, "parameters", float)
         lower_left = params[:len(params)//2]
         upper_right = params[len(params)//2:]
         return cls(lower_left, upper_right, only_fissionable)
@@ -1046,7 +1040,7 @@ class Point(Spatial):
             Point distribution generated from XML element
 
         """
-        xyz = [float(x) for x in get_text(elem, 'parameters').split()]
+        xyz = get_elem_list(elem, "parameters", float)
         return cls(xyz)
 
 
diff --git a/openmc/stats/univariate.py b/openmc/stats/univariate.py
index e0475bf78..28d5e87ef 100644
--- a/openmc/stats/univariate.py
+++ b/openmc/stats/univariate.py
@@ -12,7 +12,7 @@ import numpy as np
 from scipy.integrate import trapezoid
 
 import openmc.checkvalue as cv
-from .._xml import get_text
+from .._xml import get_elem_list, get_text
 from ..mixin import EqualityMixin
 
 _INTERPOLATION_SCHEMES = {
@@ -57,8 +57,7 @@ class Univariate(EqualityMixin, ABC):
             return Normal.from_xml_element(elem)
         elif distribution == 'muir':
             # Support older files where Muir had its own class
-            params = [float(x) for x in get_text(elem, 'parameters').split()]
-            return muir(*params)
+            return muir(*get_elem_list(elem, "parameters", float))
         elif distribution == 'tabular':
             return Tabular.from_xml_element(elem)
         elif distribution == 'legendre':
@@ -240,7 +239,7 @@ class Discrete(Univariate):
             Discrete distribution generated from XML element
 
         """
-        params = [float(x) for x in get_text(elem, 'parameters').split()]
+        params = get_elem_list(elem, "parameters", float)
         x = params[:len(params)//2]
         p = params[len(params)//2:]
         return cls(x, p)
@@ -448,8 +447,8 @@ class Uniform(Univariate):
             Uniform distribution generated from XML element
 
         """
-        params = get_text(elem, 'parameters').split()
-        return cls(*map(float, params))
+        params = get_elem_list(elem, "parameters", float)
+        return cls(*params)
 
 
 class PowerLaw(Univariate):
@@ -557,8 +556,8 @@ class PowerLaw(Univariate):
             Distribution generated from XML element
 
         """
-        params = get_text(elem, 'parameters').split()
-        return cls(*map(float, params))
+        params = get_elem_list(elem, "parameters", float)
+        return cls(*params)
 
 
 class Maxwell(Univariate):
@@ -737,8 +736,8 @@ class Watt(Univariate):
             Watt distribution generated from XML element
 
         """
-        params = get_text(elem, 'parameters').split()
-        return cls(*map(float, params))
+        params = get_elem_list(elem, "parameters", float)
+        return cls(*params)
 
 
 class Normal(Univariate):
@@ -827,8 +826,8 @@ class Normal(Univariate):
             Normal distribution generated from XML element
 
         """
-        params = get_text(elem, 'parameters').split()
-        return cls(*map(float, params))
+        params = get_elem_list(elem, "parameters", float)
+        return cls(*params)
 
 
 def muir(e0: float, m_rat: float, kt: float):
@@ -1115,7 +1114,7 @@ class Tabular(Univariate):
 
         """
         interpolation = get_text(elem, 'interpolation')
-        params = [float(x) for x in get_text(elem, 'parameters').split()]
+        params = get_elem_list(elem, "parameters", float)        
         m = (len(params) + 1)//2  # +1 for when len(params) is odd
         x = params[:m]
         p = params[m:]
diff --git a/openmc/surface.py b/openmc/surface.py
index 840c3125d..4839783ff 100644
--- a/openmc/surface.py
+++ b/openmc/surface.py
@@ -13,6 +13,7 @@ from .checkvalue import check_type, check_value, check_length, check_greater_tha
 from .mixin import IDManagerMixin, IDWarning
 from .region import Region, Intersection, Union
 from .bounding_box import BoundingBox
+from ._xml import get_elem_list, get_text
 
 
 _BOUNDARY_TYPES = {'transmission', 'vacuum', 'reflective', 'periodic', 'white'}
@@ -451,17 +452,17 @@ class Surface(IDManagerMixin, ABC):
         """
 
         # Determine appropriate class
-        surf_type = elem.get('type')
+        surf_type = get_text(elem, "type")
         cls = _SURFACE_CLASSES[surf_type]
 
         # Determine ID, boundary type, boundary albedo, coefficients
         kwargs = {}
-        kwargs['surface_id'] = int(elem.get('id'))
-        kwargs['boundary_type'] = elem.get('boundary', 'transmission')
+        kwargs['surface_id'] = int(get_text(elem, "id"))
+        kwargs['boundary_type'] = get_text(elem, "boundary", "transmission")
         if kwargs['boundary_type'] in _ALBEDO_BOUNDARIES:
-            kwargs['albedo'] = float(elem.get('albedo', 1.0))
-        kwargs['name'] = elem.get('name')
-        coeffs = [float(x) for x in elem.get('coeffs').split()]
+            kwargs['albedo'] = float(get_text(elem, "albedo", 1.0))
+        kwargs['name'] = get_text(elem, "name")
+        coeffs = get_elem_list(elem, "coeffs", float)
         kwargs.update(dict(zip(cls._coeff_keys, coeffs)))
 
         return cls(**kwargs)
diff --git a/openmc/tallies.py b/openmc/tallies.py
index 3a5b42519..075b1e991 100644
--- a/openmc/tallies.py
+++ b/openmc/tallies.py
@@ -15,7 +15,7 @@ import scipy.sparse as sps
 
 import openmc
 import openmc.checkvalue as cv
-from ._xml import clean_indentation, get_text
+from ._xml import clean_indentation, get_elem_list, get_text
 from .mixin import IDManagerMixin
 from .mesh import MeshBase
 
@@ -1006,8 +1006,8 @@ class Tally(IDManagerMixin):
             Tally object
 
         """
-        tally_id = int(elem.get('id'))
-        name = elem.get('name', '')
+        tally_id = int(get_text(elem, "id"))
+        name = get_text(elem, "name", "")
         tally = cls(tally_id=tally_id, name=name)
 
         text = get_text(elem, 'multiply_density')
@@ -1015,25 +1015,24 @@ class Tally(IDManagerMixin):
             tally.multiply_density = text in ('true', '1')
 
         # Read filters
-        filters_elem = elem.find('filters')
-        if filters_elem is not None:
-            filter_ids = [int(x) for x in filters_elem.text.split()]
+        filter_ids = get_elem_list(elem, "filters", int)
+        if filter_ids is not None:
             tally.filters = [kwargs['filters'][uid] for uid in filter_ids]
 
         # Read nuclides
-        nuclides_elem = elem.find('nuclides')
-        if nuclides_elem is not None:
-            tally.nuclides = nuclides_elem.text.split()
+        nuclides = get_elem_list(elem, "nuclides", str)
+        if nuclides is not None:
+            tally.nuclides = nuclides
 
         # Read scores
-        scores_elem = elem.find('scores')
-        if scores_elem is not None:
-            tally.scores = scores_elem.text.split()
+        scores = get_elem_list(elem, "scores", str)
+        if scores is not None:
+            tally.scores = scores
 
         # Set estimator
-        estimator_elem = elem.find('estimator')
-        if estimator_elem is not None:
-            tally.estimator = estimator_elem.text
+        estimator = get_text(elem, "estimator")
+        if estimator is not None:
+            tally.estimator = estimator
 
         # Read triggers
         tally.triggers = [
@@ -1042,9 +1041,9 @@ class Tally(IDManagerMixin):
         ]
 
         # Read tally derivative
-        deriv_elem = elem.find('derivative')
-        if deriv_elem is not None:
-            deriv_id = int(deriv_elem.text)
+        deriv = get_text(elem, "derivative")
+        if deriv is not None:
+            deriv_id = int(deriv)
             tally.derivative = kwargs['derivatives'][deriv_id]
 
         return tally
diff --git a/openmc/tally_derivative.py b/openmc/tally_derivative.py
index ff918c1b3..f7ba5dce5 100644
--- a/openmc/tally_derivative.py
+++ b/openmc/tally_derivative.py
@@ -4,6 +4,7 @@ import lxml.etree as ET
 
 import openmc.checkvalue as cv
 from .mixin import EqualityMixin, IDManagerMixin
+from ._xml import get_text
 
 
 class TallyDerivative(EqualityMixin, IDManagerMixin):
@@ -122,8 +123,8 @@ class TallyDerivative(EqualityMixin, IDManagerMixin):
             Tally derivative object
 
         """
-        derivative_id = int(elem.get("id"))
-        variable = elem.get("variable")
-        material = int(elem.get("material"))
-        nuclide = elem.get("nuclide") if variable == "nuclide_density" else None
+        derivative_id = int(get_text(elem, "id"))
+        variable = get_text(elem, "variable")
+        material = int(get_text(elem, "material"))
+        nuclide = get_text(elem, "nuclide") if variable == "nuclide_density" else None
         return cls(derivative_id, variable, material, nuclide)
diff --git a/openmc/trigger.py b/openmc/trigger.py
index be2537e3a..70b6b7a03 100644
--- a/openmc/trigger.py
+++ b/openmc/trigger.py
@@ -5,6 +5,7 @@ import lxml.etree as ET
 
 import openmc.checkvalue as cv
 from .mixin import EqualityMixin
+from ._xml import get_elem_list, get_text
 
 
 class Trigger(EqualityMixin):
@@ -129,16 +130,16 @@ class Trigger(EqualityMixin):
 
         """
         # Generate trigger object
-        trigger_type = elem.get("type")
-        threshold = float(elem.get("threshold"))
-        ignore_zeros = str(elem.get("ignore_zeros", "false")).lower()
+        trigger_type = get_text(elem, "type")
+        threshold = float(get_text(elem, "threshold"))
+        ignore_zeros = str(get_text(elem, "ignore_zeros", "false")).lower()
         # Try to convert to bool. Let Trigger error out on instantiation.
         ignore_zeros = ignore_zeros in ('true', '1')
         trigger = cls(trigger_type, threshold, ignore_zeros)
 
         # Add scores if present
-        scores = elem.get("scores")
+        scores = get_elem_list(elem, "scores", str)
         if scores is not None:
-            trigger.scores = scores.split()
+            trigger.scores = scores
 
         return trigger
diff --git a/openmc/volume.py b/openmc/volume.py
index df19def1e..c44adf98a 100644
--- a/openmc/volume.py
+++ b/openmc/volume.py
@@ -10,7 +10,7 @@ from uncertainties import ufloat
 
 import openmc
 import openmc.checkvalue as cv
-from openmc._xml import get_text
+from openmc._xml import get_elem_list, get_text
 
 _VERSION_VOLUME = 1
 
@@ -375,13 +375,10 @@ class VolumeCalculation:
 
         """
         domain_type = get_text(elem, "domain_type")
-        domain_ids = get_text(elem, "domain_ids").split()
-        ids = [int(x) for x in domain_ids]
+        ids = get_elem_list(elem, "domain_ids", int)
         samples = int(get_text(elem, "samples"))
-        lower_left = get_text(elem, "lower_left").split()
-        lower_left = tuple([float(x) for x in lower_left])
-        upper_right = get_text(elem, "upper_right").split()
-        upper_right = tuple([float(x) for x in upper_right])
+        lower_left = tuple(get_elem_list(elem, "lower_left", float))
+        upper_right = tuple(get_elem_list(elem, "upper_right", float))
 
         # Instantiate some throw-away domains that are used by the constructor
         # to assign IDs
diff --git a/openmc/weight_windows.py b/openmc/weight_windows.py
index 90856ebab..5d52a579a 100644
--- a/openmc/weight_windows.py
+++ b/openmc/weight_windows.py
@@ -14,7 +14,7 @@ from openmc.filter import _PARTICLES
 from openmc.mesh import MeshBase, RectilinearMesh, CylindricalMesh, SphericalMesh, UnstructuredMesh
 import openmc.checkvalue as cv
 from openmc.checkvalue import PathLike
-from ._xml import get_text, clean_indentation
+from ._xml import get_elem_list, get_text, clean_indentation
 from .mixin import IDManagerMixin
 from .utility_funcs import change_directory
 
@@ -379,9 +379,9 @@ class WeightWindows(IDManagerMixin):
         mesh = meshes[mesh_id]
 
         # Read all other parameters
-        lower_ww_bounds = [float(l) for l in get_text(elem, 'lower_ww_bounds').split()]
-        upper_ww_bounds = [float(u) for u in get_text(elem, 'upper_ww_bounds').split()]
-        e_bounds = [float(b) for b in get_text(elem, 'energy_bounds').split()]
+        lower_ww_bounds = get_elem_list(elem, "lower_ww_bounds", float)
+        upper_ww_bounds = get_elem_list(elem, "upper_ww_bounds", float)
+        e_bounds = get_elem_list(elem, "energy_bounds", float)
         particle_type = get_text(elem, 'particle_type')
         survival_ratio = float(get_text(elem, 'survival_ratio'))
 
@@ -730,11 +730,8 @@ class WeightWindowGenerator:
 
         mesh_id = int(get_text(elem, 'mesh'))
         mesh = meshes[mesh_id]
-
-        if (energy_bounds := get_text(elem, 'energy_bounds')) is not None:
-            energy_bounds = [float(x) for x in energy_bounds.split()]
-        else:
-            energy_bounds = None
+        
+        energy_bounds = get_elem_list(elem, "energy_bounds, float")
         particle_type = get_text(elem, 'particle_type')
 
         wwg = cls(mesh, energy_bounds, particle_type)

From a34365396e8bd66698f5481474ebf17a5ed30d14 Mon Sep 17 00:00:00 2001
From: GuySten <62616591+GuySten@users.noreply.github.com>
Date: Mon, 11 Aug 2025 18:51:45 +0300
Subject: [PATCH 095/203] Remove unused special accessors for tallies (#3527)

---
 include/openmc/tallies/tally.h | 2 --
 src/tallies/tally.cpp          | 4 ----
 2 files changed, 6 deletions(-)

diff --git a/include/openmc/tallies/tally.h b/include/openmc/tallies/tally.h
index 48f678ced..8c088c460 100644
--- a/include/openmc/tallies/tally.h
+++ b/include/openmc/tallies/tally.h
@@ -169,10 +169,8 @@ public:
   // We need to have quick access to some filters.  The following gives indices
   // for various filters that could be in the tally or C_NONE if they are not
   // present.
-  int energy_filter_ {C_NONE};
   int energyout_filter_ {C_NONE};
   int delayedgroup_filter_ {C_NONE};
-  int cell_filter_ {C_NONE};
 
   vector<Trigger> triggers_;
 
diff --git a/src/tallies/tally.cpp b/src/tallies/tally.cpp
index e737f79d3..ba1838602 100644
--- a/src/tallies/tally.cpp
+++ b/src/tallies/tally.cpp
@@ -487,10 +487,6 @@ void Tally::add_filter(Filter* filter)
     energyout_filter_ = filters_.size();
   } else if (filter->type() == FilterType::DELAYED_GROUP) {
     delayedgroup_filter_ = filters_.size();
-  } else if (filter->type() == FilterType::CELL) {
-    cell_filter_ = filters_.size();
-  } else if (filter->type() == FilterType::ENERGY) {
-    energy_filter_ = filters_.size();
   }
   filters_.push_back(filter_idx);
 }

From f8fa751da0437ddf42a1f4873e5162a6fcb1c51e Mon Sep 17 00:00:00 2001
From: Jonathan Shimwell <mail@jshimwell.com>
Date: Wed, 13 Aug 2025 15:41:39 +0200
Subject: [PATCH 096/203] Adding 616 group structure (#3531)

---
 openmc/mgxs/__init__.py | 94 ++++++++++++++++++++++++++++++++++++++++-
 src/particle.cpp        |  2 +-
 2 files changed, 94 insertions(+), 2 deletions(-)

diff --git a/openmc/mgxs/__init__.py b/openmc/mgxs/__init__.py
index 901c1eabb..f8de84b37 100644
--- a/openmc/mgxs/__init__.py
+++ b/openmc/mgxs/__init__.py
@@ -21,7 +21,7 @@ GROUP_STRUCTURES = {}
 - "ECCO-1968_" designed for fine group reactor cell calculations for fast,
   intermediate and thermal reactor applications ([SAR1990]_)
 - activation_ energy group structures "VITAMIN-J-42", "VITAMIN-J-175",
-  "TRIPOLI-315", "CCFE-709_" and "UKAEA-1102_"
+  "TRIPOLI-315", "LLNL-616", "CCFE-709_" and "UKAEA-1102_"
 
 .. _CASMO: http://large.stanford.edu/courses/2013/ph241/dalvi1/docs/c5.physor2006.pdf
 .. _SCALE44: https://www-nds.iaea.org/publications/indc/indc-czr-0001.pdf
@@ -31,6 +31,7 @@ GROUP_STRUCTURES = {}
 .. _SHEM-361: http://merlin.polymtl.ca/downloads/FP214.pdf
 .. _activation: https://fispact.ukaea.uk/wiki/Keyword:GETXS
 .. _VITAMIN-J-42: https://www.oecd-nea.org/dbdata/nds_jefreports/jefreport-10.pdf
+.. _LLNL-616: https://fispact.ukaea.uk/manual/user_manual.pdf
 .. _CCFE-709: https://fispact.ukaea.uk/wiki/CCFE-709_group_structure
 .. _UKAEA-1102: https://fispact.ukaea.uk/wiki/UKAEA-1102_group_structure
 .. _ECCO-1968: https://serpent.vtt.fi/mediawiki/index.php/ECCO_1968-group_structure
@@ -346,6 +347,97 @@ GROUP_STRUCTURES['SHEM-361'] = np.array([
     4.06569e+06, 4.96585e+06, 6.06530e+06, 6.70319e+06, 7.40817e+06,
     8.18730e+06, 9.04836e+06, 9.99999e+06, 1.16183e+07, 1.38403e+07,
     1.49182e+07, 1.96403e+07])
+GROUP_STRUCTURES['LLNL-616'] = np.array([
+    1.0000e-5, 1.0471e-5, 1.0965e-5, 1.1482e-5, 1.2023e-5, 1.2589e-5, 1.3183e-5,
+    1.3804e-5, 1.4454e-5, 1.5136e-5, 1.5849e-5, 1.6596e-5, 1.7378e-5, 1.8197e-5,
+    1.9055e-5, 1.9953e-5, 2.0893e-5, 2.1878e-5, 2.2909e-5, 2.3988e-5, 2.5119e-5,
+    2.6303e-5, 2.7542e-5, 2.8840e-5, 3.0200e-5, 3.1623e-5, 3.3113e-5, 3.4674e-5,
+    3.6308e-5, 3.8019e-5, 3.9811e-5, 4.1687e-5, 4.3652e-5, 4.5709e-5, 4.7863e-5,
+    5.0119e-5, 5.2481e-5, 5.4954e-5, 5.7544e-5, 6.0256e-5, 6.3096e-5, 6.6069e-5,
+    6.9183e-5, 7.2444e-5, 7.5858e-5, 7.9433e-5, 8.3176e-5, 8.7096e-5, 9.1201e-5,
+    9.5499e-5, 1.0000e-4, 1.0471e-4, 1.0965e-4, 1.1482e-4, 1.2023e-4, 1.2589e-4,
+    1.3183e-4, 1.3804e-4, 1.4454e-4, 1.5136e-4, 1.5849e-4, 1.6596e-4, 1.7378e-4,
+    1.8197e-4, 1.9055e-4, 1.9953e-4, 2.0893e-4, 2.1878e-4, 2.2909e-4, 2.3988e-4,
+    2.5119e-4, 2.6303e-4, 2.7542e-4, 2.8840e-4, 3.0200e-4, 3.1623e-4, 3.3113e-4,
+    3.4674e-4, 3.6308e-4, 3.8019e-4, 3.9811e-4, 4.1687e-4, 4.3652e-4, 4.5709e-4,
+    4.7863e-4, 5.0119e-4, 5.2481e-4, 5.4954e-4, 5.7544e-4, 6.0256e-4, 6.3096e-4,
+    6.6069e-4, 6.9183e-4, 7.2444e-4, 7.5858e-4, 7.9433e-4, 8.3176e-4, 8.7096e-4,
+    9.1201e-4, 9.5499e-4, 1.0000e-3, 1.0471e-3, 1.0965e-3, 1.1482e-3, 1.2023e-3,
+    1.2589e-3, 1.3183e-3, 1.3804e-3, 1.4454e-3, 1.5136e-3, 1.5849e-3, 1.6596e-3,
+    1.7378e-3, 1.8197e-3, 1.9055e-3, 1.9953e-3, 2.0893e-3, 2.1878e-3, 2.2909e-3,
+    2.3988e-3, 2.5119e-3, 2.6303e-3, 2.7542e-3, 2.8840e-3, 3.0200e-3, 3.1623e-3,
+    3.3113e-3, 3.4674e-3, 3.6308e-3, 3.8019e-3, 3.9811e-3, 4.1687e-3, 4.3652e-3,
+    4.5709e-3, 4.7863e-3, 5.0119e-3, 5.2481e-3, 5.4954e-3, 5.7544e-3, 6.0256e-3,
+    6.3096e-3, 6.6069e-3, 6.9183e-3, 7.2444e-3, 7.5858e-3, 7.9433e-3, 8.3176e-3,
+    8.7096e-3, 9.1201e-3, 9.5499e-3, 1.0000e-2, 1.0471e-2, 1.0965e-2, 1.1482e-2,
+    1.2023e-2, 1.2589e-2, 1.3183e-2, 1.3804e-2, 1.4454e-2, 1.5136e-2, 1.5849e-2,
+    1.6596e-2, 1.7378e-2, 1.8197e-2, 1.9055e-2, 1.9953e-2, 2.0893e-2, 2.1878e-2,
+    2.2909e-2, 2.3988e-2, 2.5119e-2, 2.6303e-2, 2.7542e-2, 2.8840e-2, 3.0200e-2,
+    3.1623e-2, 3.3113e-2, 3.4674e-2, 3.6308e-2, 3.8019e-2, 3.9811e-2, 4.1687e-2,
+    4.3652e-2, 4.5709e-2, 4.7863e-2, 5.0119e-2, 5.2481e-2, 5.4954e-2, 5.7544e-2,
+    6.0256e-2, 6.3096e-2, 6.6069e-2, 6.9183e-2, 7.2444e-2, 7.5858e-2, 7.9433e-2,
+    8.3176e-2, 8.7096e-2, 9.1201e-2, 9.5499e-2, 1.0000e-1, 1.0471e-1, 1.0965e-1,
+    1.1482e-1, 1.2023e-1, 1.2589e-1, 1.3183e-1, 1.3804e-1, 1.4454e-1, 1.5136e-1,
+    1.5849e-1, 1.6596e-1, 1.7378e-1, 1.8197e-1, 1.9055e-1, 1.9953e-1, 2.0893e-1,
+    2.1878e-1, 2.2909e-1, 2.3988e-1, 2.5119e-1, 2.6303e-1, 2.7542e-1, 2.8840e-1,
+    3.0200e-1, 3.1623e-1, 3.3113e-1, 3.4674e-1, 3.6308e-1, 3.8019e-1, 3.9811e-1,
+    4.1687e-1, 4.3652e-1, 4.5709e-1, 4.7863e-1, 5.0119e-1, 5.2481e-1, 5.4954e-1,
+    5.7544e-1, 6.0256e-1, 6.3096e-1, 6.6069e-1, 6.9183e-1, 7.2444e-1, 7.5858e-1,
+    7.9433e-1, 8.3176e-1, 8.7096e-1, 9.1201e-1, 9.5499e-1, 1.0000e0, 1.0471e0,
+    1.0965e0, 1.1482e0, 1.2023e0, 1.2589e0, 1.3183e0, 1.3804e0, 1.4454e0,
+    1.5136e0, 1.5849e0, 1.6596e0, 1.7378e0, 1.8197e0, 1.9055e0, 1.9953e0,
+    2.0893e0, 2.1878e0, 2.2909e0, 2.3988e0, 2.5119e0, 2.6303e0, 2.7542e0,
+    2.8840e0, 3.0200e0, 3.1623e0, 3.3113e0, 3.4674e0, 3.6308e0, 3.8019e0,
+    3.9811e0, 4.1687e0, 4.3652e0, 4.5709e0, 4.7863e0, 5.0119e0, 5.2481e0,
+    5.4954e0, 5.7544e0, 6.0256e0, 6.3096e0, 6.6069e0, 6.9183e0, 7.2444e0,
+    7.5858e0, 7.9433e0, 8.3176e0, 8.7096e0, 9.1201e0, 9.5499e0, 1.0000e1,
+    1.0471e1, 1.0965e1, 1.1482e1, 1.2023e1, 1.2589e1, 1.3183e1, 1.3804e1,
+    1.4454e1, 1.5136e1, 1.5849e1, 1.6596e1, 1.7378e1, 1.8197e1, 1.9055e1,
+    1.9953e1, 2.0893e1, 2.1878e1, 2.2909e1, 2.3988e1, 2.5119e1, 2.6303e1,
+    2.7542e1, 2.8840e1, 3.0200e1, 3.1623e1, 3.3113e1, 3.4674e1, 3.6308e1,
+    3.8019e1, 3.9811e1, 4.1687e1, 4.3652e1, 4.5709e1, 4.7863e1, 5.0119e1,
+    5.2481e1, 5.4954e1, 5.7544e1, 6.0256e1, 6.3096e1, 6.6069e1, 6.9183e1,
+    7.2444e1, 7.5858e1, 7.9433e1, 8.3176e1, 8.7096e1, 9.1201e1, 9.5499e1,
+    1.0000e2, 1.0471e2, 1.0965e2, 1.1482e2, 1.2023e2, 1.2589e2, 1.3183e2,
+    1.3804e2, 1.4454e2, 1.5136e2, 1.5849e2, 1.6596e2, 1.7378e2, 1.8197e2,
+    1.9055e2, 1.9953e2, 2.0893e2, 2.1878e2, 2.2909e2, 2.3988e2, 2.5119e2,
+    2.6303e2, 2.7542e2, 2.8840e2, 3.0200e2, 3.1623e2, 3.3113e2, 3.4674e2,
+    3.6308e2, 3.8019e2, 3.9811e2, 4.1687e2, 4.3652e2, 4.5709e2, 4.7863e2,
+    5.0119e2, 5.2481e2, 5.4954e2, 5.7544e2, 6.0256e2, 6.3096e2, 6.6069e2,
+    6.9183e2, 7.2444e2, 7.5858e2, 7.9433e2, 8.3176e2, 8.7096e2, 9.1201e2,
+    9.5499e2, 1.0000e3, 1.0471e3, 1.0965e3, 1.1482e3, 1.2023e3, 1.2589e3,
+    1.3183e3, 1.3804e3, 1.4454e3, 1.5136e3, 1.5849e3, 1.6596e3, 1.7378e3,
+    1.8197e3, 1.9055e3, 1.9953e3, 2.0893e3, 2.1878e3, 2.2909e3, 2.3988e3,
+    2.5119e3, 2.6303e3, 2.7542e3, 2.8840e3, 3.0200e3, 3.1623e3, 3.3113e3,
+    3.4674e3, 3.6308e3, 3.8019e3, 3.9811e3, 4.1687e3, 4.3652e3, 4.5709e3,
+    4.7863e3, 5.0119e3, 5.2481e3, 5.4954e3, 5.7544e3, 6.0256e3, 6.3096e3,
+    6.6069e3, 6.9183e3, 7.2444e3, 7.5858e3, 7.9433e3, 8.3176e3, 8.7096e3,
+    9.1201e3, 9.5499e3, 1.0000e4, 1.0471e4, 1.0965e4, 1.1482e4, 1.2023e4,
+    1.2589e4, 1.3183e4, 1.3804e4, 1.4454e4, 1.5136e4, 1.5849e4, 1.6596e4,
+    1.7378e4, 1.8197e4, 1.9055e4, 1.9953e4, 2.0893e4, 2.1878e4, 2.2909e4,
+    2.3988e4, 2.5119e4, 2.6303e4, 2.7542e4, 2.8840e4, 3.0200e4, 3.1623e4,
+    3.3113e4, 3.4674e4, 3.6308e4, 3.8019e4, 3.9811e4, 4.1687e4, 4.3652e4,
+    4.5709e4, 4.7863e4, 5.0119e4, 5.2481e4, 5.4954e4, 5.7544e4, 6.0256e4,
+    6.3096e4, 6.6069e4, 6.9183e4, 7.2444e4, 7.5858e4, 7.9433e4, 8.3176e4,
+    8.7096e4, 9.1201e4, 9.5499e4, 1.0000e5, 1.0471e5, 1.0965e5, 1.1482e5,
+    1.2023e5, 1.2589e5, 1.3183e5, 1.3804e5, 1.4454e5, 1.5136e5, 1.5849e5,
+    1.6596e5, 1.7378e5, 1.8197e5, 1.9055e5, 1.9953e5, 2.0893e5, 2.1878e5,
+    2.2909e5, 2.3988e5, 2.5119e5, 2.6303e5, 2.7542e5, 2.8840e5, 3.0200e5,
+    3.1623e5, 3.3113e5, 3.4674e5, 3.6308e5, 3.8019e5, 3.9811e5, 4.1687e5,
+    4.3652e5, 4.5709e5, 4.7863e5, 5.0119e5, 5.2481e5, 5.4954e5, 5.7544e5,
+    6.0256e5, 6.3096e5, 6.6069e5, 6.9183e5, 7.2444e5, 7.5858e5, 7.9433e5,
+    8.3176e5, 8.7096e5, 9.1201e5, 9.5499e5, 1.0000e6, 1.0471e6, 1.0965e6,
+    1.1482e6, 1.2023e6, 1.2589e6, 1.3183e6, 1.3804e6, 1.4454e6, 1.5136e6,
+    1.5849e6, 1.6596e6, 1.7378e6, 1.8197e6, 1.9055e6, 1.9953e6, 2.0893e6,
+    2.1878e6, 2.2909e6, 2.3988e6, 2.5119e6, 2.6303e6, 2.7542e6, 2.8840e6,
+    3.0200e6, 3.1623e6, 3.3113e6, 3.4674e6, 3.6308e6, 3.8019e6, 3.9811e6,
+    4.1687e6, 4.3652e6, 4.5709e6, 4.7863e6, 5.0119e6, 5.2481e6, 5.4954e6,
+    5.7544e6, 6.0256e6, 6.3096e6, 6.6069e6, 6.9183e6, 7.2444e6, 7.5858e6,
+    7.9433e6, 8.3176e6, 8.7096e6, 9.1201e6, 9.5499e6, 1.0000e7, 1.0471e7,
+    1.0965e7, 1.1482e7, 1.2023e7, 1.2589e7, 1.3183e7, 1.3804e7, 1.4454e7,
+    1.5136e7, 1.5849e7, 1.6596e7, 1.7378e7, 1.8197e7, 1.9055e7, 1.9953e7,
+    2.0000e7
+])
 GROUP_STRUCTURES['CCFE-709'] = np.array([
     1.e-5, 1.0471e-5, 1.0965e-5, 1.1482e-5, 1.2023e-5,
     1.2589e-5, 1.3183e-5, 1.3804e-5, 1.4454e-5, 1.5136e-5,
diff --git a/src/particle.cpp b/src/particle.cpp
index 118b084b0..7a003feb9 100644
--- a/src/particle.cpp
+++ b/src/particle.cpp
@@ -105,7 +105,7 @@ void Particle::split(double wgt)
   bank.E = settings::run_CE ? E() : g();
   bank.time = time();
 
-  // Convert signed index to a singed surface ID
+  // Convert signed index to a signed surface ID
   if (surface() == SURFACE_NONE) {
     bank.surf_id = SURFACE_NONE;
   } else {

From 14d51e0ebaa4de3f122ec85478002d559245fabc Mon Sep 17 00:00:00 2001
From: Jonathan Shimwell <mail@jshimwell.com>
Date: Thu, 14 Aug 2025 20:26:27 +0200
Subject: [PATCH 097/203] more helpful error message for dose_coefficients
 (#3534)

---
 openmc/data/effective_dose/dose.py |  7 ++++++-
 tests/unit_tests/test_data_dose.py | 20 ++++++++++++++++++++
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/openmc/data/effective_dose/dose.py b/openmc/data/effective_dose/dose.py
index c7f458d1c..d49043b0a 100644
--- a/openmc/data/effective_dose/dose.py
+++ b/openmc/data/effective_dose/dose.py
@@ -82,7 +82,12 @@ def dose_coefficients(particle, geometry='AP', data_source='icrp116'):
     cv.check_value('data_source', data_source, {'icrp74', 'icrp116'})
 
     if (data_source, particle) not in _FILES:
-        raise ValueError(f"{particle} has no dose data in data source {data_source}.")
+        available_particles = sorted({p for (ds, p) in _FILES if ds == data_source})
+        msg = (
+            f"'{particle}' has no dose data in data source {data_source}. "
+            f"Available particles for {data_source} are: {available_particles}"
+        )
+        raise ValueError(msg)
     elif (data_source, particle) not in _DOSE_TABLES:
         _load_dose_icrp(data_source, particle)
 
diff --git a/tests/unit_tests/test_data_dose.py b/tests/unit_tests/test_data_dose.py
index 2d80cf838..4f1880014 100644
--- a/tests/unit_tests/test_data_dose.py
+++ b/tests/unit_tests/test_data_dose.py
@@ -41,3 +41,23 @@ def test_dose_coefficients():
         dose_coefficients('neutron', 'ZZ')
     with raises(ValueError):
         dose_coefficients('neutron', data_source='icrp7000')
+    with raises(ValueError) as excinfo:
+        dose_coefficients("photons", data_source="icrp116")
+    expected_particles = [
+        "electron",
+        "helium",
+        "mu+",
+        "mu-",
+        "neutron",
+        "photon",
+        "photon kerma",
+        "pi+",
+        "pi-",
+        "positron",
+        "proton",
+    ]
+    expected_msg = (
+        "'photons' has no dose data in data source icrp116. "
+        f"Available particles for icrp116 are: {expected_particles}"
+    )
+    assert str(excinfo.value) == expected_msg

From 75b581301256c3c77676f798883d993917c1d221 Mon Sep 17 00:00:00 2001
From: GuySten <62616591+GuySten@users.noreply.github.com>
Date: Mon, 18 Aug 2025 15:42:38 +0200
Subject: [PATCH 098/203] Use cached property for openmc.data.Decay.sources
 (#3535)

Co-authored-by: Paul Romano <paul.k.romano@gmail.com>
---
 openmc/data/decay.py | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/openmc/data/decay.py b/openmc/data/decay.py
index 66acb2212..1a11d3614 100644
--- a/openmc/data/decay.py
+++ b/openmc/data/decay.py
@@ -1,4 +1,5 @@
 from collections.abc import Iterable
+from functools import cached_property
 from io import StringIO
 from math import log
 import re
@@ -339,7 +340,6 @@ class Decay(EqualityMixin):
         self.modes = []
         self.spectra = {}
         self.average_energies = {}
-        self._sources = None
 
         # Get head record
         items = get_head_record(file_obj)
@@ -506,14 +506,9 @@ class Decay(EqualityMixin):
         """
         return cls(ev_or_filename)
 
-    @property
+    @cached_property
     def sources(self):
         """Radioactive decay source distributions"""
-        # If property has been computed already, return it
-        # TODO: Replace with functools.cached_property when support is Python 3.9+
-        if self._sources is not None:
-            return self._sources
-
         sources = {}
         name = self.nuclide['name']
         decay_constant = self.decay_constant.n
@@ -571,8 +566,7 @@ class Decay(EqualityMixin):
             merged_sources[particle_type] = combine_distributions(
                 dist_list, [1.0]*len(dist_list))
 
-        self._sources = merged_sources
-        return self._sources
+        return merged_sources
 
 
 _DECAY_PHOTON_ENERGY = {}

From c5a71738642244a5d7a27898dd0491f1e3966a6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Delaporte-Mathurin?=
 <40028739+RemDelaporteMathurin@users.noreply.github.com>
Date: Mon, 18 Aug 2025 10:34:12 -0400
Subject: [PATCH 099/203] Avoid duplicate materials written to XML (#3536)

Co-authored-by: Paul Romano <paul.k.romano@gmail.com>
---
 openmc/material.py                 |  2 +-
 tests/unit_tests/test_materials.py | 16 ++++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/openmc/material.py b/openmc/material.py
index 0afe5b670..c7b954b66 100644
--- a/openmc/material.py
+++ b/openmc/material.py
@@ -1927,7 +1927,7 @@ class Materials(cv.CheckedList):
             file.write(ET.tostring(element, encoding="unicode"))
 
         # Write the <material> elements.
-        for material in sorted(self, key=lambda x: x.id):
+        for material in sorted(set(self), key=lambda x: x.id):
             element = material.to_xml_element(nuclides_to_ignore=nuclides_to_ignore)
             clean_indentation(element, level=level+1)
             element.tail = element.tail.strip(' ')
diff --git a/tests/unit_tests/test_materials.py b/tests/unit_tests/test_materials.py
index 6c8c59fc9..03484e2b6 100644
--- a/tests/unit_tests/test_materials.py
+++ b/tests/unit_tests/test_materials.py
@@ -61,3 +61,19 @@ def test_materials_deplete():
     # Ni59 is one of the main activation product of Ni60 in the first irradiation
     # step. It then decays in the second cooling step (flux = 0)
     assert Ni59_mat_1_step_1 > 0.0 and Ni59_mat_1_step_1 > Ni59_mat_1_step_2
+
+
+def test_export_duplicate_materials_to_xml(run_in_tmpdir):
+    """
+    Test exporting Materials to xml with a duplicate and checking that only
+    unique entities are exported.
+    """
+    my_mat = openmc.Material(name="my_mat")
+    my_mat2 = openmc.Material(name="my_mat2")
+
+    materials = openmc.Materials([my_mat, my_mat2, my_mat])
+
+    materials.export_to_xml("materials.xml")
+
+    materials_in = openmc.Materials.from_xml("materials.xml")
+    assert len(materials_in) == 2

From 68e894c4b01cfdc027b8961a0f02be987bb44c53 Mon Sep 17 00:00:00 2001
From: GuySten <62616591+GuySten@users.noreply.github.com>
Date: Mon, 18 Aug 2025 16:40:54 +0200
Subject: [PATCH 100/203] Fix a bug in time cutoff behavior (#3526)

---
 src/particle.cpp                              | 77 ++++++++-----------
 src/physics_mg.cpp                            |  1 +
 .../time_cutoff/results_true.dat              |  4 +-
 tests/unit_tests/test_mesh.py                 |  2 +-
 4 files changed, 37 insertions(+), 47 deletions(-)

diff --git a/src/particle.cpp b/src/particle.cpp
index 7a003feb9..a0f1d66bd 100644
--- a/src/particle.cpp
+++ b/src/particle.cpp
@@ -44,34 +44,30 @@ namespace openmc {
 
 double Particle::speed() const
 {
-  // Determine mass in eV/c^2
-  double mass;
-  switch (this->type()) {
-  case ParticleType::neutron:
-    mass = MASS_NEUTRON_EV;
-    break;
-  case ParticleType::photon:
-    mass = 0.0;
-    break;
-  case ParticleType::electron:
-  case ParticleType::positron:
-    mass = MASS_ELECTRON_EV;
-    break;
-  }
-
-  if (this->E() < 1.0e-9 * mass) {
-    // If the energy is much smaller than the mass, revert to non-relativistic
-    // formula. The 1e-9 criterion is specifically chosen as the point below
-    // which the error from using the non-relativistic formula is less than the
-    // round-off eror when using the relativistic formula (see analysis at
-    // https://gist.github.com/paulromano/da3b473fe3df33de94b265bdff0c7817)
-    return C_LIGHT * std::sqrt(2 * this->E() / mass);
+  if (settings::run_CE) {
+    // Determine mass in eV/c^2
+    double mass;
+    switch (this->type()) {
+    case ParticleType::neutron:
+      mass = MASS_NEUTRON_EV;
+      break;
+    case ParticleType::photon:
+      mass = 0.0;
+      break;
+    case ParticleType::electron:
+    case ParticleType::positron:
+      mass = MASS_ELECTRON_EV;
+      break;
+    }
+    // Equivalent to C * sqrt(1-(m/(m+E))^2) without problem at E<<m:
+    return C_LIGHT * std::sqrt(this->E() * (this->E() + 2 * mass)) /
+           (this->E() + mass);
   } else {
-    // Calculate inverse of Lorentz factor
-    const double inv_gamma = mass / (this->E() + mass);
-
-    // Calculate speed via v = c * sqrt(1 - γ^-2)
-    return C_LIGHT * std::sqrt(1 - inv_gamma * inv_gamma);
+    auto& macro_xs = data::mg.macro_xs_[this->material()];
+    int macro_t = this->mg_xs_cache().t;
+    int macro_a = macro_xs.get_angle_index(this->u());
+    return 1.0 / macro_xs.get_xs(MgxsType::INVERSE_VELOCITY, this->g(), nullptr,
+                   nullptr, nullptr, macro_t, macro_a);
   }
 }
 
@@ -241,8 +237,14 @@ void Particle::event_advance()
     collision_distance() = -std::log(prn(current_seed())) / macro_xs().total;
   }
 
-  // Select smaller of the two distances
-  double distance = std::min(boundary().distance(), collision_distance());
+  double speed = this->speed();
+  double time_cutoff = settings::time_cutoff[static_cast<int>(type())];
+  double distance_cutoff =
+    (time_cutoff < INFTY) ? (time_cutoff - time()) * speed : INFTY;
+
+  // Select smaller of the three distances
+  double distance =
+    std::min({boundary().distance(), collision_distance(), distance_cutoff});
 
   // Advance particle in space and time
   // Short-term solution until the surface source is revised and we can use
@@ -250,23 +252,10 @@ void Particle::event_advance()
   for (int j = 0; j < n_coord(); ++j) {
     coord(j).r() += distance * coord(j).u();
   }
-  double dt = distance / this->speed();
+  double dt = distance / speed;
   this->time() += dt;
   this->lifetime() += dt;
 
-  // Kill particle if its time exceeds the cutoff
-  bool hit_time_boundary = false;
-  double time_cutoff = settings::time_cutoff[static_cast<int>(type())];
-  if (time() > time_cutoff) {
-    double dt = time() - time_cutoff;
-    time() = time_cutoff;
-    lifetime() = time_cutoff;
-
-    double push_back_distance = speed() * dt;
-    this->move_distance(-push_back_distance);
-    hit_time_boundary = true;
-  }
-
   // Score track-length tallies
   if (!model::active_tracklength_tallies.empty()) {
     score_tracklength_tally(*this, distance);
@@ -284,7 +273,7 @@ void Particle::event_advance()
   }
 
   // Set particle weight to zero if it hit the time boundary
-  if (hit_time_boundary) {
+  if (distance == distance_cutoff) {
     wgt() = 0.0;
   }
 }
diff --git a/src/physics_mg.cpp b/src/physics_mg.cpp
index c97a3d6f3..5ebef9c14 100644
--- a/src/physics_mg.cpp
+++ b/src/physics_mg.cpp
@@ -137,6 +137,7 @@ void create_fission_sites(Particle& p)
     SourceSite site;
     site.r = p.r();
     site.particle = ParticleType::neutron;
+    site.time = p.time();
     site.wgt = 1. / weight;
     site.parent_id = p.id();
     site.progeny_id = p.n_progeny()++;
diff --git a/tests/regression_tests/time_cutoff/results_true.dat b/tests/regression_tests/time_cutoff/results_true.dat
index 1cafceb77..d3d5e1b3c 100644
--- a/tests/regression_tests/time_cutoff/results_true.dat
+++ b/tests/regression_tests/time_cutoff/results_true.dat
@@ -1,5 +1,5 @@
 tally 1:
-2.000000E+03
-4.000000E+05
+1.383148E+02
+1.913099E+03
 0.000000E+00
 0.000000E+00
diff --git a/tests/unit_tests/test_mesh.py b/tests/unit_tests/test_mesh.py
index 3c8e988c0..67ca4028e 100644
--- a/tests/unit_tests/test_mesh.py
+++ b/tests/unit_tests/test_mesh.py
@@ -620,7 +620,7 @@ def test_mesh_material_volumes_serialize():
     assert new_volumes.by_element(3) == [(2, 1.0)]
 
 
-def test_raytrace_mesh_infinite_loop():
+def test_raytrace_mesh_infinite_loop(run_in_tmpdir):
     # Create a model with one large spherical cell
     sphere = openmc.Sphere(r=100, boundary_type='vacuum')
     cell = openmc.Cell(region=-sphere)

From e878aeb82ff240478e3079787a1f94ea5ac58e7f Mon Sep 17 00:00:00 2001
From: Jonathan Shimwell <mail@jshimwell.com>
Date: Thu, 21 Aug 2025 11:14:21 +0200
Subject: [PATCH 101/203] not printing nuclides with 0 percent to terminal
 (option 2 ) (#3448)

---
 openmc/deplete/stepresult.py                 | 2 +-
 tests/unit_tests/test_deplete_resultslist.py | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/openmc/deplete/stepresult.py b/openmc/deplete/stepresult.py
index 7c86b8645..1a26cbe34 100644
--- a/openmc/deplete/stepresult.py
+++ b/openmc/deplete/stepresult.py
@@ -233,7 +233,7 @@ class StepResult:
             ) from e
         for nuc, _ in sorted(self.index_nuc.items(), key=lambda x: x[1]):
             atoms = self[0, mat_id, nuc]
-            if atoms < 0.0:
+            if atoms <= 0.0:
                 continue
             atom_per_bcm = atoms / vol * 1e-24
             material.add_nuclide(nuc, atom_per_bcm)
diff --git a/tests/unit_tests/test_deplete_resultslist.py b/tests/unit_tests/test_deplete_resultslist.py
index b22a78650..308eccf7b 100644
--- a/tests/unit_tests/test_deplete_resultslist.py
+++ b/tests/unit_tests/test_deplete_resultslist.py
@@ -220,5 +220,4 @@ def test_stepresult_get_material(res):
     # Spot check number densities
     densities = mat1.get_nuclide_atom_densities()
     assert densities['Xe135'] == pytest.approx(1e-14)
-    assert densities['I135'] == pytest.approx(1e-21)
     assert densities['U234'] == pytest.approx(1.00506e-05)

From 5e3249f0063e1bb9c2fd69d3b7542b4106d20baa Mon Sep 17 00:00:00 2001
From: GuySten <62616591+GuySten@users.noreply.github.com>
Date: Thu, 21 Aug 2025 13:13:50 -0800
Subject: [PATCH 102/203] fix tests that accidentaly got broken (#3543)

---
 tests/unit_tests/test_material.py  | 7 ++++---
 tests/unit_tests/test_materials.py | 9 +++++----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/tests/unit_tests/test_material.py b/tests/unit_tests/test_material.py
index eae814a75..2e3724272 100644
--- a/tests/unit_tests/test_material.py
+++ b/tests/unit_tests/test_material.py
@@ -738,11 +738,12 @@ def test_material_deplete():
         chain_file=chain,
     )
 
-    for material in depleted_material:
+    for i_step, material in enumerate(depleted_material):
         assert isinstance(material, openmc.Material)
-        assert len(material.get_nuclides()) > len(pristine_material.get_nuclides())
+        if i_step > 0:
+            assert len(material.get_nuclides()) > len(pristine_material.get_nuclides())
 
-    Co58_mat_1_step_0 = depleted_material[0].get_nuclide_atom_densities("Co58")["Co58"]
+    Co58_mat_1_step_0 = depleted_material[0].get_nuclide_atom_densities("Co58").get("Co58", 0.0)
     Co58_mat_1_step_1 = depleted_material[1].get_nuclide_atom_densities("Co58")["Co58"]
     Co58_mat_1_step_2 = depleted_material[2].get_nuclide_atom_densities("Co58")["Co58"]
 
diff --git a/tests/unit_tests/test_materials.py b/tests/unit_tests/test_materials.py
index 03484e2b6..5a382b777 100644
--- a/tests/unit_tests/test_materials.py
+++ b/tests/unit_tests/test_materials.py
@@ -38,13 +38,14 @@ def test_materials_deplete():
 
     assert list(depleted_material.keys()) == [pristine_material_1.id, pristine_material_2.id]
     for mat_id, materials in depleted_material.items():
-        for material in materials:
+        for i_step, material in enumerate(materials):
             assert isinstance(material, openmc.Material)
-            assert len(material.get_nuclides()) > 1
+            if i_step > 0:
+                assert len(material.get_nuclides()) > 1
             assert mat_id == material.id
 
     mats = depleted_material[pristine_material_1.id]
-    Co58_mat_1_step_0 = mats[0].get_nuclide_atom_densities("Co58")["Co58"]
+    Co58_mat_1_step_0 = mats[0].get_nuclide_atom_densities("Co58").get("Co58", 0.0)
     Co58_mat_1_step_1 = mats[1].get_nuclide_atom_densities("Co58")["Co58"]
     Co58_mat_1_step_2 = mats[2].get_nuclide_atom_densities("Co58")["Co58"]
 
@@ -53,7 +54,7 @@ def test_materials_deplete():
     # It then decays in the second cooling step (flux = 0)
     assert Co58_mat_1_step_1 > 0.0 and Co58_mat_1_step_1 > Co58_mat_1_step_2
 
-    Ni59_mat_1_step_0 = mats[0].get_nuclide_atom_densities("Ni59")["Ni59"]
+    Ni59_mat_1_step_0 = mats[0].get_nuclide_atom_densities("Ni59").get("Ni59", 0.0)
     Ni59_mat_1_step_1 = mats[1].get_nuclide_atom_densities("Ni59")["Ni59"]
     Ni59_mat_1_step_2 = mats[2].get_nuclide_atom_densities("Ni59")["Ni59"]
 

From d1df80a210f94a9b68194310e1e540a863b2ce8c Mon Sep 17 00:00:00 2001
From: GuySten <62616591+GuySten@users.noreply.github.com>
Date: Fri, 22 Aug 2025 06:58:39 -0800
Subject: [PATCH 103/203] Leverage particle.move_distance in event advance
 (#3544)

---
 src/particle.cpp | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/particle.cpp b/src/particle.cpp
index a0f1d66bd..fb41d82e9 100644
--- a/src/particle.cpp
+++ b/src/particle.cpp
@@ -247,11 +247,7 @@ void Particle::event_advance()
     std::min({boundary().distance(), collision_distance(), distance_cutoff});
 
   // Advance particle in space and time
-  // Short-term solution until the surface source is revised and we can use
-  // this->move_distance(distance)
-  for (int j = 0; j < n_coord(); ++j) {
-    coord(j).r() += distance * coord(j).u();
-  }
+  this->move_distance(distance);
   double dt = distance / speed;
   this->time() += dt;
   this->lifetime() += dt;

From b14eff47603dbc1e52fbef11cced930bbc6869b2 Mon Sep 17 00:00:00 2001
From: GuySten <62616591+GuySten@users.noreply.github.com>
Date: Wed, 27 Aug 2025 22:28:11 +0300
Subject: [PATCH 104/203] fix broken CI (#3551)

---
 .github/workflows/format-check.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/format-check.yml b/.github/workflows/format-check.yml
index cef14ca2c..c2ceb88e2 100644
--- a/.github/workflows/format-check.yml
+++ b/.github/workflows/format-check.yml
@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: cpp-linter/cpp-linter-action@v2
+      - uses: cpp-linter/cpp-linter-action@v2.16.0
         id: linter
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

From 2a278c93a67e6666c4408b752fd9c4f0e91e7cfe Mon Sep 17 00:00:00 2001
From: GuySten <62616591+GuySten@users.noreply.github.com>
Date: Thu, 28 Aug 2025 02:18:06 +0300
Subject: [PATCH 105/203] Revert "fix broken CI" (#3554)

---
 .github/workflows/format-check.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/format-check.yml b/.github/workflows/format-check.yml
index c2ceb88e2..cef14ca2c 100644
--- a/.github/workflows/format-check.yml
+++ b/.github/workflows/format-check.yml
@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: cpp-linter/cpp-linter-action@v2.16.0
+      - uses: cpp-linter/cpp-linter-action@v2
         id: linter
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

From 5529731e2f7933b3386a854db24edf3e2e535a44 Mon Sep 17 00:00:00 2001
From: GuySten <62616591+GuySten@users.noreply.github.com>
Date: Fri, 29 Aug 2025 15:06:33 +0300
Subject: [PATCH 106/203] Refactor endf_data to be a fixture (#3539)

---
 openmc/config.py                           | 16 +++----
 tests/conftest.py                          |  6 ++-
 tests/unit_tests/test_data_decay.py        |  9 ++--
 tests/unit_tests/test_data_kalbach_mann.py |  7 +--
 tests/unit_tests/test_data_misc.py         |  2 +-
 tests/unit_tests/test_data_multipole.py    | 10 ++--
 tests/unit_tests/test_data_neutron.py      | 56 ++++++++--------------
 tests/unit_tests/test_data_photon.py       |  7 ++-
 tests/unit_tests/test_data_thermal.py      | 22 ++++-----
 tests/unit_tests/test_deplete_chain.py     | 10 ++--
 10 files changed, 59 insertions(+), 86 deletions(-)

diff --git a/openmc/config.py b/openmc/config.py
index d61fb2d31..e75973495 100644
--- a/openmc/config.py
+++ b/openmc/config.py
@@ -193,12 +193,12 @@ def _default_config() -> _Config:
 
     """
     config = _Config()
-    if "OPENMC_CROSS_SECTIONS" in os.environ:
-        config['cross_sections'] = os.environ["OPENMC_CROSS_SECTIONS"]
-    if "OPENMC_MG_CROSS_SECTIONS" in os.environ:
-        config['mg_cross_sections'] = os.environ["OPENMC_MG_CROSS_SECTIONS"]
-    chain_file = os.environ.get("OPENMC_CHAIN_FILE")
-    xs_path = config.get('cross_sections')
+    for key,var in _Config._PATH_KEYS.items():
+        if var in os.environ:
+            config[key] = os.environ[var]
+    
+    chain_file = config.get("chain_file")
+    xs_path = config.get("cross_sections")
     if chain_file is None and xs_path is not None and xs_path.exists():
         try:
             data = DataLibrary.from_xml(xs_path)
@@ -209,10 +209,8 @@ def _default_config() -> _Config:
         else:
             for lib in reversed(data.libraries):
                 if lib['type'] == 'depletion_chain':
-                    chain_file = xs_path.parent / lib['path']
+                    config['chain_file'] = xs_path.parent / lib['path']
                     break
-    if chain_file is not None:
-        config['chain_file'] = chain_file
     return config
 
 
diff --git a/tests/conftest.py b/tests/conftest.py
index cd86da539..fa6718502 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -1,3 +1,4 @@
+import os
 import pytest
 import openmc
 
@@ -28,7 +29,10 @@ def run_in_tmpdir(tmpdir):
         yield
     finally:
         orig.chdir()
-
+        
+@pytest.fixture(scope="module")
+def endf_data():
+    return os.environ['OPENMC_ENDF_DATA']        
 
 @pytest.fixture(scope='session', autouse=True)
 def resolve_paths():
diff --git a/tests/unit_tests/test_data_decay.py b/tests/unit_tests/test_data_decay.py
index 8900e7eac..de8d90a43 100644
--- a/tests/unit_tests/test_data_decay.py
+++ b/tests/unit_tests/test_data_decay.py
@@ -17,25 +17,22 @@ def ufloat_close(a, b):
 
 
 @pytest.fixture(scope='module')
-def nb90():
+def nb90(endf_data):
     """Nb90 decay data."""
-    endf_data = os.environ['OPENMC_ENDF_DATA']
     filename = os.path.join(endf_data, 'decay', 'dec-041_Nb_090.endf')
     return openmc.data.Decay.from_endf(filename)
 
 
 @pytest.fixture(scope='module')
-def ba137m():
+def ba137m(endf_data):
     """Ba137_m1 decay data."""
-    endf_data = os.environ['OPENMC_ENDF_DATA']
     filename = os.path.join(endf_data, 'decay', 'dec-056_Ba_137m1.endf')
     return openmc.data.Decay.from_endf(filename)
 
 
 @pytest.fixture(scope='module')
-def u235_yields():
+def u235_yields(endf_data):
     """U235 fission product yield data."""
-    endf_data = os.environ['OPENMC_ENDF_DATA']
     filename = os.path.join(endf_data, 'nfy', 'nfy-092_U_235.endf')
     return openmc.data.FissionProductYields.from_endf(filename)
 
diff --git a/tests/unit_tests/test_data_kalbach_mann.py b/tests/unit_tests/test_data_kalbach_mann.py
index 3b837af7d..5d06669f7 100644
--- a/tests/unit_tests/test_data_kalbach_mann.py
+++ b/tests/unit_tests/test_data_kalbach_mann.py
@@ -7,6 +7,7 @@ import pytest
 
 import numpy as np
 
+import openmc
 from openmc.data import IncidentNeutron
 from openmc.data.kalbach_mann import _separation_energy, _AtomicRepresentation
 from openmc.data import kalbach_slope
@@ -129,7 +130,7 @@ def test_kalbach_slope():
         ('Hg204.h5', 'n-080_Hg_204.endf')
     ]
 )
-def test_comparison_slope_hdf5(hdf5_filename, endf_filename):
+def test_comparison_slope_hdf5(hdf5_filename, endf_filename, endf_data):
     """Test the calculation of the Kalbach-Mann slope done by OpenMC
     by comparing it to HDF5 data. The test is based on the first product
     of MT=5 (neutron). The isotopes tested have been selected because the
@@ -147,13 +148,13 @@ def test_comparison_slope_hdf5(hdf5_filename, endf_filename):
 
     """
     # HDF5 data
-    hdf5_directory = Path(os.environ['OPENMC_CROSS_SECTIONS']).parent
+    hdf5_directory = Path(openmc.config.get('cross_sections')).parent
     hdf5_data = IncidentNeutron.from_hdf5(hdf5_directory / hdf5_filename)
     hdf5_product = hdf5_data[5].products[0]
     hdf5_distribution = hdf5_product.distribution[0]
 
     # ENDF data
-    endf_directory = Path(os.environ['OPENMC_ENDF_DATA'])
+    endf_directory = Path(endf_data)
     endf_path = endf_directory / 'neutrons' / endf_filename
     endf_data = IncidentNeutron.from_endf(endf_path)
     endf_product = endf_data[5].products[0]
diff --git a/tests/unit_tests/test_data_misc.py b/tests/unit_tests/test_data_misc.py
index b65c704af..14db68913 100644
--- a/tests/unit_tests/test_data_misc.py
+++ b/tests/unit_tests/test_data_misc.py
@@ -30,7 +30,7 @@ def test_data_library(tmpdir):
     assert os.path.exists(filename)
 
     new_lib = openmc.data.DataLibrary()
-    directory = os.path.dirname(os.environ['OPENMC_CROSS_SECTIONS'])
+    directory = os.path.dirname(openmc.config.get('cross_sections'))
     new_lib.register_file(os.path.join(directory, 'H1.h5'))
     assert new_lib[-1]['type'] == 'neutron'
     new_lib.register_file(os.path.join(directory, 'c_Zr_in_ZrH.h5'))
diff --git a/tests/unit_tests/test_data_multipole.py b/tests/unit_tests/test_data_multipole.py
index bc7136a97..105099bb9 100644
--- a/tests/unit_tests/test_data_multipole.py
+++ b/tests/unit_tests/test_data_multipole.py
@@ -8,14 +8,14 @@ import openmc.data
 
 @pytest.fixture(scope='module')
 def u235():
-    directory = pathlib.Path(os.environ['OPENMC_CROSS_SECTIONS']).parent
+    directory = pathlib.Path(openmc.config.get('cross_sections')).parent
     u235 = directory / 'wmp' / '092235.h5'
     return openmc.data.WindowedMultipole.from_hdf5(u235)
 
 
 @pytest.fixture(scope='module')
 def b10():
-    directory = pathlib.Path(os.environ['OPENMC_CROSS_SECTIONS']).parent
+    directory = pathlib.Path(openmc.config.get('cross_sections')).parent
     b10 = directory / 'wmp' / '005010.h5'
     return openmc.data.WindowedMultipole.from_hdf5(b10)
 
@@ -48,17 +48,15 @@ def test_export_to_hdf5(tmpdir, u235):
     assert os.path.exists(filename)
 
 
-def test_from_endf():
+def test_from_endf(endf_data):
     pytest.importorskip('vectfit')
-    endf_data = os.environ['OPENMC_ENDF_DATA']
     endf_file = os.path.join(endf_data, 'neutrons', 'n-001_H_001.endf')
     assert openmc.data.WindowedMultipole.from_endf(
             endf_file, log=True, wmp_options={"n_win": 400, "n_cf": 3})
 
 
-def test_from_endf_search():
+def test_from_endf_search(endf_data):
     pytest.importorskip('vectfit')
-    endf_data = os.environ['OPENMC_ENDF_DATA']
     endf_file = os.path.join(endf_data, 'neutrons', 'n-095_Am_244.endf')
     assert openmc.data.WindowedMultipole.from_endf(
             endf_file, log=True, wmp_options={"search": True, 'rtol':1e-2})
diff --git a/tests/unit_tests/test_data_neutron.py b/tests/unit_tests/test_data_neutron.py
index db6ae1eb8..d43d93ae5 100644
--- a/tests/unit_tests/test_data_neutron.py
+++ b/tests/unit_tests/test_data_neutron.py
@@ -14,128 +14,113 @@ _TEMPERATURES = [300., 600., 900.]
 @pytest.fixture(scope='module')
 def pu239():
     """Pu239 HDF5 data."""
-    directory = os.path.dirname(os.environ['OPENMC_CROSS_SECTIONS'])
+    directory = os.path.dirname(openmc.config.get('cross_sections'))
     filename = os.path.join(directory, 'Pu239.h5')
     return openmc.data.IncidentNeutron.from_hdf5(filename)
 
 
 @pytest.fixture(scope='module')
-def xe135():
+def xe135(endf_data):
     """Xe135 ENDF data (contains SLBW resonance range)"""
-    endf_data = os.environ['OPENMC_ENDF_DATA']
     filename = os.path.join(endf_data, 'neutrons', 'n-054_Xe_135.endf')
     return openmc.data.IncidentNeutron.from_endf(filename)
 
 
 @pytest.fixture(scope='module')
-def sm150():
+def sm150(endf_data):
     """Sm150 ENDF data (contains MLBW resonance range)"""
-    endf_data = os.environ['OPENMC_ENDF_DATA']
     filename = os.path.join(endf_data, 'neutrons', 'n-062_Sm_150.endf')
     return openmc.data.IncidentNeutron.from_endf(filename)
 
 
 @pytest.fixture(scope='module')
-def gd154():
+def gd154(endf_data):
     """Gd154 ENDF data (contains Reich Moore resonance range and reosnance
     covariance with LCOMP=1)."""
-    endf_data = os.environ['OPENMC_ENDF_DATA']
     filename = os.path.join(endf_data, 'neutrons', 'n-064_Gd_154.endf')
     return openmc.data.IncidentNeutron.from_endf(filename, covariance=True)
 
 
 @pytest.fixture(scope='module')
-def cl35():
+def cl35(endf_data):
     """Cl35 ENDF data (contains RML resonance range)"""
-    endf_data = os.environ['OPENMC_ENDF_DATA']
     filename = os.path.join(endf_data, 'neutrons', 'n-017_Cl_035.endf')
     return openmc.data.IncidentNeutron.from_endf(filename)
 
 
 @pytest.fixture(scope='module')
-def am241():
+def am241(endf_data):
     """Am241 ENDF data (contains Madland-Nix fission energy distribution)."""
-    endf_data = os.environ['OPENMC_ENDF_DATA']
     filename = os.path.join(endf_data, 'neutrons', 'n-095_Am_241.endf')
     return openmc.data.IncidentNeutron.from_endf(filename)
 
 
 @pytest.fixture(scope='module')
-def u233():
+def u233(endf_data):
     """U233 ENDF data (contains Watt fission energy distribution)."""
-    endf_data = os.environ['OPENMC_ENDF_DATA']
     filename = os.path.join(endf_data, 'neutrons', 'n-092_U_233.endf')
     return openmc.data.IncidentNeutron.from_endf(filename)
 
 
 @pytest.fixture(scope='module')
-def u236():
+def u236(endf_data):
     """U236 ENDF data (contains Watt fission energy distribution)."""
-    endf_data = os.environ['OPENMC_ENDF_DATA']
     filename = os.path.join(endf_data, 'neutrons', 'n-092_U_236.endf')
     return openmc.data.IncidentNeutron.from_endf(filename)
 
 
 @pytest.fixture(scope='module')
-def na22():
+def na22(endf_data):
     """Na22 ENDF data (contains evaporation spectrum)."""
-    endf_data = os.environ['OPENMC_ENDF_DATA']
     filename = os.path.join(endf_data, 'neutrons', 'n-011_Na_022.endf')
     return openmc.data.IncidentNeutron.from_endf(filename)
 
 
 @pytest.fixture(scope='module')
-def na23():
+def na23(endf_data):
     """Na23 ENDF data (contains MLBW resonance covariance with LCOMP=0)."""
-    endf_data = os.environ['OPENMC_ENDF_DATA']
     filename = os.path.join(endf_data, 'neutrons', 'n-011_Na_023.endf')
     return openmc.data.IncidentNeutron.from_endf(filename, covariance=True)
 
 
 @pytest.fixture(scope='module')
-def be9():
+def be9(endf_data):
     """Be9 ENDF data (contains laboratory angle-energy distribution)."""
-    endf_data = os.environ['OPENMC_ENDF_DATA']
     filename = os.path.join(endf_data, 'neutrons', 'n-004_Be_009.endf')
     return openmc.data.IncidentNeutron.from_endf(filename)
 
 
 @pytest.fixture(scope='module')
-def h2():
-    endf_data = os.environ['OPENMC_ENDF_DATA']
+def h2(endf_data):
     endf_file = os.path.join(endf_data, 'neutrons', 'n-001_H_002.endf')
     return openmc.data.IncidentNeutron.from_njoy(
         endf_file, temperatures=_TEMPERATURES)
 
 
 @pytest.fixture(scope='module')
-def am244():
-    endf_data = os.environ['OPENMC_ENDF_DATA']
+def am244(endf_data):
     endf_file = os.path.join(endf_data, 'neutrons', 'n-095_Am_244.endf')
     return openmc.data.IncidentNeutron.from_njoy(endf_file)
 
 
 @pytest.fixture(scope='module')
-def ti50():
+def ti50(endf_data):
     """Ti50 ENDF data (contains Multi-level Breit-Wigner resonance range and
        resonance covariance with LCOMP=1)."""
-    endf_data = os.environ['OPENMC_ENDF_DATA']
     filename = os.path.join(endf_data, 'neutrons', 'n-022_Ti_050.endf')
     return openmc.data.IncidentNeutron.from_endf(filename, covariance=True)
 
 
 @pytest.fixture(scope='module')
-def cf252():
+def cf252(endf_data):
     """Cf252 ENDF data (contains RM resonance covariance with LCOMP=0)."""
-    endf_data = os.environ['OPENMC_ENDF_DATA']
     filename = os.path.join(endf_data, 'neutrons', 'n-098_Cf_252.endf')
     return openmc.data.IncidentNeutron.from_endf(filename, covariance=True)
 
 
 @pytest.fixture(scope='module')
-def th232():
+def th232(endf_data):
     """Th232 ENDF data (contains RM resonance covariance with LCOMP=2)."""
-    endf_data = os.environ['OPENMC_ENDF_DATA']
     filename = os.path.join(endf_data, 'neutrons', 'n-090_Th_232.endf')
     return openmc.data.IncidentNeutron.from_endf(filename, covariance=True)
 
@@ -453,8 +438,7 @@ def test_laboratory(be9):
 
 
 @needs_njoy
-def test_correlated(tmpdir):
-    endf_data = os.environ['OPENMC_ENDF_DATA']
+def test_correlated(tmpdir, endf_data):
     endf_file = os.path.join(endf_data, 'neutrons', 'n-014_Si_030.endf')
     si30 = openmc.data.IncidentNeutron.from_njoy(endf_file, heatr=False)
 
@@ -480,8 +464,7 @@ def test_nbody(tmpdir, h2):
 
 
 @needs_njoy
-def test_ace_convert(run_in_tmpdir):
-    endf_data = os.environ['OPENMC_ENDF_DATA']
+def test_ace_convert(run_in_tmpdir, endf_data):
     filename = os.path.join(endf_data, 'neutrons', 'n-001_H_001.endf')
     ace_ascii = 'ace_ascii'
     ace_binary = 'ace_binary'
@@ -515,8 +498,7 @@ def test_ace_table_types():
 
 
 @needs_njoy
-def test_high_temperature():
-    endf_data = os.environ['OPENMC_ENDF_DATA']
+def test_high_temperature(endf_data):
     endf_file = os.path.join(endf_data, 'neutrons', 'n-001_H_001.endf')
 
     # Ensure that from_njoy works when given a high temperature
diff --git a/tests/unit_tests/test_data_photon.py b/tests/unit_tests/test_data_photon.py
index 010ac1f35..98b180f52 100644
--- a/tests/unit_tests/test_data_photon.py
+++ b/tests/unit_tests/test_data_photon.py
@@ -9,9 +9,8 @@ import openmc.data
 
 
 @pytest.fixture(scope='module')
-def elements_endf():
+def elements_endf(endf_data):
     """Dictionary of element ENDF data indexed by atomic symbol."""
-    endf_data = os.environ['OPENMC_ENDF_DATA']
     elements = {'H': 1, 'O': 8, 'Al': 13, 'Cu': 29, 'Ag': 47, 'U': 92, 'Pu': 94}
     data = {}
     for symbol, Z in elements.items():
@@ -145,8 +144,8 @@ def test_export_to_hdf5(tmpdir, element):
     element2.export_to_hdf5(filename, 'w')
 
 
-def test_photodat_only(run_in_tmpdir):
-    endf_dir = Path(os.environ['OPENMC_ENDF_DATA'])
+def test_photodat_only(run_in_tmpdir, endf_data):
+    endf_dir = Path(endf_data)
     photoatomic_file = endf_dir / 'photoat' / 'photoat-001_H_000.endf'
     data = openmc.data.IncidentPhoton.from_endf(photoatomic_file)
     data.export_to_hdf5('tmp.h5', 'w')
diff --git a/tests/unit_tests/test_data_thermal.py b/tests/unit_tests/test_data_thermal.py
index c9fd9045b..c444d0c58 100644
--- a/tests/unit_tests/test_data_thermal.py
+++ b/tests/unit_tests/test_data_thermal.py
@@ -13,7 +13,7 @@ from . import needs_njoy
 @pytest.fixture(scope='module')
 def h2o():
     """H in H2O thermal scattering data."""
-    directory = os.path.dirname(os.environ['OPENMC_CROSS_SECTIONS'])
+    directory = os.path.dirname(openmc.config.get('cross_sections'))
     filename = os.path.join(directory, 'c_H_in_H2O.h5')
     return openmc.data.ThermalScattering.from_hdf5(filename)
 
@@ -21,15 +21,14 @@ def h2o():
 @pytest.fixture(scope='module')
 def graphite():
     """Graphite thermal scattering data."""
-    directory = os.path.dirname(os.environ['OPENMC_CROSS_SECTIONS'])
+    directory = os.path.dirname(openmc.config.get('cross_sections'))
     filename = os.path.join(directory, 'c_Graphite.h5')
     return openmc.data.ThermalScattering.from_hdf5(filename)
 
 
 @pytest.fixture(scope='module')
-def h2o_njoy():
+def h2o_njoy(endf_data):
     """H in H2O generated using NJOY."""
-    endf_data = os.environ['OPENMC_ENDF_DATA']
     path_h1 = os.path.join(endf_data, 'neutrons', 'n-001_H_001.endf')
     path_h2o = os.path.join(endf_data, 'thermal_scatt', 'tsl-HinH2O.endf')
     return openmc.data.ThermalScattering.from_njoy(
@@ -37,17 +36,15 @@ def h2o_njoy():
 
 
 @pytest.fixture(scope='module')
-def hzrh():
+def hzrh(endf_data):
     """H in ZrH thermal scattering data."""
-    endf_data = os.environ['OPENMC_ENDF_DATA']
     filename = os.path.join(endf_data, 'thermal_scatt', 'tsl-HinZrH.endf')
     return openmc.data.ThermalScattering.from_endf(filename, divide_incoherent_elastic=True)
 
 
 @pytest.fixture(scope='module')
-def hzrh_njoy():
+def hzrh_njoy(endf_data):
     """H in ZrH generated using NJOY."""
-    endf_data = os.environ['OPENMC_ENDF_DATA']
     path_h1 = os.path.join(endf_data, 'neutrons', 'n-001_H_001.endf')
     path_hzrh = os.path.join(endf_data, 'thermal_scatt', 'tsl-HinZrH.endf')
     with_endf_data = openmc.data.ThermalScattering.from_njoy(
@@ -60,9 +57,8 @@ def hzrh_njoy():
 
 
 @pytest.fixture(scope='module')
-def sio2():
+def sio2(endf_data):
     """SiO2 thermal scattering data."""
-    endf_data = os.environ['OPENMC_ENDF_DATA']
     filename = os.path.join(endf_data, 'thermal_scatt', 'tsl-SiO2.endf')
     return openmc.data.ThermalScattering.from_endf(filename, divide_incoherent_elastic=True)
 
@@ -102,8 +98,7 @@ def test_graphite_xs(graphite):
     assert elastic([1e-3, 1.0]) == pytest.approx([0.0, 0.62586153])
 
 @needs_njoy
-def test_graphite_njoy():
-    endf_data = os.environ['OPENMC_ENDF_DATA']
+def test_graphite_njoy(endf_data):
     path_c0 = os.path.join(endf_data, 'neutrons', 'n-006_C_000.endf')
     path_gr = os.path.join(endf_data, 'thermal_scatt', 'tsl-graphite.endf')
     graphite = openmc.data.ThermalScattering.from_njoy(
@@ -141,8 +136,7 @@ def test_continuous_dist(h2o_njoy):
         assert isinstance(dist, openmc.data.IncoherentInelasticAE)
 
 
-def test_h2o_endf():
-    endf_data = os.environ['OPENMC_ENDF_DATA']
+def test_h2o_endf(endf_data):
     filename = os.path.join(endf_data, 'thermal_scatt', 'tsl-HinH2O.endf')
     h2o = openmc.data.ThermalScattering.from_endf(filename, divide_incoherent_elastic=True)
     assert not h2o.elastic
diff --git a/tests/unit_tests/test_deplete_chain.py b/tests/unit_tests/test_deplete_chain.py
index bd5cc2263..e90b61022 100644
--- a/tests/unit_tests/test_deplete_chain.py
+++ b/tests/unit_tests/test_deplete_chain.py
@@ -54,11 +54,11 @@ def simple_chain():
 
 
 @pytest.fixture(scope='module')
-def endf_chain():
-    endf_data = Path(os.environ['OPENMC_ENDF_DATA'])
-    decay_data = (endf_data / 'decay').glob('*.endf')
-    fpy_data = (endf_data / 'nfy').glob('*.endf')
-    neutron_data = (endf_data / 'neutrons').glob('*.endf')
+def endf_chain(endf_data):
+    endf_dir = Path(endf_data)
+    decay_data = (endf_dir / 'decay').glob('*.endf')
+    fpy_data = (endf_dir / 'nfy').glob('*.endf')
+    neutron_data = (endf_dir / 'neutrons').glob('*.endf')
     return Chain.from_endf(decay_data, fpy_data, neutron_data)
 
 

From ec15803d4134e7e72384801ce08b03b45608d6ba Mon Sep 17 00:00:00 2001
From: Jonathan Shimwell <mail@jshimwell.com>
Date: Sat, 30 Aug 2025 03:39:45 +0200
Subject: [PATCH 107/203] adding ecco 33 (#3556)

---
 openmc/mgxs/__init__.py | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/openmc/mgxs/__init__.py b/openmc/mgxs/__init__.py
index f8de84b37..5de85afb0 100644
--- a/openmc/mgxs/__init__.py
+++ b/openmc/mgxs/__init__.py
@@ -18,6 +18,8 @@ GROUP_STRUCTURES = {}
   ([ZAL1999]_ and [REARDEN2013]_)
 - "MPACT-X" (where X is 51 (PWR), 60 (BWR), 69 (Magnox)) from the MPACT_ reactor
   physics code ([KIM2019]_ and [KIM2020]_)
+- "ECCO-33" intended for fast reactor criticality benchmarks. It’s derived as a
+  subset of VITAMIN‑J
 - "ECCO-1968_" designed for fine group reactor cell calculations for fast,
   intermediate and thermal reactor applications ([SAR1990]_)
 - activation_ energy group structures "VITAMIN-J-42", "VITAMIN-J-175",
@@ -25,6 +27,7 @@ GROUP_STRUCTURES = {}
 
 .. _CASMO: http://large.stanford.edu/courses/2013/ph241/dalvi1/docs/c5.physor2006.pdf
 .. _SCALE44: https://www-nds.iaea.org/publications/indc/indc-czr-0001.pdf
+.. _ECCO-33: https://serpent.vtt.fi/mediawiki/index.php/ECCO_33-group_structure
 .. _SCALE252: https://oecd-nea.org/science/wpncs/amct/workingarea/meeting2013/EGAMCT2013_08.pdf
 .. _MPACT: https://vera.ornl.gov/mpact/
 .. _XMAS-172: https://www-nds.iaea.org/wimsd/energy.htm
@@ -81,6 +84,16 @@ GROUP_STRUCTURES['CASMO-25']  = np.array([
     0., 3.e-2, 5.8e-2, 1.4e-1, 2.8e-1, 3.5e-1, 6.25e-1, 9.72e-1, 1.02, 1.097,
     1.15, 1.855, 4., 9.877, 1.5968e1, 1.4873e2, 5.53e3, 9.118e3, 1.11e5, 5.e5,
     8.21e5, 1.353e6, 2.231e6, 3.679e6, 6.0655e6, 2.e7])
+GROUP_STRUCTURES['ECCO-33'] = np.array([
+    1.0000100000E-05, 1.0000000000E-01, 5.4000000000E-01, 4.0000000000E+00,
+    8.3152870000E+00, 1.3709590000E+01, 2.2603290000E+01, 4.0169000000E+01,
+    6.7904050000E+01, 9.1660880000E+01, 1.4862540000E+02, 3.0432480000E+02,
+    4.5399930000E+02, 7.4851830000E+02, 1.2340980000E+03, 2.0346840000E+03,
+    3.3546260000E+03, 5.5308440000E+03, 9.1188200000E+03, 1.5034390000E+04,
+    2.4787520000E+04, 4.0867710000E+04, 6.7379470000E+04, 1.1109000000E+05,
+    1.8315640000E+05, 3.0197380000E+05, 4.9787070000E+05, 8.2085000000E+05,
+    1.3533530000E+06, 2.2313020000E+06, 3.6787940000E+06, 6.0653070000E+06,
+    1.0000000000E+07, 1.9640330000E+07])
 GROUP_STRUCTURES['CASMO-40'] = np.array([
     0., 1.5e-2, 3.e-2, 4.2e-2, 5.8e-2, 8.e-2, 1.e-1, 1.4e-1,
     1.8e-1, 2.2e-1, 2.8e-1, 3.5e-1, 6.25e-1, 8.5e-1, 9.5e-1,

From 00edc77691c60411cf00431fdc6788f8fceb886a Mon Sep 17 00:00:00 2001
From: GuySten <62616591+GuySten@users.noreply.github.com>
Date: Sat, 30 Aug 2025 05:39:46 +0200
Subject: [PATCH 108/203] Change test order to run unit tests first. (#3533)

Co-authored-by: Paul Romano <paul.k.romano@gmail.com>
---
 openmc/cell.py                  | 6 +++---
 openmc/config.py                | 6 +++---
 tests/unit_tests/test_config.py | 5 +++--
 tools/ci/gha-script.sh          | 4 ++--
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/openmc/cell.py b/openmc/cell.py
index 672afe095..88aaebc8f 100644
--- a/openmc/cell.py
+++ b/openmc/cell.py
@@ -567,10 +567,10 @@ class Cell(IDManagerMixin):
         .. versionadded:: 0.14.0
         """
         # Create dummy universe but preserve used_ids
-        next_id = openmc.Universe.next_id
+        next_id = openmc.UniverseBase.next_id
         u = openmc.Universe(cells=[self])
-        openmc.Universe.used_ids.remove(u.id)
-        openmc.Universe.next_id = next_id
+        openmc.UniverseBase.used_ids.remove(u.id)
+        openmc.UniverseBase.next_id = next_id
         return u.plot(*args, **kwargs)
 
     def create_xml_subelement(self, xml_element, memo=None):
diff --git a/openmc/config.py b/openmc/config.py
index e75973495..23d8e23a7 100644
--- a/openmc/config.py
+++ b/openmc/config.py
@@ -178,7 +178,7 @@ class _Config(MutableMapping):
                 self[key] = previous_value
 
 
-def _default_config() -> _Config:
+def _default_config(**kwargs) -> _Config:
     """Create a configuration initialized from environment variables.
 
     This function checks for OPENMC_CROSS_SECTIONS, OPENMC_MG_CROSS_SECTIONS,
@@ -192,11 +192,11 @@ def _default_config() -> _Config:
         A new configuration object.
 
     """
-    config = _Config()
+    config = _Config(kwargs)
     for key,var in _Config._PATH_KEYS.items():
         if var in os.environ:
             config[key] = os.environ[var]
-    
+
     chain_file = config.get("chain_file")
     xs_path = config.get("cross_sections")
     if chain_file is None and xs_path is not None and xs_path.exists():
diff --git a/tests/unit_tests/test_config.py b/tests/unit_tests/test_config.py
index 242c59b5e..45e6a7e5a 100644
--- a/tests/unit_tests/test_config.py
+++ b/tests/unit_tests/test_config.py
@@ -13,6 +13,7 @@ def reset_config_and_env():
     """A fixture to ensure each test has a clean config, env, and CWD."""
     original_env = dict(os.environ)
     original_cwd = os.getcwd()
+    original_resolve_paths = openmc.config["resolve_paths"]
 
     # Reset environment variables that affect config
     for key in ['OPENMC_CROSS_SECTIONS', 'OPENMC_MG_CROSS_SECTIONS', 'OPENMC_CHAIN_FILE']:
@@ -25,13 +26,13 @@ def reset_config_and_env():
     try:
         yield
     finally:
-        # Restore environment and CWD
+        # Restore environment, CWD and resolve_paths
         os.environ.clear()
         os.environ.update(original_env)
         os.chdir(original_cwd)
 
         # Restore config one last time for safety between modules
-        openmc.config = _default_config()
+        openmc.config = _default_config(resolve_paths=original_resolve_paths)
 
 
 def test_config_basics():
diff --git a/tools/ci/gha-script.sh b/tools/ci/gha-script.sh
index c7c634ffa..c0f754c32 100755
--- a/tools/ci/gha-script.sh
+++ b/tools/ci/gha-script.sh
@@ -14,5 +14,5 @@ if [[ $EVENT == 'y' ]]; then
   args="${args} --event "
 fi
 
-# Run regression and unit tests
-pytest --cov=openmc -v $args tests
+# Run unit tests and then regression tests
+pytest --cov=openmc -v $args tests/unit_tests tests/regression_tests

From eaed4009873e6dc28e0aa0794209be2857552163 Mon Sep 17 00:00:00 2001
From: GuySten <62616591+GuySten@users.noreply.github.com>
Date: Wed, 3 Sep 2025 05:52:27 +0200
Subject: [PATCH 109/203] Fixed a bug in plotting cross sections with S(a,b)
 data (#3558)

---
 openmc/plotter.py | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/openmc/plotter.py b/openmc/plotter.py
index 85c4963a7..693cdaca4 100644
--- a/openmc/plotter.py
+++ b/openmc/plotter.py
@@ -413,7 +413,8 @@ def _calculate_cexs_nuclide(this, types, temperature=294., sab_name=None,
 
         # Prep S(a,b) data if needed
         if sab_name:
-            sab = openmc.data.ThermalScattering.from_hdf5(sab_name)
+            sab = openmc.data.ThermalScattering.from_hdf5(
+                library.get_by_material(sab_name, data_type='thermal')['path'])
             # Obtain the nearest temperature
             if strT in sab.temperatures:
                 sabT = strT
@@ -640,14 +641,13 @@ def _calculate_cexs_elem_mat(this, types, temperature=294.,
             sab = openmc.data.ThermalScattering.from_hdf5(
                 library.get_by_material(sab_name, data_type='thermal')['path'])
             for nuc in sab.nuclides:
-                sabs[nuc] = library.get_by_material(sab_name,
-                        data_type='thermal')['path']
+                sabs[nuc] = sab_name
     else:
         if sab_name:
-            sab = openmc.data.ThermalScattering.from_hdf5(sab_name)
+            sab = openmc.data.ThermalScattering.from_hdf5(
+                library.get_by_material(sab_name, data_type='thermal')['path'])
             for nuc in sab.nuclides:
-                sabs[nuc] = library.get_by_material(sab_name,
-                        data_type='thermal')['path']
+                sabs[nuc] = sab_name
 
     # Now we can create the data sets to be plotted
     xs = {}
@@ -655,8 +655,8 @@ def _calculate_cexs_elem_mat(this, types, temperature=294.,
     for nuclide in nuclides.items():
         name = nuclide[0]
         nuc = nuclide[1]
-        sab_tab = sabs[name]
-        temp_E, temp_xs = calculate_cexs(nuc, types, T, sab_tab, cross_sections,
+        sab_name = sabs[name]
+        temp_E, temp_xs = calculate_cexs(nuc, types, T, sab_name, cross_sections,
                                          ncrystal_cfg=ncrystal_cfg
                                          )
         E.append(temp_E)

From 5918564727a34ac7bb071ceafe1a7bf4d50542d7 Mon Sep 17 00:00:00 2001
From: Paul Romano <paul.k.romano@gmail.com>
Date: Wed, 3 Sep 2025 11:35:11 -0500
Subject: [PATCH 110/203] Bump up tolerance for flaky activation test (#3560)

---
 tests/unit_tests/test_deplete_activation.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/tests/unit_tests/test_deplete_activation.py b/tests/unit_tests/test_deplete_activation.py
index 6afea8c9f..cbe00d680 100644
--- a/tests/unit_tests/test_deplete_activation.py
+++ b/tests/unit_tests/test_deplete_activation.py
@@ -45,7 +45,7 @@ ENERGIES = np.logspace(log10(1e-5), log10(2e7), 100)
 
 @pytest.mark.parametrize("reaction_rate_mode,reaction_rate_opts,tolerance", [
     ("direct", {}, 1e-5),
-    ("flux", {'energies': ENERGIES}, 0.01),
+    ("flux", {'energies': ENERGIES}, 0.1),
     ("flux", {'energies': ENERGIES, 'reactions': ['(n,gamma)']}, 1e-5),
     ("flux", {'energies': ENERGIES, 'reactions': ['(n,gamma)'], 'nuclides': ['W186', 'H3']}, 1e-2),
 ])
@@ -61,11 +61,10 @@ def test_activation(run_in_tmpdir, model, reaction_rate_mode, reaction_rate_opts
     w186 = openmc.deplete.Nuclide('W186')
     w186.add_reaction('(n,gamma)', None, 0.0, 1.0)
     chain.add_nuclide(w186)
-    chain.export_to_xml('test_chain.xml')
 
     # Create transport operator
     op = openmc.deplete.CoupledOperator(
-        model, 'test_chain.xml',
+        model, chain,
         normalization_mode="source-rate",
         reaction_rate_mode=reaction_rate_mode,
         reaction_rate_opts=reaction_rate_opts,

From 366509051381db89a3a6a7b3346e3b339e8af0af Mon Sep 17 00:00:00 2001
From: Patrick Shriwise <pshriwise@gmail.com>
Date: Fri, 5 Sep 2025 06:34:49 -0500
Subject: [PATCH 111/203] Do not apply boundary conditions when initialized in
 volume calculation mode (#3562)

---
 src/particle.cpp              |  3 ++-
 tests/unit_tests/test_mesh.py | 27 +++++++++++++++++++++++++++
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/src/particle.cpp b/src/particle.cpp
index fb41d82e9..fd4df14c3 100644
--- a/src/particle.cpp
+++ b/src/particle.cpp
@@ -544,7 +544,8 @@ void Particle::cross_surface(const Surface& surf)
 #endif
 
   // Handle any applicable boundary conditions.
-  if (surf.bc_ && settings::run_mode != RunMode::PLOTTING) {
+  if (surf.bc_ && settings::run_mode != RunMode::PLOTTING &&
+      settings::run_mode != RunMode::VOLUME) {
     surf.bc_->handle_particle(*this, surf);
     return;
   }
diff --git a/tests/unit_tests/test_mesh.py b/tests/unit_tests/test_mesh.py
index 67ca4028e..1930e3264 100644
--- a/tests/unit_tests/test_mesh.py
+++ b/tests/unit_tests/test_mesh.py
@@ -620,6 +620,33 @@ def test_mesh_material_volumes_serialize():
     assert new_volumes.by_element(3) == [(2, 1.0)]
 
 
+def test_mesh_material_volumes_boundary_conditions(sphere_model):
+    """Test the material volumes method using a regular mesh
+    that overlaps with a vacuum boundary condition."""
+
+    mesh = openmc.SphericalMesh.from_domain(sphere_model.geometry, dimension=(1, 1, 1))
+    # extend mesh beyond the outer sphere surface to test rays crossing the boundary condition
+    mesh.r_grid[-1] += 5.0
+
+    # add a new cell to the modelthat occupies the outside of the sphere
+    sphere_surfaces = list(filter(lambda s: isinstance(s, openmc.Sphere),
+                            sphere_model.geometry.get_all_surfaces().values()))
+    outer_cell = openmc.Cell(region=+sphere_surfaces[0])
+    sphere_model.geometry.root_universe.add_cell(outer_cell)
+
+    volumes = mesh.material_volumes(sphere_model, (0, 100, 100))
+    sphere_volume = 4/3*np.pi*25**3
+    mats = sphere_model.materials
+    expected_volumes = [(mats[0].id, 0.25*sphere_volume),
+                        (mats[1].id, 0.25*sphere_volume),
+                        (mats[2].id, 0.5*sphere_volume),
+                        (None, 4/3*np.pi*mesh.r_grid[-1]**3 - sphere_volume)]
+
+    for evaluated, expected in zip(volumes.by_element(0), expected_volumes):
+        assert evaluated[0] == expected[0]
+        assert evaluated[1] == pytest.approx(expected[1], rel=1e-2)
+
+
 def test_raytrace_mesh_infinite_loop(run_in_tmpdir):
     # Create a model with one large spherical cell
     sphere = openmc.Sphere(r=100, boundary_type='vacuum')

From ca4295748d1b547ea3e5d9c8fb1ec55b64809289 Mon Sep 17 00:00:00 2001
From: Robert Carlsen <r@typical.place>
Date: Wed, 10 Sep 2025 20:13:28 -0600
Subject: [PATCH 112/203] depletion: fix performance of chain matrix
 construction (#3567)

Co-authored-by: GuySten <62616591+GuySten@users.noreply.github.com>
---
 openmc/deplete/chain.py | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/openmc/deplete/chain.py b/openmc/deplete/chain.py
index f1a23317f..ac5c02aa5 100644
--- a/openmc/deplete/chain.py
+++ b/openmc/deplete/chain.py
@@ -627,9 +627,15 @@ class Chain:
         """
         reactions = set()
 
-        # Use DOK matrix as intermediate representation for matrix
         n = len(self)
-        matrix = sp.dok_matrix((n, n))
+
+        # we accumulate indices and value entries for everything and create the matrix 
+        # in one step at the end to avoid expensive index checks scipy otherwise does.
+        rows, cols, vals = [], [], []
+        def setval(i, j, val):
+            rows.append(i)
+            cols.append(j)
+            vals.append(val)
 
         if fission_yields is None:
             fission_yields = self.get_default_fission_yields()
@@ -639,7 +645,7 @@ class Chain:
             if nuc.half_life is not None:
                 decay_constant = math.log(2) / nuc.half_life
                 if decay_constant != 0.0:
-                    matrix[i, i] -= decay_constant
+                    setval(i, i, -decay_constant)
 
             # Gain from radioactive decay
             if nuc.n_decay_modes != 0:
@@ -650,19 +656,19 @@ class Chain:
                     if branch_val != 0.0:
                         if target is not None:
                             k = self.nuclide_dict[target]
-                            matrix[k, i] += branch_val
+                            setval(k, i, branch_val)
 
                         # Produce alphas and protons from decay
                         if 'alpha' in decay_type:
                             k = self.nuclide_dict.get('He4')
                             if k is not None:
                                 count = decay_type.count('alpha')
-                                matrix[k, i] += count * branch_val
+                                setval(k, i, count * branch_val)
                         elif 'p' in decay_type:
                             k = self.nuclide_dict.get('H1')
                             if k is not None:
                                 count = decay_type.count('p')
-                                matrix[k, i] += count * branch_val
+                                setval(k, i, count * branch_val)
 
             if nuc.name in rates.index_nuc:
                 # Extract all reactions for this nuclide in this cell
@@ -679,13 +685,13 @@ class Chain:
                     if r_type not in reactions:
                         reactions.add(r_type)
                         if path_rate != 0.0:
-                            matrix[i, i] -= path_rate
+                            setval(i, i, -path_rate)
 
                     # Gain term; allow for total annihilation for debug purposes
                     if r_type != 'fission':
                         if target is not None and path_rate != 0.0:
                             k = self.nuclide_dict[target]
-                            matrix[k, i] += path_rate * br
+                            setval(k, i, path_rate * br)
 
                         # Determine light nuclide production, e.g., (n,d) should
                         # produce H2
@@ -693,20 +699,20 @@ class Chain:
                         for light_nuc in light_nucs:
                             k = self.nuclide_dict.get(light_nuc)
                             if k is not None:
-                                matrix[k, i] += path_rate * br
+                                setval(k, i, path_rate * br)
 
                     else:
                         for product, y in fission_yields[nuc.name].items():
                             yield_val = y * path_rate
                             if yield_val != 0.0:
                                 k = self.nuclide_dict[product]
-                                matrix[k, i] += yield_val
+                                setval(k, i, yield_val)
 
                 # Clear set of reactions
                 reactions.clear()
 
         # Return CSC representation instead of DOK
-        return matrix.tocsc()
+        return sp.csc_matrix((vals, (rows, cols)), shape=(n, n))
 
     def form_rr_term(self, tr_rates, current_timestep, mats):
         """Function to form the transfer rate term matrices.

From c7175289eb0f801b38b7b684a5ddd4803261f66a Mon Sep 17 00:00:00 2001
From: Jack Fletcher <115663563+j-fletcher@users.noreply.github.com>
Date: Thu, 11 Sep 2025 08:57:02 -0400
Subject: [PATCH 113/203] PowerLaw raises an error if sampling interval
 contains negative values (#3542)

---
 openmc/stats/univariate.py | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/openmc/stats/univariate.py b/openmc/stats/univariate.py
index 28d5e87ef..d6cf19f2b 100644
--- a/openmc/stats/univariate.py
+++ b/openmc/stats/univariate.py
@@ -480,6 +480,9 @@ class PowerLaw(Univariate):
     """
 
     def __init__(self, a: float = 0.0, b: float = 1.0, n: float = 0.):
+        if a >= b:
+            raise ValueError(
+                "Lower bound of sampling interval must be less than upper bound.")
         self.a = a
         self.b = b
         self.n = n
@@ -494,6 +497,9 @@ class PowerLaw(Univariate):
     @a.setter
     def a(self, a):
         cv.check_type('interval lower bound', a, Real)
+        if a < 0:
+            raise ValueError(
+                "PowerLaw sampling is restricted to positive-valued intervals.")
         self._a = a
 
     @property
@@ -503,6 +509,9 @@ class PowerLaw(Univariate):
     @b.setter
     def b(self, b):
         cv.check_type('interval upper bound', b, Real)
+        if b < 0:
+            raise ValueError(
+                "PowerLaw sampling is restricted to positive-valued intervals.")
         self._b = b
 
     @property

From afd9d0607445f00c6de97b1ff866521c319722b0 Mon Sep 17 00:00:00 2001
From: GuySten <62616591+GuySten@users.noreply.github.com>
Date: Fri, 12 Sep 2025 22:23:17 +0200
Subject: [PATCH 114/203] Fixed a bug when combining TimeFilter, MeshFilter,
 and tracklength estimator (#3525)

Co-authored-by: Paul Romano <paul.k.romano@gmail.com>
---
 include/openmc/tallies/tally.h         | 10 ++++
 include/openmc/tallies/tally_scoring.h | 10 ++++
 src/particle.cpp                       |  5 ++
 src/tallies/tally.cpp                  | 80 ++++++++++++++++++++-----
 src/tallies/tally_scoring.cpp          | 59 ++++++++++++++++--
 tests/unit_tests/test_mesh.py          | 83 +++++++++++++++++++++++++-
 6 files changed, 227 insertions(+), 20 deletions(-)

diff --git a/include/openmc/tallies/tally.h b/include/openmc/tallies/tally.h
index 8c088c460..3beeb9d5a 100644
--- a/include/openmc/tallies/tally.h
+++ b/include/openmc/tallies/tally.h
@@ -203,11 +203,14 @@ extern vector<unique_ptr<Tally>> tallies;
 extern vector<int> active_tallies;
 extern vector<int> active_analog_tallies;
 extern vector<int> active_tracklength_tallies;
+extern vector<int> active_timed_tracklength_tallies;
 extern vector<int> active_collision_tallies;
 extern vector<int> active_meshsurf_tallies;
 extern vector<int> active_surface_tallies;
 extern vector<int> active_pulse_height_tallies;
 extern vector<int> pulse_height_cells;
+extern vector<double> time_grid;
+
 } // namespace model
 
 namespace simulation {
@@ -239,6 +242,13 @@ void read_tallies_xml(pugi::xml_node root);
 //! batch to a new random variable
 void accumulate_tallies();
 
+//! Determine distance to next time boundary
+//
+//! \param time Current time of particle
+//! \param speed Speed of particle
+//! \return Distance to next time boundary (or INFTY if none)
+double distance_to_time_boundary(double time, double speed);
+
 //! Determine which tallies should be active
 void setup_active_tallies();
 
diff --git a/include/openmc/tallies/tally_scoring.h b/include/openmc/tallies/tally_scoring.h
index 28f1f1622..c3ab779e6 100644
--- a/include/openmc/tallies/tally_scoring.h
+++ b/include/openmc/tallies/tally_scoring.h
@@ -91,6 +91,16 @@ void score_analog_tally_mg(Particle& p);
 //! \param distance The distance in [cm] traveled by the particle
 void score_tracklength_tally(Particle& p, double distance);
 
+//! Score time filtered tallies using a tracklength estimate of the flux.
+//
+//! This is triggered at every event (surface crossing, lattice crossing, or
+//! collision) and thus cannot be done for tallies that require post-collision
+//! information.
+//
+//! \param p The particle being tracked
+//! \param total_distance The distance in [cm] traveled by the particle
+void score_timed_tracklength_tally(Particle& p, double total_distance);
+
 //! Score surface or mesh-surface tallies for particle currents.
 //
 //! \param p The particle being tracked
diff --git a/src/particle.cpp b/src/particle.cpp
index fd4df14c3..f25ada02c 100644
--- a/src/particle.cpp
+++ b/src/particle.cpp
@@ -252,6 +252,11 @@ void Particle::event_advance()
   this->time() += dt;
   this->lifetime() += dt;
 
+  // Score timed track-length tallies
+  if (!model::active_timed_tracklength_tallies.empty()) {
+    score_timed_tracklength_tally(*this, distance);
+  }
+
   // Score track-length tallies
   if (!model::active_tracklength_tallies.empty()) {
     score_tracklength_tally(*this, distance);
diff --git a/src/tallies/tally.cpp b/src/tallies/tally.cpp
index ba1838602..ae0bffe6e 100644
--- a/src/tallies/tally.cpp
+++ b/src/tallies/tally.cpp
@@ -27,10 +27,12 @@
 #include "openmc/tallies/filter_legendre.h"
 #include "openmc/tallies/filter_mesh.h"
 #include "openmc/tallies/filter_meshborn.h"
+#include "openmc/tallies/filter_meshmaterial.h"
 #include "openmc/tallies/filter_meshsurface.h"
 #include "openmc/tallies/filter_particle.h"
 #include "openmc/tallies/filter_sph_harm.h"
 #include "openmc/tallies/filter_surface.h"
+#include "openmc/tallies/filter_time.h"
 #include "openmc/xml_interface.h"
 
 #include "xtensor/xadapt.hpp"
@@ -38,9 +40,10 @@
 #include "xtensor/xview.hpp"
 #include <fmt/core.h>
 
-#include <algorithm> // for max
+#include <algorithm> // for max, set_union
 #include <cassert>
-#include <cstddef> // for size_t
+#include <cstddef>  // for size_t
+#include <iterator> // for back_inserter
 #include <string>
 
 namespace openmc {
@@ -56,11 +59,13 @@ vector<unique_ptr<Tally>> tallies;
 vector<int> active_tallies;
 vector<int> active_analog_tallies;
 vector<int> active_tracklength_tallies;
+vector<int> active_timed_tracklength_tallies;
 vector<int> active_collision_tallies;
 vector<int> active_meshsurf_tallies;
 vector<int> active_surface_tallies;
 vector<int> active_pulse_height_tallies;
 vector<int> pulse_height_cells;
+vector<double> time_grid;
 } // namespace model
 
 namespace simulation {
@@ -243,8 +248,8 @@ Tally::Tally(pugi::xml_node node)
     for (int score : scores_) {
       switch (score) {
       case SCORE_PULSE_HEIGHT:
-        fatal_error(
-          "For pulse-height tallies, photon transport needs to be activated.");
+        fatal_error("For pulse-height tallies, photon transport needs to be "
+                    "activated.");
         break;
       }
     }
@@ -318,7 +323,8 @@ Tally::Tally(pugi::xml_node node)
         if (has_energyout && i_nuc == -1) {
           fatal_error(fmt::format(
             "Error on tally {}: Cannot use a "
-            "'nuclide_density' or 'temperature' derivative on a tally with an "
+            "'nuclide_density' or 'temperature' derivative on a tally with "
+            "an "
             "outgoing energy filter and 'total' nuclide rate. Instead, tally "
             "each nuclide in the material individually.",
             id_));
@@ -493,9 +499,9 @@ void Tally::add_filter(Filter* filter)
 
 void Tally::set_strides()
 {
-  // Set the strides.  Filters are traversed in reverse so that the last filter
-  // has the shortest stride in memory and the first filter has the longest
-  // stride.
+  // Set the strides.  Filters are traversed in reverse so that the last
+  // filter has the shortest stride in memory and the first filter has the
+  // longest stride.
   auto n = filters_.size();
   strides_.resize(n, 0);
   int stride = 1;
@@ -551,7 +557,8 @@ void Tally::set_scores(const vector<std::string>& scores)
 
   // Iterate over the given scores.
   for (auto score_str : scores) {
-    // Make sure a delayed group filter wasn't used with an incompatible score.
+    // Make sure a delayed group filter wasn't used with an incompatible
+    // score.
     if (delayedgroup_filter_ != C_NONE) {
       if (score_str != "delayed-nu-fission" && score_str != "decay-rate")
         fatal_error("Cannot tally " + score_str + "with a delayedgroup filter");
@@ -984,8 +991,8 @@ void reduce_tally_results()
     }
   }
 
-  // Note that global tallies are *always* reduced even when no_reduce option is
-  // on.
+  // Note that global tallies are *always* reduced even when no_reduce option
+  // is on.
 
   // Get view of global tally values
   auto& gt = simulation::global_tallies;
@@ -1064,21 +1071,59 @@ void accumulate_tallies()
   }
 }
 
+double distance_to_time_boundary(double time, double speed)
+{
+  if (model::time_grid.empty()) {
+    return INFTY;
+  } else if (time >= model::time_grid.back()) {
+    return INFTY;
+  } else {
+    double next_time =
+      *std::upper_bound(model::time_grid.begin(), model::time_grid.end(), time);
+    return (next_time - time) * speed;
+  }
+}
+
+//! Add new points to the global time grid
+//
+//! \param grid Vector of new time points to add
+void add_to_time_grid(vector<double> grid)
+{
+  if (grid.empty())
+    return;
+
+  // Create new vector with enough space to hold old and new grid points
+  vector<double> merged;
+  merged.reserve(model::time_grid.size() + grid.size());
+
+  // Merge and remove duplicates
+  std::set_union(model::time_grid.begin(), model::time_grid.end(), grid.begin(),
+    grid.end(), std::back_inserter(merged));
+
+  // Swap in the new grid
+  model::time_grid.swap(merged);
+}
+
 void setup_active_tallies()
 {
   model::active_tallies.clear();
   model::active_analog_tallies.clear();
   model::active_tracklength_tallies.clear();
+  model::active_timed_tracklength_tallies.clear();
   model::active_collision_tallies.clear();
   model::active_meshsurf_tallies.clear();
   model::active_surface_tallies.clear();
   model::active_pulse_height_tallies.clear();
+  model::time_grid.clear();
 
   for (auto i = 0; i < model::tallies.size(); ++i) {
     const auto& tally {*model::tallies[i]};
 
     if (tally.active_) {
       model::active_tallies.push_back(i);
+      bool mesh_present = (tally.get_filter<MeshFilter>() ||
+                           tally.get_filter<MeshMaterialFilter>());
+      auto time_filter = tally.get_filter<TimeFilter>();
       switch (tally.type_) {
 
       case TallyType::VOLUME:
@@ -1087,7 +1132,12 @@ void setup_active_tallies()
           model::active_analog_tallies.push_back(i);
           break;
         case TallyEstimator::TRACKLENGTH:
-          model::active_tracklength_tallies.push_back(i);
+          if (time_filter && mesh_present) {
+            model::active_timed_tracklength_tallies.push_back(i);
+            add_to_time_grid(time_filter->bins());
+          } else {
+            model::active_tracklength_tallies.push_back(i);
+          }
           break;
         case TallyEstimator::COLLISION:
           model::active_collision_tallies.push_back(i);
@@ -1123,10 +1173,12 @@ void free_memory_tally()
   model::active_tallies.clear();
   model::active_analog_tallies.clear();
   model::active_tracklength_tallies.clear();
+  model::active_timed_tracklength_tallies.clear();
   model::active_collision_tallies.clear();
   model::active_meshsurf_tallies.clear();
   model::active_surface_tallies.clear();
   model::active_pulse_height_tallies.clear();
+  model::time_grid.clear();
 
   model::tally_map.clear();
 }
@@ -1465,8 +1517,8 @@ extern "C" int openmc_tally_get_n_realizations(int32_t index, int32_t* n)
   return 0;
 }
 
-//! \brief Returns a pointer to a tally results array along with its shape. This
-//! allows a user to obtain in-memory tally results from Python directly.
+//! \brief Returns a pointer to a tally results array along with its shape.
+//! This allows a user to obtain in-memory tally results from Python directly.
 extern "C" int openmc_tally_results(
   int32_t index, double** results, size_t* shape)
 {
diff --git a/src/tallies/tally_scoring.cpp b/src/tallies/tally_scoring.cpp
index e73fb90f3..04b047b64 100644
--- a/src/tallies/tally_scoring.cpp
+++ b/src/tallies/tally_scoring.cpp
@@ -2404,15 +2404,13 @@ void score_analog_tally_mg(Particle& p)
     match.bins_present_ = false;
 }
 
-void score_tracklength_tally(Particle& p, double distance)
+void score_tracklength_tally_general(
+  Particle& p, double flux, const vector<int>& tallies)
 {
-  // Determine the tracklength estimate of the flux
-  double flux = p.wgt() * distance;
-
   // Set 'none' value for log union grid index
   int i_log_union = C_NONE;
 
-  for (auto i_tally : model::active_tracklength_tallies) {
+  for (auto i_tally : tallies) {
     const Tally& tally {*model::tallies[i_tally]};
 
     // Initialize an iterator over valid filter bin combinations.  If there are
@@ -2481,6 +2479,57 @@ void score_tracklength_tally(Particle& p, double distance)
     match.bins_present_ = false;
 }
 
+void score_timed_tracklength_tally(Particle& p, double total_distance)
+{
+  double speed = p.speed();
+  double total_dt = total_distance / speed;
+
+  // save particle last state
+  auto time_last = p.time_last();
+  auto r_last = p.r_last();
+
+  // move particle back
+  p.move_distance(-total_distance);
+  p.time() -= total_dt;
+  p.lifetime() -= total_dt;
+
+  double distance_traveled = 0.0;
+  while (distance_traveled < total_distance) {
+
+    double distance = std::min(distance_to_time_boundary(p.time(), speed),
+      total_distance - distance_traveled);
+    double dt = distance / speed;
+
+    // Save particle last state for tracklength tallies
+    p.time_last() = p.time();
+    p.r_last() = p.r();
+
+    // Advance particle in space and time
+    p.move_distance(distance);
+    p.time() += dt;
+    p.lifetime() += dt;
+
+    // Determine the tracklength estimate of the flux
+    double flux = p.wgt() * distance;
+
+    score_tracklength_tally_general(
+      p, flux, model::active_timed_tracklength_tallies);
+    distance_traveled += distance;
+  }
+
+  p.time_last() = time_last;
+  p.r_last() = r_last;
+}
+
+void score_tracklength_tally(Particle& p, double distance)
+{
+
+  // Determine the tracklength estimate of the flux
+  double flux = p.wgt() * distance;
+
+  score_tracklength_tally_general(p, flux, model::active_tracklength_tallies);
+}
+
 void score_collision_tally(Particle& p)
 {
   // Determine the collision estimate of the flux
diff --git a/tests/unit_tests/test_mesh.py b/tests/unit_tests/test_mesh.py
index 1930e3264..f0f289408 100644
--- a/tests/unit_tests/test_mesh.py
+++ b/tests/unit_tests/test_mesh.py
@@ -3,10 +3,12 @@ from tempfile import TemporaryDirectory
 from pathlib import Path
 
 import numpy as np
+from scipy.stats import chi2
 import pytest
 import openmc
 import openmc.lib
 from openmc.utility_funcs import change_directory
+from uncertainties.unumpy import uarray, nominal_values, std_devs
 
 
 @pytest.mark.parametrize("val_left,val_right", [(0, 0), (-1., -1.), (2.0, 2)])
@@ -481,7 +483,7 @@ def test_umesh(run_in_tmpdir, simple_umesh, export_type):
     np.testing.assert_almost_equal(mean, ref_data)
 
     # attempt to apply a dataset with an improper size to a VTK write
-    with pytest.raises(ValueError, match='Cannot apply dataset "mean"') as e:
+    with pytest.raises(ValueError, match='Cannot apply dataset "mean"'):
         simple_umesh.write_data_to_vtk(datasets={'mean': ref_data[:-2]}, filename=filename)
 
 def test_mesh_get_homogenized_materials():
@@ -678,3 +680,82 @@ def test_raytrace_mesh_infinite_loop(run_in_tmpdir):
 
     # Run the model; this should not cause an infinite loop
     model.run()
+
+
+def test_filter_time_mesh(run_in_tmpdir):
+    """Test combination of TimeFilter and MeshFilter"""
+
+    # Define material
+    mat = openmc.Material()
+    mat.add_nuclide('Fe56', 1.0)
+    mat.set_density('g/cm3', 7.8)
+
+    # Define geometry
+    surf_Z1 = openmc.XPlane(x0=-1e10, boundary_type="reflective")
+    surf_Z2 = openmc.XPlane(x0=1e10, boundary_type="reflective")
+    cell_F = openmc.Cell(fill=mat, region=+surf_Z1 & -surf_Z2)
+    model = openmc.Model()
+    model.geometry = openmc.Geometry([cell_F])
+
+    # Define settings
+    model.settings.run_mode = "fixed source"
+    model.settings.particles = 1000
+    model.settings.batches = 20
+    model.settings.output = {"tallies": False}
+    model.settings.cutoff = {"time_neutron": 1e-7}
+
+    # Define tallies
+
+    # Create a mesh filter that can be used in a tally
+    mesh = openmc.RegularMesh()
+    mesh.dimension = (21, 1, 1)
+    mesh.lower_left = (-20.5, -1e10, -1e10)
+    mesh.upper_right = (20.5, 1e10, 1e10)
+    time_grid = np.linspace(0.0, 1e-7, 21)
+
+    mesh_filter = openmc.MeshFilter(mesh)
+    time_filter = openmc.TimeFilter(time_grid)
+
+    # Now use the mesh filter in a tally and indicate what scores are desired
+    tally1 = openmc.Tally(name="collision")
+    tally1.estimator = "collision"
+    tally1.filters = [time_filter, mesh_filter]
+    tally1.scores = ["flux"]
+    tally2 = openmc.Tally(name="tracklength")
+    tally2.estimator = "tracklength"
+    tally2.filters = [time_filter, mesh_filter]
+    tally2.scores = ["flux"]
+    model.tallies = openmc.Tallies([tally1, tally2])
+
+    # Run and post-process
+    model.run(apply_tally_results=True)
+
+    # Get radial flux distribution
+    flux_collision = tally1.mean.ravel()
+    flux_collision_unc = tally1.std_dev.ravel()
+    flux_tracklength = tally2.mean.ravel()
+    flux_tracklength_unc = tally2.std_dev.ravel()
+
+    # Construct arrays with uncertainties
+    collision = uarray(flux_collision, flux_collision_unc)
+    tracklength = uarray(flux_tracklength, flux_tracklength_unc)
+    delta = collision - tracklength
+
+    # Compute differences and standard deviations
+    diff = nominal_values(delta)
+    std_dev = std_devs(delta)
+
+    # Exclude zero-uncertainty bins
+    mask = std_dev > 0.0
+    dof = int(np.sum(mask))
+
+    # Global chi-square consistency test between collision and tracklength
+    # estimators. Target false positive rate ~1e-4 (1 in 10,000)
+    z = diff[mask] / std_dev[mask]
+    chi2_stat = np.sum(z * z)
+    alpha = 1.0e-4
+    crit = chi2.ppf(1 - alpha, dof)
+    assert chi2_stat < crit, (
+        f"Collision vs tracklength tallies disagree: chi2={chi2_stat:.2f} "
+        f">= {crit=:.2f} ({dof=}, {alpha=})"
+    )

From 607f6babe5c7fc1a441082fb355e7f30f182e72d Mon Sep 17 00:00:00 2001
From: Kevin Sawatzky <66632997+nuclearkevin@users.noreply.github.com>
Date: Thu, 18 Sep 2025 23:11:06 -0500
Subject: [PATCH 115/203] Add distributed cell densities (#3546)

Co-authored-by: Patrick Shriwise <pshriwise@gmail.com>
Co-authored-by: Paul Romano <paul.k.romano@gmail.com>
---
 docs/source/capi/index.rst                    |  29 ++-
 docs/source/io_formats/properties.rst         |   3 +-
 docs/source/io_formats/summary.rst            |   3 +-
 include/openmc/capi.h                         |   4 +
 include/openmc/cell.h                         |  25 +++
 include/openmc/constants.h                    |   4 +-
 include/openmc/geometry_aux.h                 |   6 +
 include/openmc/material.h                     |   7 +
 include/openmc/particle_data.h                |   8 +
 openmc/cell.py                                |  43 ++++-
 openmc/lib/cell.py                            |  46 +++++
 openmc/model/model.py                         |  16 +-
 src/cell.cpp                                  | 178 +++++++++++++++++-
 src/geometry.cpp                              |   4 +-
 src/geometry_aux.cpp                          |  29 +++
 src/initialize.cpp                            |   9 +
 src/material.cpp                              |   4 +-
 src/mgxs.cpp                                  |   8 +-
 src/particle.cpp                              |   7 +-
 src/physics.cpp                               |   4 +-
 src/tallies/tally_scoring.cpp                 |  33 ++--
 tests/regression_tests/cpp_driver/driver.cpp  |  18 +-
 .../cpp_driver/results_true.dat               |  22 +--
 .../regression_tests/dagmc/external/main.cpp  |   3 +
 .../lattice_distribrho/__init__.py            |   0
 .../lattice_distribrho/inputs_true.dat        |  40 ++++
 .../lattice_distribrho/results_true.dat       |   2 +
 .../lattice_distribrho/test.py                |  51 +++++
 .../multipole/results_true.dat                |   1 +
 tests/unit_tests/test_cell.py                 |  23 +++
 tests/unit_tests/test_lib.py                  |  23 +++
 tests/unit_tests/test_model.py                |   6 +-
 32 files changed, 607 insertions(+), 52 deletions(-)
 create mode 100644 tests/regression_tests/lattice_distribrho/__init__.py
 create mode 100644 tests/regression_tests/lattice_distribrho/inputs_true.dat
 create mode 100644 tests/regression_tests/lattice_distribrho/results_true.dat
 create mode 100644 tests/regression_tests/lattice_distribrho/test.py

diff --git a/docs/source/capi/index.rst b/docs/source/capi/index.rst
index d9ac0d1e0..2583d51df 100644
--- a/docs/source/capi/index.rst
+++ b/docs/source/capi/index.rst
@@ -84,6 +84,17 @@ Functions
    :return: Return status (negative if an error occurred)
    :rtype: int
 
+.. c:function:: int openmc_cell_get_density(int32_t index, const int32_t* instance, double* density)
+
+   Get the density of a cell
+
+   :param int32_t index: Index in the cells array
+   :param int32_t* instance: Which instance of the cell. If a null pointer is passed, the density
+                             multiplier of the first instance is returned.
+   :param double* density: Density of the cell in [g/cm3]
+   :return: Return status (negative if an error occurred)
+   :rtype: int
+
 .. c:function:: int openmc_cell_set_fill(int32_t index, int type, int32_t n, const int32_t* indices)
 
    Set the fill for a cell
@@ -113,8 +124,22 @@ Functions
    :param double T: Temperature in Kelvin
    :param instance: Which instance of the cell. To set the temperature for all
                     instances, pass a null pointer.
-   :param set_contained: If the cell is not filled by a material, whether to set the temperatures
-                         of all filled cells
+   :param bool set_contained: If the cell is not filled by a material, whether
+                              to set the temperatures of all filled cells
+   :type instance: const int32_t*
+   :return: Return status (negative if an error occurred)
+   :rtype: int
+
+.. c:function:: int openmc_cell_set_density(index index, double density, const int32_t* instance, bool set_contained)
+
+   Set the density of a cell.
+
+   :param int32_t index: Index in the cells array
+   :param double density: Density of the cell in [g/cm3]
+   :param instance: Which instance of the cell. To set the density multiplier for all
+                    instances, pass a null pointer.
+   :param bool set_contained: If the cell is not filled by a material, whether
+                              to set the density multiplier of all filled cells
    :type instance: const int32_t*
    :return: Return status (negative if an error occurred)
    :rtype: int
diff --git a/docs/source/io_formats/properties.rst b/docs/source/io_formats/properties.rst
index 5030e78f3..4cc5da379 100644
--- a/docs/source/io_formats/properties.rst
+++ b/docs/source/io_formats/properties.rst
@@ -4,7 +4,7 @@
 Properties File Format
 ======================
 
-The current version of the properties file format is 1.0.
+The current version of the properties file format is 1.1.
 
 **/**
 
@@ -25,6 +25,7 @@ The current version of the properties file format is 1.0.
 **/geometry/cells/cell <uid>/**
 
 :Datasets: - **temperature** (*double[]*) -- Temperature of the cell in [K].
+           - **density** (*double[]*) -- Density of the cell in [g/cm3].
 
 **/materials/**
 
diff --git a/docs/source/io_formats/summary.rst b/docs/source/io_formats/summary.rst
index 7d3ab94d9..64ca68b9c 100644
--- a/docs/source/io_formats/summary.rst
+++ b/docs/source/io_formats/summary.rst
@@ -4,7 +4,7 @@
 Summary File Format
 ===================
 
-The current version of the summary file format is 6.0.
+The current version of the summary file format is 6.1.
 
 **/**
 
@@ -38,6 +38,7 @@ The current version of the summary file format is 6.0.
              is an array if the cell uses distributed materials, otherwise it is
              a scalar.
            - **temperature** (*double[]*) -- Temperature of the cell in Kelvin.
+           - **density** (*double[]*) -- Density of the cell in [g/cm3].
            - **translation** (*double[3]*) -- Translation applied to the fill
              universe. This dataset is present only if fill_type is set to
              'universe'.
diff --git a/include/openmc/capi.h b/include/openmc/capi.h
index 54257d093..d8041ef41 100644
--- a/include/openmc/capi.h
+++ b/include/openmc/capi.h
@@ -17,6 +17,8 @@ int openmc_cell_get_fill(
 int openmc_cell_get_id(int32_t index, int32_t* id);
 int openmc_cell_get_temperature(
   int32_t index, const int32_t* instance, double* T);
+int openmc_cell_get_density(
+  int32_t index, const int32_t* instance, double* rho);
 int openmc_cell_get_translation(int32_t index, double xyz[]);
 int openmc_cell_get_rotation(int32_t index, double rot[], size_t* n);
 int openmc_cell_get_name(int32_t index, const char** name);
@@ -27,6 +29,8 @@ int openmc_cell_set_fill(
 int openmc_cell_set_id(int32_t index, int32_t id);
 int openmc_cell_set_temperature(
   int32_t index, double T, const int32_t* instance, bool set_contained = false);
+int openmc_cell_set_density(int32_t index, double rho, const int32_t* instance,
+  bool set_contained = false);
 int openmc_cell_set_translation(int32_t index, const double xyz[]);
 int openmc_cell_set_rotation(int32_t index, const double rot[], size_t rot_len);
 int openmc_dagmc_universe_get_cell_ids(
diff --git a/include/openmc/cell.h b/include/openmc/cell.h
index e9fcfe391..9dfe2339a 100644
--- a/include/openmc/cell.h
+++ b/include/openmc/cell.h
@@ -216,6 +216,18 @@ public:
   //! \return Temperature in [K]
   double temperature(int32_t instance = -1) const;
 
+  //! Get the density multiplier of a cell instance
+  //! \param[in] instance Instance index. If -1 is given, the density multiplier
+  //! for the first instance is returned.
+  //! \return Density multiplier
+  double density_mult(int32_t instance = -1) const;
+
+  //! Get the density of a cell instance in g/cm3
+  //! \param[in] instance Instance index. If -1 is given, the density
+  //! for the first instance is returned.
+  //! \return Density in [g/cm3]
+  double density(int32_t instance = -1) const;
+
   //! Set the temperature of a cell instance
   //! \param[in] T Temperature in [K]
   //! \param[in] instance Instance index. If -1 is given, the temperature for
@@ -226,6 +238,16 @@ public:
   void set_temperature(
     double T, int32_t instance = -1, bool set_contained = false);
 
+  //! Set the density of a cell instance
+  //! \param[in] density Density [g/cm3]
+  //! \param[in] instance Instance index. If -1 is given, the density
+  //!   for all instances is set.
+  //! \param[in] set_contained If this cell is not filled with a material,
+  //!   collect all contained cells with material fills and set their
+  //!   densities.
+  void set_density(
+    double density, int32_t instance = -1, bool set_contained = false);
+
   int32_t n_instances() const;
 
   //! Set the rotation matrix of a cell instance
@@ -334,6 +356,9 @@ public:
   //! T. The units are sqrt(eV).
   vector<double> sqrtkT_;
 
+  //! \brief Unitless density multiplier(s) within this cell.
+  vector<double> density_mult_;
+
   //! \brief Neighboring cells in the same universe.
   NeighborList neighbors_;
 
diff --git a/include/openmc/constants.h b/include/openmc/constants.h
index ae7056079..df13da370 100644
--- a/include/openmc/constants.h
+++ b/include/openmc/constants.h
@@ -28,11 +28,11 @@ constexpr int HDF5_VERSION[] {3, 0};
 constexpr array<int, 2> VERSION_STATEPOINT {18, 1};
 constexpr array<int, 2> VERSION_PARTICLE_RESTART {2, 0};
 constexpr array<int, 2> VERSION_TRACK {3, 0};
-constexpr array<int, 2> VERSION_SUMMARY {6, 0};
+constexpr array<int, 2> VERSION_SUMMARY {6, 1};
 constexpr array<int, 2> VERSION_VOLUME {1, 0};
 constexpr array<int, 2> VERSION_VOXEL {2, 0};
 constexpr array<int, 2> VERSION_MGXS_LIBRARY {1, 0};
-constexpr array<int, 2> VERSION_PROPERTIES {1, 0};
+constexpr array<int, 2> VERSION_PROPERTIES {1, 1};
 constexpr array<int, 2> VERSION_WEIGHT_WINDOWS {1, 0};
 
 // ============================================================================
diff --git a/include/openmc/geometry_aux.h b/include/openmc/geometry_aux.h
index f60f2d649..4dafdea5c 100644
--- a/include/openmc/geometry_aux.h
+++ b/include/openmc/geometry_aux.h
@@ -37,6 +37,12 @@ void adjust_indices();
 
 void assign_temperatures();
 
+//==============================================================================
+//! Finalize densities (compute density multipliers).
+//==============================================================================
+
+void finalize_cell_densities();
+
 //==============================================================================
 //! \brief Obtain a list of temperatures that each nuclide/thermal scattering
 //! table appears at in the model. Later, this list is used to determine the
diff --git a/include/openmc/material.h b/include/openmc/material.h
index fe587a86f..e36946c71 100644
--- a/include/openmc/material.h
+++ b/include/openmc/material.h
@@ -99,6 +99,13 @@ public:
   //----------------------------------------------------------------------------
   // Accessors
 
+  //! Get the atom density in [atom/b-cm]
+  //! \return Density in [atom/b-cm]
+  double atom_density(int32_t i, double rho_multiplier = 1.0) const
+  {
+    return atom_density_(i) * rho_multiplier;
+  }
+
   //! Get density in [atom/b-cm]
   //! \return Density in [atom/b-cm]
   double density() const { return density_; }
diff --git a/include/openmc/particle_data.h b/include/openmc/particle_data.h
index ec393845f..1a22f5837 100644
--- a/include/openmc/particle_data.h
+++ b/include/openmc/particle_data.h
@@ -389,6 +389,11 @@ public:
   const double& sqrtkT() const { return sqrtkT_; }
   double& sqrtkT_last() { return sqrtkT_last_; }
 
+  // density multiplier of the current and last cell
+  double& density_mult() { return density_mult_; }
+  const double& density_mult() const { return density_mult_; }
+  double& density_mult_last() { return density_mult_last_; }
+
 private:
   int64_t id_ {-1}; //!< Unique ID
 
@@ -417,6 +422,9 @@ private:
   double sqrtkT_ {-1.0};     //!< sqrt(k_Boltzmann * temperature) in eV
   double sqrtkT_last_ {0.0}; //!< last temperature
 
+  double density_mult_ {1.0};      //!< density multiplier
+  double density_mult_last_ {1.0}; //!< last density multiplier
+
 #ifdef OPENMC_DAGMC_ENABLED
   moab::DagMC::RayHistory history_;
   Direction last_dir_;
diff --git a/openmc/cell.py b/openmc/cell.py
index 88aaebc8f..82a034b1c 100644
--- a/openmc/cell.py
+++ b/openmc/cell.py
@@ -72,6 +72,10 @@ class Cell(IDManagerMixin):
     temperature : float or iterable of float
         Temperature of the cell in Kelvin.  Multiple temperatures can be given
         to give each distributed cell instance a unique temperature.
+    density : float or iterable of float
+        Density of the cell in [g/cm3]. Multiple densities can be given to give
+        each distributed cell instance a unique density. Densities set here will
+        override the density set on materials used to fill the cell.
     translation : Iterable of float
         If the cell is filled with a universe, this array specifies a vector
         that is used to translate (shift) the universe.
@@ -109,6 +113,7 @@ class Cell(IDManagerMixin):
         self._rotation = None
         self._rotation_matrix = None
         self._temperature = None
+        self._density = None
         self._translation = None
         self._paths = None
         self._num_instances = None
@@ -141,6 +146,7 @@ class Cell(IDManagerMixin):
         if self.fill_type == 'material':
             string += '\t{0: <15}=\t{1}\n'.format('Temperature',
                                                   self.temperature)
+            string += '\t{0: <15}=\t{1}\n'.format('Density', self.density)
         string += '{: <16}=\t{}\n'.format('\tTranslation', self.translation)
         string += '{: <16}=\t{}\n'.format('\tVolume', self.volume)
 
@@ -257,6 +263,30 @@ class Cell(IDManagerMixin):
         else:
             self._temperature = temperature
 
+    @property
+    def density(self):
+        return self._density
+
+    @density.setter
+    def density(self, density):
+        # Make sure densities are greater than zero
+        cv.check_type('cell density', density, (Iterable, Real), none_ok=True)
+        if isinstance(density, Iterable):
+            cv.check_type('cell density', density, Iterable, Real)
+            for rho in density:
+                cv.check_greater_than('cell density', rho, 0.0, True)
+        elif isinstance(density, Real):
+            cv.check_greater_than('cell density', density, 0.0, True)
+
+        # If this cell is filled with a universe or lattice, propagate
+        # densities to all cells contained. Otherwise, simply assign it.
+        if self.fill_type in ('universe', 'lattice'):
+            for c in self.get_all_cells().values():
+                if c.fill_type == 'material':
+                    c._density = density
+        else:
+            self._density = density
+
     @property
     def translation(self):
         return self._translation
@@ -525,6 +555,8 @@ class Cell(IDManagerMixin):
             clone.volume = self.volume
             if self.temperature is not None:
                 clone.temperature = self.temperature
+            if self.density is not None:
+                clone.density = self.density
             if self.translation is not None:
                 clone.translation = self.translation
             if self.rotation is not None:
@@ -650,6 +682,12 @@ class Cell(IDManagerMixin):
             else:
                 element.set("temperature", str(self.temperature))
 
+        if self.density is not None:
+            if isinstance(self.density, Iterable):
+                element.set("density", ' '.join(str(t) for t in self.density))
+            else:
+                element.set("density", str(self.density))
+
         if self.translation is not None:
             element.set("translation", ' '.join(map(str, self.translation)))
 
@@ -711,10 +749,13 @@ class Cell(IDManagerMixin):
                 c.temperature = temperature
             else:
                 c.temperature = temperature[0]
+        density = get_elem_list(elem, 'density', float)
+        if density is not None:
+            c.density = density if len(density) > 1 else density[0]
         v = get_text(elem, 'volume')
         if v is not None:
             c.volume = float(v)
-        for key in ('temperature', 'rotation', 'translation'):
+        for key in ('temperature', 'density', 'rotation', 'translation'):
             values = get_elem_list(elem, key, float)
             if values is not None:
                 if key == 'rotation' and len(values) == 9:
diff --git a/openmc/lib/cell.py b/openmc/lib/cell.py
index 971a24cba..dfd09d2f9 100644
--- a/openmc/lib/cell.py
+++ b/openmc/lib/cell.py
@@ -34,6 +34,10 @@ _dll.openmc_cell_get_temperature.argtypes = [
     c_int32, POINTER(c_int32), POINTER(c_double)]
 _dll.openmc_cell_get_temperature.restype = c_int
 _dll.openmc_cell_get_temperature.errcheck = _error_handler
+_dll.openmc_cell_get_density.argtypes = [
+    c_int32, POINTER(c_int32), POINTER(c_double)]
+_dll.openmc_cell_get_density.restype = c_int
+_dll.openmc_cell_get_density.errcheck = _error_handler
 _dll.openmc_cell_get_name.argtypes = [c_int32, POINTER(c_char_p)]
 _dll.openmc_cell_get_name.restype = c_int
 _dll.openmc_cell_get_name.errcheck = _error_handler
@@ -58,6 +62,10 @@ _dll.openmc_cell_set_temperature.argtypes = [
     c_int32, c_double, POINTER(c_int32), c_bool]
 _dll.openmc_cell_set_temperature.restype = c_int
 _dll.openmc_cell_set_temperature.errcheck = _error_handler
+_dll.openmc_cell_set_density.argtypes = [
+    c_int32, c_double, POINTER(c_int32), c_bool]
+_dll.openmc_cell_set_density.restype = c_int
+_dll.openmc_cell_set_density.errcheck = _error_handler
 _dll.openmc_cell_set_translation.argtypes = [c_int32, POINTER(c_double)]
 _dll.openmc_cell_set_translation.restype = c_int
 _dll.openmc_cell_set_translation.errcheck = _error_handler
@@ -236,6 +244,44 @@ class Cell(_FortranObjectWithID):
 
         _dll.openmc_cell_set_temperature(self._index, T, instance, set_contained)
 
+    def get_density(self, instance: int | None = None):
+        """Get the density of a cell in [g/cm3]
+
+        Parameters
+        ----------
+        instance : int or None
+            Which instance of the cell
+
+        """
+
+        if instance is not None:
+            instance = c_int32(instance)
+
+        rho = c_double()
+        _dll.openmc_cell_get_density(self._index, instance, rho)
+        return rho.value
+
+    def set_density(self, rho: float, instance: int | None = None,
+                    set_contained: bool = False):
+        """Set the density of a cell
+
+        Parameters
+        ----------
+        rho : float
+            Density of the cell in [g/cm3]
+        instance : int or None
+            Which instance of the cell
+        set_contained : bool
+            If cell is not filled by a material, whether to set the density
+            of all filled cells
+
+        """
+
+        if instance is not None:
+            instance = c_int32(instance)
+
+        _dll.openmc_cell_set_density(self._index, rho, instance, set_contained)
+
     @property
     def translation(self):
         translation = np.zeros(3)
diff --git a/openmc/model/model.py b/openmc/model/model.py
index 03fdcda1f..59e6fa511 100644
--- a/openmc/model/model.py
+++ b/openmc/model/model.py
@@ -633,7 +633,7 @@ class Model:
                 raise ValueError("Number of cells in properties file doesn't "
                                  "match current model.")
 
-            # Update temperatures for cells filled with materials
+            # Update temperatures and densities for cells filled with materials
             for name, group in cells_group.items():
                 cell_id = int(name.split()[1])
                 cell = cells[cell_id]
@@ -648,6 +648,20 @@ class Model:
                         else:
                             lib_cell.set_temperature(temperature[0])
 
+                    if group['density']:
+                      density = group['density'][()]
+                      if density.size > 1:
+                          cell.density = [rho for rho in density]
+                      else:
+                          cell.density = density
+                      if self.is_initialized:
+                          lib_cell = openmc.lib.cells[cell_id]
+                          if density.size > 1:
+                              for i, rho in enumerate(density):
+                                  lib_cell.set_density(rho, i)
+                          else:
+                              lib_cell.set_density(density[0])
+
             # Make sure number of materials matches
             mats_group = fh['materials']
             n_cells = mats_group.attrs['n_materials']
diff --git a/src/cell.cpp b/src/cell.cpp
index d838bfbb4..e2479994a 100644
--- a/src/cell.cpp
+++ b/src/cell.cpp
@@ -101,6 +101,25 @@ double Cell::temperature(int32_t instance) const
   }
 }
 
+double Cell::density_mult(int32_t instance) const
+{
+  if (instance >= 0) {
+    return density_mult_.size() == 1 ? density_mult_.at(0)
+                                     : density_mult_.at(instance);
+  } else {
+    return density_mult_[0];
+  }
+}
+
+double Cell::density(int32_t instance) const
+{
+  const int32_t mat_index = material(instance);
+  if (mat_index == MATERIAL_VOID)
+    return 0.0;
+
+  return density_mult(instance) * model::materials[mat_index]->density_gpcc();
+}
+
 void Cell::set_temperature(double T, int32_t instance, bool set_contained)
 {
   if (settings::temperature_method == TemperatureMethod::INTERPOLATION) {
@@ -151,6 +170,47 @@ void Cell::set_temperature(double T, int32_t instance, bool set_contained)
   }
 }
 
+void Cell::set_density(double density, int32_t instance, bool set_contained)
+{
+  if (type_ != Fill::MATERIAL && !set_contained) {
+    fatal_error(
+      fmt::format("Attempted to set the density multiplier of cell {} "
+                  "which is not filled by a material.",
+        id_));
+  }
+
+  if (type_ == Fill::MATERIAL) {
+    const int32_t mat_index = material(instance);
+    if (mat_index == MATERIAL_VOID)
+      return;
+
+    if (instance >= 0) {
+      // If density multiplier vector is not big enough, resize it first
+      if (density_mult_.size() != n_instances())
+        density_mult_.resize(n_instances(), density_mult_[0]);
+
+      // Set density multiplier for the corresponding instance
+      density_mult_.at(instance) =
+        density / model::materials[mat_index]->density_gpcc();
+    } else {
+      // Set density multiplier for all instances
+      for (auto& x : density_mult_) {
+        x = density / model::materials[mat_index]->density_gpcc();
+      }
+    }
+  } else {
+    auto contained_cells = this->get_contained_cells(instance);
+    for (const auto& entry : contained_cells) {
+      auto& cell = model::cells[entry.first];
+      assert(cell->type_ == Fill::MATERIAL);
+      auto& instances = entry.second;
+      for (auto instance : instances) {
+        cell->set_density(density, instance);
+      }
+    }
+  }
+}
+
 void Cell::export_properties_hdf5(hid_t group) const
 {
   // Create a group for this cell.
@@ -162,6 +222,15 @@ void Cell::export_properties_hdf5(hid_t group) const
     temps.push_back(sqrtkT_val * sqrtkT_val / K_BOLTZMANN);
   write_dataset(cell_group, "temperature", temps);
 
+  // Write density for one or more cell instances
+  if (type_ == Fill::MATERIAL && material_.size() > 0) {
+    vector<double> density;
+    for (int32_t i = 0; i < density_mult_.size(); ++i)
+      density.push_back(this->density(i));
+
+    write_dataset(cell_group, "density", density);
+  }
+
   close_group(cell_group);
 }
 
@@ -176,7 +245,7 @@ void Cell::import_properties_hdf5(hid_t group)
   // Ensure number of temperatures makes sense
   auto n_temps = temps.size();
   if (n_temps > 1 && n_temps != n_instances()) {
-    throw std::runtime_error(fmt::format(
+    fatal_error(fmt::format(
       "Number of temperatures for cell {} doesn't match number of instances",
       id_));
   }
@@ -188,6 +257,25 @@ void Cell::import_properties_hdf5(hid_t group)
     this->set_temperature(temps[i], i);
   }
 
+  // Read densities
+  if (object_exists(cell_group, "density")) {
+    vector<double> density;
+    read_dataset(cell_group, "density", density);
+
+    // Ensure number of densities makes sense
+    auto n_density = density.size();
+    if (n_density > 1 && n_density != n_instances()) {
+      fatal_error(fmt::format("Number of densities for cell {} "
+                              "doesn't match number of instances",
+        id_));
+    }
+
+    // Set densities.
+    for (int32_t i = 0; i < n_density; ++i) {
+      this->set_density(density[i], i);
+    }
+  }
+
   close_group(cell_group);
 }
 
@@ -227,6 +315,8 @@ void Cell::to_hdf5(hid_t cell_group) const
       temps.push_back(sqrtkT_val * sqrtkT_val / K_BOLTZMANN);
     write_dataset(group, "temperature", temps);
 
+    write_dataset(group, "density_mult", density_mult_);
+
   } else if (type_ == Fill::UNIVERSE) {
     write_dataset(group, "fill_type", "universe");
     write_dataset(group, "fill", model::universes[fill_]->id_);
@@ -344,6 +434,44 @@ CSGCell::CSGCell(pugi::xml_node cell_node)
     }
   }
 
+  // Read the density element which can be distributed similar to temperature.
+  // These get assigned to the density multiplier, requiring a division by
+  // the material density.
+  // Note: calculating the actual density multiplier is deferred until materials
+  // are finalized. density_mult_ contains the true density in the meantime.
+  if (check_for_node(cell_node, "density")) {
+    density_mult_ = get_node_array<double>(cell_node, "density");
+    density_mult_.shrink_to_fit();
+
+    // Make sure this is a material-filled cell.
+    if (material_.size() == 0) {
+      fatal_error(fmt::format(
+        "Cell {} was specified with a density but no material. Density"
+        "specification is only valid for cells filled with a material.",
+        id_));
+    }
+
+    // Make sure this is a non-void material.
+    for (auto mat_id : material_) {
+      if (mat_id == MATERIAL_VOID) {
+        fatal_error(fmt::format(
+          "Cell {} was specified with a density, but contains a void "
+          "material. Density specification is only valid for cells "
+          "filled with a non-void material.",
+          id_));
+      }
+    }
+
+    // Make sure all densities are non-negative and greater than zero.
+    for (auto rho : density_mult_) {
+      if (rho <= 0) {
+        fatal_error(fmt::format(
+          "Cell {} was specified with a density less than or equal to zero",
+          id_));
+      }
+    }
+  }
+
   // Read the region specification.
   std::string region_spec;
   if (check_for_node(cell_node, "region")) {
@@ -1129,6 +1257,24 @@ extern "C" int openmc_cell_set_temperature(
   return 0;
 }
 
+extern "C" int openmc_cell_set_density(
+  int32_t index, double density, const int32_t* instance, bool set_contained)
+{
+  if (index < 0 || index >= model::cells.size()) {
+    strcpy(openmc_err_msg, "Index in cells array is out of bounds.");
+    return OPENMC_E_OUT_OF_BOUNDS;
+  }
+
+  int32_t instance_index = instance ? *instance : -1;
+  try {
+    model::cells[index]->set_density(density, instance_index, set_contained);
+  } catch (const std::exception& e) {
+    set_errmsg(e.what());
+    return OPENMC_E_UNASSIGNED;
+  }
+  return 0;
+}
+
 extern "C" int openmc_cell_get_temperature(
   int32_t index, const int32_t* instance, double* T)
 {
@@ -1147,6 +1293,36 @@ extern "C" int openmc_cell_get_temperature(
   return 0;
 }
 
+extern "C" int openmc_cell_get_density(
+  int32_t index, const int32_t* instance, double* density)
+{
+  if (index < 0 || index >= model::cells.size()) {
+    strcpy(openmc_err_msg, "Index in cells array is out of bounds.");
+    return OPENMC_E_OUT_OF_BOUNDS;
+  }
+
+  int32_t instance_index = instance ? *instance : -1;
+  try {
+    if (model::cells[index]->type_ != Fill::MATERIAL) {
+      fatal_error(
+        fmt::format("Cell {}, instance {} is not filled with a material.",
+          model::cells[index]->id_, instance_index));
+    }
+
+    int32_t mat_index = model::cells[index]->material(instance_index);
+    if (mat_index == MATERIAL_VOID) {
+      *density = 0.0;
+    } else {
+      *density = model::cells[index]->density_mult(instance_index) *
+                 model::materials[mat_index]->density_gpcc();
+    }
+  } catch (const std::exception& e) {
+    set_errmsg(e.what());
+    return OPENMC_E_UNASSIGNED;
+  }
+  return 0;
+}
+
 //! Get the bounding box of a cell
 extern "C" int openmc_cell_bounding_box(
   const int32_t index, double* llc, double* urc)
diff --git a/src/geometry.cpp b/src/geometry.cpp
index df4850891..5ff15097b 100644
--- a/src/geometry.cpp
+++ b/src/geometry.cpp
@@ -172,11 +172,13 @@ bool find_cell_inner(
         p.cell_instance() = cell_instance_at_level(p, p.n_coord() - 1);
       }
 
-      // Set the material and temperature.
+      // Set the material, temperature and density multiplier.
       p.material_last() = p.material();
       p.material() = c.material(p.cell_instance());
       p.sqrtkT_last() = p.sqrtkT();
       p.sqrtkT() = c.sqrtkT(p.cell_instance());
+      p.density_mult_last() = p.density_mult();
+      p.density_mult() = c.density_mult(p.cell_instance());
 
       return true;
 
diff --git a/src/geometry_aux.cpp b/src/geometry_aux.cpp
index 51732cf8b..8a145fb1f 100644
--- a/src/geometry_aux.cpp
+++ b/src/geometry_aux.cpp
@@ -195,6 +195,24 @@ void assign_temperatures()
 
 //==============================================================================
 
+void finalize_cell_densities()
+{
+  for (auto& c : model::cells) {
+    // Convert to density multipliers.
+    if (!c->density_mult_.empty()) {
+      for (int32_t instance = 0; instance < c->density_mult_.size();
+           ++instance) {
+        c->density_mult_[instance] /=
+          model::materials[c->material(instance)]->density_gpcc();
+      }
+    } else {
+      c->density_mult_ = {1.0};
+    }
+  }
+}
+
+//==============================================================================
+
 void get_temperatures(
   vector<vector<double>>& nuc_temps, vector<vector<double>>& thermal_temps)
 {
@@ -362,6 +380,17 @@ void prepare_distribcell(const std::vector<int32_t>* user_distribcells)
           c.id_, c.sqrtkT_.size(), c.n_instances()));
       }
     }
+
+    if (c.density_mult_.size() > 1) {
+      if (c.density_mult_.size() != c.n_instances()) {
+        fatal_error(fmt::format("Cell {} was specified with {} density "
+                                "multipliers but has {} distributed "
+                                "instances. The number of density multipliers "
+                                "must equal one or the number "
+                                "of instances.",
+          c.id_, c.density_mult_.size(), c.n_instances()));
+      }
+    }
   }
 
   // Search through universes for material cells and assign each one a
diff --git a/src/initialize.cpp b/src/initialize.cpp
index 2da78137d..36f326116 100644
--- a/src/initialize.cpp
+++ b/src/initialize.cpp
@@ -401,6 +401,10 @@ bool read_model_xml()
   // Finalize cross sections having assigned temperatures
   finalize_cross_sections();
 
+  // Compute cell density multipliers now that material densities
+  // have been finalized (from geometry_aux.h)
+  finalize_cell_densities();
+
   if (check_for_node(root, "tallies"))
     read_tallies_xml(root.child("tallies"));
 
@@ -441,6 +445,11 @@ void read_separate_xml_files()
 
   // Finalize cross sections having assigned temperatures
   finalize_cross_sections();
+
+  // Compute cell density multipliers now that material densities
+  // have been finalized (from geometry_aux.h)
+  finalize_cell_densities();
+
   read_tallies_xml();
 
   // Initialize distribcell_filters
diff --git a/src/material.cpp b/src/material.cpp
index 32384ddf1..54caa3840 100644
--- a/src/material.cpp
+++ b/src/material.cpp
@@ -890,7 +890,7 @@ void Material::calculate_neutron_xs(Particle& p) const
     // ADD TO MACROSCOPIC CROSS SECTION
 
     // Copy atom density of nuclide in material
-    double atom_density = atom_density_(i);
+    double atom_density = this->atom_density(i, p.density_mult());
 
     // Add contributions to cross sections
     p.macro_xs().total += atom_density * micro.total;
@@ -925,7 +925,7 @@ void Material::calculate_photon_xs(Particle& p) const
     // ADD TO MACROSCOPIC CROSS SECTION
 
     // Copy atom density of nuclide in material
-    double atom_density = atom_density_(i);
+    double atom_density = this->atom_density(i, p.density_mult());
 
     // Add contributions to material macroscopic cross sections
     p.macro_xs().total += atom_density * micro.total;
diff --git a/src/mgxs.cpp b/src/mgxs.cpp
index a88d2c196..a2c479f21 100644
--- a/src/mgxs.cpp
+++ b/src/mgxs.cpp
@@ -617,10 +617,12 @@ void Mgxs::calculate_xs(Particle& p)
   }
   int temperature = p.mg_xs_cache().t;
   int angle = p.mg_xs_cache().a;
-  p.macro_xs().total = xs[temperature].total(angle, p.g());
-  p.macro_xs().absorption = xs[temperature].absorption(angle, p.g());
+  p.macro_xs().total = xs[temperature].total(angle, p.g()) * p.density_mult();
+  p.macro_xs().absorption =
+    xs[temperature].absorption(angle, p.g()) * p.density_mult();
   p.macro_xs().nu_fission =
-    fissionable ? xs[temperature].nu_fission(angle, p.g()) : 0.;
+    fissionable ? xs[temperature].nu_fission(angle, p.g()) * p.density_mult()
+                : 0.;
 }
 
 //==============================================================================
diff --git a/src/particle.cpp b/src/particle.cpp
index f25ada02c..f5ad45d80 100644
--- a/src/particle.cpp
+++ b/src/particle.cpp
@@ -200,7 +200,8 @@ void Particle::event_calculate_xs()
   // Calculate microscopic and macroscopic cross sections
   if (material() != MATERIAL_VOID) {
     if (settings::run_CE) {
-      if (material() != material_last() || sqrtkT() != sqrtkT_last()) {
+      if (material() != material_last() || sqrtkT() != sqrtkT_last() ||
+          density_mult() != density_mult_last()) {
         // If the material is the same as the last material and the
         // temperature hasn't changed, we don't need to lookup cross
         // sections again.
@@ -564,9 +565,10 @@ void Particle::cross_surface(const Surface& surf)
     int32_t i_cell = next_cell(surface_index(), cell_last(n_coord() - 1),
                        lowest_coord().universe()) -
                      1;
-    // save material and temp
+    // save material, temperature, and density multiplier
     material_last() = material();
     sqrtkT_last() = sqrtkT();
+    density_mult_last() = density_mult();
     // set new cell value
     lowest_coord().cell() = i_cell;
     auto& cell = model::cells[i_cell];
@@ -577,6 +579,7 @@ void Particle::cross_surface(const Surface& surf)
 
     material() = cell->material(cell_instance());
     sqrtkT() = cell->sqrtkT(cell_instance());
+    density_mult() = cell->density_mult(cell_instance());
     return;
   }
 #endif
diff --git a/src/physics.cpp b/src/physics.cpp
index 3c06e543d..8ad1b99d7 100644
--- a/src/physics.cpp
+++ b/src/physics.cpp
@@ -496,7 +496,7 @@ int sample_nuclide(Particle& p)
   for (int i = 0; i < n; ++i) {
     // Get atom density
     int i_nuclide = mat->nuclide_[i];
-    double atom_density = mat->atom_density_[i];
+    double atom_density = mat->atom_density(i, p.density_mult());
 
     // Increment probability to compare to cutoff
     prob += atom_density * p.neutron_xs(i_nuclide).total;
@@ -521,7 +521,7 @@ int sample_element(Particle& p)
   for (int i = 0; i < mat->element_.size(); ++i) {
     // Find atom density
     int i_element = mat->element_[i];
-    double atom_density = mat->atom_density_[i];
+    double atom_density = mat->atom_density(i, p.density_mult());
 
     // Determine microscopic cross section
     double sigma = atom_density * p.photon_xs(i_element).total;
diff --git a/src/tallies/tally_scoring.cpp b/src/tallies/tally_scoring.cpp
index 04b047b64..f078a5c6e 100644
--- a/src/tallies/tally_scoring.cpp
+++ b/src/tallies/tally_scoring.cpp
@@ -233,7 +233,7 @@ double score_fission_q(const Particle& p, int score_bin, const Tally& tally,
       double score {0.0};
       for (auto i = 0; i < material.nuclide_.size(); ++i) {
         auto j_nuclide = material.nuclide_[i];
-        auto atom_density = material.atom_density_(i);
+        auto atom_density = material.atom_density(i, p.density_mult());
         const Nuclide& nuc {*data::nuclides[j_nuclide]};
         score += get_nuc_fission_q(nuc, p, score_bin) * atom_density *
                  p.neutron_xs(j_nuclide).fission;
@@ -696,7 +696,7 @@ void score_general_ce_nonanalog(Particle& p, int i_tally, int start_index,
           const Material& material {*model::materials[p.material()]};
           for (auto i = 0; i < material.nuclide_.size(); ++i) {
             auto j_nuclide = material.nuclide_[i];
-            auto atom_density = material.atom_density_(i);
+            auto atom_density = material.atom_density(i, p.density_mult());
             score += p.neutron_xs(j_nuclide).fission *
                      data::nuclides[j_nuclide]->nu(
                        E, ReactionProduct::EmissionMode::prompt) *
@@ -743,7 +743,7 @@ void score_general_ce_nonanalog(Particle& p, int i_tally, int start_index,
             const Material& material {*model::materials[p.material()]};
             for (auto i = 0; i < material.nuclide_.size(); ++i) {
               auto j_nuclide = material.nuclide_[i];
-              auto atom_density = material.atom_density_(i);
+              auto atom_density = material.atom_density(i, p.density_mult());
               // Tally each delayed group bin individually
               for (auto d_bin = 0; d_bin < filt.n_bins(); ++d_bin) {
                 auto d = filt.groups()[d_bin];
@@ -763,7 +763,7 @@ void score_general_ce_nonanalog(Particle& p, int i_tally, int start_index,
             const Material& material {*model::materials[p.material()]};
             for (auto i = 0; i < material.nuclide_.size(); ++i) {
               auto j_nuclide = material.nuclide_[i];
-              auto atom_density = material.atom_density_(i);
+              auto atom_density = material.atom_density(i, p.density_mult());
               score += p.neutron_xs(j_nuclide).fission *
                        data::nuclides[j_nuclide]->nu(
                          E, ReactionProduct::EmissionMode::delayed) *
@@ -824,7 +824,7 @@ void score_general_ce_nonanalog(Particle& p, int i_tally, int start_index,
             const Material& material {*model::materials[p.material()]};
             for (auto i = 0; i < material.nuclide_.size(); ++i) {
               auto j_nuclide = material.nuclide_[i];
-              auto atom_density = material.atom_density_(i);
+              auto atom_density = material.atom_density(i, p.density_mult());
               const auto& nuc {*data::nuclides[j_nuclide]};
               if (nuc.fissionable_) {
                 const auto& rxn {*nuc.fission_rx_[0]};
@@ -849,7 +849,7 @@ void score_general_ce_nonanalog(Particle& p, int i_tally, int start_index,
             const Material& material {*model::materials[p.material()]};
             for (auto i = 0; i < material.nuclide_.size(); ++i) {
               auto j_nuclide = material.nuclide_[i];
-              auto atom_density = material.atom_density_(i);
+              auto atom_density = material.atom_density(i, p.density_mult());
               const auto& nuc {*data::nuclides[j_nuclide]};
               if (nuc.fissionable_) {
                 const auto& rxn {*nuc.fission_rx_[0]};
@@ -893,7 +893,7 @@ void score_general_ce_nonanalog(Particle& p, int i_tally, int start_index,
         const Material& material {*model::materials[p.material()]};
         for (auto i = 0; i < material.nuclide_.size(); ++i) {
           auto j_nuclide = material.nuclide_[i];
-          auto atom_density = material.atom_density_(i);
+          auto atom_density = material.atom_density(i, p.density_mult());
           const auto& nuc {*data::nuclides[j_nuclide]};
           if (nuc.fissionable_) {
             const auto& rxn {*nuc.fission_rx_[0]};
@@ -924,7 +924,7 @@ void score_general_ce_nonanalog(Particle& p, int i_tally, int start_index,
           const Material& material {*model::materials[p.material()]};
           for (auto i = 0; i < material.nuclide_.size(); ++i) {
             auto j_nuclide = material.nuclide_[i];
-            auto atom_density = material.atom_density_(i);
+            auto atom_density = material.atom_density(i, p.density_mult());
             if (p.neutron_xs(j_nuclide).elastic == CACHE_INVALID)
               data::nuclides[j_nuclide]->calculate_elastic_xs(p);
             score += p.neutron_xs(j_nuclide).elastic * atom_density * flux;
@@ -1025,7 +1025,7 @@ void score_general_ce_nonanalog(Particle& p, int i_tally, int start_index,
           const Material& material {*model::materials[p.material()]};
           for (auto i = 0; i < material.nuclide_.size(); ++i) {
             auto j_nuclide = material.nuclide_[i];
-            auto atom_density = material.atom_density_(i);
+            auto atom_density = material.atom_density(i, p.density_mult());
             score += p.neutron_xs(j_nuclide).reaction[m] * atom_density * flux;
           }
         }
@@ -1079,7 +1079,7 @@ void score_general_ce_nonanalog(Particle& p, int i_tally, int start_index,
         const Material& material {*model::materials[p.material()]};
         for (auto i = 0; i < material.nuclide_.size(); ++i) {
           auto j_nuclide = material.nuclide_[i];
-          auto atom_density = material.atom_density_(i);
+          auto atom_density = material.atom_density(i, p.density_mult());
           score +=
             get_nuclide_xs(p, j_nuclide, score_bin) * atom_density * flux;
         }
@@ -2383,7 +2383,8 @@ void score_analog_tally_mg(Particle& p)
             model::materials[p.material()]->mat_nuclide_index_[i_nuclide];
           if (j == C_NONE)
             continue;
-          atom_density = model::materials[p.material()]->atom_density_(j);
+          atom_density =
+            model::materials[p.material()]->atom_density(j, p.density_mult());
         }
 
         score_general_mg(p, i_tally, i * tally.scores_.size(), filter_index,
@@ -2449,8 +2450,9 @@ void score_tracklength_tally_general(
                 atom_density = 1.0;
               }
             } else {
-              atom_density =
-                tally.multiply_density() ? mat->atom_density_(j) : 1.0;
+              atom_density = tally.multiply_density()
+                               ? mat->atom_density(j, p.density_mult())
+                               : 1.0;
             }
           }
         }
@@ -2579,8 +2581,9 @@ void score_collision_tally(Particle& p)
               atom_density = 1.0;
             }
           } else {
-            atom_density =
-              tally.multiply_density() ? mat->atom_density_(j) : 1.0;
+            atom_density = tally.multiply_density()
+                             ? mat->atom_density(j, p.density_mult())
+                             : 1.0;
           }
         }
 
diff --git a/tests/regression_tests/cpp_driver/driver.cpp b/tests/regression_tests/cpp_driver/driver.cpp
index 48ed7f317..a99c97b64 100644
--- a/tests/regression_tests/cpp_driver/driver.cpp
+++ b/tests/regression_tests/cpp_driver/driver.cpp
@@ -15,14 +15,16 @@
 
 using namespace openmc;
 
-int main(int argc, char** argv) {
+int main(int argc, char** argv)
+{
 #ifdef OPENMC_MPI
   MPI_Comm world {MPI_COMM_WORLD};
   int err = openmc_init(argc, argv, &world);
 #else
   int err = openmc_init(argc, argv, nullptr);
 #endif
-  if (err) fatal_error(openmc_err_msg);
+  if (err)
+    fatal_error(openmc_err_msg);
 
   // create a new cell filter
   auto cell_filter = Filter::create<CellFilter>();
@@ -30,7 +32,7 @@ int main(int argc, char** argv) {
   // add all cells to the cell filter
   std::vector<int32_t> cell_indices;
   for (auto& entry : openmc::model::cell_map) {
-      cell_indices.push_back(entry.second);
+    cell_indices.push_back(entry.second);
   }
   // enable distribcells offsets for all cells
   prepare_distribcell(&cell_indices);
@@ -39,7 +41,6 @@ int main(int argc, char** argv) {
   std::sort(cell_indices.begin(), cell_indices.end());
   cell_filter->set_cells(cell_indices);
 
-
   // create a new tally
   auto tally = Tally::create();
   std::vector<Filter*> filters = {cell_filter};
@@ -60,14 +61,19 @@ int main(int argc, char** argv) {
     }
   }
 
-  // set a higher temperature for only one of the lattice cells (ID is 4 in the model)
+  // set a higher temperature for only one of the lattice cells (ID is 4 in the
+  // model)
   model::cells[model::cell_map[4]]->set_temperature(400.0, 3, true);
 
+  // set the density of another lattice cell to 2
+  model::cells[model::cell_map[4]]->set_density(2.0, 2, true);
+
   // the summary file will be used to check that
   // temperatures were set correctly so clear
   // error output can be provided
 #ifdef OPENMC_MPI
-  if (openmc::mpi::master) openmc::write_summary();
+  if (openmc::mpi::master)
+    openmc::write_summary();
 #else
   openmc::write_summary();
 #endif
diff --git a/tests/regression_tests/cpp_driver/results_true.dat b/tests/regression_tests/cpp_driver/results_true.dat
index c2b0b8d6f..26f07842c 100644
--- a/tests/regression_tests/cpp_driver/results_true.dat
+++ b/tests/regression_tests/cpp_driver/results_true.dat
@@ -1,13 +1,13 @@
 k-combined:
-1.933305E+00 1.300360E-02
+1.953962E+00 1.828426E-02
 tally 1:
-9.552846E+01
-1.019358E+03
-2.887973E+01
-9.308509E+01
-9.732441E+01
-1.059022E+03
-2.217326E+02
-5.486892E+03
-2.217326E+02
-5.486892E+03
+9.607953E+01
+1.031898E+03
+2.853683E+01
+9.085469E+01
+9.745011E+01
+1.058928E+03
+2.220665E+02
+5.496813E+03
+2.220665E+02
+5.496813E+03
diff --git a/tests/regression_tests/dagmc/external/main.cpp b/tests/regression_tests/dagmc/external/main.cpp
index 3765cf79a..e78ab03fa 100644
--- a/tests/regression_tests/dagmc/external/main.cpp
+++ b/tests/regression_tests/dagmc/external/main.cpp
@@ -100,6 +100,9 @@ int main(int argc, char* argv[])
     }
   }
 
+  // Finalize cell densities
+  openmc::finalize_cell_densities();
+
   // Run OpenMC
   openmc_err = openmc_run();
   if (openmc_err)
diff --git a/tests/regression_tests/lattice_distribrho/__init__.py b/tests/regression_tests/lattice_distribrho/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/regression_tests/lattice_distribrho/inputs_true.dat b/tests/regression_tests/lattice_distribrho/inputs_true.dat
new file mode 100644
index 000000000..5031bea6e
--- /dev/null
+++ b/tests/regression_tests/lattice_distribrho/inputs_true.dat
@@ -0,0 +1,40 @@
+<?xml version='1.0' encoding='utf-8'?>
+<model>
+  <materials>
+    <material id="1" name="UO2" depletable="true">
+      <density value="10.0" units="g/cm3"/>
+      <nuclide name="U235" ao="1.0"/>
+      <nuclide name="O16" ao="2.0"/>
+    </material>
+    <material id="2" name="light water">
+      <density value="1.0" units="g/cm3"/>
+      <nuclide name="H1" ao="2.0"/>
+      <nuclide name="O16" ao="1.0"/>
+      <sab name="c_H_in_H2O"/>
+    </material>
+  </materials>
+  <geometry>
+    <cell id="1" material="1" region="-1" density="10.0 20.0 10.0 20.0" universe="1"/>
+    <cell id="2" material="2" region="1" universe="1"/>
+    <cell id="3" fill="2" region="2 -3 4 -5" universe="3"/>
+    <lattice id="2">
+      <pitch>1.0 1.0</pitch>
+      <dimension>2 2</dimension>
+      <lower_left>-1.0 -1.0</lower_left>
+      <universes>
+1 1 
+1 1 </universes>
+    </lattice>
+    <surface id="1" type="z-cylinder" coeffs="0.0 0.0 0.4"/>
+    <surface id="2" name="minimum x" type="x-plane" boundary="reflective" coeffs="-1.0"/>
+    <surface id="3" name="maximum x" type="x-plane" boundary="reflective" coeffs="1.0"/>
+    <surface id="4" name="minimum y" type="y-plane" boundary="reflective" coeffs="-1.0"/>
+    <surface id="5" name="maximum y" type="y-plane" boundary="reflective" coeffs="1.0"/>
+  </geometry>
+  <settings>
+    <run_mode>eigenvalue</run_mode>
+    <particles>1000</particles>
+    <batches>10</batches>
+    <inactive>5</inactive>
+  </settings>
+  </model>
diff --git a/tests/regression_tests/lattice_distribrho/results_true.dat b/tests/regression_tests/lattice_distribrho/results_true.dat
new file mode 100644
index 000000000..d7094f4e3
--- /dev/null
+++ b/tests/regression_tests/lattice_distribrho/results_true.dat
@@ -0,0 +1,2 @@
+k-combined:
+1.904471E+00 5.255549E-03
diff --git a/tests/regression_tests/lattice_distribrho/test.py b/tests/regression_tests/lattice_distribrho/test.py
new file mode 100644
index 000000000..ec94fe96b
--- /dev/null
+++ b/tests/regression_tests/lattice_distribrho/test.py
@@ -0,0 +1,51 @@
+import openmc
+import pytest
+
+from tests.testing_harness import PyAPITestHarness
+
+
+@pytest.fixture
+def model():
+    model = openmc.Model()
+
+    uo2 = openmc.Material(name='UO2')
+    uo2.set_density('g/cm3', 10.0)
+    uo2.add_nuclide('U235', 1.0)
+    uo2.add_nuclide('O16', 2.0)
+    water = openmc.Material(name='light water')
+    water.add_nuclide('H1', 2.0)
+    water.add_nuclide('O16', 1.0)
+    water.set_density('g/cm3', 1.0)
+    water.add_s_alpha_beta('c_H_in_H2O')
+    model.materials.extend([uo2, water])
+
+    cyl = openmc.ZCylinder(r=0.4)
+    pin = openmc.model.pin([cyl], [uo2, water])
+    d = 1.0
+
+    lattice = openmc.RectLattice()
+    lattice.lower_left = (-d, -d)
+    lattice.pitch = (d, d)
+    lattice.universes = [[pin, pin],
+                         [pin, pin]]
+    box = openmc.model.RectangularPrism(
+        2.0 * d, 2.0 * d,
+        origin=(0.0, 0.0),
+        boundary_type='reflective'
+    )
+
+    pin.cells[1].density = [10.0, 20.0, 10.0, 20.0]
+
+    model.geometry = openmc.Geometry([openmc.Cell(fill=lattice, region=-box)])
+    model.geometry.merge_surfaces = True
+
+    model.settings.batches = 10
+    model.settings.inactive = 5
+    model.settings.particles = 1000
+
+    return model
+
+
+def test_lattice_checkerboard(model):
+    harness = PyAPITestHarness('statepoint.10.h5', model)
+    harness.main()
diff --git a/tests/regression_tests/multipole/results_true.dat b/tests/regression_tests/multipole/results_true.dat
index 8e82655ce..8eb75b894 100644
--- a/tests/regression_tests/multipole/results_true.dat
+++ b/tests/regression_tests/multipole/results_true.dat
@@ -38,5 +38,6 @@ Cell
 	Region         =	-1
 	Rotation       =	None
 	Temperature    =	[500. 700.   0. 800.]
+	Density        =	None
 	Translation    =	None
 	Volume         =	None
diff --git a/tests/unit_tests/test_cell.py b/tests/unit_tests/test_cell.py
index 95c8249bb..60b205818 100644
--- a/tests/unit_tests/test_cell.py
+++ b/tests/unit_tests/test_cell.py
@@ -126,6 +126,29 @@ def test_temperature(cell_with_lattice):
     c.temperature = (300., 600., 900.)
 
 
+def test_densities(cell_with_lattice):
+    # Make sure density propagates through universes
+    m = openmc.Material()
+    s = openmc.XPlane()
+    c1 = openmc.Cell(fill=m, region=+s)
+    c2 = openmc.Cell(fill=m, region=-s)
+    u1 = openmc.Universe(cells=[c1, c2])
+    c = openmc.Cell(fill=u1)
+
+    c.density = 1.
+    assert c1.density == 1.
+    assert c2.density == 1.
+    with pytest.raises(ValueError):
+        c.density = -1.
+    c.density = None
+    assert c1.density == None
+    assert c2.density == None
+
+    # distributed density
+    cells, _, _, _ = cell_with_lattice
+    c = cells[0]
+    c.density = (1., 2., 3.)
+
 def test_rotation():
     u = openmc.Universe()
     c = openmc.Cell(fill=u)
diff --git a/tests/unit_tests/test_lib.py b/tests/unit_tests/test_lib.py
index 8ab35335f..8080ce894 100644
--- a/tests/unit_tests/test_lib.py
+++ b/tests/unit_tests/test_lib.py
@@ -159,6 +159,29 @@ def test_properties_temperature(lib_init):
     assert cell.get_temperature() == pytest.approx(200.0)
 
 
+def test_cell_density(lib_init):
+    cell = openmc.lib.cells[1]
+    cell.set_density(1.5, 0)
+    assert cell.get_density(0) == pytest.approx(1.5)
+    cell.set_density(2.0)
+    assert cell.get_density() == pytest.approx(2.0)
+
+
+def test_properties_cell_density(lib_init):
+    # Cell density should be 2.0 from above test
+    cell = openmc.lib.cells[1]
+    assert cell.get_density() == pytest.approx(2.0)
+
+    # Export properties and change density
+    openmc.lib.export_properties('properties.h5')
+    cell.set_density(3.0)
+    assert cell.get_density() == pytest.approx(3.0)
+
+    # Import properties and check that density is restored
+    openmc.lib.import_properties('properties.h5')
+    assert cell.get_density() == pytest.approx(2.0)
+
+
 def test_new_cell(lib_init):
     with pytest.raises(exc.AllocationError):
         openmc.lib.Cell(1)
diff --git a/tests/unit_tests/test_model.py b/tests/unit_tests/test_model.py
index 6e4dec00f..12f0df6c9 100644
--- a/tests/unit_tests/test_model.py
+++ b/tests/unit_tests/test_model.py
@@ -251,10 +251,11 @@ def test_import_properties(run_in_tmpdir, mpi_intracomm):
     model = openmc.examples.pwr_pin_cell()
     model.init_lib(output=False, intracomm=mpi_intracomm)
 
-    # Change fuel temperature and density and export properties
+    # Change cell fuel temperature, density, material density and export properties
     cell = openmc.lib.cells[1]
     cell.set_temperature(600.0)
     cell.fill.set_density(5.0, 'g/cm3')
+    cell.set_density(10.0)
     openmc.lib.export_properties(output=False)
 
     # Import properties to existing model
@@ -264,9 +265,11 @@ def test_import_properties(run_in_tmpdir, mpi_intracomm):
     # First python
     cell = model.geometry.get_all_cells()[1]
     assert cell.temperature == [600.0]
+    assert cell.density == [pytest.approx(10.0, 1e-5)]
     assert cell.fill.get_mass_density() == pytest.approx(5.0)
     # Now C
     assert openmc.lib.cells[1].get_temperature() == 600.
+    assert openmc.lib.cells[1].get_density() == pytest.approx(10.0, 1e-5)
     assert openmc.lib.materials[1].get_density('g/cm3') == pytest.approx(5.0)
 
     # Clear the C API
@@ -283,6 +286,7 @@ def test_import_properties(run_in_tmpdir, mpi_intracomm):
     )
     cell = model_with_properties.geometry.get_all_cells()[1]
     assert cell.temperature == [600.0]
+    assert cell.density == [pytest.approx(10.0, 1e-5)]
     assert cell.fill.get_mass_density() == pytest.approx(5.0)
 
 

From 007ac8148bcda4911edb0191df762fa7ef3c5b8e Mon Sep 17 00:00:00 2001
From: Paul Romano <paul.k.romano@gmail.com>
Date: Thu, 18 Sep 2025 23:27:41 -0500
Subject: [PATCH 116/203] Allow newer Sphinx version and fix docbuild warnings
 (#3571)

---
 docs/source/conf.py           | 2 --
 openmc/deplete/abc.py         | 9 +++++----
 openmc/deplete/integrators.py | 1 -
 openmc/mgxs/mgxs.py           | 5 +++--
 openmc/plots.py               | 6 ++++--
 pyproject.toml                | 4 ++--
 6 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/docs/source/conf.py b/docs/source/conf.py
index 8aeff5cdc..826c20022 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -121,9 +121,7 @@ pygments_style = 'tango'
 # -- Options for HTML output ---------------------------------------------------
 
 # The theme to use for HTML and HTML Help pages
-import sphinx_rtd_theme
 html_theme = 'sphinx_rtd_theme'
-html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
 html_baseurl = "https://docs.openmc.org/en/stable/"
 
 html_logo = '_images/openmc_logo.png'
diff --git a/openmc/deplete/abc.py b/openmc/deplete/abc.py
index e6d4c1512..c5a6219c7 100644
--- a/openmc/deplete/abc.py
+++ b/openmc/deplete/abc.py
@@ -12,6 +12,7 @@ from copy import deepcopy
 from inspect import signature
 from numbers import Real, Integral
 from pathlib import Path
+from textwrap import dedent
 import time
 from typing import Optional, Union, Sequence
 from warnings import warn
@@ -526,7 +527,7 @@ class Integrator(ABC):
     r"""Abstract class for solving the time-integration for depletion
     """
 
-    _params = r"""
+    _params = dedent(r"""
     Parameters
     ----------
     operator : openmc.deplete.abc.TransportOperator
@@ -617,7 +618,7 @@ class Integrator(ABC):
 
         .. versionadded:: 0.15.3
 
-    """
+    """)
 
     def __init__(
             self,
@@ -1020,7 +1021,7 @@ class SIIntegrator(Integrator):
     the number of particles used in initial transport calculation
     """
 
-    _params = r"""
+    _params = dedent(r"""
     Parameters
     ----------
     operator : openmc.deplete.abc.TransportOperator
@@ -1108,7 +1109,7 @@ class SIIntegrator(Integrator):
 
         .. versionadded:: 0.12
 
-    """
+    """)
 
     def __init__(
             self,
diff --git a/openmc/deplete/integrators.py b/openmc/deplete/integrators.py
index 000cb2c41..7c543a6cb 100644
--- a/openmc/deplete/integrators.py
+++ b/openmc/deplete/integrators.py
@@ -22,7 +22,6 @@ class PredictorIntegrator(Integrator):
 
     .. math::
         \mathbf{n}_{i+1} = \exp\left(h\mathbf{A}(\mathbf{n}_i) \right) \mathbf{n}_i
-
     """
     _num_stages = 1
 
diff --git a/openmc/mgxs/mgxs.py b/openmc/mgxs/mgxs.py
index 1bc7f9387..b8f2b8d3f 100644
--- a/openmc/mgxs/mgxs.py
+++ b/openmc/mgxs/mgxs.py
@@ -2,6 +2,7 @@ import copy
 from numbers import Integral
 import os
 import warnings
+from textwrap import dedent
 
 import h5py
 import numpy as np
@@ -164,7 +165,7 @@ class MGXS:
 
     """
 
-    _params = """
+    _params = dedent("""
     Parameters
     ----------
     domain : openmc.Material or openmc.Cell or openmc.Universe or openmc.RegularMesh
@@ -251,7 +252,7 @@ class MGXS:
 
         .. versionadded:: 0.13.1
 
-    """
+    """)
 
     # Store whether or not the number density should be removed for microscopic
     # values of this data
diff --git a/openmc/plots.py b/openmc/plots.py
index 072a9a319..e9130f0be 100644
--- a/openmc/plots.py
+++ b/openmc/plots.py
@@ -1,6 +1,7 @@
 from collections.abc import Iterable, Mapping
 from numbers import Integral, Real
 from pathlib import Path
+from textwrap import dedent
 
 import h5py
 import lxml.etree as ET
@@ -167,7 +168,8 @@ _SVG_COLORS = {
     'yellowgreen': (154, 205, 50)
 }
 
-_PLOT_PARAMS = """
+_PLOT_PARAMS = dedent("""\
+
         Parameters
         ----------
         origin : iterable of float
@@ -249,7 +251,7 @@ _PLOT_PARAMS = """
         -------
         matplotlib.axes.Axes
             Axes containing resulting image
-"""
+""")
 
 
 # Decorator for consistently adding plot parameters to docstrings (Model.plot,
diff --git a/pyproject.toml b/pyproject.toml
index 6e8ed798e..7705de8da 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -41,12 +41,12 @@ dependencies = [
 [project.optional-dependencies]
 depletion-mpi = ["mpi4py"]
 docs = [
-    "sphinx==5.0.2",
+    "sphinx",
     "sphinxcontrib-katex",
     "sphinx-numfig",
     "jupyter",
     "sphinxcontrib-svg2pdfconverter",
-    "sphinx-rtd-theme==1.0.0"
+    "sphinx-rtd-theme"
 ]
 test = ["packaging", "pytest", "pytest-cov", "colorama", "openpyxl"]
 ci = ["cpp-coveralls", "coveralls"]

From ecb0a3361f600594984b72ce37e33cd7650497b6 Mon Sep 17 00:00:00 2001
From: Ilham Variansyah <variansi@oregonstate.edu>
Date: Fri, 19 Sep 2025 15:10:08 +0700
Subject: [PATCH 117/203] Combing for fission site sampling, and delayed
 neutron emission time (#2992)

Co-authored-by: Gavin Ridley <gavin.keith.ridley@gmail.com>
Co-authored-by: Paul Romano <paul.k.romano@gmail.com>
---
 docs/source/methods/neutron_physics.rst       |   19 +-
 examples/pincell_pulsed/run_pulse.py          |  101 +
 include/openmc/settings.h                     |    1 +
 openmc/settings.py                            |   27 +
 src/eigenvalue.cpp                            |  106 +-
 src/finalize.cpp                              |    1 +
 src/physics.cpp                               |   20 +-
 src/physics_mg.cpp                            |   20 +-
 src/settings.cpp                              |    6 +
 src/tallies/tally_scoring.cpp                 |    3 +-
 .../adj_cell_rotation/results_true.dat        |    2 +-
 .../albedo_box/results_true.dat               |    2 +-
 .../asymmetric_lattice/results_true.dat       |    2 +-
 .../cmfd_feed/results_true.dat                |  612 +--
 .../cmfd_feed_2g/results_true.dat             |  538 +--
 .../results_true.dat                          |  562 +--
 .../cmfd_feed_ng/results_true.dat             |  680 ++--
 .../cmfd_feed_rectlin/results_true.dat        |  778 ++--
 .../cmfd_feed_ref_d/results_true.dat          |  562 +--
 .../cmfd_feed_rolling_window/results_true.dat |  562 +--
 .../cmfd_nofeed/results_true.dat              |  610 +--
 .../cmfd_restart/results_true.dat             |  612 +--
 .../complex_cell/results_true.dat             |   16 +-
 .../confidence_intervals/results_true.dat     |    6 +-
 .../cpp_driver/results_true.dat               |   22 +-
 .../dagmc/external/results_true.dat           |    6 +-
 .../dagmc/legacy/results_true.dat             |    6 +-
 .../dagmc/refl/results_true.dat               |    6 +-
 .../dagmc/universes/inputs_true.dat           |    8 +
 .../dagmc/universes/results_true.dat          |   18 +-
 .../regression_tests/dagmc/universes/test.py  |  134 +-
 .../regression_tests/density/results_true.dat |    2 +-
 .../test_reference_coupled_days.h5            |  Bin 36048 -> 36048 bytes
 .../test_reference_coupled_hours.h5           |  Bin 36048 -> 36048 bytes
 .../test_reference_coupled_minutes.h5         |  Bin 36048 -> 36048 bytes
 .../test_reference_coupled_months.h5          |  Bin 36048 -> 36048 bytes
 .../test_reference_fission_q.h5               |  Bin 36048 -> 36048 bytes
 .../test_reference_source_rate.h5             |  Bin 36048 -> 36048 bytes
 .../ref_depletion_with_ext_source.h5          |  Bin 37328 -> 37328 bytes
 .../ref_depletion_with_feed.h5                |  Bin 37328 -> 37328 bytes
 .../ref_depletion_with_removal.h5             |  Bin 37328 -> 37328 bytes
 .../ref_depletion_with_transfer.h5            |  Bin 37328 -> 37328 bytes
 .../ref_no_depletion_only_feed.h5             |  Bin 37328 -> 37328 bytes
 .../ref_no_depletion_only_removal.h5          |  Bin 37328 -> 37328 bytes
 .../ref_no_depletion_with_ext_source.h5       |  Bin 37328 -> 37328 bytes
 .../ref_no_depletion_with_transfer.h5         |  Bin 37328 -> 37328 bytes
 .../deplete_with_transfer_rates/test.py       |    3 +-
 .../last_step_reference_materials.xml         | 1280 +++----
 .../deplete_with_transport/test_reference.h5  |  Bin 163736 -> 163736 bytes
 .../diff_tally/results_true.dat               |  220 +-
 .../distribmat/results_true.dat               |    2 +-
 .../eigenvalue_genperbatch/results_true.dat   |    6 +-
 .../eigenvalue_no_inactive/results_true.dat   |    2 +-
 .../energy_grid/results_true.dat              |    2 +-
 .../energy_laws/results_true.dat              |    2 +-
 .../regression_tests/entropy/results_true.dat |   20 +-
 .../filter_cellfrom/results_true.dat          |   62 +-
 .../filter_cellinstance/results_true.dat      |  162 +-
 .../case-3/results_true.dat                   |    2 +-
 .../case-4/results_true.dat                   |    6 +-
 .../filter_energyfun/results_true.dat         |   10 +-
 .../filter_mesh/results_true.dat              |    2 +-
 .../filter_musurface/results_true.dat         |   10 +-
 .../filter_translations/results_true.dat      |  674 ++--
 tests/regression_tests/ifp/results_true.dat   |   14 +-
 .../infinite_cell/results_true.dat            |    2 +-
 .../iso_in_lab/results_true.dat               |    2 +-
 .../regression_tests/lattice/results_true.dat |    2 +-
 .../lattice_distribmat/False/results_true.dat |    2 +-
 .../lattice_distribmat/True/results_true.dat  |    2 +-
 .../lattice_distribrho/results_true.dat       |    2 +-
 .../lattice_hex/results_true.dat              |    2 +-
 .../lattice_hex_coincident/results_true.dat   |    2 +-
 .../lattice_hex_x/results_true.dat            |    2 +-
 .../lattice_multiple/results_true.dat         |    2 +-
 .../lattice_rotated/results_true.dat          |    2 +-
 .../mg_basic/results_true.dat                 |    2 +-
 .../mg_basic_delayed/results_true.dat         |    2 +-
 .../mg_convert/results_true.dat               |   24 +-
 tests/regression_tests/mg_convert/test.py     |    6 +-
 .../mg_legendre/results_true.dat              |    2 +-
 .../mg_max_order/results_true.dat             |    2 +-
 .../mg_survival_biasing/results_true.dat      |    2 +-
 .../mg_tallies/results_true.dat               | 2482 ++++++------
 .../mg_temperature/results_true.dat           |   20 +-
 .../mg_temperature_multi/results_true.dat     |   10 +-
 .../mgxs_library_ce_to_mg/results_true.dat    |    2 +-
 .../results_true.dat                          |    2 +-
 .../mgxs_library_condense/results_true.dat    |  572 +--
 .../mgxs_library_correction/results_true.dat  |   72 +-
 .../mgxs_library_distribcell/results_true.dat |  142 +-
 .../mgxs_library_hdf5/results_true.dat        |  266 +-
 .../mgxs_library_histogram/results_true.dat   |  660 ++--
 .../mgxs_library_mesh/results_true.dat        |  548 +--
 .../mgxs_library_no_nuclides/results_true.dat |  782 ++--
 .../mgxs_library_nuclides/results_true.dat    |    2 +-
 .../results_true.dat                          |    2 +-
 .../test_reference_materials_direct.csv       |    8 +-
 .../microxs/test_reference_materials_flux.csv |    8 +-
 .../microxs/test_reference_mesh_direct.csv    |    8 +-
 .../microxs/test_reference_mesh_flux.csv      |    8 +-
 .../multipole/results_true.dat                |   54 +-
 .../regression_tests/output/results_true.dat  |    2 +-
 .../particle_restart_eigval/results_true.dat  |   10 +-
 .../particle_restart_eigval/settings.xml      |    2 +-
 .../particle_restart_eigval/test.py           |    2 +-
 .../periodic/results_true.dat                 |    2 +-
 .../periodic_6fold/results_true.dat           |    2 +-
 .../periodic_hex/results_true.dat             |    2 +-
 .../results_true.dat                          |   58 +-
 .../ptables_off/results_true.dat              |    2 +-
 .../quadric_surfaces/results_true.dat         |    2 +-
 .../results_true.dat                          |    2 +-
 .../infinite_medium/results_true.dat          |    2 +-
 .../material_wise/results_true.dat            |    2 +-
 .../stochastic_slab/results_true.dat          |    2 +-
 .../results_true.dat                          |    2 +-
 .../linear/results_true.dat                   |    4 +-
 .../flat/results_true.dat                     |    6 +-
 .../linear_xy/results_true.dat                |   14 +-
 .../results_true.dat                          |   10 +-
 .../random_ray_k_eff/results_true.dat         |   14 +-
 .../random_ray_k_eff_mesh/results_true.dat    |   18 +-
 .../random_ray_linear/linear/results_true.dat |    6 +-
 .../hybrid/results_true.dat                   |    4 +-
 .../reflective_plane/results_true.dat         |    2 +-
 .../resonance_scattering/results_true.dat     |    2 +-
 .../rotation/results_true.dat                 |    2 +-
 .../salphabeta/results_true.dat               |    2 +-
 .../score_current/results_true.dat            | 3366 ++++++++---------
 tests/regression_tests/seed/results_true.dat  |    2 +-
 .../regression_tests/source/results_true.dat  |    2 +-
 .../source_file/results_true.dat              |    2 +-
 .../source_mcpl_file/results_true.dat         |    2 +-
 .../sourcepoint_batch/results_true.dat        |    4 +-
 .../sourcepoint_latest/results_true.dat       |    2 +-
 .../sourcepoint_restart/results_true.dat      | 1578 ++++----
 .../statepoint_batch/__init__.py              |    0
 .../statepoint_batch/geometry.xml             |    8 -
 .../statepoint_batch/materials.xml            |    9 -
 .../statepoint_batch/results_true.dat         |    2 -
 .../statepoint_batch/settings.xml             |   17 -
 .../regression_tests/statepoint_batch/test.py |   18 -
 .../statepoint_restart/results_true.dat       | 2306 +++++------
 .../statepoint_sourcesep/results_true.dat     |    2 +-
 .../regression_tests/stride/results_true.dat  |    2 +-
 .../surface_source/surface_source_true.h5     |  Bin 106144 -> 106144 bytes
 .../surface_source/surface_source_true.mcpl   |  Bin 36071 -> 36120 bytes
 .../case-01/results_true.dat                  |    2 +-
 .../case-01/surface_source_true.h5            |  Bin 33344 -> 33344 bytes
 .../case-02/results_true.dat                  |    2 +-
 .../case-02/surface_source_true.h5            |  Bin 12752 -> 13896 bytes
 .../case-03/results_true.dat                  |    2 +-
 .../case-03/surface_source_true.h5            |  Bin 33344 -> 33344 bytes
 .../case-04/results_true.dat                  |    2 +-
 .../case-04/surface_source_true.h5            |  Bin 33344 -> 33344 bytes
 .../case-05/results_true.dat                  |    2 +-
 .../case-05/surface_source_true.h5            |  Bin 33344 -> 33344 bytes
 .../case-06/results_true.dat                  |    2 +-
 .../case-06/surface_source_true.h5            |  Bin 33344 -> 33344 bytes
 .../case-07/results_true.dat                  |    2 +-
 .../case-07/surface_source_true.h5            |  Bin 33344 -> 33344 bytes
 .../case-08/results_true.dat                  |    2 +-
 .../case-08/surface_source_true.h5            |  Bin 33344 -> 33344 bytes
 .../case-09/results_true.dat                  |    2 +-
 .../case-09/surface_source_true.h5            |  Bin 33344 -> 33344 bytes
 .../case-10/results_true.dat                  |    2 +-
 .../case-10/surface_source_true.h5            |  Bin 33344 -> 33344 bytes
 .../case-11/results_true.dat                  |    2 +-
 .../case-11/surface_source_true.h5            |  Bin 6408 -> 5160 bytes
 .../case-12/results_true.dat                  |    2 +-
 .../case-12/surface_source_true.h5            |  Bin 33344 -> 33344 bytes
 .../case-13/results_true.dat                  |    2 +-
 .../case-13/surface_source_true.h5            |  Bin 33344 -> 33344 bytes
 .../case-14/results_true.dat                  |    2 +-
 .../case-14/surface_source_true.h5            |  Bin 33344 -> 33344 bytes
 .../case-15/results_true.dat                  |    2 +-
 .../case-15/surface_source_true.h5            |  Bin 2144 -> 2144 bytes
 .../case-16/results_true.dat                  |    2 +-
 .../case-16/surface_source_true.h5            |  Bin 33344 -> 33344 bytes
 .../case-17/results_true.dat                  |    2 +-
 .../case-17/surface_source_true.h5            |  Bin 2144 -> 2144 bytes
 .../case-18/results_true.dat                  |    2 +-
 .../case-18/surface_source_true.h5            |  Bin 2144 -> 2144 bytes
 .../case-19/results_true.dat                  |    2 +-
 .../case-19/surface_source_true.h5            |  Bin 2144 -> 2144 bytes
 .../case-20/results_true.dat                  |    2 +-
 .../case-20/surface_source_true.h5            |  Bin 33344 -> 33344 bytes
 .../case-21/results_true.dat                  |    2 +-
 .../case-21/surface_source_true.h5            |  Bin 2144 -> 2144 bytes
 .../case-a01/results_true.dat                 |    2 +-
 .../case-a01/surface_source_true.h5           |  Bin 6616 -> 6720 bytes
 .../case-d01/results_true.dat                 |    2 +-
 .../case-d01/surface_source_true.h5           |  Bin 33344 -> 33344 bytes
 .../case-d02/results_true.dat                 |    2 +-
 .../case-d02/surface_source_true.h5           |  Bin 31472 -> 33344 bytes
 .../case-d03/results_true.dat                 |    2 +-
 .../case-d03/surface_source_true.h5           |  Bin 33344 -> 33344 bytes
 .../case-d04/results_true.dat                 |    2 +-
 .../case-d04/surface_source_true.h5           |  Bin 31472 -> 33344 bytes
 .../case-d05/results_true.dat                 |    2 +-
 .../case-d05/surface_source_true.h5           |  Bin 33344 -> 33344 bytes
 .../case-d06/results_true.dat                 |    2 +-
 .../case-d06/surface_source_true.h5           |  Bin 29496 -> 30744 bytes
 .../case-d07/results_true.dat                 |    2 +-
 .../case-d07/surface_source_true.h5           |  Bin 33344 -> 33344 bytes
 .../case-d08/results_true.dat                 |    2 +-
 .../case-d08/surface_source_true.h5           |  Bin 33344 -> 33344 bytes
 .../case-e01/results_true.dat                 |    2 +-
 .../case-e01/surface_source_true.h5           |  Bin 33344 -> 33344 bytes
 .../case-e02/results_true.dat                 |    2 +-
 .../case-e02/surface_source_true.h5           |  Bin 33344 -> 33344 bytes
 .../case-e03/results_true.dat                 |    2 +-
 .../case-e03/surface_source_true.h5           |  Bin 33344 -> 33344 bytes
 .../surface_tally/results_true.dat            |   82 +-
 .../survival_biasing/results_true.dat         |   34 +-
 .../regression_tests/tallies/results_true.dat |    2 +-
 .../tally_aggregation/results_true.dat        |  194 +-
 .../tally_arithmetic/results_true.dat         |   98 +-
 .../tally_assumesep/results_true.dat          |   14 +-
 .../tally_nuclides/results_true.dat           |   50 +-
 .../tally_slice_merge/results_true.dat        |  104 +-
 tests/regression_tests/torus/results_true.dat |    2 +-
 tests/regression_tests/trace/results_true.dat |    2 +-
 .../track_output/results_true.dat             |  144 +-
 .../translation/results_true.dat              |    2 +-
 .../trigger_batch_interval/results_true.dat   |   50 +-
 .../results_true.dat                          |   50 +-
 .../trigger_no_status/results_true.dat        |   50 +-
 .../inputs_true.dat                           |    2 +-
 .../results_true.dat                          |    6 +-
 .../trigger_statepoint_restart/test.py        |   10 +-
 .../trigger_tallies/results_true.dat          |   50 +-
 tests/regression_tests/triso/results_true.dat |    2 +-
 .../uniform_fs/results_true.dat               |    2 +-
 .../universe/results_true.dat                 |    2 +-
 .../white_plane/results_true.dat              |    2 +-
 tests/unit_tests/test_deplete_resultslist.py  |   20 +-
 tests/unit_tests/test_lib.py                  |   17 +-
 tests/unit_tests/test_settings.py             |    2 +
 tests/unit_tests/test_statepoint_batches.py   |   26 +
 241 files changed, 11472 insertions(+), 11352 deletions(-)
 create mode 100644 examples/pincell_pulsed/run_pulse.py
 delete mode 100644 tests/regression_tests/statepoint_batch/__init__.py
 delete mode 100644 tests/regression_tests/statepoint_batch/geometry.xml
 delete mode 100644 tests/regression_tests/statepoint_batch/materials.xml
 delete mode 100644 tests/regression_tests/statepoint_batch/results_true.dat
 delete mode 100644 tests/regression_tests/statepoint_batch/settings.xml
 delete mode 100644 tests/regression_tests/statepoint_batch/test.py
 create mode 100644 tests/unit_tests/test_statepoint_batches.py

diff --git a/docs/source/methods/neutron_physics.rst b/docs/source/methods/neutron_physics.rst
index fe8b8ad85..2b797e3db 100644
--- a/docs/source/methods/neutron_physics.rst
+++ b/docs/source/methods/neutron_physics.rst
@@ -290,7 +290,10 @@ 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. The total number of neutrons emitted
+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
 :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
@@ -306,8 +309,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 calculated the delayed
+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
 neutron fraction
 
 .. math::
@@ -335,8 +338,14 @@ 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 since they
-each have an associated secondary energy distribution.
+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}.
 
 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
diff --git a/examples/pincell_pulsed/run_pulse.py b/examples/pincell_pulsed/run_pulse.py
new file mode 100644
index 000000000..b6a61ad3d
--- /dev/null
+++ b/examples/pincell_pulsed/run_pulse.py
@@ -0,0 +1,101 @@
+import matplotlib.pyplot as plt
+import numpy as np
+import openmc
+
+###############################################################################
+# Create materials for the problem
+
+uo2 = openmc.Material(name="UO2 fuel at 2.4% wt enrichment")
+uo2.set_density("g/cm3", 10.29769)
+uo2.add_element("U", 1.0, enrichment=2.4)
+uo2.add_element("O", 2.0)
+
+helium = openmc.Material(name="Helium for gap")
+helium.set_density("g/cm3", 0.001598)
+helium.add_element("He", 2.4044e-4)
+
+zircaloy = openmc.Material(name="Zircaloy 4")
+zircaloy.set_density("g/cm3", 6.55)
+zircaloy.add_element("Sn", 0.014, "wo")
+zircaloy.add_element("Fe", 0.00165, "wo")
+zircaloy.add_element("Cr", 0.001, "wo")
+zircaloy.add_element("Zr", 0.98335, "wo")
+
+borated_water = openmc.Material(name="Borated water")
+borated_water.set_density("g/cm3", 0.740582)
+borated_water.add_element("B", 2.0e-4)  # 3x the original pincell
+borated_water.add_element("H", 5.0e-2)
+borated_water.add_element("O", 2.4e-2)
+borated_water.add_s_alpha_beta("c_H_in_H2O")
+
+###############################################################################
+# Define problem geometry
+
+# Create cylindrical surfaces
+fuel_or = openmc.ZCylinder(r=0.39218, name="Fuel OR")
+clad_ir = openmc.ZCylinder(r=0.40005, name="Clad IR")
+clad_or = openmc.ZCylinder(r=0.45720, name="Clad OR")
+
+# Create a region represented as the inside of a rectangular prism
+pitch = 1.25984
+box = openmc.model.RectangularPrism(pitch, pitch, boundary_type="reflective")
+
+# Create cells, mapping materials to regions
+fuel = openmc.Cell(fill=uo2, region=-fuel_or)
+gap = openmc.Cell(fill=helium, region=+fuel_or & -clad_ir)
+clad = openmc.Cell(fill=zircaloy, region=+clad_ir & -clad_or)
+water = openmc.Cell(fill=borated_water, region=+clad_or & -box)
+
+# Create a model and assign geometry
+model = openmc.Model()
+model.geometry = openmc.Geometry([fuel, gap, clad, water])
+
+###############################################################################
+# Define problem settings
+
+# Set the mode
+model.settings.run_mode = "fixed source"
+
+# Indicate how many batches and particles to run
+model.settings.batches = 10
+model.settings.particles = 10000
+
+# Set time cutoff (we only care about t < 100 seconds, see tally below)
+model.settings.cutoff = {"time_neutron": 100}
+
+# Create the neutron pulse source (by default, isotropic direction, t=0)
+space = openmc.stats.Point()  # At the origin (0, 0, 0)
+energy = openmc.stats.delta_function(14.1e6)  # At 14.1 MeV
+model.settings.source = openmc.IndependentSource(space=space, energy=energy)
+
+###############################################################################
+# Define tallies
+
+# Create time filter
+t_grid = np.insert(np.logspace(-6, 2, 100), 0, 0.0)
+time_filter = openmc.TimeFilter(t_grid)
+
+# Tally for total neutron density in time
+density_tally = openmc.Tally(name="Density")
+density_tally.filters = [time_filter]
+density_tally.scores = ["inverse-velocity"]
+
+# Add tallies to model
+model.tallies = openmc.Tallies([density_tally])
+
+
+# Run the model
+model.run(apply_tally_results=True)
+
+# Bin-averaged result
+density_mean = density_tally.mean.ravel() / np.diff(t_grid)
+
+# Plot particle density versus time
+fig, ax = plt.subplots()
+ax.stairs(density_mean, t_grid)
+ax.set_xscale("log")
+ax.set_yscale("log")
+ax.set_xlabel("Time [s]")
+ax.set_ylabel("Total density")
+ax.grid()
+plt.show()
diff --git a/include/openmc/settings.h b/include/openmc/settings.h
index 069d94c3b..999b1b83f 100644
--- a/include/openmc/settings.h
+++ b/include/openmc/settings.h
@@ -150,6 +150,7 @@ 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
diff --git a/openmc/settings.py b/openmc/settings.py
index ce3743ff5..7bbc31c19 100644
--- a/openmc/settings.py
+++ b/openmc/settings.py
@@ -128,6 +128,10 @@ 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).
 
@@ -431,6 +435,7 @@ class Settings:
         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 = {}
@@ -1137,6 +1142,16 @@ class Settings:
         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
@@ -1673,6 +1688,11 @@ class Settings:
             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")
@@ -2073,6 +2093,11 @@ class Settings:
         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:
@@ -2194,6 +2219,7 @@ class Settings:
         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)
@@ -2302,6 +2328,7 @@ class Settings:
         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)
diff --git a/src/eigenvalue.cpp b/src/eigenvalue.cpp
index 2685bbe98..a2120a006 100644
--- a/src/eigenvalue.cpp
+++ b/src/eigenvalue.cpp
@@ -127,30 +127,8 @@ 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;
@@ -165,33 +143,38 @@ void synchronize_bank()
       temp_delayed_groups, temp_lifetimes, 3 * simulation::work_per_rank);
   }
 
-  for (int64_t i = 0; i < simulation::fission_bank.size(); i++) {
-    const auto& site = simulation::fission_bank[i];
+  // ==========================================================================
+  // SAMPLE N_PARTICLES FROM FISSION BANK AND PLACE IN TEMP_SITES
 
-    // 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;
-      }
-    }
+  // We use Uniform Combing method to exactly get the targeted particle size
+  // [https://doi.org/10.1080/00295639.2022.2091906]
 
-    // 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;
+  // 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);
+
+  // 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]);
     }
+    ++index_temp;
+
+    // Next tooth
+    tooth += teeth_distance;
   }
 
   // At this point, the sampling of source sites is done and now we need to
@@ -217,37 +200,6 @@ 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();
 
diff --git a/src/finalize.cpp b/src/finalize.cpp
index e38b0b251..25b471a8b 100644
--- a/src/finalize.cpp
+++ b/src/finalize.cpp
@@ -92,6 +92,7 @@ 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;
diff --git a/src/physics.cpp b/src/physics.cpp
index 8ad1b99d7..f667fd586 100644
--- a/src/physics.cpp
+++ b/src/physics.cpp
@@ -115,7 +115,7 @@ void sample_neutron_reaction(Particle& p)
 
       // Make sure particle population doesn't grow out of control for
       // subcritical multiplication problems.
-      if (p.secondary_bank().size() >= 10000) {
+      if (p.secondary_bank().size() >= settings::max_secondaries) {
         fatal_error(
           "The secondary particle bank appears to be growing without "
           "bound. You are likely running a subcritical multiplication problem "
@@ -210,13 +210,23 @@ void create_fission_sites(Particle& p, int i_nuclide, const Reaction& rx)
     site.particle = ParticleType::neutron;
     site.time = p.time();
     site.wgt = 1. / weight;
-    site.parent_id = p.id();
-    site.progeny_id = p.n_progeny()++;
     site.surf_id = 0;
 
     // Sample delayed group and angle/energy for fission reaction
     sample_fission_neutron(i_nuclide, rx, &site, p);
 
+    // Reject site if it exceeds time cutoff
+    if (site.delayed_group > 0) {
+      double t_cutoff = settings::time_cutoff[static_cast<int>(site.particle)];
+      if (site.time > t_cutoff) {
+        continue;
+      }
+    }
+
+    // Set parent and progeny IDs
+    site.parent_id = p.id();
+    site.progeny_id = p.n_progeny()++;
+
     // Store fission site in bank
     if (use_fission_bank) {
       int64_t idx = simulation::fission_bank.thread_safe_append(site);
@@ -1069,6 +1079,10 @@ void sample_fission_neutron(
     // set the delayed group for the particle born from fission
     site->delayed_group = group;
 
+    // Sample time of emission based on decay constant of precursor
+    double decay_rate = rx.products_[site->delayed_group].decay_rate_;
+    site->time -= std::log(prn(p.current_seed())) / decay_rate;
+
   } else {
     // ====================================================================
     // PROMPT NEUTRON SAMPLED
diff --git a/src/physics_mg.cpp b/src/physics_mg.cpp
index 5ebef9c14..4c28cb179 100644
--- a/src/physics_mg.cpp
+++ b/src/physics_mg.cpp
@@ -139,8 +139,6 @@ void create_fission_sites(Particle& p)
     site.particle = ParticleType::neutron;
     site.time = p.time();
     site.wgt = 1. / weight;
-    site.parent_id = p.id();
-    site.progeny_id = p.n_progeny()++;
 
     // Sample the cosine of the angle, assuming fission neutrons are emitted
     // isotropically
@@ -165,6 +163,24 @@ void create_fission_sites(Particle& p)
     // of the code, 0 is prompt.
     site.delayed_group = dg + 1;
 
+    // If delayed product production, sample time of emission
+    if (dg != -1) {
+      auto& macro_xs = data::mg.macro_xs_[p.material()];
+      double decay_rate =
+        macro_xs.get_xs(MgxsType::DECAY_RATE, 0, nullptr, nullptr, &dg, 0, 0);
+      site.time -= std::log(prn(p.current_seed())) / decay_rate;
+
+      // Reject site if it exceeds time cutoff
+      double t_cutoff = settings::time_cutoff[static_cast<int>(site.particle)];
+      if (site.time > t_cutoff) {
+        continue;
+      }
+    }
+
+    // Set parent and progeny ID
+    site.parent_id = p.id();
+    site.progeny_id = p.n_progeny()++;
+
     // Store fission site in bank
     if (use_fission_bank) {
       int64_t idx = simulation::fission_bank.thread_safe_append(site);
diff --git a/src/settings.cpp b/src/settings.cpp
index afa42a3c5..03d42bb9d 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -114,6 +114,7 @@ int max_order {0};
 int n_log_bins {8000};
 int n_batches;
 int n_max_batches;
+int max_secondaries {10000};
 int max_history_splits {10'000'000};
 int max_tracks {1000};
 ResScatMethod res_scat_method {ResScatMethod::rvs};
@@ -1144,6 +1145,11 @@ void read_settings_xml(pugi::xml_node root)
     weight_windows_on = get_node_value_bool(root, "weight_windows_on");
   }
 
+  if (check_for_node(root, "max_secondaries")) {
+    settings::max_secondaries =
+      std::stoi(get_node_value(root, "max_secondaries"));
+  }
+
   if (check_for_node(root, "max_history_splits")) {
     settings::max_history_splits =
       std::stoi(get_node_value(root, "max_history_splits"));
diff --git a/src/tallies/tally_scoring.cpp b/src/tallies/tally_scoring.cpp
index f078a5c6e..0df80a239 100644
--- a/src/tallies/tally_scoring.cpp
+++ b/src/tallies/tally_scoring.cpp
@@ -1624,8 +1624,7 @@ void score_general_mg(Particle& p, int i_tally, int start_index,
       tally.estimator_ == TallyEstimator::COLLISION) {
     if (settings::survival_biasing) {
       // Determine weight that was absorbed
-      wgt_absorb = p.wgt_last() * p.neutron_xs(p.event_nuclide()).absorption /
-                   p.neutron_xs(p.event_nuclide()).total;
+      wgt_absorb = p.wgt_last() * p.macro_xs().absorption / p.macro_xs().total;
 
       // Then we either are alive and had a scatter (and so g changed),
       // or are dead and g did not change
diff --git a/tests/regression_tests/adj_cell_rotation/results_true.dat b/tests/regression_tests/adj_cell_rotation/results_true.dat
index b3df12e71..ddb1546b5 100644
--- a/tests/regression_tests/adj_cell_rotation/results_true.dat
+++ b/tests/regression_tests/adj_cell_rotation/results_true.dat
@@ -1,2 +1,2 @@
 k-combined:
-4.403987E-01 1.514158E-03
+4.368327E-01 1.953533E-03
diff --git a/tests/regression_tests/albedo_box/results_true.dat b/tests/regression_tests/albedo_box/results_true.dat
index 0f571f245..dca80abcd 100644
--- a/tests/regression_tests/albedo_box/results_true.dat
+++ b/tests/regression_tests/albedo_box/results_true.dat
@@ -1,2 +1,2 @@
 k-combined:
-1.590800E+00 4.251788E-03
+1.593206E+00 2.925742E-03
diff --git a/tests/regression_tests/asymmetric_lattice/results_true.dat b/tests/regression_tests/asymmetric_lattice/results_true.dat
index 741327d80..3d6b610a6 100644
--- a/tests/regression_tests/asymmetric_lattice/results_true.dat
+++ b/tests/regression_tests/asymmetric_lattice/results_true.dat
@@ -1 +1 @@
-b0ca1fb0436732188b1a199b3250ca9a33782f8fc379b0f7ff9c582e0c794b0a0470df063cafd0b05e802b26f61eaaf9ff5c0a8a672a933246acf49eed3ebf9f
\ No newline at end of file
+cc76769636be4f681137598cf366e978d7347425a1dfa1b293d17a28381b2b62595fb7f0d2f126dd06972ff9e79089a18dd53aba45fa2b1f316515b91fe6495a
\ No newline at end of file
diff --git a/tests/regression_tests/cmfd_feed/results_true.dat b/tests/regression_tests/cmfd_feed/results_true.dat
index f5f22d9ac..1ef9624d4 100644
--- a/tests/regression_tests/cmfd_feed/results_true.dat
+++ b/tests/regression_tests/cmfd_feed/results_true.dat
@@ -1,117 +1,117 @@
 k-combined:
-1.164262E+00 9.207592E-03
+1.181723E+00 9.944883E-03
 tally 1:
-1.156972E+01
-1.339924E+01
-2.136306E+01
-4.567185E+01
-2.859527E+01
-8.195821E+01
-3.470754E+01
-1.207851E+02
-3.766403E+01
-1.422263E+02
-3.778821E+01
-1.432660E+02
-3.573197E+01
-1.278854E+02
-2.849979E+01
-8.135515E+01
-2.073803E+01
-4.303374E+01
-1.112117E+01
-1.242944E+01
+1.169899E+01
+1.373251E+01
+2.142380E+01
+4.605511E+01
+2.968085E+01
+8.838716E+01
+3.561418E+01
+1.271206E+02
+3.777783E+01
+1.428817E+02
+3.805832E+01
+1.450213E+02
+3.439836E+01
+1.184892E+02
+2.852438E+01
+8.161896E+01
+2.088423E+01
+4.376204E+01
+1.076670E+01
+1.168108E+01
 tally 2:
-2.388054E+01
-2.875255E+01
-1.667791E+01
-1.403426E+01
-4.224771E+01
-8.942109E+01
-2.993088E+01
-4.490335E+01
-5.689839E+01
-1.625557E+02
-4.043633E+01
-8.212299E+01
-6.764024E+01
-2.297126E+02
-4.807902E+01
-1.161468E+02
-7.314835E+01
-2.684645E+02
-5.203584E+01
-1.359261E+02
-7.375727E+01
-2.733105E+02
-5.252944E+01
-1.386205E+02
-6.909571E+01
-2.397721E+02
-4.922548E+01
-1.217465E+02
-5.685978E+01
-1.621746E+02
-4.051938E+01
-8.237277E+01
-4.185562E+01
-8.784067E+01
-2.983570E+01
-4.467414E+01
-2.238373E+01
-2.520356E+01
-1.566758E+01
-1.234103E+01
+2.321241E+01
+2.702156E+01
+1.620912E+01
+1.317752E+01
+4.197404E+01
+8.845008E+01
+2.982666E+01
+4.469221E+01
+5.810089E+01
+1.695857E+02
+4.134123E+01
+8.588866E+01
+6.982488E+01
+2.447068E+02
+4.966939E+01
+1.238763E+02
+7.428421E+01
+2.767613E+02
+5.287955E+01
+1.403163E+02
+7.447402E+01
+2.785012E+02
+5.324628E+01
+1.423393E+02
+6.895164E+01
+2.381937E+02
+4.916366E+01
+1.211701E+02
+5.679253E+01
+1.617881E+02
+4.043125E+01
+8.204061E+01
+4.218618E+01
+8.933666E+01
+2.978592E+01
+4.456592E+01
+2.196426E+01
+2.435867E+01
+1.525576E+01
+1.175879E+01
 tally 3:
-1.609520E+01
-1.307542E+01
-1.033429E+00
-5.510889E-02
-2.877073E+01
-4.149542E+01
-1.964219E+00
-1.954692E-01
-3.896816E+01
-7.629752E+01
-2.484053E+00
-3.103733E-01
-4.634285E+01
-1.079367E+02
-2.974750E+00
-4.468223E-01
-5.007964E+01
-1.259202E+02
-3.181802E+00
-5.103621E-01
-5.058915E+01
-1.286193E+02
-3.249442E+00
-5.337712E-01
-4.744464E+01
-1.131026E+02
-3.067644E+00
-4.736335E-01
-3.900632E+01
-7.634433E+01
-2.443552E+00
-3.028060E-01
-2.874166E+01
-4.146375E+01
-1.810421E+00
-1.671667E-01
-1.509222E+01
-1.145579E+01
-1.014919E+00
-5.391053E-02
+1.563788E+01
+1.226528E+01
+1.053289E+00
+5.666942E-02
+2.870755E+01
+4.139654E+01
+1.838017E+00
+1.710528E-01
+3.978616E+01
+7.955764E+01
+2.560657E+00
+3.334449E-01
+4.780385E+01
+1.147770E+02
+3.139243E+00
+4.967628E-01
+5.106650E+01
+1.308704E+02
+3.170056E+00
+5.078920E-01
+5.123992E+01
+1.318586E+02
+3.211706E+00
+5.205979E-01
+4.729862E+01
+1.121695E+02
+3.068662E+00
+4.749488E-01
+3.898816E+01
+7.630564E+01
+2.516911E+00
+3.199696E-01
+2.865357E+01
+4.125742E+01
+1.852314E+00
+1.741116E-01
+1.467340E+01
+1.088460E+01
+9.268633E-01
+4.450662E-02
 tally 4:
-3.148231E+00
-4.974555E-01
+3.029754E+00
+4.613561E-01
 0.000000E+00
 0.000000E+00
-2.805439E+00
-3.982239E-01
-5.574031E+00
-1.561105E+00
+2.832501E+00
+4.049252E-01
+5.517243E+00
+1.527794E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -128,14 +128,14 @@ tally 4:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-5.574031E+00
-1.561105E+00
-2.805439E+00
-3.982239E-01
-5.171038E+00
-1.344877E+00
-7.372031E+00
-2.725420E+00
+5.517243E+00
+1.527794E+00
+2.832501E+00
+4.049252E-01
+5.117178E+00
+1.316972E+00
+7.333303E+00
+2.701677E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -152,14 +152,14 @@ tally 4:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-7.372031E+00
-2.725420E+00
-5.171038E+00
-1.344877E+00
-6.946847E+00
-2.424850E+00
-8.496610E+00
-3.627542E+00
+7.333303E+00
+2.701677E+00
+5.117178E+00
+1.316972E+00
+7.248464E+00
+2.641591E+00
+8.817788E+00
+3.905530E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -176,14 +176,14 @@ tally 4:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-8.496610E+00
-3.627542E+00
-6.946847E+00
-2.424850E+00
-8.479501E+00
-3.607280E+00
-9.261869E+00
-4.305912E+00
+8.817788E+00
+3.905530E+00
+7.248464E+00
+2.641591E+00
+8.646465E+00
+3.749847E+00
+9.460948E+00
+4.495388E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -200,14 +200,14 @@ tally 4:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-9.261869E+00
-4.305912E+00
-8.479501E+00
-3.607280E+00
-9.232858E+00
-4.278432E+00
-9.306384E+00
-4.348594E+00
+9.460948E+00
+4.495388E+00
+8.646465E+00
+3.749847E+00
+9.379341E+00
+4.415049E+00
+9.278640E+00
+4.320720E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -224,14 +224,14 @@ tally 4:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-9.306384E+00
-4.348594E+00
-9.232858E+00
-4.278432E+00
-9.299764E+00
-4.347828E+00
-8.511976E+00
-3.639893E+00
+9.278640E+00
+4.320720E+00
+9.379341E+00
+4.415049E+00
+9.465746E+00
+4.498591E+00
+8.656146E+00
+3.760545E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -248,14 +248,14 @@ tally 4:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-8.511976E+00
-3.639893E+00
-9.299764E+00
-4.347828E+00
-8.726086E+00
-3.819567E+00
-7.147277E+00
-2.562747E+00
+8.656146E+00
+3.760545E+00
+9.465746E+00
+4.498591E+00
+8.589782E+00
+3.700308E+00
+6.996002E+00
+2.456935E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -272,14 +272,14 @@ tally 4:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-7.147277E+00
-2.562747E+00
-8.726086E+00
-3.819567E+00
-7.218790E+00
-2.612243E+00
-5.018287E+00
-1.263077E+00
+6.996002E+00
+2.456935E+00
+8.589782E+00
+3.700308E+00
+7.352050E+00
+2.714808E+00
+5.105164E+00
+1.312559E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -296,14 +296,14 @@ tally 4:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-5.018287E+00
-1.263077E+00
-7.218790E+00
-2.612243E+00
-5.443494E+00
-1.487018E+00
-2.732334E+00
-3.773047E-01
+5.105164E+00
+1.312559E+00
+7.352050E+00
+2.714808E+00
+5.442756E+00
+1.486776E+00
+2.697305E+00
+3.675580E-01
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -320,12 +320,12 @@ tally 4:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-2.732334E+00
-3.773047E-01
-5.443494E+00
-1.487018E+00
-3.044773E+00
-4.655756E-01
+2.697305E+00
+3.675580E-01
+5.442756E+00
+1.486776E+00
+3.017025E+00
+4.571443E-01
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -345,144 +345,144 @@ tally 4:
 0.000000E+00
 0.000000E+00
 tally 5:
-1.609029E+01
-1.306718E+01
-2.230601E+00
-2.559496E-01
-2.876780E+01
-4.148686E+01
-3.835952E+00
-7.456562E-01
-3.895738E+01
-7.625344E+01
-4.841024E+00
-1.197335E+00
-4.633595E+01
-1.079043E+02
-6.236821E+00
-1.963311E+00
-5.007472E+01
-1.258967E+02
-6.749745E+00
-2.297130E+00
-5.058336E+01
-1.285894E+02
-6.727612E+00
-2.315656E+00
-4.743869E+01
-1.130735E+02
-6.338193E+00
-2.042159E+00
-3.899838E+01
-7.631289E+01
-5.187573E+00
-1.359733E+00
-2.873434E+01
-4.144233E+01
-3.815610E+00
-7.367619E-01
-1.509020E+01
-1.145268E+01
-2.125767E+00
-2.341894E-01
+1.563588E+01
+1.226217E+01
+2.209027E+00
+2.507131E-01
+2.870034E+01
+4.137550E+01
+3.726620E+00
+7.021948E-01
+3.977762E+01
+7.952285E+01
+5.304975E+00
+1.427333E+00
+4.779747E+01
+1.147456E+02
+6.528302E+00
+2.151715E+00
+5.105366E+01
+1.308037E+02
+6.986782E+00
+2.467487E+00
+5.123380E+01
+1.318264E+02
+6.845633E+00
+2.383542E+00
+4.729296E+01
+1.121433E+02
+6.252695E+00
+1.977351E+00
+3.898236E+01
+7.628315E+01
+5.461495E+00
+1.528579E+00
+2.864576E+01
+4.123538E+01
+3.857301E+00
+7.581323E-01
+1.467047E+01
+1.088031E+01
+2.277024E+00
+2.679801E-01
 cmfd indices
 1.000000E+01
 1.000000E+00
 1.000000E+00
 1.000000E+00
 k cmfd
-1.129918E+00
-1.143848E+00
-1.147976E+00
-1.151534E+00
-1.152378E+00
-1.148219E+00
-1.150402E+00
-1.154647E+00
-1.156159E+00
-1.160048E+00
-1.167441E+00
-1.168163E+00
-1.168629E+00
-1.164120E+00
-1.165051E+00
-1.169177E+00
+1.169107E+00
+1.175079E+00
+1.173912E+00
+1.175368E+00
+1.174026E+00
+1.181745E+00
+1.182261E+00
+1.183559E+00
+1.178691E+00
+1.179222E+00
+1.179017E+00
+1.172979E+00
+1.175043E+00
+1.173458E+00
+1.174152E+00
+1.171451E+00
 cmfd entropy
-3.224769E+00
-3.225945E+00
-3.227421E+00
-3.226174E+00
-3.224429E+00
-3.227049E+00
-3.230710E+00
-3.230315E+00
-3.226825E+00
-3.226655E+00
-3.226588E+00
-3.224155E+00
-3.223246E+00
-3.222640E+00
-3.223920E+00
-3.222838E+00
+3.207640E+00
+3.210547E+00
+3.212218E+00
+3.209573E+00
+3.211619E+00
+3.212126E+00
+3.213163E+00
+3.214288E+00
+3.215737E+00
+3.213677E+00
+3.214925E+00
+3.215612E+00
+3.216708E+00
+3.221454E+00
+3.219048E+00
+3.218387E+00
 cmfd balance
-3.90454E-03
-4.08089E-03
-3.46511E-03
-4.09535E-03
-2.62009E-03
-2.23559E-03
-2.54033E-03
-2.12799E-03
-2.25864E-03
-1.85766E-03
-1.49916E-03
-1.63471E-03
-1.48377E-03
-1.59800E-03
-1.37354E-03
-1.32853E-03
+4.88208E-03
+4.75139E-03
+3.15783E-03
+3.67091E-03
+2.99797E-03
+2.91060E-03
+2.06576E-03
+1.83482E-03
+1.56292E-03
+1.58659E-03
+2.32986E-03
+1.47376E-03
+1.46673E-03
+1.22627E-03
+1.31963E-03
+1.26456E-03
 cmfd dominance ratio
-5.539E-01
-5.537E-01
-5.536E-01
-5.515E-01
-5.512E-01
-5.514E-01
-5.518E-01
-5.507E-01
-5.500E-01
-5.497E-01
-5.477E-01
-5.461E-01
-5.444E-01
-5.445E-01
-5.454E-01
+5.467E-01
+5.453E-01
+5.458E-01
+5.436E-01
+5.442E-01
+5.406E-01
+5.401E-01
+5.413E-01
+4.995E-01
+5.396E-01
+5.409E-01
+5.414E-01
+5.423E-01
+5.456E-01
+5.442E-01
 5.441E-01
 cmfd openmc source comparison
-9.875240E-03
-1.106163E-02
-9.847628E-03
-6.065921E-03
-5.772039E-03
-4.615656E-03
-4.244331E-03
-3.694299E-03
-3.545814E-03
-3.213063E-03
-3.467537E-03
-3.383489E-03
-3.697591E-03
-3.937358E-03
-3.369124E-03
-3.190359E-03
+9.587418E-03
+8.150978E-03
+6.677661E-03
+6.334727E-03
+5.153692E-03
+5.082964E-03
+4.633153E-03
+4.037383E-03
+3.528742E-03
+4.559089E-03
+3.517370E-03
+3.306117E-03
+2.913809E-03
+1.906045E-03
+1.932794E-03
+1.711341E-03
 cmfd source
-4.360494E-02
-8.397599E-02
-1.074181E-01
-1.294531E-01
-1.385611E-01
-1.407934E-01
-1.325191E-01
-1.044311E-01
-7.660359E-02
-4.263941E-02
+4.496492E-02
+7.869674E-02
+1.100280E-01
+1.354045E-01
+1.363339E-01
+1.380533E-01
+1.314512E-01
+1.077480E-01
+7.847306E-02
+3.884630E-02
diff --git a/tests/regression_tests/cmfd_feed_2g/results_true.dat b/tests/regression_tests/cmfd_feed_2g/results_true.dat
index 2b61d9f4e..e66eae13c 100644
--- a/tests/regression_tests/cmfd_feed_2g/results_true.dat
+++ b/tests/regression_tests/cmfd_feed_2g/results_true.dat
@@ -1,112 +1,112 @@
 k-combined:
-1.035567E+00 9.463160E-03
+1.027434E+00 6.509170E-03
 tally 1:
-1.146535E+02
-1.315267E+03
-1.157458E+02
-1.340166E+03
-1.140491E+02
-1.301364E+03
-1.146589E+02
-1.315433E+03
+1.162758E+02
+1.352562E+03
+1.138125E+02
+1.295815E+03
+1.143712E+02
+1.308316E+03
+1.150293E+02
+1.323834E+03
 tally 2:
-4.319968E+01
-9.360083E+01
-6.373035E+01
-2.038056E+02
-1.889646E+02
-1.812892E+03
-1.024866E+02
-5.254528E+02
-4.323262E+01
-9.360200E+01
-6.363111E+01
-2.028178E+02
-1.849746E+02
-1.711533E+03
-1.034532E+02
-5.352768E+02
-4.296541E+01
-9.249656E+01
-6.346919E+01
-2.018659E+02
-1.888697E+02
-1.812037E+03
-1.025707E+02
-5.262261E+02
-4.691085E+01
-1.269707E+02
-6.299377E+01
-1.990497E+02
-1.853864E+02
-1.719984E+03
-1.023015E+02
-5.235858E+02
+4.284580E+01
+9.207089E+01
+6.335165E+01
+2.014931E+02
+1.894187E+02
+1.818190E+03
+1.033212E+02
+5.340768E+02
+4.282771E+01
+9.186295E+01
+6.295029E+01
+1.983895E+02
+1.834276E+02
+1.684375E+03
+1.022482E+02
+5.228403E+02
+4.330690E+01
+9.402038E+01
+6.395965E+01
+2.053163E+02
+1.851113E+02
+1.714198E+03
+1.030809E+02
+5.314535E+02
+4.337097E+01
+9.426435E+01
+6.417590E+01
+2.063443E+02
+1.846817E+02
+1.706518E+03
+1.027233E+02
+5.279582E+02
 tally 3:
-6.034963E+01
-1.827718E+02
+5.992726E+01
+1.803120E+02
 0.000000E+00
 0.000000E+00
-1.865665E-02
-4.244195E-05
-4.170941E+00
-8.769372E-01
-3.453368E+00
-5.989168E-01
+2.172646E-02
+4.414237E-05
+4.181401E+00
+8.912796E-01
+3.536506E+00
+6.287425E-01
 0.000000E+00
 0.000000E+00
-9.743205E+01
-4.749420E+02
-8.570316E-01
-3.807993E-02
-6.005903E+01
-1.807233E+02
+9.824432E+01
+4.828691E+02
+9.116848E-01
+4.231247E-02
+5.955090E+01
+1.775522E+02
 0.000000E+00
 0.000000E+00
-1.885450E-02
-3.653402E-05
-4.323863E+00
-9.447512E-01
-3.465465E+00
-6.022861E-01
+1.893222E-02
+3.288000E-05
+4.048183E+00
+8.291130E-01
+3.384041E+00
+5.742363E-01
 0.000000E+00
 0.000000E+00
-9.843481E+01
-4.846158E+02
-9.048150E-01
-4.205551E-02
-5.996660E+01
-1.802150E+02
+9.734253E+01
+4.738861E+02
+9.157632E-01
+4.329280E-02
+6.045835E+01
+1.835255E+02
 0.000000E+00
 0.000000E+00
-1.221444E-02
-2.263445E-05
-4.301287E+00
-9.309882E-01
-3.456076E+00
-5.992144E-01
+1.501842E-02
+1.896931E-05
+4.289989E+00
+9.251538E-01
+3.481357E+00
+6.071667E-01
 0.000000E+00
 0.000000E+00
-9.761231E+01
-4.765834E+02
-8.434644E-01
-3.728180E-02
-5.961891E+01
-1.783106E+02
+9.799829E+01
+4.803591E+02
+8.899390E-01
+4.078750E-02
+6.064531E+01
+1.842746E+02
 0.000000E+00
 0.000000E+00
-1.500709E-02
-3.541280E-05
-4.155669E+00
-8.713442E-01
-3.455342E+00
-6.006426E-01
+1.495496E-02
+3.082640E-05
+4.321537E+00
+9.371611E-01
+3.453767E+00
+5.983727E-01
 0.000000E+00
 0.000000E+00
-9.726798E+01
-4.733393E+02
-9.202611E-01
-4.390503E-02
+9.771776E+01
+4.777781E+02
+8.975444E-01
+4.157471E-02
 tally 4:
 0.000000E+00
 0.000000E+00
@@ -116,14 +116,14 @@ tally 4:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-8.943264E+00
-4.008855E+00
-3.661063E+01
-6.704808E+01
-8.945553E+00
-4.011707E+00
-3.696832E+01
-6.835286E+01
+8.840487E+00
+3.915792E+00
+3.700362E+01
+6.851588E+01
+8.756789E+00
+3.844443E+00
+3.672366E+01
+6.747174E+01
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -132,14 +132,14 @@ tally 4:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-8.844569E+00
-3.924591E+00
-3.666726E+01
-6.726522E+01
-8.769637E+00
-3.855006E+00
-3.654115E+01
-6.680777E+01
+8.860460E+00
+3.940908E+00
+3.704658E+01
+6.864069E+01
+8.832046E+00
+3.916611E+00
+3.736239E+01
+6.982147E+01
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -156,14 +156,14 @@ tally 4:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-8.945553E+00
-4.011707E+00
-3.696832E+01
-6.835286E+01
-8.943264E+00
-4.008855E+00
-3.661063E+01
-6.704808E+01
+8.756789E+00
+3.844443E+00
+3.672366E+01
+6.747174E+01
+8.840487E+00
+3.915792E+00
+3.700362E+01
+6.851588E+01
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -180,14 +180,14 @@ tally 4:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-8.648474E+00
-3.752219E+00
-3.689442E+01
-6.808997E+01
-8.757378E+00
-3.850408E+00
-3.716920E+01
-6.909715E+01
+8.892576E+00
+3.964978E+00
+3.703525E+01
+6.860645E+01
+8.824229E+00
+3.906925E+00
+3.685909E+01
+6.796123E+01
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -212,22 +212,22 @@ tally 4:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-8.783669E+00
-3.870748E+00
-3.687358E+01
-6.802581E+01
-8.755250E+00
-3.846298E+00
-3.660278E+01
-6.704349E+01
-8.769637E+00
-3.855006E+00
-3.654115E+01
-6.680777E+01
-8.844569E+00
-3.924591E+00
-3.666726E+01
-6.726522E+01
+9.050876E+00
+4.111409E+00
+3.656082E+01
+6.687580E+01
+9.042402E+00
+4.105842E+00
+3.687247E+01
+6.801050E+01
+8.832046E+00
+3.916611E+00
+3.736239E+01
+6.982147E+01
+8.860460E+00
+3.940908E+00
+3.704658E+01
+6.864069E+01
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -252,14 +252,14 @@ tally 4:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-8.755250E+00
-3.846298E+00
-3.660278E+01
-6.704349E+01
-8.783669E+00
-3.870748E+00
-3.687358E+01
-6.802581E+01
+9.042402E+00
+4.105842E+00
+3.687247E+01
+6.801050E+01
+9.050876E+00
+4.111409E+00
+3.656082E+01
+6.687580E+01
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -268,14 +268,14 @@ tally 4:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-8.757378E+00
-3.850408E+00
-3.716920E+01
-6.909715E+01
-8.648474E+00
-3.752219E+00
-3.689442E+01
-6.808997E+01
+8.824229E+00
+3.906925E+00
+3.685909E+01
+6.796123E+01
+8.892576E+00
+3.964978E+00
+3.703525E+01
+6.860645E+01
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -301,133 +301,133 @@ tally 4:
 0.000000E+00
 0.000000E+00
 tally 5:
-6.036829E+01
-1.828885E+02
-1.008777E+02
-5.091033E+02
-1.353211E+01
-9.188155E+00
-4.618716E+01
-1.067410E+02
-6.007789E+01
-1.808371E+02
-1.018892E+02
-5.192269E+02
-1.357961E+01
-9.247052E+00
-4.618560E+01
-1.067058E+02
-5.997882E+01
-1.802895E+02
-1.010597E+02
-5.108478E+02
-1.374955E+01
-9.502494E+00
-4.619500E+01
-1.067547E+02
-5.963392E+01
-1.783999E+02
-1.007134E+02
-5.074700E+02
-1.319398E+01
-8.734106E+00
-4.586295E+01
-1.052870E+02
+5.994898E+01
+1.804403E+02
+1.017670E+02
+5.181130E+02
+1.354160E+01
+9.220935E+00
+4.648971E+01
+1.081636E+02
+5.956983E+01
+1.776668E+02
+1.007226E+02
+5.073592E+02
+1.347883E+01
+9.120344E+00
+4.609907E+01
+1.063127E+02
+6.047337E+01
+1.836168E+02
+1.014777E+02
+5.150557E+02
+1.390508E+01
+9.722899E+00
+4.629251E+01
+1.072027E+02
+6.066027E+01
+1.843661E+02
+1.011648E+02
+5.120629E+02
+1.365982E+01
+9.372236E+00
+4.602994E+01
+1.060579E+02
 cmfd indices
 2.000000E+00
 2.000000E+00
 1.000000E+00
 2.000000E+00
 k cmfd
-1.018115E+00
-1.022665E+00
-1.020323E+00
-1.020653E+00
-1.021036E+00
-1.020623E+00
-1.021482E+00
-1.025450E+00
-1.027292E+00
-1.028065E+00
-1.027065E+00
-1.024275E+00
-1.025309E+00
-1.026039E+00
-1.026700E+00
-1.023865E+00
+1.013488E+00
+1.024396E+00
+1.015533E+00
+1.009319E+00
+1.012726E+00
+1.014831E+00
+1.021757E+00
+1.022002E+00
+1.023619E+00
+1.020953E+00
+1.023910E+00
+1.027657E+00
+1.024501E+00
+1.023838E+00
+1.025464E+00
+1.022802E+00
 cmfd entropy
-1.998965E+00
-1.999214E+00
-1.999348E+00
-1.999366E+00
-1.999564E+00
-1.999453E+00
-1.999533E+00
-1.999630E+00
-1.999739E+00
-1.999588E+00
-1.999581E+00
-1.999719E+00
-1.999773E+00
-1.999764E+00
-1.999821E+00
-1.999843E+00
+1.998974E+00
+1.998742E+00
+1.999128E+00
+1.998952E+00
+1.998951E+00
+1.999439E+00
+1.999626E+00
+1.999826E+00
+1.999513E+00
+1.999451E+00
+1.999514E+00
+1.999590E+00
+1.999563E+00
+1.999604E+00
+1.999742E+00
+1.999736E+00
 cmfd balance
-5.73174E-04
-7.55398E-04
-1.46671E-03
-6.39625E-04
-8.19008E-04
-1.93449E-03
-1.15900E-03
-1.01690E-03
-5.62788E-04
-6.90450E-04
-6.01060E-04
-5.73418E-04
-4.37190E-04
-4.82966E-04
-4.09700E-04
-3.45096E-04
+9.79896E-04
+4.24873E-04
+8.05696E-04
+1.92071E-03
+3.70731E-04
+2.81424E-04
+8.28991E-04
+6.12217E-04
+5.29185E-04
+4.97799E-04
+3.09154E-04
+1.73703E-04
+2.56689E-04
+2.64938E-04
+1.96305E-04
+1.82702E-04
 cmfd dominance ratio
-6.264E-03
-6.142E-03
-5.987E-03
-6.082E-03
-5.895E-03
-5.939E-03
-5.910E-03
-5.948E-03
-6.013E-03
-6.017E-03
-6.024E-03
-6.008E-03
-5.976E-03
-5.987E-03
-5.967E-03
-5.929E-03
+6.304E-03
+6.246E-03
+6.159E-03
+6.249E-03
+6.101E-03
+6.155E-03
+6.010E-03
+6.177E-03
+6.349E-03
+6.241E-03
+6.244E-03
+6.249E-03
+6.270E-03
+6.272E-03
+6.278E-03
+6.290E-03
 cmfd openmc source comparison
-4.832872E-05
-6.552342E-05
-7.516800E-05
-7.916087E-05
-9.022260E-05
-8.574478E-05
-7.891622E-05
-7.281636E-05
-7.750571E-05
-6.565408E-05
-6.078665E-05
-5.834343E-05
-4.758176E-05
-5.723990E-05
-4.994116E-05
-4.116808E-05
+4.046094E-05
+5.979431E-05
+3.836521E-05
+4.577591E-05
+5.012911E-05
+2.114677E-05
+2.074571E-05
+3.042280E-05
+2.408163E-05
+2.434542E-05
+1.190699E-05
+9.499301E-06
+2.354221E-05
+2.937924E-05
+1.889875E-05
+1.913866E-05
 cmfd source
-2.455663E-01
-2.553511E-01
-2.512257E-01
-2.478570E-01
+2.489706E-01
+2.426801E-01
+2.532142E-01
+2.551351E-01
 0.000000E+00
 0.000000E+00
 0.000000E+00
diff --git a/tests/regression_tests/cmfd_feed_expanding_window/results_true.dat b/tests/regression_tests/cmfd_feed_expanding_window/results_true.dat
index 8fd8cdbb8..b39f82f96 100644
--- a/tests/regression_tests/cmfd_feed_expanding_window/results_true.dat
+++ b/tests/regression_tests/cmfd_feed_expanding_window/results_true.dat
@@ -1,117 +1,117 @@
 k-combined:
-1.167865E+00 7.492213E-03
+1.170835E+00 5.423480E-03
 tally 1:
-1.146860E+01
-1.318884E+01
-2.161527E+01
-4.685283E+01
-2.951158E+01
-8.733566E+01
-3.521610E+01
-1.242821E+02
-3.774236E+01
-1.426501E+02
-3.727918E+01
-1.391158E+02
-3.377176E+01
-1.143839E+02
-2.904497E+01
-8.452907E+01
-2.090871E+01
-4.384549E+01
-1.078642E+01
-1.168086E+01
+1.205100E+01
+1.456707E+01
+2.183882E+01
+4.781179E+01
+2.844010E+01
+8.102358E+01
+3.356334E+01
+1.130832E+02
+3.660829E+01
+1.344973E+02
+3.697740E+01
+1.371500E+02
+3.400119E+01
+1.160196E+02
+2.839868E+01
+8.083199E+01
+2.140398E+01
+4.615447E+01
+1.118179E+01
+1.262942E+01
 tally 2:
-1.136810E+00
-1.292338E+00
-7.987303E-01
-6.379700E-01
-2.266938E+00
-5.139009E+00
-1.613483E+00
-2.603328E+00
-3.046349E+00
-9.280239E+00
-2.182459E+00
-4.763126E+00
-3.568068E+00
-1.273111E+01
-2.532456E+00
-6.413333E+00
-3.989504E+00
-1.591614E+01
-2.848301E+00
-8.112818E+00
-3.853133E+00
-1.484663E+01
-2.718493E+00
-7.390202E+00
-3.478138E+00
-1.209745E+01
-2.467281E+00
-6.087476E+00
-2.952220E+00
-8.715605E+00
-2.103261E+00
-4.423706E+00
-1.917459E+00
-3.676649E+00
-1.378369E+00
-1.899902E+00
-1.048240E+00
-1.098807E+00
-7.511947E-01
-5.642934E-01
+1.218245E+00
+1.484121E+00
+8.387442E-01
+7.034918E-01
+2.142134E+00
+4.588738E+00
+1.526727E+00
+2.330895E+00
+2.736157E+00
+7.486556E+00
+1.973921E+00
+3.896363E+00
+3.606244E+00
+1.300500E+01
+2.537580E+00
+6.439313E+00
+3.668958E+00
+1.346126E+01
+2.599095E+00
+6.755294E+00
+3.647982E+00
+1.330777E+01
+2.539750E+00
+6.450332E+00
+3.118921E+00
+9.727669E+00
+2.186447E+00
+4.780549E+00
+2.881110E+00
+8.300795E+00
+2.042635E+00
+4.172360E+00
+2.045602E+00
+4.184486E+00
+1.458384E+00
+2.126884E+00
+1.022124E+00
+1.044738E+00
+7.112678E-01
+5.059018E-01
 tally 3:
-7.701233E-01
-5.930898E-01
-4.481585E-02
-2.008461E-03
-1.547307E+00
-2.394158E+00
-1.226539E-01
-1.504398E-02
-2.106373E+00
-4.436806E+00
-1.450618E-01
-2.104294E-02
-2.437654E+00
-5.942157E+00
-1.521380E-01
-2.314598E-02
-2.754639E+00
-7.588038E+00
-1.745460E-01
-3.046629E-02
-2.623852E+00
-6.884601E+00
-1.851602E-01
-3.428432E-02
-2.376886E+00
-5.649588E+00
-1.615729E-01
-2.610582E-02
-2.021856E+00
-4.087900E+00
-1.533174E-01
-2.350622E-02
-1.333190E+00
-1.777397E+00
-7.076188E-02
-5.007243E-03
-7.258527E-01
-5.268622E-01
-3.656030E-02
-1.336656E-03
+8.048428E-01
+6.477720E-01
+6.603741E-02
+4.360940E-03
+1.466886E+00
+2.151755E+00
+1.002354E-01
+1.004713E-02
+1.909238E+00
+3.645189E+00
+1.202824E-01
+1.446786E-02
+2.443130E+00
+5.968886E+00
+1.627351E-01
+2.648270E-02
+2.492602E+00
+6.213064E+00
+1.910368E-01
+3.649506E-02
+2.437262E+00
+5.940245E+00
+1.568389E-01
+2.459843E-02
+2.104091E+00
+4.427200E+00
+1.450465E-01
+2.103848E-02
+1.965900E+00
+3.864762E+00
+1.367918E-01
+1.871199E-02
+1.402871E+00
+1.968047E+00
+1.061316E-01
+1.126391E-02
+6.832689E-01
+4.668565E-01
+4.599034E-02
+2.115112E-03
 tally 4:
-1.667432E-01
-2.780328E-02
+1.497312E-01
+2.241943E-02
 0.000000E+00
 0.000000E+00
-1.292567E-01
-1.670730E-02
-2.813370E-01
-7.915052E-02
+1.535839E-01
+2.358801E-02
+2.882052E-01
+8.306225E-02
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -128,14 +128,14 @@ tally 4:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-2.813370E-01
-7.915052E-02
-1.292567E-01
-1.670730E-02
-2.670549E-01
-7.131835E-02
-4.055324E-01
-1.644566E-01
+2.882052E-01
+8.306225E-02
+1.535839E-01
+2.358801E-02
+2.526805E-01
+6.384743E-02
+3.616220E-01
+1.307705E-01
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -152,14 +152,14 @@ tally 4:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-4.055324E-01
-1.644566E-01
-2.670549E-01
-7.131835E-02
-3.848125E-01
-1.480807E-01
-4.809430E-01
-2.313062E-01
+3.616220E-01
+1.307705E-01
+2.526805E-01
+6.384743E-02
+3.594306E-01
+1.291904E-01
+4.229730E-01
+1.789062E-01
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -176,14 +176,14 @@ tally 4:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-4.809430E-01
-2.313062E-01
-3.848125E-01
-1.480807E-01
-4.543918E-01
-2.064719E-01
-5.106133E-01
-2.607260E-01
+4.229730E-01
+1.789062E-01
+3.594306E-01
+1.291904E-01
+3.973299E-01
+1.578711E-01
+4.255879E-01
+1.811250E-01
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -200,14 +200,14 @@ tally 4:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-5.106133E-01
-2.607260E-01
-4.543918E-01
-2.064719E-01
-4.543120E-01
-2.063994E-01
-4.626328E-01
-2.140291E-01
+4.255879E-01
+1.811250E-01
+3.973299E-01
+1.578711E-01
+4.633933E-01
+2.147333E-01
+4.672837E-01
+2.183540E-01
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -224,14 +224,14 @@ tally 4:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-4.626328E-01
-2.140291E-01
-4.543120E-01
-2.063994E-01
-4.827759E-01
-2.330726E-01
-4.442622E-01
-1.973689E-01
+4.672837E-01
+2.183540E-01
+4.633933E-01
+2.147333E-01
+4.251073E-01
+1.807162E-01
+3.842922E-01
+1.476805E-01
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -248,14 +248,14 @@ tally 4:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-4.442622E-01
-1.973689E-01
-4.827759E-01
-2.330726E-01
-4.630420E-01
-2.144079E-01
-3.886524E-01
-1.510507E-01
+3.842922E-01
+1.476805E-01
+4.251073E-01
+1.807162E-01
+4.045096E-01
+1.636280E-01
+3.192860E-01
+1.019436E-01
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -272,14 +272,14 @@ tally 4:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-3.886524E-01
-1.510507E-01
-4.630420E-01
-2.144079E-01
-3.535870E-01
-1.250237E-01
-2.530312E-01
-6.402478E-02
+3.192860E-01
+1.019436E-01
+4.045096E-01
+1.636280E-01
+3.738326E-01
+1.397508E-01
+2.598153E-01
+6.750398E-02
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -296,14 +296,14 @@ tally 4:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-2.530312E-01
-6.402478E-02
-3.535870E-01
-1.250237E-01
-2.465524E-01
-6.078808E-02
-1.197152E-01
-1.433173E-02
+2.598153E-01
+6.750398E-02
+3.738326E-01
+1.397508E-01
+2.453191E-01
+6.018146E-02
+1.098964E-01
+1.207721E-02
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -320,12 +320,12 @@ tally 4:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-1.197152E-01
-1.433173E-02
-2.465524E-01
-6.078808E-02
-1.369631E-01
-1.875888E-02
+1.098964E-01
+1.207721E-02
+2.453191E-01
+6.018146E-02
+1.458094E-01
+2.126039E-02
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -345,119 +345,119 @@ tally 4:
 0.000000E+00
 0.000000E+00
 tally 5:
-7.701233E-01
-5.930898E-01
-1.386250E-01
-1.921688E-02
-1.547307E+00
-2.394158E+00
-2.630277E-01
-6.918357E-02
-2.106373E+00
-4.436806E+00
-2.807880E-01
-7.884187E-02
-2.435849E+00
-5.933361E+00
-3.322060E-01
-1.103608E-01
-2.753634E+00
-7.582501E+00
-3.825922E-01
-1.463768E-01
-2.623852E+00
-6.884601E+00
-3.888710E-01
-1.512206E-01
-2.376886E+00
-5.649588E+00
-3.196217E-01
-1.021581E-01
-2.021856E+00
-4.087900E+00
-2.897881E-01
-8.397715E-02
-1.333190E+00
-1.777397E+00
-1.627110E-01
-2.647486E-02
-7.258527E-01
-5.268622E-01
-9.348666E-02
-8.739755E-03
+8.048428E-01
+6.477720E-01
+1.018934E-01
+1.038226E-02
+1.466886E+00
+2.151755E+00
+1.414681E-01
+2.001322E-02
+1.909238E+00
+3.645189E+00
+2.450211E-01
+6.003535E-02
+2.443130E+00
+5.968886E+00
+3.360056E-01
+1.128997E-01
+2.492602E+00
+6.213064E+00
+3.266277E-01
+1.066856E-01
+2.437262E+00
+5.940245E+00
+2.878100E-01
+8.283461E-02
+2.104091E+00
+4.427200E+00
+3.440457E-01
+1.183675E-01
+1.965900E+00
+3.864762E+00
+2.880615E-01
+8.297945E-02
+1.401955E+00
+1.965478E+00
+1.646479E-01
+2.710892E-02
+6.832689E-01
+4.668565E-01
+1.147413E-01
+1.316557E-02
 cmfd indices
 1.000000E+01
 1.000000E+00
 1.000000E+00
 1.000000E+00
 k cmfd
-1.149077E+00
-1.156751E+00
-1.158648E+00
-1.159506E+00
-1.156567E+00
-1.160259E+00
-1.150345E+00
-1.149846E+00
-1.151606E+00
-1.164544E+00
-1.174648E+00
+1.181376E+00
+1.176656E+00
+1.161939E+00
+1.163552E+00
+1.163035E+00
+1.170382E+00
+1.160597E+00
+1.154301E+00
+1.159007E+00
+1.148290E+00
+1.157088E+00
 cmfd entropy
-3.216173E+00
-3.228717E+00
-3.220402E+00
-3.214352E+00
-3.215636E+00
-3.213599E+00
-3.212854E+00
-3.213131E+00
-3.213196E+00
-3.205474E+00
-3.202869E+00
+3.246419E+00
+3.246511E+00
+3.252247E+00
+3.240919E+00
+3.237600E+00
+3.233990E+00
+3.234226E+00
+3.229356E+00
+3.224272E+00
+3.225381E+00
+3.226778E+00
 cmfd balance
-3.08825E-03
-1.42345E-03
-1.21253E-03
-1.17694E-03
-1.05901E-03
-9.29611E-04
-1.35587E-03
-1.13579E-03
-1.14964E-03
-1.29313E-03
-1.46566E-03
+4.18486E-03
+1.72126E-03
+1.10899E-03
+1.88170E-03
+1.31646E-03
+1.34128E-03
+1.57944E-03
+2.11251E-03
+1.79912E-03
+1.86000E-03
+1.47765E-03
 cmfd dominance ratio
 5.524E-01
-5.614E-01
-5.522E-01
-5.487E-01
-5.482E-01
-5.446E-01
-5.437E-01
-5.429E-01
-5.407E-01
-5.380E-01
-5.377E-01
+5.597E-01
+5.622E-01
+5.544E-01
+5.541E-01
+5.519E-01
+5.532E-01
+5.550E-01
+5.484E-01
+5.497E-01
+5.500E-01
 cmfd openmc source comparison
-1.586045E-02
-6.953134E-03
-6.860419E-03
-6.198467E-03
-5.142854E-03
-4.373354E-03
-5.564831E-03
-4.184765E-03
-1.867780E-03
-2.734784E-03
-2.523985E-03
+1.905464E-03
+4.145126E-03
+2.465876E-03
+2.346755E-03
+1.848120E-03
+3.263822E-03
+3.641639E-03
+4.031509E-03
+4.999010E-03
+6.640746E-03
+5.691414E-03
 cmfd source
-4.241440E-02
-8.226026E-02
-1.180811E-01
-1.328433E-01
-1.412410E-01
-1.424902E-01
-1.269340E-01
-1.096490E-01
-6.953251E-02
-3.455422E-02
+4.951338E-02
+8.478025E-02
+1.083132E-01
+1.301432E-01
+1.341190E-01
+1.445825E-01
+1.255119E-01
+1.063303E-01
+7.830158E-02
+3.840469E-02
diff --git a/tests/regression_tests/cmfd_feed_ng/results_true.dat b/tests/regression_tests/cmfd_feed_ng/results_true.dat
index 153238bfe..4ea1515f1 100644
--- a/tests/regression_tests/cmfd_feed_ng/results_true.dat
+++ b/tests/regression_tests/cmfd_feed_ng/results_true.dat
@@ -1,208 +1,208 @@
 k-combined:
-1.005987E+00 1.354263E-02
+1.008852E+00 9.028695E-03
 tally 1:
-1.140273E+02
-1.301245E+03
-1.147962E+02
-1.319049E+03
-1.151426E+02
-1.326442E+03
-1.149265E+02
-1.321518E+03
+1.151271E+02
+1.325871E+03
+1.143934E+02
+1.309051E+03
+1.142507E+02
+1.306616E+03
+1.140242E+02
+1.300786E+03
 tally 2:
-3.462748E+01
-7.542476E+01
-5.129219E+01
-1.658142E+02
-1.034704E+01
-6.730603E+00
-8.672967E+00
-4.715295E+00
-1.344669E+02
-1.132019E+03
-7.262519E+01
-3.300787E+02
-3.447358E+01
-7.459545E+01
-5.075836E+01
-1.619570E+02
-1.080516E+01
-7.366369E+00
-8.908065E+00
-4.991975E+00
-1.354224E+02
-1.146824E+03
-7.300078E+01
-3.332531E+02
-3.432298E+01
-7.388666E+01
-5.096378E+01
-1.627979E+02
-1.053664E+01
-7.029789E+00
-8.826624E+00
-4.904429E+00
-1.388389E+02
-1.207280E+03
-7.376623E+01
-3.403211E+02
-4.383841E+01
-1.943331E+02
-5.165881E+01
-1.675923E+02
-1.059646E+01
-7.048052E+00
-8.763673E+00
-4.823505E+00
-1.378179E+02
-1.188104E+03
-7.431708E+01
-3.453746E+02
+3.403617E+01
+7.260478E+01
+5.031678E+01
+1.588977E+02
+1.003700E+01
+6.373741E+00
+8.514575E+00
+4.571811E+00
+1.413036E+02
+1.264708E+03
+7.321799E+01
+3.353408E+02
+3.354839E+01
+7.052647E+01
+4.895930E+01
+1.501243E+02
+9.972495E+00
+6.271276E+00
+8.436263E+00
+4.481319E+00
+1.353506E+02
+1.146040E+03
+7.309382E+01
+3.341751E+02
+3.389861E+01
+7.205501E+01
+5.005946E+01
+1.571210E+02
+1.041650E+01
+6.810868E+00
+8.839753E+00
+4.897617E+00
+1.344145E+02
+1.130242E+03
+7.270373E+01
+3.307223E+02
+3.347928E+01
+7.040185E+01
+4.940585E+01
+1.535767E+02
+9.898649E+00
+6.175319E+00
+8.406032E+00
+4.442856E+00
+1.374544E+02
+1.182191E+03
+7.334301E+01
+3.365399E+02
 tally 3:
-4.858880E+01
-1.488705E+02
+4.755532E+01
+1.419592E+02
 0.000000E+00
 0.000000E+00
-8.148667E-03
-1.337050E-05
+1.628248E-02
+3.680742E-05
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-3.347376E+00
-7.045574E-01
-2.433484E+00
-3.727266E-01
+3.347160E+00
+7.104290E-01
+2.453669E+00
+3.797470E-01
 0.000000E+00
 0.000000E+00
-6.095478E+00
-2.332622E+00
+5.925795E+00
+2.220734E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-1.235421E-01
-1.205155E-03
-3.647699E-01
-8.953589E-03
+9.542527E-02
+1.118856E-03
+3.018759E-01
+6.371059E-03
 0.000000E+00
 0.000000E+00
-2.673965E+00
-4.517972E-01
+2.501316E+00
+3.938401E-01
 0.000000E+00
 0.000000E+00
-6.841105E+01
-2.929195E+02
-5.902473E-01
-2.307683E-02
-4.792291E+01
-1.444397E+02
+6.926265E+01
+3.001504E+02
+6.765221E-01
+2.991787E-02
+4.605523E+01
+1.328435E+02
 0.000000E+00
 0.000000E+00
-2.183275E-02
-8.061011E-05
+1.687782E-02
+3.921162E-05
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-3.435826E+00
-7.480244E-01
-2.450829E+00
-3.800327E-01
+3.481608E+00
+7.705602E-01
+2.439374E+00
+3.779705E-01
 0.000000E+00
 0.000000E+00
-6.331358E+00
-2.530492E+00
+5.855806E+00
+2.162361E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-1.012941E-01
-8.217580E-04
-2.981274E-01
-5.863186E-03
+1.016677E-01
+9.263706E-04
+3.264878E-01
+7.385168E-03
 0.000000E+00
 0.000000E+00
-2.535628E+00
-4.048310E-01
+2.519730E+00
+3.986182E-01
 0.000000E+00
 0.000000E+00
-6.912003E+01
-2.987684E+02
-5.984862E-01
-2.386115E-02
-4.822881E+01
-1.458309E+02
+6.920950E+01
+2.996184E+02
+5.985719E-01
+2.368062E-02
+4.730723E+01
+1.403550E+02
 0.000000E+00
 0.000000E+00
-1.525590E-02
-3.794082E-05
+6.800415E-03
+1.163614E-05
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-3.314494E+00
-6.944527E-01
-2.424209E+00
-3.691360E-01
+3.347607E+00
+7.085691E-01
+2.556997E+00
+4.109118E-01
 0.000000E+00
 0.000000E+00
-6.254897E+00
-2.474317E+00
+6.171063E+00
+2.391770E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-1.112542E-01
-1.051688E-03
-3.234880E-01
-7.156753E-03
+7.942016E-02
+5.628747E-04
+3.456912E-01
+7.940086E-03
 0.000000E+00
 0.000000E+00
-2.474142E+00
-3.837496E-01
+2.684459E+00
+4.546338E-01
 0.000000E+00
 0.000000E+00
-6.987095E+01
-3.053358E+02
-5.928782E-01
-2.368116E-02
-4.885415E+01
-1.499856E+02
+6.850588E+01
+2.936078E+02
+6.458806E-01
+2.672541E-02
+4.673301E+01
+1.374202E+02
 0.000000E+00
 0.000000E+00
-1.262416E-02
-2.486286E-05
+1.504681E-02
+4.202606E-05
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-3.426826E+00
-7.480396E-01
-2.487209E+00
-3.903882E-01
+3.139138E+00
+6.206027E-01
+2.341735E+00
+3.454035E-01
 0.000000E+00
 0.000000E+00
-6.127303E+00
-2.364605E+00
+5.923755E+00
+2.216341E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-9.439007E-02
-1.082564E-03
-2.963491E-01
-5.652952E-03
+7.030156E-02
+4.283974E-04
+3.247594E-01
+7.133772E-03
 0.000000E+00
 0.000000E+00
-2.620696E+00
-4.311792E-01
+2.559691E+00
+4.119674E-01
 0.000000E+00
 0.000000E+00
-7.030725E+01
-3.091241E+02
-5.986966E-01
-2.352487E-02
+6.938051E+01
+3.012078E+02
+5.159565E-01
+1.730381E-02
 tally 4:
 0.000000E+00
 0.000000E+00
@@ -216,18 +216,18 @@ tally 4:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-7.028624E+00
-3.105990E+00
-2.154648E+00
-2.948865E-01
-2.714077E+01
-4.607926E+01
-7.035506E+00
-3.118549E+00
-2.085916E+00
-2.730884E-01
-2.750091E+01
-4.731304E+01
+7.028166E+00
+3.103666E+00
+2.028371E+00
+2.606104E-01
+2.715466E+01
+4.614452E+01
+6.981028E+00
+3.059096E+00
+2.032450E+00
+2.610410E-01
+2.734281E+01
+4.675062E+01
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -240,18 +240,18 @@ tally 4:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-7.170567E+00
-3.240715E+00
-2.131758E+00
-2.862355E-01
-2.747702E+01
-4.722977E+01
-7.068817E+00
-3.139275E+00
-2.095865E+00
-2.762179E-01
-2.737835E+01
-4.688689E+01
+6.969559E+00
+3.054867E+00
+2.042871E+00
+2.624815E-01
+2.766332E+01
+4.787778E+01
+7.022610E+00
+3.098329E+00
+2.109973E+00
+2.824233E-01
+2.733826E+01
+4.676309E+01
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -276,18 +276,18 @@ tally 4:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-7.035506E+00
-3.118549E+00
-2.085916E+00
-2.730884E-01
-2.750091E+01
-4.731304E+01
-7.028624E+00
-3.105990E+00
-2.154648E+00
-2.948865E-01
-2.714077E+01
-4.607926E+01
+6.981028E+00
+3.059096E+00
+2.032450E+00
+2.610410E-01
+2.734281E+01
+4.675062E+01
+7.028166E+00
+3.103666E+00
+2.028371E+00
+2.606104E-01
+2.715466E+01
+4.614452E+01
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -312,18 +312,18 @@ tally 4:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-7.103896E+00
-3.171147E+00
-2.095666E+00
-2.756673E-01
-2.711842E+01
-4.600196E+01
-7.197270E+00
-3.255501E+00
-2.046179E+00
-2.630301E-01
-2.729901E+01
-4.662030E+01
+6.782152E+00
+2.885448E+00
+1.951138E+00
+2.400912E-01
+2.739652E+01
+4.697696E+01
+6.873220E+00
+2.965563E+00
+1.999066E+00
+2.521586E-01
+2.732700E+01
+4.670990E+01
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -360,30 +360,30 @@ tally 4:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-7.240906E+00
-3.296285E+00
-2.130816E+00
-2.850713E-01
-2.761433E+01
-4.771548E+01
-7.126427E+00
-3.199209E+00
-2.177254E+00
-2.998765E-01
-2.754936E+01
-4.748447E+01
-7.068817E+00
-3.139275E+00
-2.095865E+00
-2.762179E-01
-2.737835E+01
-4.688689E+01
-7.170567E+00
-3.240715E+00
-2.131758E+00
-2.862355E-01
-2.747702E+01
-4.722977E+01
+6.933695E+00
+3.028826E+00
+2.080336E+00
+2.719620E-01
+2.726925E+01
+4.650782E+01
+6.836291E+00
+2.935998E+00
+2.124868E+00
+2.841370E-01
+2.709685E+01
+4.591604E+01
+7.022610E+00
+3.098329E+00
+2.109973E+00
+2.824233E-01
+2.733826E+01
+4.676309E+01
+6.969559E+00
+3.054867E+00
+2.042871E+00
+2.624815E-01
+2.766332E+01
+4.787778E+01
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -420,18 +420,18 @@ tally 4:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-7.126427E+00
-3.199209E+00
-2.177254E+00
-2.998765E-01
-2.754936E+01
-4.748447E+01
-7.240906E+00
-3.296285E+00
-2.130816E+00
-2.850713E-01
-2.761433E+01
-4.771548E+01
+6.836291E+00
+2.935998E+00
+2.124868E+00
+2.841370E-01
+2.709685E+01
+4.591604E+01
+6.933695E+00
+3.028826E+00
+2.080336E+00
+2.719620E-01
+2.726925E+01
+4.650782E+01
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -444,18 +444,18 @@ tally 4:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-7.197270E+00
-3.255501E+00
-2.046179E+00
-2.630301E-01
-2.729901E+01
-4.662030E+01
-7.103896E+00
-3.171147E+00
-2.095666E+00
-2.756673E-01
-2.711842E+01
-4.600196E+01
+6.873220E+00
+2.965563E+00
+1.999066E+00
+2.521586E-01
+2.732700E+01
+4.670990E+01
+6.782152E+00
+2.885448E+00
+1.951138E+00
+2.400912E-01
+2.739652E+01
+4.697696E+01
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -493,124 +493,124 @@ tally 4:
 0.000000E+00
 0.000000E+00
 tally 5:
-4.859695E+01
-1.489217E+02
-8.528963E+00
-4.561881E+00
-7.144500E+01
-3.194467E+02
-1.120265E+01
-7.944038E+00
-4.009821E+00
-1.012575E+00
-3.235456E+01
-6.558658E+01
-4.794474E+01
-1.445671E+02
-8.782187E+00
-4.852477E+00
-7.195036E+01
-3.237389E+02
-1.075572E+01
-7.333822E+00
-4.084680E+00
-1.054714E+00
-3.267154E+01
-6.675266E+01
-4.824407E+01
-1.459220E+02
-8.679106E+00
-4.742342E+00
-7.266858E+01
-3.302641E+02
-1.094872E+01
-7.536318E+00
-3.935828E+00
-9.749543E-01
-3.319517E+01
-6.894791E+01
-4.886677E+01
-1.500624E+02
-8.614512E+00
-4.662618E+00
-7.321408E+01
-3.352172E+02
-1.095123E+01
-7.574359E+00
-3.885927E+00
-9.539315E-01
-3.334065E+01
-6.953215E+01
+4.757160E+01
+1.420561E+02
+8.379464E+00
+4.426892E+00
+7.205748E+01
+3.248178E+02
+1.047742E+01
+6.922945E+00
+3.879420E+00
+9.517577E-01
+3.297227E+01
+6.802001E+01
+4.607211E+01
+1.329402E+02
+8.295180E+00
+4.334618E+00
+7.205259E+01
+3.247324E+02
+1.059307E+01
+7.039382E+00
+3.783039E+00
+9.030658E-01
+3.288052E+01
+6.762048E+01
+4.731403E+01
+1.403940E+02
+8.728060E+00
+4.774750E+00
+7.152809E+01
+3.200993E+02
+1.074636E+01
+7.270116E+00
+4.007351E+00
+1.010562E+00
+3.249303E+01
+6.611829E+01
+4.674806E+01
+1.375015E+02
+8.265491E+00
+4.296947E+00
+7.226174E+01
+3.267127E+02
+1.079228E+01
+7.340408E+00
+3.843888E+00
+9.273339E-01
+3.300391E+01
+6.823122E+01
 cmfd indices
 2.000000E+00
 2.000000E+00
 1.000000E+00
 3.000000E+00
 k cmfd
-1.026473E+00
-1.024183E+00
-1.023151E+00
-1.025047E+00
-1.019801E+00
-1.020492E+00
-1.015249E+00
-1.016714E+00
-1.016047E+00
-1.019687E+00
-1.020955E+00
+1.011190E+00
+1.010705E+00
+1.014132E+00
+1.015900E+00
+1.019132E+00
+1.022616E+00
+1.023007E+00
+1.022300E+00
+1.014692E+00
+1.007628E+00
+1.006204E+00
 cmfd entropy
-1.999640E+00
-1.999556E+00
-1.999484E+00
-1.999718E+00
-1.999697E+00
-1.999657E+00
-1.999883E+00
-1.999902E+00
-1.999977E+00
-1.999977E+00
-1.999906E+00
+1.999167E+00
+1.999076E+00
+1.998507E+00
+1.997924E+00
+1.997814E+00
+1.997752E+00
+1.997882E+00
+1.998074E+00
+1.998109E+00
+1.998301E+00
+1.998581E+00
 cmfd balance
-8.10090E-04
-1.28103E-03
-7.97200E-04
-5.82188E-04
-7.20670E-04
-7.31475E-04
-5.71904E-04
-6.14057E-04
-6.00142E-04
-5.47870E-04
-3.53604E-04
+9.30124E-04
+2.56632E-04
+3.62598E-04
+4.17543E-04
+5.25720E-04
+4.90208E-04
+3.61304E-04
+2.24090E-04
+1.86602E-04
+1.78395E-04
+6.42497E-05
 cmfd dominance ratio
-3.977E-03
-4.018E-03
-3.950E-03
-3.866E-03
-3.840E-03
-3.888E-03
-3.867E-03
-3.896E-03
-3.924E-03
-3.885E-03
-3.913E-03
+4.194E-03
+4.234E-03
+4.149E-03
+4.209E-03
+4.185E-03
+4.197E-03
+4.175E-03
+4.105E-03
+4.056E-03
+4.122E-03
+4.113E-03
 cmfd openmc source comparison
-4.787501E-05
-4.450525E-05
-2.532345E-05
-3.844307E-05
-4.821504E-05
-4.840760E-05
-3.739246E-05
-3.957960E-05
-4.521480E-05
-4.072007E-05
-2.532636E-05
+2.078995E-05
+2.415218E-05
+3.311536E-05
+3.598613E-05
+3.156455E-05
+2.737017E-05
+2.468500E-05
+2.514215E-05
+1.601626E-05
+1.424027E-05
+4.201148E-06
 cmfd source
-2.486236E-01
-2.531628E-01
-2.460219E-01
-2.521918E-01
+2.558585E-01
+2.597562E-01
+2.529866E-01
+2.313986E-01
 0.000000E+00
 0.000000E+00
 0.000000E+00
diff --git a/tests/regression_tests/cmfd_feed_rectlin/results_true.dat b/tests/regression_tests/cmfd_feed_rectlin/results_true.dat
index 600b5d152..a98f3fbd3 100644
--- a/tests/regression_tests/cmfd_feed_rectlin/results_true.dat
+++ b/tests/regression_tests/cmfd_feed_rectlin/results_true.dat
@@ -1,149 +1,149 @@
 k-combined:
-1.160561E+00 1.029736E-02
+1.157362E+00 9.651846E-03
 tally 1:
-1.089904E+01
-1.193573E+01
-2.026534E+01
-4.113383E+01
-2.723584E+01
-7.440537E+01
-3.309956E+01
-1.101184E+02
-3.659327E+01
-1.341221E+02
-3.780158E+01
-1.430045E+02
-3.520883E+01
-1.241772E+02
-2.961801E+01
-8.784675E+01
-2.182029E+01
-4.781083E+01
-1.180347E+01
-1.399970E+01
+1.160989E+01
+1.351117E+01
+2.127132E+01
+4.540172E+01
+2.903242E+01
+8.450044E+01
+3.443549E+01
+1.188763E+02
+3.678332E+01
+1.355586E+02
+3.760088E+01
+1.418740E+02
+3.433077E+01
+1.181837E+02
+2.861986E+01
+8.231285E+01
+2.182277E+01
+4.792086E+01
+1.138713E+01
+1.304425E+01
 tally 2:
-8.794706E+00
-3.939413E+00
-6.131113E+00
-1.913116E+00
-3.265522E+01
-5.364042E+01
-2.304238E+01
-2.672742E+01
-2.250225E+01
-2.541491E+01
-1.601668E+01
-1.288405E+01
-5.525355E+01
-1.531915E+02
-3.929637E+01
-7.748545E+01
-3.222711E+01
-5.216630E+01
-2.285375E+01
-2.623641E+01
-7.051908E+01
-2.495413E+02
-5.010064E+01
-1.259701E+02
-3.728726E+01
-6.974440E+01
-2.652872E+01
-3.530919E+01
-3.747306E+01
-7.058235E+01
-2.681415E+01
-3.613314E+01
-7.296802E+01
-2.669214E+02
-5.202502E+01
-1.356733E+02
-3.333947E+01
-5.579355E+01
-2.361733E+01
-2.800800E+01
-5.785916E+01
-1.680561E+02
-4.093282E+01
-8.410711E+01
-2.377151E+01
-2.842464E+01
-1.681789E+01
-1.423646E+01
-3.422028E+01
-5.880493E+01
-2.415199E+01
-2.930240E+01
-8.890608E+00
-3.986356E+00
-6.140159E+00
-1.897764E+00
+8.861425E+00
+3.953963E+00
+6.090757E+00
+1.866235E+00
+3.309260E+01
+5.493482E+01
+2.330765E+01
+2.725350E+01
+2.295343E+01
+2.647375E+01
+1.629166E+01
+1.334081E+01
+5.714234E+01
+1.640293E+02
+4.054051E+01
+8.261123E+01
+3.331786E+01
+5.565082E+01
+2.366345E+01
+2.807637E+01
+7.034800E+01
+2.485209E+02
+5.001286E+01
+1.256087E+02
+3.651223E+01
+6.686058E+01
+2.606851E+01
+3.408881E+01
+3.729833E+01
+6.997492E+01
+2.657970E+01
+3.553107E+01
+7.212382E+01
+2.611253E+02
+5.124647E+01
+1.318756E+02
+3.304529E+01
+5.486643E+01
+2.347504E+01
+2.771353E+01
+5.711252E+01
+1.640619E+02
+4.060288E+01
+8.298231E+01
+2.384078E+01
+2.855909E+01
+1.684046E+01
+1.426180E+01
+3.329487E+01
+5.573544E+01
+2.349871E+01
+2.776487E+01
+8.676886E+00
+3.814132E+00
+5.980976E+00
+1.815143E+00
 tally 3:
-5.925339E+00
-1.788596E+00
-3.912632E-01
-8.061838E-03
-2.215544E+01
-2.471404E+01
-1.465191E+00
-1.092622E-01
-1.542988E+01
-1.195626E+01
-1.022876E+00
-5.356825E-02
-3.792029E+01
-7.218149E+01
-2.370476E+00
-2.839465E-01
-2.200154E+01
-2.432126E+01
-1.360836E+00
-9.402424E-02
-4.824980E+01
-1.168447E+02
-3.124366E+00
-4.907460E-01
-2.557420E+01
-3.282066E+01
-1.725855E+00
-1.519830E-01
-2.577963E+01
-3.341077E+01
-1.654042E+00
-1.386845E-01
-5.008220E+01
-1.257610E+02
-3.223857E+00
-5.237360E-01
-2.273380E+01
-2.595325E+01
-1.438369E+00
-1.050840E-01
-3.938822E+01
-7.789691E+01
-2.648324E+00
-3.559703E-01
-1.623604E+01
-1.327214E+01
-1.058882E+00
-5.680630E-02
-2.325730E+01
-2.717892E+01
-1.584276E+00
-1.275868E-01
-5.937929E+00
-1.774847E+00
-3.866918E-01
-7.994353E-03
+5.847135E+00
+1.719612E+00
+3.960040E-01
+8.297721E-03
+2.245534E+01
+2.530222E+01
+1.468678E+00
+1.094031E-01
+1.571194E+01
+1.240597E+01
+1.004169E+00
+5.156464E-02
+3.901605E+01
+7.652715E+01
+2.648696E+00
+3.571840E-01
+2.275978E+01
+2.597555E+01
+1.456067E+00
+1.075035E-01
+4.821184E+01
+1.167725E+02
+3.105774E+00
+4.859873E-01
+2.519281E+01
+3.183845E+01
+1.595498E+00
+1.292133E-01
+2.560583E+01
+3.297409E+01
+1.673871E+00
+1.429651E-01
+4.930025E+01
+1.220909E+02
+3.206604E+00
+5.220919E-01
+2.255825E+01
+2.560134E+01
+1.422870E+00
+1.027151E-01
+3.910818E+01
+7.698933E+01
+2.568903E+00
+3.333385E-01
+1.620292E+01
+1.321173E+01
+1.068678E+00
+5.798793E-02
+2.264343E+01
+2.578648E+01
+1.503553E+00
+1.158411E-01
+5.751110E+00
+1.676910E+00
+3.450582E-01
+6.411784E-03
 tally 4:
-3.063235E+00
-4.714106E-01
+3.051764E+00
+4.671879E-01
 0.000000E+00
 0.000000E+00
-1.425705E+00
-1.043616E-01
-4.355515E+00
-9.538346E-01
+1.407008E+00
+1.004485E-01
+4.354708E+00
+9.506434E-01
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -160,14 +160,14 @@ tally 4:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-4.355515E+00
-9.538346E-01
-1.425705E+00
-1.043616E-01
-3.859174E+00
-7.519499E-01
-6.350310E+00
-2.024214E+00
+4.354708E+00
+9.506434E-01
+1.407008E+00
+1.004485E-01
+3.852730E+00
+7.498016E-01
+6.382605E+00
+2.043123E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -184,14 +184,14 @@ tally 4:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-6.350310E+00
-2.024214E+00
-3.859174E+00
-7.519499E-01
-4.993073E+00
-1.258264E+00
-7.194275E+00
-2.596886E+00
+6.382605E+00
+2.043123E+00
+3.852730E+00
+7.498016E-01
+5.061607E+00
+1.288306E+00
+7.281209E+00
+2.659444E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -208,14 +208,14 @@ tally 4:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-7.194275E+00
-2.596886E+00
-4.993073E+00
-1.258264E+00
-6.786617E+00
-2.312259E+00
-8.306978E+00
-3.459668E+00
+7.281209E+00
+2.659444E+00
+5.061607E+00
+1.288306E+00
+7.096602E+00
+2.527474E+00
+8.632232E+00
+3.736665E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -232,14 +232,14 @@ tally 4:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-8.306978E+00
-3.459668E+00
-6.786617E+00
-2.312259E+00
-7.603410E+00
-2.905228E+00
-8.791222E+00
-3.882935E+00
+8.632232E+00
+3.736665E+00
+7.096602E+00
+2.527474E+00
+7.759456E+00
+3.019026E+00
+8.968687E+00
+4.037738E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -256,14 +256,14 @@ tally 4:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-8.791222E+00
-3.882935E+00
-7.603410E+00
-2.905228E+00
-8.867113E+00
-3.938503E+00
-9.302808E+00
-4.340042E+00
+8.968687E+00
+4.037738E+00
+7.759456E+00
+3.019026E+00
+8.749025E+00
+3.839161E+00
+9.126289E+00
+4.176440E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -280,14 +280,14 @@ tally 4:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-9.302808E+00
-4.340042E+00
-8.867113E+00
-3.938503E+00
-9.270113E+00
-4.306513E+00
-9.263471E+00
-4.302184E+00
+9.126289E+00
+4.176440E+00
+8.749025E+00
+3.839161E+00
+9.259277E+00
+4.304020E+00
+9.165726E+00
+4.216173E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -304,14 +304,14 @@ tally 4:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-9.263471E+00
-4.302184E+00
-9.270113E+00
-4.306513E+00
-9.348712E+00
-4.388570E+00
-8.977713E+00
-4.047349E+00
+9.165726E+00
+4.216173E+00
+9.259277E+00
+4.304020E+00
+9.433925E+00
+4.473551E+00
+8.910566E+00
+3.991458E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -328,14 +328,14 @@ tally 4:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-8.977713E+00
-4.047349E+00
-9.348712E+00
-4.388570E+00
-9.234380E+00
-4.280666E+00
-8.036978E+00
-3.239853E+00
+8.910566E+00
+3.991458E+00
+9.433925E+00
+4.473551E+00
+9.099397E+00
+4.154062E+00
+7.770126E+00
+3.029928E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -352,14 +352,14 @@ tally 4:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-8.036978E+00
-3.239853E+00
-9.234380E+00
-4.280666E+00
-8.713633E+00
-3.808850E+00
-7.160878E+00
-2.572915E+00
+7.770126E+00
+3.029928E+00
+9.099397E+00
+4.154062E+00
+8.575842E+00
+3.694998E+00
+6.934243E+00
+2.418570E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -376,14 +376,14 @@ tally 4:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-7.160878E+00
-2.572915E+00
-8.713633E+00
-3.808850E+00
-7.378538E+00
-2.732122E+00
-5.145728E+00
-1.329190E+00
+6.934243E+00
+2.418570E+00
+8.575842E+00
+3.694998E+00
+7.437526E+00
+2.780629E+00
+5.136923E+00
+1.331553E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -400,14 +400,14 @@ tally 4:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-5.145728E+00
-1.329190E+00
-7.378538E+00
-2.732122E+00
-6.660125E+00
-2.228506E+00
-4.087925E+00
-8.435381E-01
+5.136923E+00
+1.331553E+00
+7.437526E+00
+2.780629E+00
+6.648582E+00
+2.216687E+00
+4.050691E+00
+8.279789E-01
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -424,14 +424,14 @@ tally 4:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-4.087925E+00
-8.435381E-01
-6.660125E+00
-2.228506E+00
-4.466295E+00
-1.002320E+00
-1.468481E+00
-1.099604E-01
+4.050691E+00
+8.279789E-01
+6.648582E+00
+2.216687E+00
+4.390906E+00
+9.686686E-01
+1.391624E+00
+9.861955E-02
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -448,12 +448,12 @@ tally 4:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-1.468481E+00
-1.099604E-01
-4.466295E+00
-1.002320E+00
-3.139355E+00
-4.955456E-01
+1.391624E+00
+9.861955E-02
+4.390906E+00
+9.686686E-01
+3.113477E+00
+4.874296E-01
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -473,164 +473,164 @@ tally 4:
 0.000000E+00
 0.000000E+00
 tally 5:
-5.925339E+00
-1.788596E+00
-8.954773E-01
-4.217679E-02
-2.215054E+01
-2.470273E+01
-2.944747E+00
-4.443186E-01
-1.542658E+01
-1.195085E+01
-1.950262E+00
-1.946340E-01
-3.791137E+01
-7.214779E+01
-4.955741E+00
-1.254830E+00
-2.200054E+01
-2.431894E+01
-3.031040E+00
-4.685971E-01
-4.823946E+01
-1.167941E+02
-6.226321E+00
-1.956308E+00
-2.556930E+01
-3.280828E+01
-3.582546E+00
-6.505962E-01
-2.577249E+01
-3.339204E+01
-3.316825E+00
-5.676842E-01
-5.007249E+01
-1.257124E+02
-6.462364E+00
-2.120157E+00
-2.273285E+01
-2.595106E+01
-2.960964E+00
-4.496277E-01
-3.937362E+01
-7.783849E+01
-5.339336E+00
-1.449257E+00
-1.623315E+01
-1.326746E+01
-2.289661E+00
-2.698618E-01
-2.325250E+01
-2.716827E+01
-3.253010E+00
-5.413837E-01
-5.937929E+00
-1.774847E+00
-9.208589E-01
-4.421403E-02
+5.846103E+00
+1.718959E+00
+8.952028E-01
+4.184063E-02
+2.245226E+01
+2.529524E+01
+3.092645E+00
+4.848878E-01
+1.571095E+01
+1.240426E+01
+2.178244E+00
+2.438479E-01
+3.900638E+01
+7.648853E+01
+5.265574E+00
+1.401505E+00
+2.275895E+01
+2.597348E+01
+3.067909E+00
+4.810969E-01
+4.820213E+01
+1.167232E+02
+6.403602E+00
+2.070034E+00
+2.519091E+01
+3.183360E+01
+3.463531E+00
+6.097568E-01
+2.560388E+01
+3.296889E+01
+3.456252E+00
+6.101655E-01
+4.929539E+01
+1.220666E+02
+6.629094E+00
+2.223366E+00
+2.255498E+01
+2.559363E+01
+2.833426E+00
+4.150907E-01
+3.909813E+01
+7.694976E+01
+5.582222E+00
+1.584757E+00
+1.620082E+01
+1.320814E+01
+2.282196E+00
+2.703156E-01
+2.263498E+01
+2.576758E+01
+3.162736E+00
+5.145038E-01
+5.750110E+00
+1.676357E+00
+9.181679E-01
+4.562885E-02
 cmfd indices
 1.400000E+01
 1.000000E+00
 1.000000E+00
 1.000000E+00
 k cmfd
-1.125528E+00
-1.145509E+00
-1.158948E+00
-1.171983E+00
-1.180649E+00
-1.184072E+00
-1.188112E+00
-1.183095E+00
-1.182269E+00
-1.175467E+00
-1.175184E+00
-1.172637E+00
-1.171593E+00
-1.175439E+00
-1.174650E+00
-1.176474E+00
+1.166740E+00
+1.184008E+00
+1.166534E+00
+1.155559E+00
+1.164960E+00
+1.163229E+00
+1.165897E+00
+1.170104E+00
+1.170207E+00
+1.168091E+00
+1.170940E+00
+1.174589E+00
+1.174609E+00
+1.171505E+00
+1.174456E+00
+1.178370E+00
 cmfd entropy
-3.607059E+00
-3.604890E+00
-3.601329E+00
-3.597776E+00
-3.597360E+00
-3.597387E+00
-3.595379E+00
-3.596995E+00
-3.600901E+00
-3.601832E+00
-3.601426E+00
-3.604521E+00
-3.602848E+00
-3.603875E+00
-3.605213E+00
-3.606699E+00
+3.594757E+00
+3.587018E+00
+3.590385E+00
+3.595101E+00
+3.592151E+00
+3.600294E+00
+3.602102E+00
+3.604941E+00
+3.605897E+00
+3.604880E+00
+3.601658E+00
+3.602551E+00
+3.600160E+00
+3.604540E+00
+3.604094E+00
+3.602509E+00
 cmfd balance
-4.46212E-03
-4.66648E-03
-5.04274E-03
-5.21553E-03
-3.92498E-03
-2.97185E-03
-2.79785E-03
-2.66951E-03
-2.17472E-03
-1.98009E-03
-1.77035E-03
-1.51281E-03
-1.52807E-03
-1.33341E-03
-1.18155E-03
-1.07752E-03
+5.52960E-03
+5.42154E-03
+3.62152E-03
+2.92850E-03
+4.08642E-03
+2.07444E-03
+2.03704E-03
+2.06886E-03
+2.09646E-03
+1.94256E-03
+2.02728E-03
+1.89830E-03
+1.83910E-03
+1.48140E-03
+1.47034E-03
+1.64452E-03
 cmfd dominance ratio
-6.136E-01
-6.127E-01
-6.137E-01
-6.102E-01
-6.067E-01
-6.061E-01
-6.031E-01
 6.046E-01
-6.071E-01
-6.089E-01
-6.073E-01
-6.080E-01
-6.080E-01
+6.015E-01
+6.059E-01
+6.060E-01
+6.061E-01
+6.109E-01
+6.110E-01
+6.108E-01
+6.120E-01
+6.124E-01
+6.109E-01
 6.090E-01
-6.092E-01
-6.094E-01
+6.116E-01
+6.137E-01
+6.117E-01
+6.131E-01
 cmfd openmc source comparison
-1.043027E-02
-1.278226E-02
-1.184867E-02
-1.017186E-02
-1.099696E-02
-7.955341E-03
-8.360344E-03
-6.875508E-03
-4.824018E-03
-4.915363E-03
-5.371647E-03
-4.593100E-03
-4.894955E-03
-4.928253E-03
-4.292171E-03
-4.018545E-03
+1.035187E-02
+9.394886E-03
+6.879487E-03
+7.236029E-03
+6.543528E-03
+3.600620E-03
+2.859638E-03
+2.230047E-03
+2.180643E-03
+1.638534E-03
+1.764349E-03
+1.621487E-03
+1.221762E-03
+1.626297E-03
+1.951813E-03
+9.584126E-04
 cmfd source
-1.600876E-02
-6.000305E-02
-4.248071E-02
-9.935789E-02
-5.768092E-02
-1.338593E-01
-7.417398E-02
-7.102984E-02
-1.382563E-01
-6.181889E-02
-1.142473E-01
-4.571447E-02
-6.864655E-02
-1.672206E-02
+1.677059E-02
+6.229453E-02
+4.278394E-02
+1.134852E-01
+6.231020E-02
+1.327286E-01
+6.808362E-02
+7.130954E-02
+1.362127E-01
+6.048013E-02
+1.094460E-01
+4.546687E-02
+6.403310E-02
+1.459510E-02
diff --git a/tests/regression_tests/cmfd_feed_ref_d/results_true.dat b/tests/regression_tests/cmfd_feed_ref_d/results_true.dat
index 9cc26b8cf..34cde1a46 100644
--- a/tests/regression_tests/cmfd_feed_ref_d/results_true.dat
+++ b/tests/regression_tests/cmfd_feed_ref_d/results_true.dat
@@ -1,117 +1,117 @@
 k-combined:
-1.167869E+00 7.492916E-03
+1.162249E+00 5.812620E-03
 tally 1:
-1.146821E+01
-1.318787E+01
-2.161476E+01
-4.685066E+01
-2.951084E+01
-8.733116E+01
-3.521523E+01
-1.242762E+02
-3.774181E+01
-1.426460E+02
-3.727924E+01
-1.391162E+02
-3.377236E+01
-1.143877E+02
-2.904590E+01
-8.453427E+01
-2.090941E+01
-4.384824E+01
-1.078680E+01
-1.168172E+01
+1.153831E+01
+1.338142E+01
+2.155552E+01
+4.659071E+01
+2.813997E+01
+7.941672E+01
+3.270996E+01
+1.073664E+02
+3.639852E+01
+1.329148E+02
+3.729637E+01
+1.393474E+02
+3.443129E+01
+1.186461E+02
+2.832690E+01
+8.040998E+01
+2.177527E+01
+4.771147E+01
+1.146822E+01
+1.328252E+01
 tally 2:
-1.136805E+00
-1.292326E+00
-7.987282E-01
-6.379667E-01
-2.266961E+00
-5.139112E+00
-1.613498E+00
-2.603376E+00
-3.046379E+00
-9.280427E+00
-2.182480E+00
-4.763219E+00
-3.568101E+00
-1.273134E+01
-2.532478E+00
-6.413444E+00
-3.989532E+00
-1.591637E+01
-2.848319E+00
-8.112921E+00
-3.853139E+00
-1.484668E+01
-2.718497E+00
-7.390223E+00
-3.478134E+00
-1.209742E+01
-2.467279E+00
-6.087465E+00
-2.952214E+00
-8.715569E+00
-2.103257E+00
-4.423688E+00
-1.917446E+00
-3.676599E+00
-1.378361E+00
-1.899878E+00
-1.048230E+00
-1.098785E+00
-7.511876E-01
-5.642828E-01
+1.024353E+00
+1.049299E+00
+6.991057E-01
+4.887487E-01
+2.200432E+00
+4.841901E+00
+1.561655E+00
+2.438768E+00
+2.910400E+00
+8.470426E+00
+2.095155E+00
+4.389674E+00
+3.466006E+00
+1.201320E+01
+2.480456E+00
+6.152662E+00
+3.711781E+00
+1.377732E+01
+2.646019E+00
+7.001418E+00
+3.953648E+00
+1.563133E+01
+2.832759E+00
+8.024524E+00
+3.597870E+00
+1.294467E+01
+2.555396E+00
+6.530048E+00
+2.860871E+00
+8.184585E+00
+2.032282E+00
+4.130169E+00
+2.006740E+00
+4.027007E+00
+1.408150E+00
+1.982886E+00
+1.035163E+00
+1.071562E+00
+7.084068E-01
+5.018402E-01
 tally 3:
-7.701212E-01
-5.930866E-01
-4.481580E-02
-2.008456E-03
-1.547321E+00
-2.394203E+00
-1.226538E-01
-1.504395E-02
-2.106393E+00
-4.436893E+00
-1.450617E-01
-2.104289E-02
-2.437675E+00
-5.942260E+00
-1.521379E-01
-2.314593E-02
-2.754657E+00
-7.588135E+00
-1.745458E-01
-3.046622E-02
-2.623856E+00
-6.884619E+00
-1.851600E-01
-3.428423E-02
-2.376884E+00
-5.649579E+00
-1.615728E-01
-2.610576E-02
-2.021851E+00
-4.087882E+00
-1.533172E-01
-2.350617E-02
-1.333182E+00
-1.777374E+00
-7.076179E-02
-5.007231E-03
-7.258458E-01
-5.268521E-01
-3.656026E-02
-1.336653E-03
+6.713566E-01
+4.507196E-01
+5.581718E-02
+3.115557E-03
+1.508976E+00
+2.277009E+00
+1.139601E-01
+1.298690E-02
+2.035529E+00
+4.143377E+00
+1.221001E-01
+1.490843E-02
+2.385217E+00
+5.689262E+00
+1.500087E-01
+2.250260E-02
+2.546286E+00
+6.483574E+00
+1.546601E-01
+2.391975E-02
+2.726427E+00
+7.433407E+00
+1.686144E-01
+2.843081E-02
+2.466613E+00
+6.084179E+00
+1.558230E-01
+2.428079E-02
+1.951251E+00
+3.807379E+00
+1.197744E-01
+1.434590E-02
+1.347903E+00
+1.816842E+00
+9.419149E-02
+8.872037E-03
+6.840490E-01
+4.679231E-01
+5.000289E-02
+2.500289E-03
 tally 4:
-1.667426E-01
-2.780308E-02
+1.561665E-01
+2.438798E-02
 0.000000E+00
 0.000000E+00
-1.292556E-01
-1.670700E-02
-2.813401E-01
-7.915227E-02
+1.307011E-01
+1.708276E-02
+2.703168E-01
+7.307115E-02
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -128,14 +128,14 @@ tally 4:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-2.813401E-01
-7.915227E-02
-1.292556E-01
-1.670700E-02
-2.670582E-01
-7.132006E-02
-4.055365E-01
-1.644599E-01
+2.703168E-01
+7.307115E-02
+1.307011E-01
+1.708276E-02
+2.637619E-01
+6.957033E-02
+3.685390E-01
+1.358210E-01
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -152,14 +152,14 @@ tally 4:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-4.055365E-01
-1.644599E-01
-2.670582E-01
-7.132006E-02
-3.848164E-01
-1.480837E-01
-4.809472E-01
-2.313102E-01
+3.685390E-01
+1.358210E-01
+2.637619E-01
+6.957033E-02
+3.887017E-01
+1.510890E-01
+4.439407E-01
+1.970834E-01
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -176,14 +176,14 @@ tally 4:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-4.809472E-01
-2.313102E-01
-3.848164E-01
-1.480837E-01
-4.543959E-01
-2.064756E-01
-5.106174E-01
-2.607301E-01
+4.439407E-01
+1.970834E-01
+3.887017E-01
+1.510890E-01
+4.456116E-01
+1.985697E-01
+4.737035E-01
+2.243950E-01
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -200,14 +200,14 @@ tally 4:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-5.106174E-01
-2.607301E-01
-4.543959E-01
-2.064756E-01
-4.543155E-01
-2.064026E-01
-4.626331E-01
-2.140294E-01
+4.737035E-01
+2.243950E-01
+4.456116E-01
+1.985697E-01
+4.760577E-01
+2.266309E-01
+4.703245E-01
+2.212052E-01
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -224,14 +224,14 @@ tally 4:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-4.626331E-01
-2.140294E-01
-4.543155E-01
-2.064026E-01
-4.827763E-01
-2.330729E-01
-4.442611E-01
-1.973679E-01
+4.703245E-01
+2.212052E-01
+4.760577E-01
+2.266309E-01
+4.878056E-01
+2.379543E-01
+4.373120E-01
+1.912418E-01
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -248,14 +248,14 @@ tally 4:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-4.442611E-01
-1.973679E-01
-4.827763E-01
-2.330729E-01
-4.630415E-01
-2.144074E-01
-3.886521E-01
-1.510505E-01
+4.373120E-01
+1.912418E-01
+4.878056E-01
+2.379543E-01
+4.262194E-01
+1.816630E-01
+3.334152E-01
+1.111657E-01
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -272,14 +272,14 @@ tally 4:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-3.886521E-01
-1.510505E-01
-4.630415E-01
-2.144074E-01
-3.535862E-01
-1.250232E-01
-2.530293E-01
-6.402384E-02
+3.334152E-01
+1.111657E-01
+4.262194E-01
+1.816630E-01
+3.560156E-01
+1.267471E-01
+2.409954E-01
+5.807879E-02
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -296,14 +296,14 @@ tally 4:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-2.530293E-01
-6.402384E-02
-3.535862E-01
-1.250232E-01
-2.465508E-01
-6.078730E-02
-1.197139E-01
-1.433141E-02
+2.409954E-01
+5.807879E-02
+3.560156E-01
+1.267471E-01
+2.646501E-01
+7.003965E-02
+1.327244E-01
+1.761576E-02
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -320,12 +320,12 @@ tally 4:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-1.197139E-01
-1.433141E-02
-2.465508E-01
-6.078730E-02
-1.369614E-01
-1.875841E-02
+1.327244E-01
+1.761576E-02
+2.646501E-01
+7.003965E-02
+1.480567E-01
+2.192079E-02
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -345,119 +345,119 @@ tally 4:
 0.000000E+00
 0.000000E+00
 tally 5:
-7.701212E-01
-5.930866E-01
-1.386254E-01
-1.921700E-02
-1.547321E+00
-2.394203E+00
-2.630318E-01
-6.918571E-02
-2.106393E+00
-4.436893E+00
-2.807911E-01
-7.884363E-02
-2.435870E+00
-5.933464E+00
-3.322093E-01
-1.103630E-01
-2.753652E+00
-7.582597E+00
-3.825961E-01
-1.463797E-01
-2.623856E+00
-6.884619E+00
-3.888719E-01
-1.512213E-01
-2.376884E+00
-5.649579E+00
-3.196211E-01
-1.021576E-01
-2.021851E+00
-4.087882E+00
-2.897873E-01
-8.397667E-02
-1.333182E+00
-1.777374E+00
-1.627096E-01
-2.647441E-02
-7.258458E-01
-5.268521E-01
-9.348575E-02
-8.739586E-03
+6.713566E-01
+4.507196E-01
+9.805793E-02
+9.615358E-03
+1.508976E+00
+2.277009E+00
+1.968348E-01
+3.874394E-02
+2.032573E+00
+4.131353E+00
+2.120922E-01
+4.498309E-02
+2.385217E+00
+5.689262E+00
+2.863031E-01
+8.196946E-02
+2.545200E+00
+6.478041E+00
+3.278920E-01
+1.075131E-01
+2.726427E+00
+7.433407E+00
+3.770758E-01
+1.421861E-01
+2.466613E+00
+6.084179E+00
+3.593230E-01
+1.291130E-01
+1.951251E+00
+3.807379E+00
+2.474112E-01
+6.121229E-02
+1.347903E+00
+1.816842E+00
+2.127109E-01
+4.524594E-02
+6.823620E-01
+4.656179E-01
+1.249863E-01
+1.562159E-02
 cmfd indices
 1.000000E+01
 1.000000E+00
 1.000000E+00
 1.000000E+00
 k cmfd
-1.149087E+00
-1.156777E+00
-1.158641E+00
-1.159507E+00
-1.156564E+00
-1.160257E+00
-1.150344E+00
-1.149854E+00
-1.151616E+00
-1.164575E+00
-1.174683E+00
+1.181365E+00
+1.176693E+00
+1.161946E+00
+1.163565E+00
+1.163043E+00
+1.169908E+00
+1.149155E+00
+1.142379E+00
+1.152957E+00
+1.137602E+00
+1.141883E+00
 cmfd entropy
-3.216202E+00
-3.228703E+00
-3.220414E+00
-3.214361E+00
-3.215642E+00
-3.213607E+00
-3.212862E+00
-3.213128E+00
-3.213189E+00
-3.205465E+00
-3.202859E+00
+3.246422E+00
+3.246496E+00
+3.252238E+00
+3.240920E+00
+3.237606E+00
+3.234301E+00
+3.234103E+00
+3.229918E+00
+3.226983E+00
+3.221321E+00
+3.223622E+00
 cmfd balance
-3.08825E-03
-1.42554E-03
-1.21448E-03
-1.17859E-03
-1.06034E-03
-9.30949E-04
-1.35713E-03
-1.13694E-03
-1.14938E-03
-1.29296E-03
-1.46518E-03
+4.18486E-03
+1.72126E-03
+1.10906E-03
+1.88158E-03
+1.31626E-03
+1.30818E-03
+1.77315E-03
+2.16148E-03
+1.67789E-03
+2.31333E-03
+1.94932E-03
 cmfd dominance ratio
-5.503E-01
-5.596E-01
 5.505E-01
-5.471E-01
-5.468E-01
-5.427E-01
-5.421E-01
-5.412E-01
-5.389E-01
-5.371E-01
-5.329E-01
+5.580E-01
+5.610E-01
+5.526E-01
+5.519E-01
+5.499E-01
+5.504E-01
+5.504E-01
+5.475E-01
+5.465E-01
+5.477E-01
 cmfd openmc source comparison
-1.571006E-02
-6.945629E-03
-6.838511E-03
-6.183655E-03
-5.138825E-03
-4.362701E-03
-5.558586E-03
-4.188314E-03
-1.837101E-03
-2.737321E-03
-2.529244E-03
+1.902234E-03
+4.110960E-03
+2.452031E-03
+2.337951E-03
+1.838979E-03
+3.138637E-03
+2.684401E-03
+2.912891E-03
+2.823494E-03
+6.391584E-03
+5.904139E-03
 cmfd source
-4.240947E-02
-8.226746E-02
-1.180848E-01
-1.328470E-01
-1.412449E-01
-1.424870E-01
-1.269297E-01
-1.096476E-01
-6.953001E-02
-3.455212E-02
+4.488002E-02
+8.895136E-02
+1.085930E-01
+1.229651E-01
+1.330479E-01
+1.497140E-01
+1.309102E-01
+1.028556E-01
+7.738878E-02
+4.069397E-02
diff --git a/tests/regression_tests/cmfd_feed_rolling_window/results_true.dat b/tests/regression_tests/cmfd_feed_rolling_window/results_true.dat
index 5ff4a132f..2e31b35ba 100644
--- a/tests/regression_tests/cmfd_feed_rolling_window/results_true.dat
+++ b/tests/regression_tests/cmfd_feed_rolling_window/results_true.dat
@@ -1,117 +1,117 @@
 k-combined:
-1.173626E+00 1.098719E-02
+1.158333E+00 1.402684E-02
 tally 1:
-1.101892E+01
-1.218768E+01
-2.036233E+01
-4.152577E+01
-2.937587E+01
-8.637268E+01
-3.502389E+01
-1.231700E+02
-3.804803E+01
-1.453948E+02
-3.822561E+01
-1.465677E+02
-3.456290E+01
-1.198651E+02
-2.904088E+01
-8.470264E+01
-2.111529E+01
-4.463713E+01
-1.147633E+01
-1.326012E+01
+1.169478E+01
+1.373162E+01
+2.192038E+01
+4.844559E+01
+2.913292E+01
+8.542569E+01
+3.446069E+01
+1.201782E+02
+3.624088E+01
+1.320213E+02
+3.569791E+01
+1.278170E+02
+3.340601E+01
+1.119165E+02
+2.908648E+01
+8.514603E+01
+2.175458E+01
+4.767916E+01
+1.171268E+01
+1.378033E+01
 tally 2:
-1.010478E+00
-1.021066E+00
-6.902031E-01
-4.763804E-01
-1.899891E+00
-3.609584E+00
-1.322615E+00
-1.749312E+00
-2.756419E+00
-7.597845E+00
-1.955934E+00
-3.825676E+00
-3.818740E+00
-1.458278E+01
-2.704746E+00
-7.315652E+00
-3.920857E+00
-1.537312E+01
-2.843144E+00
-8.083470E+00
-3.835060E+00
-1.470768E+01
-2.728705E+00
-7.445831E+00
-3.510590E+00
-1.232424E+01
-2.497237E+00
-6.236191E+00
-2.717388E+00
-7.384198E+00
-1.903638E+00
-3.623837E+00
-2.207863E+00
-4.874659E+00
-1.563588E+00
-2.444808E+00
-1.289027E+00
-1.661591E+00
-9.022714E-01
-8.140937E-01
+1.132414E+00
+1.282361E+00
+7.822980E-01
+6.119901E-01
+2.124428E+00
+4.513196E+00
+1.490832E+00
+2.222581E+00
+3.158472E+00
+9.975946E+00
+2.221665E+00
+4.935795E+00
+3.994786E+00
+1.595831E+01
+2.828109E+00
+7.998199E+00
+3.491035E+00
+1.218732E+01
+2.461223E+00
+6.057617E+00
+3.461784E+00
+1.198395E+01
+2.473337E+00
+6.117398E+00
+3.027132E+00
+9.163527E+00
+2.150455E+00
+4.624458E+00
+2.471217E+00
+6.106911E+00
+1.737168E+00
+3.017752E+00
+1.880969E+00
+3.538044E+00
+1.316574E+00
+1.733367E+00
+1.233103E+00
+1.520543E+00
+8.543318E-01
+7.298828E-01
 tally 3:
-6.593197E-01
-4.347024E-01
-5.216387E-02
-2.721069E-03
-1.266446E+00
-1.603885E+00
-8.298797E-02
-6.887003E-03
-1.888709E+00
-3.567222E+00
-1.398940E-01
-1.957033E-02
-2.616078E+00
-6.843867E+00
-1.588627E-01
-2.523735E-02
-2.733300E+00
-7.470927E+00
-1.944290E-01
-3.780262E-02
-2.643656E+00
-6.988917E+00
-1.612338E-01
-2.599633E-02
-2.410643E+00
-5.811199E+00
-1.754603E-01
-3.078631E-02
-1.838012E+00
-3.378288E+00
-1.126265E-01
-1.268473E-02
-1.500033E+00
-2.250100E+00
-1.102554E-01
-1.215626E-02
-8.750096E-01
-7.656418E-01
-6.757592E-02
-4.566505E-03
+7.540113E-01
+5.685330E-01
+6.367610E-02
+4.054646E-03
+1.436984E+00
+2.064922E+00
+8.961822E-02
+8.031425E-03
+2.132240E+00
+4.546449E+00
+1.356065E-01
+1.838913E-02
+2.726356E+00
+7.433016E+00
+1.780572E-01
+3.170438E-02
+2.379700E+00
+5.662970E+00
+1.544735E-01
+2.386206E-02
+2.383471E+00
+5.680933E+00
+1.568319E-01
+2.459624E-02
+2.047271E+00
+4.191318E+00
+1.662654E-01
+2.764418E-02
+1.673107E+00
+2.799287E+00
+1.132020E-01
+1.281468E-02
+1.271576E+00
+1.616906E+00
+7.546797E-02
+5.695415E-03
+8.249906E-01
+6.806094E-01
+5.660098E-02
+3.203671E-03
 tally 4:
-1.490605E-01
-2.221904E-02
+1.551630E-01
+2.407556E-02
 0.000000E+00
 0.000000E+00
-1.139233E-01
-1.297851E-02
-2.549497E-01
-6.499934E-02
+1.487992E-01
+2.214121E-02
+2.878091E-01
+8.283409E-02
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -128,14 +128,14 @@ tally 4:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-2.549497E-01
-6.499934E-02
-1.139233E-01
-1.297851E-02
-2.191337E-01
-4.801958E-02
-3.295187E-01
-1.085826E-01
+2.878091E-01
+8.283409E-02
+1.487992E-01
+2.214121E-02
+2.936596E-01
+8.623595E-02
+3.954149E-01
+1.563529E-01
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -152,14 +152,14 @@ tally 4:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-3.295187E-01
-1.085826E-01
-2.191337E-01
-4.801958E-02
-3.872400E-01
-1.499548E-01
-4.595835E-01
-2.112170E-01
+3.954149E-01
+1.563529E-01
+2.936596E-01
+8.623595E-02
+3.991153E-01
+1.592930E-01
+4.758410E-01
+2.264247E-01
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -176,14 +176,14 @@ tally 4:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-4.595835E-01
-2.112170E-01
-3.872400E-01
-1.499548E-01
-4.668106E-01
-2.179121E-01
-5.112307E-01
-2.613569E-01
+4.758410E-01
+2.264247E-01
+3.991153E-01
+1.592930E-01
+4.850882E-01
+2.353106E-01
+5.210840E-01
+2.715285E-01
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -200,14 +200,14 @@ tally 4:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-5.112307E-01
-2.613569E-01
-4.668106E-01
-2.179121E-01
-4.716605E-01
-2.224636E-01
-4.916148E-01
-2.416851E-01
+5.210840E-01
+2.715285E-01
+4.850882E-01
+2.353106E-01
+4.790245E-01
+2.294645E-01
+4.570092E-01
+2.088574E-01
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -224,14 +224,14 @@ tally 4:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-4.916148E-01
-2.416851E-01
-4.716605E-01
-2.224636E-01
-4.696777E-01
-2.205972E-01
-4.365150E-01
-1.905453E-01
+4.570092E-01
+2.088574E-01
+4.790245E-01
+2.294645E-01
+4.505886E-01
+2.030301E-01
+3.884038E-01
+1.508575E-01
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -248,14 +248,14 @@ tally 4:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-4.365150E-01
-1.905453E-01
-4.696777E-01
-2.205972E-01
-4.179902E-01
-1.747158E-01
-3.350564E-01
-1.122628E-01
+3.884038E-01
+1.508575E-01
+4.505886E-01
+2.030301E-01
+3.986999E-01
+1.589616E-01
+3.220889E-01
+1.037412E-01
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -272,14 +272,14 @@ tally 4:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-3.350564E-01
-1.122628E-01
-4.179902E-01
-1.747158E-01
-3.743487E-01
-1.401370E-01
-2.400661E-01
-5.763172E-02
+3.220889E-01
+1.037412E-01
+3.986999E-01
+1.589616E-01
+3.319083E-01
+1.101631E-01
+2.101261E-01
+4.415297E-02
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -296,14 +296,14 @@ tally 4:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-2.400661E-01
-5.763172E-02
-3.743487E-01
-1.401370E-01
-3.063657E-01
-9.385994E-02
-1.605078E-01
-2.576275E-02
+2.101261E-01
+4.415297E-02
+3.319083E-01
+1.101631E-01
+2.795459E-01
+7.814588E-02
+1.306499E-01
+1.706938E-02
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -320,12 +320,12 @@ tally 4:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-1.605078E-01
-2.576275E-02
-3.063657E-01
-9.385994E-02
-1.700639E-01
-2.892174E-02
+1.306499E-01
+1.706938E-02
+2.795459E-01
+7.814588E-02
+1.585507E-01
+2.513833E-02
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -345,119 +345,119 @@ tally 4:
 0.000000E+00
 0.000000E+00
 tally 5:
-6.593197E-01
-4.347024E-01
-1.314196E-01
-1.727112E-02
-1.266446E+00
-1.603885E+00
-2.002491E-01
-4.009970E-02
-1.888709E+00
-3.567222E+00
-2.444522E-01
-5.975686E-02
-2.616078E+00
-6.843867E+00
-3.234935E-01
-1.046481E-01
-2.733300E+00
-7.470927E+00
-3.309500E-01
-1.095279E-01
-2.643656E+00
-6.988917E+00
-4.025014E-01
-1.620074E-01
-2.410643E+00
-5.811199E+00
-3.050040E-01
-9.302747E-02
-1.838012E+00
-3.378288E+00
-2.800764E-01
-7.844279E-02
-1.500033E+00
-2.250100E+00
-2.324765E-01
-5.404531E-02
-8.750096E-01
-7.656418E-01
-1.256919E-01
-1.579844E-02
+7.530237E-01
+5.670447E-01
+1.178984E-01
+1.390004E-02
+1.436984E+00
+2.064922E+00
+1.458395E-01
+2.126916E-02
+2.132240E+00
+4.546449E+00
+2.950109E-01
+8.703141E-02
+2.726356E+00
+7.433016E+00
+3.397288E-01
+1.154157E-01
+2.379700E+00
+5.662970E+00
+3.113206E-01
+9.692053E-02
+2.383471E+00
+5.680933E+00
+3.455611E-01
+1.194125E-01
+2.047271E+00
+4.191318E+00
+2.910986E-01
+8.473841E-02
+1.673107E+00
+2.799287E+00
+2.381996E-01
+5.673907E-02
+1.270672E+00
+1.614606E+00
+1.795241E-01
+3.222889E-02
+8.249906E-01
+6.806094E-01
+1.201397E-01
+1.443354E-02
 cmfd indices
 1.000000E+01
 1.000000E+00
 1.000000E+00
 1.000000E+00
 k cmfd
-1.166297E+00
-1.148237E+00
-1.162472E+00
-1.187078E+00
-1.188411E+00
-1.194879E+00
-1.216739E+00
-1.216829E+00
-1.196596E+00
-1.199223E+00
-1.211817E+00
+1.184474E+00
+1.188170E+00
+1.165127E+00
+1.135010E+00
+1.145439E+00
+1.158451E+00
+1.154420E+00
+1.179615E+00
+1.197843E+00
+1.181252E+00
+1.186316E+00
 cmfd entropy
-3.215349E+00
-3.225577E+00
-3.223357E+00
-3.208828E+00
-3.211072E+00
-3.206578E+00
-3.195799E+00
-3.198236E+00
-3.220074E+00
-3.230249E+00
-3.238015E+00
+3.243654E+00
+3.244091E+00
+3.249203E+00
+3.249952E+00
+3.245538E+00
+3.240838E+00
+3.238919E+00
+3.223131E+00
+3.216002E+00
+3.220324E+00
+3.224804E+00
 cmfd balance
-2.07468E-03
-2.39687E-03
-1.51020E-03
-2.07618E-03
-1.89367E-03
-2.00902E-03
-2.54856E-03
-2.43636E-03
-2.48527E-03
-3.07775E-03
-3.37967E-03
+4.21104E-03
+1.38052E-03
+1.34642E-03
+2.39255E-03
+2.07426E-03
+1.27927E-03
+2.26249E-03
+2.72103E-03
+2.71504E-03
+2.19156E-03
+1.91989E-03
 cmfd dominance ratio
-5.505E-01
-5.558E-01
-5.584E-01
-5.477E-01
-5.477E-01
-5.426E-01
-5.335E-01
-5.305E-01
-5.427E-01
+5.520E-01
+5.535E-01
+5.628E-01
+5.696E-01
+5.723E-01
+5.651E-01
+5.648E-01
+5.555E-01
+5.448E-01
+5.488E-01
 5.484E-01
-5.465E-01
 cmfd openmc source comparison
-5.598628E-03
-1.162952E-02
-1.083004E-02
-1.037470E-02
-5.649750E-03
-5.137914E-03
-3.868209E-03
-1.208756E-02
-5.398131E-03
-8.119598E-03
-4.573105E-03
+1.713810E-03
+2.429503E-03
+4.526209E-03
+7.978149E-03
+3.320012E-03
+3.880041E-03
+1.580215E-02
+1.663452E-02
+1.878103E-02
+7.436342E-03
+3.724478E-03
 cmfd source
-4.219187E-02
-8.692096E-02
-1.061389E-01
-1.199181E-01
-1.377328E-01
-1.326161E-01
-1.345872E-01
-1.112871E-01
-7.569533E-02
-5.291175E-02
+4.688167E-02
+9.066303E-02
+1.150679E-01
+1.430247E-01
+1.370466E-01
+1.267615E-01
+1.244218E-01
+1.048774E-01
+7.083441E-02
+4.042108E-02
diff --git a/tests/regression_tests/cmfd_nofeed/results_true.dat b/tests/regression_tests/cmfd_nofeed/results_true.dat
index 756aa4570..ea1a0230b 100644
--- a/tests/regression_tests/cmfd_nofeed/results_true.dat
+++ b/tests/regression_tests/cmfd_nofeed/results_true.dat
@@ -1,117 +1,117 @@
 k-combined:
-1.172893E+00 8.095197E-03
+1.169143E+00 7.248013E-03
 tally 1:
-1.156995E+01
-1.347019E+01
-2.120053E+01
-4.531200E+01
-2.995993E+01
-8.997889E+01
-3.498938E+01
-1.226414E+02
-3.794510E+01
-1.442188E+02
-3.798115E+01
-1.446436E+02
-3.415954E+01
-1.171635E+02
-2.960329E+01
-8.785532E+01
-2.182231E+01
-4.782353E+01
-1.147379E+01
-1.321150E+01
+1.115130E+01
+1.249933E+01
+2.147608E+01
+4.643964E+01
+2.923697E+01
+8.598273E+01
+3.439175E+01
+1.189653E+02
+3.729169E+01
+1.395456E+02
+3.709975E+01
+1.380839E+02
+3.415420E+01
+1.168226E+02
+2.895696E+01
+8.419764E+01
+2.140382E+01
+4.646784E+01
+1.125483E+01
+1.275812E+01
 tally 2:
-2.345900E+01
-2.783672E+01
-1.627300E+01
-1.339749E+01
-4.127267E+01
-8.563716E+01
-2.934800E+01
-4.334439E+01
-5.742644E+01
-1.658158E+02
-4.092600E+01
-8.423842E+01
-6.740126E+01
-2.279288E+02
-4.796500E+01
-1.154602E+02
-7.340327E+01
-2.701349E+02
-5.235900E+01
-1.374186E+02
-7.387392E+01
-2.740829E+02
-5.277400E+01
-1.398425E+02
-6.733428E+01
-2.274414E+02
-4.800100E+01
-1.156206E+02
-5.794970E+01
-1.685421E+02
-4.124600E+01
-8.540686E+01
-4.257013E+01
-9.092401E+01
-3.014500E+01
-4.566369E+01
-2.300274E+01
-2.659051E+01
-1.613400E+01
-1.307448E+01
+2.275147E+01
+2.604974E+01
+1.587800E+01
+1.271197E+01
+4.191959E+01
+8.846441E+01
+2.966500E+01
+4.430669E+01
+5.699815E+01
+1.637359E+02
+4.037600E+01
+8.219353E+01
+6.656851E+01
+2.228703E+02
+4.718000E+01
+1.119941E+02
+7.334215E+01
+2.701014E+02
+5.223500E+01
+1.370726E+02
+7.394394E+01
+2.748295E+02
+5.273400E+01
+1.397334E+02
+6.931604E+01
+2.406234E+02
+4.949000E+01
+1.226886E+02
+5.799672E+01
+1.687992E+02
+4.142300E+01
+8.612116E+01
+4.320102E+01
+9.402138E+01
+3.068300E+01
+4.749148E+01
+2.295257E+01
+2.657057E+01
+1.606200E+01
+1.301453E+01
 tally 3:
-1.564900E+01
-1.239852E+01
-1.086873E+00
-6.047264E-02
-2.821700E+01
-4.006730E+01
-1.855830E+00
-1.755984E-01
-3.946300E+01
-7.833997E+01
-2.523142E+00
-3.210725E-01
-4.622500E+01
-1.072588E+02
-2.919735E+00
-4.340292E-01
-5.033400E+01
-1.270010E+02
-3.243022E+00
-5.318534E-01
-5.082400E+01
-1.297502E+02
-3.313898E+00
-5.546608E-01
-4.623700E+01
-1.072944E+02
-2.887766E+00
-4.203084E-01
-3.975000E+01
-7.934279E+01
-2.567158E+00
-3.333121E-01
-2.903500E+01
-4.237270E+01
-1.852070E+00
-1.733821E-01
-1.557800E+01
-1.219084E+01
-9.951884E-01
-5.121758E-02
+1.528200E+01
+1.177982E+01
+1.040687E+00
+5.586386E-02
+2.857900E+01
+4.113603E+01
+1.871515E+00
+1.774689E-01
+3.888800E+01
+7.626262E+01
+2.534433E+00
+3.274088E-01
+4.541400E+01
+1.037867E+02
+2.926509E+00
+4.319780E-01
+5.034500E+01
+1.273517E+02
+3.215813E+00
+5.215716E-01
+5.076100E+01
+1.295218E+02
+3.194424E+00
+5.165993E-01
+4.768100E+01
+1.138949E+02
+3.058255E+00
+4.732131E-01
+3.995800E+01
+8.015691E+01
+2.454286E+00
+3.044948E-01
+2.957000E+01
+4.412743E+01
+1.938963E+00
+1.908501E-01
+1.544000E+01
+1.202869E+01
+1.038073E+00
+5.487827E-02
 tally 4:
-3.111000E+00
-4.872850E-01
+3.086000E+00
+4.780160E-01
 0.000000E+00
 0.000000E+00
-2.794000E+00
-3.972060E-01
-5.520000E+00
-1.535670E+00
+2.739000E+00
+3.790990E-01
+5.478000E+00
+1.505928E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -128,14 +128,14 @@ tally 4:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-5.520000E+00
-1.535670E+00
-2.794000E+00
-3.972060E-01
-5.071000E+00
-1.305697E+00
-7.303000E+00
-2.685365E+00
+5.478000E+00
+1.505928E+00
+2.739000E+00
+3.790990E-01
+5.094000E+00
+1.310476E+00
+7.282000E+00
+2.669810E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -152,14 +152,14 @@ tally 4:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-7.303000E+00
-2.685365E+00
-5.071000E+00
-1.305697E+00
-7.015000E+00
-2.471981E+00
-8.545000E+00
-3.670539E+00
+7.282000E+00
+2.669810E+00
+5.094000E+00
+1.310476E+00
+6.987000E+00
+2.461137E+00
+8.487000E+00
+3.624153E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -176,14 +176,14 @@ tally 4:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-8.545000E+00
-3.670539E+00
-7.015000E+00
-2.471981E+00
-8.431000E+00
-3.570057E+00
-9.224000E+00
-4.268004E+00
+8.487000E+00
+3.624153E+00
+6.987000E+00
+2.461137E+00
+8.250000E+00
+3.421824E+00
+9.022000E+00
+4.088536E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -200,14 +200,14 @@ tally 4:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-9.224000E+00
-4.268004E+00
-8.431000E+00
-3.570057E+00
-9.217000E+00
-4.259749E+00
-9.305000E+00
-4.340149E+00
+9.022000E+00
+4.088536E+00
+8.250000E+00
+3.421824E+00
+9.300000E+00
+4.344142E+00
+9.262000E+00
+4.308946E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -224,14 +224,14 @@ tally 4:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-9.305000E+00
-4.340149E+00
-9.217000E+00
-4.259749E+00
-9.374000E+00
-4.415290E+00
-8.611000E+00
-3.718227E+00
+9.262000E+00
+4.308946E+00
+9.300000E+00
+4.344142E+00
+9.267000E+00
+4.310941E+00
+8.487000E+00
+3.613257E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -248,14 +248,14 @@ tally 4:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-8.611000E+00
-3.718227E+00
-9.374000E+00
-4.415290E+00
-8.515000E+00
-3.639945E+00
-7.056000E+00
-2.501658E+00
+8.487000E+00
+3.613257E+00
+9.267000E+00
+4.310941E+00
+8.682000E+00
+3.778194E+00
+7.123000E+00
+2.544345E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -272,14 +272,14 @@ tally 4:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-7.056000E+00
-2.501658E+00
-8.515000E+00
-3.639945E+00
-7.385000E+00
-2.737677E+00
-5.194000E+00
-1.356022E+00
+7.123000E+00
+2.544345E+00
+8.682000E+00
+3.778194E+00
+7.421000E+00
+2.773897E+00
+5.198000E+00
+1.369216E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -296,14 +296,14 @@ tally 4:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-5.194000E+00
-1.356022E+00
-7.385000E+00
-2.737677E+00
-5.436000E+00
-1.481654E+00
-2.756000E+00
-3.843860E-01
+5.198000E+00
+1.369216E+00
+7.421000E+00
+2.773897E+00
+5.567000E+00
+1.561013E+00
+2.763000E+00
+3.882750E-01
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -320,12 +320,12 @@ tally 4:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-2.756000E+00
-3.843860E-01
-5.436000E+00
-1.481654E+00
-3.030000E+00
-4.643920E-01
+2.763000E+00
+3.882750E-01
+5.567000E+00
+1.561013E+00
+3.106000E+00
+4.853380E-01
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -345,144 +345,144 @@ tally 4:
 0.000000E+00
 0.000000E+00
 tally 5:
-1.564300E+01
-1.238861E+01
-2.090227E+00
-2.262627E-01
-2.821400E+01
-4.005826E+01
-3.870834E+00
-7.614623E-01
-3.945400E+01
-7.830326E+01
-5.290557E+00
-1.422339E+00
-4.621500E+01
-1.072116E+02
-6.144745E+00
-1.903309E+00
-5.032900E+01
-1.269756E+02
-6.867524E+00
-2.373593E+00
-5.081000E+01
-1.296784E+02
-6.456283E+00
-2.130767E+00
-4.623000E+01
-1.072613E+02
-5.931623E+00
-1.776451E+00
-3.974500E+01
-7.932288E+01
-5.339603E+00
-1.456812E+00
-2.902800E+01
-4.235232E+01
-4.102240E+00
-8.519551E-01
-1.557800E+01
-1.219084E+01
-2.137954E+00
-2.347770E-01
+1.527700E+01
+1.177204E+01
+2.285003E+00
+2.661382E-01
+2.857200E+01
+4.111506E+01
+4.126099E+00
+8.737996E-01
+3.887800E+01
+7.622094E+01
+5.121343E+00
+1.333837E+00
+4.540600E+01
+1.037492E+02
+6.160114E+00
+1.913665E+00
+5.033400E+01
+1.272949E+02
+6.859861E+00
+2.384476E+00
+5.075800E+01
+1.295055E+02
+6.929393E+00
+2.443364E+00
+4.767500E+01
+1.138658E+02
+6.385463E+00
+2.080293E+00
+3.995300E+01
+8.013651E+01
+5.620641E+00
+1.603844E+00
+2.956200E+01
+4.410395E+01
+3.952701E+00
+7.877105E-01
+1.543500E+01
+1.202080E+01
+2.203583E+00
+2.512936E-01
 cmfd indices
 1.000000E+01
 1.000000E+00
 1.000000E+00
 1.000000E+00
 k cmfd
-1.129918E+00
-1.148352E+00
-1.143137E+00
-1.145795E+00
-1.147285E+00
-1.148588E+00
-1.148151E+00
-1.162118E+00
-1.165380E+00
-1.162851E+00
-1.163379E+00
-1.166986E+00
-1.167838E+00
-1.171743E+00
-1.170398E+00
-1.169773E+00
+1.169107E+00
+1.173852E+00
+1.181921E+00
+1.187733E+00
+1.185766E+00
+1.177020E+00
+1.181200E+00
+1.180088E+00
+1.180676E+00
+1.174948E+00
+1.174167E+00
+1.174935E+00
+1.169912E+00
+1.169058E+00
+1.170366E+00
+1.169774E+00
 cmfd entropy
-3.224769E+00
-3.222795E+00
-3.221174E+00
-3.222164E+00
-3.221025E+00
-3.220967E+00
-3.223497E+00
-3.219213E+00
-3.221679E+00
-3.222084E+00
-3.222281E+00
-3.222540E+00
-3.224614E+00
-3.224193E+00
-3.224925E+00
-3.224367E+00
+3.207640E+00
+3.212075E+00
+3.215463E+00
+3.219545E+00
+3.225225E+00
+3.227103E+00
+3.229048E+00
+3.228263E+00
+3.229077E+00
+3.229932E+00
+3.229351E+00
+3.228195E+00
+3.228493E+00
+3.227823E+00
+3.225830E+00
+3.227270E+00
 cmfd balance
-3.90454E-03
-4.33180E-03
-3.77057E-03
-3.16391E-03
-3.11765E-03
-2.59886E-03
-2.81060E-03
-3.25473E-03
-2.68544E-03
-2.01716E-03
-1.89350E-03
-1.79159E-03
-1.51353E-03
-1.48514E-03
-1.50207E-03
-1.44045E-03
+4.88208E-03
+4.63702E-03
+3.41158E-03
+2.99755E-03
+2.78360E-03
+3.31542E-03
+2.64344E-03
+2.04609E-03
+1.84340E-03
+1.65450E-03
+1.70816E-03
+1.69952E-03
+1.51417E-03
+1.32738E-03
+1.41435E-03
+1.01462E-03
 cmfd dominance ratio
-5.539E-01
-5.522E-01
-5.491E-01
-5.511E-01
-5.506E-01
-5.523E-01
-5.523E-01
+5.467E-01
+5.468E-01
+5.448E-01
+5.457E-01
+5.457E-01
+5.485E-01
+5.500E-01
+5.497E-01
+5.495E-01
+5.499E-01
+5.502E-01
+5.485E-01
+5.492E-01
+5.483E-01
 5.473E-01
-5.478E-01
-5.461E-01
-5.462E-01
-5.459E-01
-5.475E-01
-5.463E-01
 5.466E-01
-5.469E-01
 cmfd openmc source comparison
-9.875240E-03
-1.119358E-02
-8.513903E-03
-7.728971E-03
-5.993771E-03
-5.837301E-03
-4.861789E-03
-5.624038E-03
-4.297229E-03
-4.029732E-03
-3.669197E-03
-3.598834E-03
-3.023310E-03
-3.347346E-03
-2.943658E-03
-2.764986E-03
+9.587418E-03
+7.785087E-03
+6.798967E-03
+5.947641E-03
+4.980801E-03
+4.272665E-03
+4.073759E-03
+4.305612E-03
+3.572759E-03
+3.785830E-03
+3.766828E-03
+3.495462E-03
+3.017281E-03
+2.857633E-03
+2.858606E-03
+2.449010E-03
 cmfd source
-4.561921E-02
-7.896381E-02
-1.084687E-01
-1.264057E-01
-1.408942E-01
-1.438180E-01
-1.247333E-01
-1.100896E-01
-7.897187E-02
-4.203556E-02
+4.390084E-02
+7.966902E-02
+1.087889E-01
+1.263915E-01
+1.394331E-01
+1.383156E-01
+1.319970E-01
+1.051339E-01
+8.248244E-02
+4.388774E-02
diff --git a/tests/regression_tests/cmfd_restart/results_true.dat b/tests/regression_tests/cmfd_restart/results_true.dat
index f5f22d9ac..1ef9624d4 100644
--- a/tests/regression_tests/cmfd_restart/results_true.dat
+++ b/tests/regression_tests/cmfd_restart/results_true.dat
@@ -1,117 +1,117 @@
 k-combined:
-1.164262E+00 9.207592E-03
+1.181723E+00 9.944883E-03
 tally 1:
-1.156972E+01
-1.339924E+01
-2.136306E+01
-4.567185E+01
-2.859527E+01
-8.195821E+01
-3.470754E+01
-1.207851E+02
-3.766403E+01
-1.422263E+02
-3.778821E+01
-1.432660E+02
-3.573197E+01
-1.278854E+02
-2.849979E+01
-8.135515E+01
-2.073803E+01
-4.303374E+01
-1.112117E+01
-1.242944E+01
+1.169899E+01
+1.373251E+01
+2.142380E+01
+4.605511E+01
+2.968085E+01
+8.838716E+01
+3.561418E+01
+1.271206E+02
+3.777783E+01
+1.428817E+02
+3.805832E+01
+1.450213E+02
+3.439836E+01
+1.184892E+02
+2.852438E+01
+8.161896E+01
+2.088423E+01
+4.376204E+01
+1.076670E+01
+1.168108E+01
 tally 2:
-2.388054E+01
-2.875255E+01
-1.667791E+01
-1.403426E+01
-4.224771E+01
-8.942109E+01
-2.993088E+01
-4.490335E+01
-5.689839E+01
-1.625557E+02
-4.043633E+01
-8.212299E+01
-6.764024E+01
-2.297126E+02
-4.807902E+01
-1.161468E+02
-7.314835E+01
-2.684645E+02
-5.203584E+01
-1.359261E+02
-7.375727E+01
-2.733105E+02
-5.252944E+01
-1.386205E+02
-6.909571E+01
-2.397721E+02
-4.922548E+01
-1.217465E+02
-5.685978E+01
-1.621746E+02
-4.051938E+01
-8.237277E+01
-4.185562E+01
-8.784067E+01
-2.983570E+01
-4.467414E+01
-2.238373E+01
-2.520356E+01
-1.566758E+01
-1.234103E+01
+2.321241E+01
+2.702156E+01
+1.620912E+01
+1.317752E+01
+4.197404E+01
+8.845008E+01
+2.982666E+01
+4.469221E+01
+5.810089E+01
+1.695857E+02
+4.134123E+01
+8.588866E+01
+6.982488E+01
+2.447068E+02
+4.966939E+01
+1.238763E+02
+7.428421E+01
+2.767613E+02
+5.287955E+01
+1.403163E+02
+7.447402E+01
+2.785012E+02
+5.324628E+01
+1.423393E+02
+6.895164E+01
+2.381937E+02
+4.916366E+01
+1.211701E+02
+5.679253E+01
+1.617881E+02
+4.043125E+01
+8.204061E+01
+4.218618E+01
+8.933666E+01
+2.978592E+01
+4.456592E+01
+2.196426E+01
+2.435867E+01
+1.525576E+01
+1.175879E+01
 tally 3:
-1.609520E+01
-1.307542E+01
-1.033429E+00
-5.510889E-02
-2.877073E+01
-4.149542E+01
-1.964219E+00
-1.954692E-01
-3.896816E+01
-7.629752E+01
-2.484053E+00
-3.103733E-01
-4.634285E+01
-1.079367E+02
-2.974750E+00
-4.468223E-01
-5.007964E+01
-1.259202E+02
-3.181802E+00
-5.103621E-01
-5.058915E+01
-1.286193E+02
-3.249442E+00
-5.337712E-01
-4.744464E+01
-1.131026E+02
-3.067644E+00
-4.736335E-01
-3.900632E+01
-7.634433E+01
-2.443552E+00
-3.028060E-01
-2.874166E+01
-4.146375E+01
-1.810421E+00
-1.671667E-01
-1.509222E+01
-1.145579E+01
-1.014919E+00
-5.391053E-02
+1.563788E+01
+1.226528E+01
+1.053289E+00
+5.666942E-02
+2.870755E+01
+4.139654E+01
+1.838017E+00
+1.710528E-01
+3.978616E+01
+7.955764E+01
+2.560657E+00
+3.334449E-01
+4.780385E+01
+1.147770E+02
+3.139243E+00
+4.967628E-01
+5.106650E+01
+1.308704E+02
+3.170056E+00
+5.078920E-01
+5.123992E+01
+1.318586E+02
+3.211706E+00
+5.205979E-01
+4.729862E+01
+1.121695E+02
+3.068662E+00
+4.749488E-01
+3.898816E+01
+7.630564E+01
+2.516911E+00
+3.199696E-01
+2.865357E+01
+4.125742E+01
+1.852314E+00
+1.741116E-01
+1.467340E+01
+1.088460E+01
+9.268633E-01
+4.450662E-02
 tally 4:
-3.148231E+00
-4.974555E-01
+3.029754E+00
+4.613561E-01
 0.000000E+00
 0.000000E+00
-2.805439E+00
-3.982239E-01
-5.574031E+00
-1.561105E+00
+2.832501E+00
+4.049252E-01
+5.517243E+00
+1.527794E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -128,14 +128,14 @@ tally 4:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-5.574031E+00
-1.561105E+00
-2.805439E+00
-3.982239E-01
-5.171038E+00
-1.344877E+00
-7.372031E+00
-2.725420E+00
+5.517243E+00
+1.527794E+00
+2.832501E+00
+4.049252E-01
+5.117178E+00
+1.316972E+00
+7.333303E+00
+2.701677E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -152,14 +152,14 @@ tally 4:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-7.372031E+00
-2.725420E+00
-5.171038E+00
-1.344877E+00
-6.946847E+00
-2.424850E+00
-8.496610E+00
-3.627542E+00
+7.333303E+00
+2.701677E+00
+5.117178E+00
+1.316972E+00
+7.248464E+00
+2.641591E+00
+8.817788E+00
+3.905530E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -176,14 +176,14 @@ tally 4:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-8.496610E+00
-3.627542E+00
-6.946847E+00
-2.424850E+00
-8.479501E+00
-3.607280E+00
-9.261869E+00
-4.305912E+00
+8.817788E+00
+3.905530E+00
+7.248464E+00
+2.641591E+00
+8.646465E+00
+3.749847E+00
+9.460948E+00
+4.495388E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -200,14 +200,14 @@ tally 4:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-9.261869E+00
-4.305912E+00
-8.479501E+00
-3.607280E+00
-9.232858E+00
-4.278432E+00
-9.306384E+00
-4.348594E+00
+9.460948E+00
+4.495388E+00
+8.646465E+00
+3.749847E+00
+9.379341E+00
+4.415049E+00
+9.278640E+00
+4.320720E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -224,14 +224,14 @@ tally 4:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-9.306384E+00
-4.348594E+00
-9.232858E+00
-4.278432E+00
-9.299764E+00
-4.347828E+00
-8.511976E+00
-3.639893E+00
+9.278640E+00
+4.320720E+00
+9.379341E+00
+4.415049E+00
+9.465746E+00
+4.498591E+00
+8.656146E+00
+3.760545E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -248,14 +248,14 @@ tally 4:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-8.511976E+00
-3.639893E+00
-9.299764E+00
-4.347828E+00
-8.726086E+00
-3.819567E+00
-7.147277E+00
-2.562747E+00
+8.656146E+00
+3.760545E+00
+9.465746E+00
+4.498591E+00
+8.589782E+00
+3.700308E+00
+6.996002E+00
+2.456935E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -272,14 +272,14 @@ tally 4:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-7.147277E+00
-2.562747E+00
-8.726086E+00
-3.819567E+00
-7.218790E+00
-2.612243E+00
-5.018287E+00
-1.263077E+00
+6.996002E+00
+2.456935E+00
+8.589782E+00
+3.700308E+00
+7.352050E+00
+2.714808E+00
+5.105164E+00
+1.312559E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -296,14 +296,14 @@ tally 4:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-5.018287E+00
-1.263077E+00
-7.218790E+00
-2.612243E+00
-5.443494E+00
-1.487018E+00
-2.732334E+00
-3.773047E-01
+5.105164E+00
+1.312559E+00
+7.352050E+00
+2.714808E+00
+5.442756E+00
+1.486776E+00
+2.697305E+00
+3.675580E-01
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -320,12 +320,12 @@ tally 4:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-2.732334E+00
-3.773047E-01
-5.443494E+00
-1.487018E+00
-3.044773E+00
-4.655756E-01
+2.697305E+00
+3.675580E-01
+5.442756E+00
+1.486776E+00
+3.017025E+00
+4.571443E-01
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -345,144 +345,144 @@ tally 4:
 0.000000E+00
 0.000000E+00
 tally 5:
-1.609029E+01
-1.306718E+01
-2.230601E+00
-2.559496E-01
-2.876780E+01
-4.148686E+01
-3.835952E+00
-7.456562E-01
-3.895738E+01
-7.625344E+01
-4.841024E+00
-1.197335E+00
-4.633595E+01
-1.079043E+02
-6.236821E+00
-1.963311E+00
-5.007472E+01
-1.258967E+02
-6.749745E+00
-2.297130E+00
-5.058336E+01
-1.285894E+02
-6.727612E+00
-2.315656E+00
-4.743869E+01
-1.130735E+02
-6.338193E+00
-2.042159E+00
-3.899838E+01
-7.631289E+01
-5.187573E+00
-1.359733E+00
-2.873434E+01
-4.144233E+01
-3.815610E+00
-7.367619E-01
-1.509020E+01
-1.145268E+01
-2.125767E+00
-2.341894E-01
+1.563588E+01
+1.226217E+01
+2.209027E+00
+2.507131E-01
+2.870034E+01
+4.137550E+01
+3.726620E+00
+7.021948E-01
+3.977762E+01
+7.952285E+01
+5.304975E+00
+1.427333E+00
+4.779747E+01
+1.147456E+02
+6.528302E+00
+2.151715E+00
+5.105366E+01
+1.308037E+02
+6.986782E+00
+2.467487E+00
+5.123380E+01
+1.318264E+02
+6.845633E+00
+2.383542E+00
+4.729296E+01
+1.121433E+02
+6.252695E+00
+1.977351E+00
+3.898236E+01
+7.628315E+01
+5.461495E+00
+1.528579E+00
+2.864576E+01
+4.123538E+01
+3.857301E+00
+7.581323E-01
+1.467047E+01
+1.088031E+01
+2.277024E+00
+2.679801E-01
 cmfd indices
 1.000000E+01
 1.000000E+00
 1.000000E+00
 1.000000E+00
 k cmfd
-1.129918E+00
-1.143848E+00
-1.147976E+00
-1.151534E+00
-1.152378E+00
-1.148219E+00
-1.150402E+00
-1.154647E+00
-1.156159E+00
-1.160048E+00
-1.167441E+00
-1.168163E+00
-1.168629E+00
-1.164120E+00
-1.165051E+00
-1.169177E+00
+1.169107E+00
+1.175079E+00
+1.173912E+00
+1.175368E+00
+1.174026E+00
+1.181745E+00
+1.182261E+00
+1.183559E+00
+1.178691E+00
+1.179222E+00
+1.179017E+00
+1.172979E+00
+1.175043E+00
+1.173458E+00
+1.174152E+00
+1.171451E+00
 cmfd entropy
-3.224769E+00
-3.225945E+00
-3.227421E+00
-3.226174E+00
-3.224429E+00
-3.227049E+00
-3.230710E+00
-3.230315E+00
-3.226825E+00
-3.226655E+00
-3.226588E+00
-3.224155E+00
-3.223246E+00
-3.222640E+00
-3.223920E+00
-3.222838E+00
+3.207640E+00
+3.210547E+00
+3.212218E+00
+3.209573E+00
+3.211619E+00
+3.212126E+00
+3.213163E+00
+3.214288E+00
+3.215737E+00
+3.213677E+00
+3.214925E+00
+3.215612E+00
+3.216708E+00
+3.221454E+00
+3.219048E+00
+3.218387E+00
 cmfd balance
-3.90454E-03
-4.08089E-03
-3.46511E-03
-4.09535E-03
-2.62009E-03
-2.23559E-03
-2.54033E-03
-2.12799E-03
-2.25864E-03
-1.85766E-03
-1.49916E-03
-1.63471E-03
-1.48377E-03
-1.59800E-03
-1.37354E-03
-1.32853E-03
+4.88208E-03
+4.75139E-03
+3.15783E-03
+3.67091E-03
+2.99797E-03
+2.91060E-03
+2.06576E-03
+1.83482E-03
+1.56292E-03
+1.58659E-03
+2.32986E-03
+1.47376E-03
+1.46673E-03
+1.22627E-03
+1.31963E-03
+1.26456E-03
 cmfd dominance ratio
-5.539E-01
-5.537E-01
-5.536E-01
-5.515E-01
-5.512E-01
-5.514E-01
-5.518E-01
-5.507E-01
-5.500E-01
-5.497E-01
-5.477E-01
-5.461E-01
-5.444E-01
-5.445E-01
-5.454E-01
+5.467E-01
+5.453E-01
+5.458E-01
+5.436E-01
+5.442E-01
+5.406E-01
+5.401E-01
+5.413E-01
+4.995E-01
+5.396E-01
+5.409E-01
+5.414E-01
+5.423E-01
+5.456E-01
+5.442E-01
 5.441E-01
 cmfd openmc source comparison
-9.875240E-03
-1.106163E-02
-9.847628E-03
-6.065921E-03
-5.772039E-03
-4.615656E-03
-4.244331E-03
-3.694299E-03
-3.545814E-03
-3.213063E-03
-3.467537E-03
-3.383489E-03
-3.697591E-03
-3.937358E-03
-3.369124E-03
-3.190359E-03
+9.587418E-03
+8.150978E-03
+6.677661E-03
+6.334727E-03
+5.153692E-03
+5.082964E-03
+4.633153E-03
+4.037383E-03
+3.528742E-03
+4.559089E-03
+3.517370E-03
+3.306117E-03
+2.913809E-03
+1.906045E-03
+1.932794E-03
+1.711341E-03
 cmfd source
-4.360494E-02
-8.397599E-02
-1.074181E-01
-1.294531E-01
-1.385611E-01
-1.407934E-01
-1.325191E-01
-1.044311E-01
-7.660359E-02
-4.263941E-02
+4.496492E-02
+7.869674E-02
+1.100280E-01
+1.354045E-01
+1.363339E-01
+1.380533E-01
+1.314512E-01
+1.077480E-01
+7.847306E-02
+3.884630E-02
diff --git a/tests/regression_tests/complex_cell/results_true.dat b/tests/regression_tests/complex_cell/results_true.dat
index 3ce3d7cbc..ddedb07ff 100644
--- a/tests/regression_tests/complex_cell/results_true.dat
+++ b/tests/regression_tests/complex_cell/results_true.dat
@@ -1,11 +1,11 @@
 k-combined:
-2.564169E-01 4.095378E-03
+2.603220E-01 1.429366E-03
 tally 1:
-2.607144E+00
-1.360414E+00
-2.681079E+00
-1.439354E+00
-9.627534E-01
-1.855496E-01
-1.123751E-01
+2.624819E+00
+1.378200E+00
+2.730035E+00
+1.492361E+00
+1.013707E+00
+2.055807E-01
+1.123257E-01
 2.530233E-03
diff --git a/tests/regression_tests/confidence_intervals/results_true.dat b/tests/regression_tests/confidence_intervals/results_true.dat
index 6a906d07e..8ca256624 100644
--- a/tests/regression_tests/confidence_intervals/results_true.dat
+++ b/tests/regression_tests/confidence_intervals/results_true.dat
@@ -1,5 +1,5 @@
 k-combined:
-2.759923E-01 6.988588E-03
+2.850178E-01 9.646334E-03
 tally 1:
-6.167984E+01
-4.772717E+02
+6.234169E+01
+4.884167E+02
diff --git a/tests/regression_tests/cpp_driver/results_true.dat b/tests/regression_tests/cpp_driver/results_true.dat
index 26f07842c..09f188db6 100644
--- a/tests/regression_tests/cpp_driver/results_true.dat
+++ b/tests/regression_tests/cpp_driver/results_true.dat
@@ -1,13 +1,13 @@
 k-combined:
-1.953962E+00 1.828426E-02
+1.874924E+00 2.180236E-02
 tally 1:
-9.607953E+01
-1.031898E+03
-2.853683E+01
-9.085469E+01
-9.745011E+01
-1.058928E+03
-2.220665E+02
-5.496813E+03
-2.220665E+02
-5.496813E+03
+9.484447E+01
+1.002269E+03
+2.746252E+01
+8.406603E+01
+9.833099E+01
+1.076376E+03
+2.206380E+02
+5.417609E+03
+2.206380E+02
+5.417609E+03
diff --git a/tests/regression_tests/dagmc/external/results_true.dat b/tests/regression_tests/dagmc/external/results_true.dat
index cda656937..9a6b481b7 100644
--- a/tests/regression_tests/dagmc/external/results_true.dat
+++ b/tests/regression_tests/dagmc/external/results_true.dat
@@ -1,5 +1,5 @@
 k-combined:
-9.118190E-01 3.615552E-02
+1.083415E+00 5.991738E-02
 tally 1:
-8.430103E+00
-1.442878E+01
+8.862860E+00
+1.602117E+01
diff --git a/tests/regression_tests/dagmc/legacy/results_true.dat b/tests/regression_tests/dagmc/legacy/results_true.dat
index cda656937..9a6b481b7 100644
--- a/tests/regression_tests/dagmc/legacy/results_true.dat
+++ b/tests/regression_tests/dagmc/legacy/results_true.dat
@@ -1,5 +1,5 @@
 k-combined:
-9.118190E-01 3.615552E-02
+1.083415E+00 5.991738E-02
 tally 1:
-8.430103E+00
-1.442878E+01
+8.862860E+00
+1.602117E+01
diff --git a/tests/regression_tests/dagmc/refl/results_true.dat b/tests/regression_tests/dagmc/refl/results_true.dat
index 533c62a90..b49a4a7a4 100644
--- a/tests/regression_tests/dagmc/refl/results_true.dat
+++ b/tests/regression_tests/dagmc/refl/results_true.dat
@@ -1,5 +1,5 @@
 k-combined:
-2.035173E+00 3.967029E-02
+2.047107E+00 8.605767E-02
 tally 1:
-1.064492E+01
-2.301019E+01
+1.145034E+01
+2.636875E+01
diff --git a/tests/regression_tests/dagmc/universes/inputs_true.dat b/tests/regression_tests/dagmc/universes/inputs_true.dat
index 2fa79d831..be1a17383 100644
--- a/tests/regression_tests/dagmc/universes/inputs_true.dat
+++ b/tests/regression_tests/dagmc/universes/inputs_true.dat
@@ -48,6 +48,14 @@
     <particles>100</particles>
     <batches>10</batches>
     <inactive>5</inactive>
+    <source type="independent" strength="1.0" particle="neutron">
+      <space type="box">
+        <parameters>-10.0 -10.0 -24.0 10.0 10.0 24.0</parameters>
+      </space>
+      <constraints>
+        <fissionable>true</fissionable>
+      </constraints>
+    </source>
     <output>
       <summary>false</summary>
     </output>
diff --git a/tests/regression_tests/dagmc/universes/results_true.dat b/tests/regression_tests/dagmc/universes/results_true.dat
index 76cbc9db0..aacb7d1ab 100644
--- a/tests/regression_tests/dagmc/universes/results_true.dat
+++ b/tests/regression_tests/dagmc/universes/results_true.dat
@@ -1,13 +1,13 @@
 k-combined:
-9.887663E-01 1.510336E-02
+9.719586E-01 3.630894E-02
 tally 1:
-4.340758E+00
-4.265459E+00
-4.712319E+00
-4.654778E+00
-4.151897E+00
-3.588090E+00
-2.965925E+00
-1.852746E+00
+4.463288E+00
+4.136647E+00
+4.769631E+00
+4.622840E+00
+4.315273E+00
+3.871129E+00
+4.091804E+00
+3.582192E+00
 0.000000E+00
 0.000000E+00
diff --git a/tests/regression_tests/dagmc/universes/test.py b/tests/regression_tests/dagmc/universes/test.py
index 057a7b0d4..d68c6b11c 100644
--- a/tests/regression_tests/dagmc/universes/test.py
+++ b/tests/regression_tests/dagmc/universes/test.py
@@ -11,81 +11,87 @@ pytestmark = pytest.mark.skipif(
     reason="DAGMC CAD geometry is not enabled.")
 
 
-class DAGMCUniverseTest(PyAPITestHarness):
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
+@pytest.fixture
+def pin_lattice_model():
+    ### MATERIALS ###
+    fuel = openmc.Material(name='no-void fuel')
+    fuel.set_density('g/cc', 10.29769)
+    fuel.add_nuclide('U234', 0.93120485)
+    fuel.add_nuclide('U235', 0.00055815)
+    fuel.add_nuclide('U238', 0.022408)
+    fuel.add_nuclide('O16', 0.045829)
 
-        ### MATERIALS ###
-        fuel = openmc.Material(name='no-void fuel')
-        fuel.set_density('g/cc', 10.29769)
-        fuel.add_nuclide('U234', 0.93120485)
-        fuel.add_nuclide('U235', 0.00055815)
-        fuel.add_nuclide('U238', 0.022408)
-        fuel.add_nuclide('O16', 0.045829)
+    cladding = openmc.Material(name='clad')
+    cladding.set_density('g/cc', 6.55)
+    cladding.add_nuclide('Zr90', 0.021827)
+    cladding.add_nuclide('Zr91', 0.00476)
+    cladding.add_nuclide('Zr92', 0.0072758)
+    cladding.add_nuclide('Zr94', 0.0073734)
+    cladding.add_nuclide('Zr96', 0.0011879)
 
-        cladding = openmc.Material(name='clad')
-        cladding.set_density('g/cc', 6.55)
-        cladding.add_nuclide('Zr90', 0.021827)
-        cladding.add_nuclide('Zr91', 0.00476)
-        cladding.add_nuclide('Zr92', 0.0072758)
-        cladding.add_nuclide('Zr94', 0.0073734)
-        cladding.add_nuclide('Zr96', 0.0011879)
+    water = openmc.Material(name='water')
+    water.set_density('g/cc', 0.740582)
+    water.add_nuclide('H1', 0.049457)
+    water.add_nuclide('O16', 0.024672)
+    water.add_nuclide('B10', 8.0042e-06)
+    water.add_nuclide('B11', 3.2218e-05)
+    water.add_s_alpha_beta('c_H_in_H2O')
 
-        water = openmc.Material(name='water')
-        water.set_density('g/cc', 0.740582)
-        water.add_nuclide('H1', 0.049457)
-        water.add_nuclide('O16', 0.024672)
-        water.add_nuclide('B10', 8.0042e-06)
-        water.add_nuclide('B11', 3.2218e-05)
-        water.add_s_alpha_beta('c_H_in_H2O')
+    model = openmc.Model()
+    model.materials = openmc.Materials([fuel, cladding, water])
 
-        self._model.materials = openmc.Materials([fuel, cladding, water])
+    ### GEOMETRY ###
+    # create the DAGMC universe
+    pincell_univ = openmc.DAGMCUniverse(filename='dagmc.h5m', auto_geom_ids=True)
 
-        ### GEOMETRY ###
-        # create the DAGMC universe
-        pincell_univ = openmc.DAGMCUniverse(filename='dagmc.h5m', auto_geom_ids=True)
+    # creates another DAGMC universe, this time with within a bounded cell
+    bound_pincell_universe = openmc.DAGMCUniverse(filename='dagmc.h5m').bounded_universe()
+    # uses the bound_dag_cell as the root argument to test the type checks in openmc.Geometry
+    bound_pincell_geometry = openmc.Geometry(root=bound_pincell_universe)
+    # assigns the bound_dag_geometry to the model to test the type checks in model.Geometry setter
+    model.geometry = bound_pincell_geometry
 
-        # creates another DAGMC universe, this time with within a bounded cell
-        bound_pincell_universe = openmc.DAGMCUniverse(filename='dagmc.h5m').bounded_universe()
-        # uses the bound_dag_cell as the root argument to test the type checks in openmc.Geometry
-        bound_pincell_geometry = openmc.Geometry(root=bound_pincell_universe)
-        # assigns the bound_dag_geometry to the model to test the type checks in model.Geometry setter
-        self._model.geometry = bound_pincell_geometry
+    # create a 2 x 2 lattice using the DAGMC pincell
+    pitch = np.asarray((24.0, 24.0))
+    lattice = openmc.RectLattice()
+    lattice.pitch = pitch
+    lattice.universes = [[pincell_univ] * 2] * 2
+    lattice.lower_left = -pitch
 
-        # create a 2 x 2 lattice using the DAGMC pincell
-        pitch = np.asarray((24.0, 24.0))
-        lattice = openmc.RectLattice()
-        lattice.pitch = pitch
-        lattice.universes = [[pincell_univ] * 2] * 2
-        lattice.lower_left = -pitch
+    left = openmc.XPlane(x0=-pitch[0], name='left', boundary_type='reflective')
+    right = openmc.XPlane(x0=pitch[0], name='right', boundary_type='reflective')
+    front = openmc.YPlane(y0=-pitch[1], name='front', boundary_type='reflective')
+    back = openmc.YPlane(y0=pitch[1], name='back', boundary_type='reflective')
+    # clip the DAGMC geometry at +/- 10 cm w/ CSG planes
+    bottom = openmc.ZPlane(z0=-10.0, name='bottom', boundary_type='reflective')
+    top = openmc.ZPlane(z0=10.0, name='top', boundary_type='reflective')
 
-        left = openmc.XPlane(x0=-pitch[0], name='left', boundary_type='reflective')
-        right = openmc.XPlane(x0=pitch[0], name='right', boundary_type='reflective')
-        front = openmc.YPlane(y0=-pitch[1], name='front', boundary_type='reflective')
-        back = openmc.YPlane(y0=pitch[1], name='back', boundary_type='reflective')
-        # clip the DAGMC geometry at +/- 10 cm w/ CSG planes
-        bottom = openmc.ZPlane(z0=-10.0, name='bottom', boundary_type='reflective')
-        top = openmc.ZPlane(z0=10.0, name='top', boundary_type='reflective')
+    bounding_region = +left & -right & +front & -back & +bottom & -top
+    bounding_cell = openmc.Cell(fill=lattice, region=bounding_region)
 
-        bounding_region = +left & -right & +front & -back & +bottom & -top
-        bounding_cell = openmc.Cell(fill=lattice, region=bounding_region)
+    model.geometry = openmc.Geometry([bounding_cell])
 
-        self._model.geometry = openmc.Geometry([bounding_cell])
+    # add a cell instance tally
+    tally = openmc.Tally(name='cell instance tally')
+    # using scattering
+    cell_instance_filter = openmc.CellInstanceFilter(((4, 0), (4, 1), (4, 2), (4, 3), (4, 4)))
+    tally.filters = [cell_instance_filter]
+    tally.scores = ['scatter']
+    model.tallies = [tally]
 
-        # add a cell instance tally
-        tally = openmc.Tally(name='cell instance tally')
-        # using scattering
-        cell_instance_filter = openmc.CellInstanceFilter(((4, 0), (4, 1), (4, 2), (4, 3), (4, 4)))
-        tally.filters = [cell_instance_filter]
-        tally.scores = ['scatter']
-        self._model.tallies = [tally]
+    # settings
+    model.settings.particles = 100
+    model.settings.batches = 10
+    model.settings.inactive = 5
+    model.settings.output = {'summary' : False}
+    model.settings.source = openmc.IndependentSource(
+        space=openmc.stats.Box((-10., -10., -24.), (10., 10., 24.)),
+        constraints={'fissionable': True},
+    )
 
-        # settings
-        self._model.settings.particles = 100
-        self._model.settings.batches = 10
-        self._model.settings.inactive = 5
-        self._model.settings.output = {'summary' : False}
+    return model
 
-def test_univ():
-    harness = DAGMCUniverseTest('statepoint.10.h5', model=openmc.Model())
+
+def test_univ(pin_lattice_model):
+    harness = PyAPITestHarness('statepoint.10.h5', model=pin_lattice_model)
     harness.main()
diff --git a/tests/regression_tests/density/results_true.dat b/tests/regression_tests/density/results_true.dat
index c8e3b1ede..42dc0c19f 100644
--- a/tests/regression_tests/density/results_true.dat
+++ b/tests/regression_tests/density/results_true.dat
@@ -1,2 +1,2 @@
 k-combined:
-1.110057E+00 1.303260E-02
+1.082191E+00 3.064029E-02
diff --git a/tests/regression_tests/deplete_no_transport/test_reference_coupled_days.h5 b/tests/regression_tests/deplete_no_transport/test_reference_coupled_days.h5
index 5fdc656d97018b596147839415fa967031dc18e5..9757c9791be0030366544aaf515276409d1fec03 100644
GIT binary patch
delta 250
zcmcaGlj*`trVUlrj7*!Wt>qbk)NGsiKx(qJ-G3m*+MXZ8@pb@lyd9T%GRjW=*d?y`
zFYxU3nKj~e3{cP}m3HXDWp;ZQ|M6taZh67#+!d;#c}L-@u1=2ZR_A0{v}>>PF&Det
zlRLYuO&NUR?cWNmlWYt(c4j-fH;1`J$+;ti>$Gcesk6$S$Q3iM2RR3sJUGpA`=-;=
zV?T^!9e+68n*6g{T~Y7AoEsW%5O)4tZG4Bhc#18|4Ra?u_Ly^Sn|{DEJm$8o#^lBx
PamG`VXZ9Ggfb0YSug+EV

delta 250
zcmcaGlj*`trVUlrj0~Hrt>qbk)NGsiKx(qJ-G3m*+MXZ8@pb@lyd9T%GRjQ;*d?y`
zH}LHBnKj~e3{cQ2m3HXDWp;ZQ|Hov_Zh66~+!d;#c}L-@u1t>XR_A11v}>>PF&DdC
zlRLYuO&!E5?B5EllWYt(c4j@hH;1`J$+<0s>$Gcesk8c?$Q3iM2RZwiJUGpA`=-<L
zV?T^!9e+68o&2*~T~YtQoEsW%5O(sfF}}lGJjE8~hIx}6d(1hvPe0%p9&_7Pb8=&k
PIOFNbGkc6#Kz0HEmH$;+

diff --git a/tests/regression_tests/deplete_no_transport/test_reference_coupled_hours.h5 b/tests/regression_tests/deplete_no_transport/test_reference_coupled_hours.h5
index 65bfc19a91cc73512791a1adb2d1dfef8131c8a3..08d4d3eedcd05a7e88dfd77112bc19fbfbe7fb9e 100644
GIT binary patch
delta 353
zcmcaGlj*`trVUlrj7*!Wt>qbk)NGsiKx(qJ-G3m*+MXZ8@pb@lyd9T%GRjW=*d?y`
zFYxU3nKj~e3{cP}m3HXDWp;ZQ|M6taZh67#+!d;#c}L-@u1=2ZR_A0{v}>>PF&Det
zlRLYu>lyCF+pq3wQB~R_<t#YuQ}7DGpH7yuZ_3PgDe268`KwNE#VMz!M_d}FBu{g?
zFC#K@&#RSA52sJ&TdRK2ndA1&D%C%>E^iCuVisI&aZ$eh-#V=p;i{&mlVlfMLAZ*i
zcGk70aZ_wzuG|%HJ?z%+%YWelx*P5-K9A(!tx38kO(WUi9@uv4t=wD@W4mje6ISIo
o-nPx&<L$ilkD}d!{+9M1KrbnzMn7e|^xXF3<e5FjEFiA|0NT%f(EtDd

delta 353
zcmcaGlj*`trVUlrj0~Hrt>qbk)NGsiKx(qJ-G3m*+MXZ8@pb@lyd9T%GRjQ;*d?y`
zH}LHBnKj~e3{cQ2m3HXDWp;ZQ|Hov_Zh66~+!d;#c}L-@u1t>XR_A11v}>>PF&DdC
zlRLYu>l*?q>{oTQs4DG|au%HSDR_n8PbZ7nH)UqLlyv61{8gv7;*`^aBQ6b7lBYS{
zml2t{=haH5N7E<styRD1%z67}mFgc`msbUHF$=D?xTswJZ=F_)a8>iuNwN#BAY7$X
zJL}rhxGA<USMCY89(L>Z<-c$Ny$$ykpGR`=wj|w?rjhJ$5A3-0R&K6{vE7Z%39E7(
nZ`<bX@pj(&N73$Ke@puhpqCU=qn|QfdTx7q^2{D%7LeBf?`nSx

diff --git a/tests/regression_tests/deplete_no_transport/test_reference_coupled_minutes.h5 b/tests/regression_tests/deplete_no_transport/test_reference_coupled_minutes.h5
index 294cb589f7bf66d88f2cd5ec53353657cd043ef6..41b5235bb6def3c63b52d78c1ef1bfac17172101 100644
GIT binary patch
delta 353
zcmcaGlj*`trVUlrj7*!Wt>qbk)NGsiKx(qJ-G3m*+MXZ8@pb@lyd9T%GRjW=*d?y`
zFYxU3nKj~e3{cP}m3HXDWp;ZQ|M6taZh67#+!d;#c}L-@u1=2ZR_A0{v}>>PF&Det
zlRLYu>lyUp?SF;#t$8eR%Bdn>ppW_6Bqtr|eBSpVhn>!tPi9~9L&}LgoAa@zjgu26
z+ot(adqSK#J{iqlr+(2{L`*-;;IFNV#)?CS7F=y{xjXUl=Xpr3I@6T;@hXz5q&IA5
zv5cEy3v*>}jbPZ>f0zEk1!f#mJ}-&n;B)b8Tk<2=;U0J`D{lW=*w{{A@<x8E!)@Er
kFzHn?e-!PcZf<t+0D6h@Px5*5i_dM}O`h3f%mVTn0OzcAegFUf

delta 353
zcmcaGlj*`trVUlrj0~Hrt>qbk)NGsiKx(qJ-G3m*+MXZ8@pb@lyd9T%GRjQ;*d?y`
zH}LHBnKj~e3{cQ2m3HXDWp;ZQ|Hov_Zh66~+!d;#c}L-@u1t>XR_A11v}>>PF&DdC
zlRLYu>l;KX?0<&#t$8eR%BeJ8ppW_6Bqtr|eBSpVhn-HDPi9~9L&}LgoAa@zjgu2Q
z+ot(adqSK#KN-zmr+(2{L`*-;;IFNV>WV{$7F=y{xi|6h=Xpr3I@^@`@hXz5j5cg%
zv5cEy3v*?EjbPZ>f0zEk1!f&nJ}-&n;PdfpTk<2=;U0J+D{lW=*x1fc@<x8E!)@EL
kFzHn?e-!PcZ*F$-0D6h@Px5*5i_dM}PoCLh%mVTn0A1g9m;e9(

diff --git a/tests/regression_tests/deplete_no_transport/test_reference_coupled_months.h5 b/tests/regression_tests/deplete_no_transport/test_reference_coupled_months.h5
index ed62e461049f610d488e7af40ebf18866ec600b5..53d80aff0fe2afc9c480c8fd37fb6b30e365148b 100644
GIT binary patch
delta 353
zcmcaGlj*`trVUlrj7*!Wt>qbk)NGsiKx(qJ-G3m*+MXZ8@pb@lyd9T%GRjW=*d?y`
zFYxU3nKj~e3{cP}m3HXDWp;ZQ|M6taZh67#+!d;#c}L-@u1=2ZR_A0{v}>>PF&Det
zlRLYu>lrHJ>@OZrx4it+(77d2Va;+yMdwS-ExQ#Ab~|ry6VrX~Fw<Gn?C#(5HIJM$
z*UaBD+1u9nyZJ}XH_8{CU*C(;pFh>w<=Rzg{#936T=d0$i|OP^!tI-SS7z0$Gn{Z&
z?G;d7zJ+(1EzFh03~XU(X{rox4TkGo{)(6!hx6MSk9z-e<An2z9xnc@w8F%0_LX_^
q*BbBIwk!E|NLMP`d24J6N~m+Q%bRsU_~^-(w!0?J>@j8mc?|$K8+AJX

delta 353
zcmcaGlj*`trVUlrj0~Hrt>qbk)NGsiKx(qJ-G3m*+MXZ8@pb@lyd9T%GRjQ;*d?y`
zH}LHBnKj~e3{cQ2m3HXDWp;ZQ|Hov_Zh66~+!d;#c}L-@u1t>XR_A11v}>>PF&DdC
zlRLYu>l=2L*`Gb2Zh85sp>s>5!kXoZiq4muTXriL>~>z~CZ_w|VWzXD+1<bAYaThN
zubIDRvbU}CC-aY-Z<H@Ozql8rKYyyV%eAZ0{Hw0CxEP837SqX-gxfdcuFR@gXE@=m
zx-Ou+d<*Y1TbL`$7}&zn(o`AX8cf!^{1q`d4(E3^9`*j`#tG+_K3x1+X@!a1f-Cdn
quQlGa?NajXkgim=^V8TAlu+kpS2*i}@X?bmZTC%{*<;KC@)`gDg?AqS

diff --git a/tests/regression_tests/deplete_no_transport/test_reference_fission_q.h5 b/tests/regression_tests/deplete_no_transport/test_reference_fission_q.h5
index 9d32d89fe233fd05e736519766eb54fb9c5486d1..fe695692d6a7337db58feeb783e462960efd3e4a 100644
GIT binary patch
delta 351
zcmcaGlj*`trVUlrj7*!Wt>qbk)NGsiKx(qJ-G3m*+MXZ8@pb@lyd9T%GRjW=*d?y`
zFYxU3nKj~e3{cP}m3HXDWp;ZQ|M6taZh67#+!d;#c}L-@u1=2ZR_A0{v}>>PF&Det
zlRLX@>Mz9E{|fC}^H}7RQ$@Z&AM>|KPCC;0yzfH}JDo9~%)aJ_loNY4=VMJ9Cnrv}
zP4lJpggAA4GMc|m{i3son0}hUUt1TA6^9NjxZ2`!cjD#G^N<{MrYZH~RU}7AZ`jUa
z88^ii=E&X}!Ly<NF8zfI%s8feUJ}W@=i=G6<VUc>-Tzuv-2S()v7Nr;jr>-J+qR`)
j(yL_tDB4Ng-0b85^bzNu<n!hipWD8hJhR7y8R#<r*Bo}f

delta 351
zcmcaGlj*`trVUlrj0~Hrt>qbk)NGsiKx(qJ-G3m*+MXZ8@pb@lyd9T%GRjQ;*d?y`
zH}LHBnKj~e3{cQ2m3HXDWp;ZQ|Hov_Zh66~+!d;#c}L-@u1t>XR_A11v}>>PF&DdC
zlRLX@>RHO|e}?w0c`S0usWe}pkNMjqCmrd0-uEGgolcogW?%C|%85Oj^RcFllM_4J
zrukBPLYz838O>j(e$iP(Oh3)wudR#fibIDMTy1f=H}Uf4c}R{r+m!n8Dw3m&Hf(3H
zjGJN$b7X&w;MvfBm;S;9W*t*LFNx&d^YLt3@*~*c?tddIZvR`@*v?S$Mt-ZqZQHUi
j=~Xg+6z!yMZg%nj`iS#S@_F-%&u!mNp4nr<4D=ZQKjU?D

diff --git a/tests/regression_tests/deplete_no_transport/test_reference_source_rate.h5 b/tests/regression_tests/deplete_no_transport/test_reference_source_rate.h5
index 3f3b4aa2ac5c2040059adee2acda433177ff4464..c9c7e9e363421792108b928ada201f80d20a67df 100644
GIT binary patch
delta 188
zcmcaGlj*`trVUlrj7*!Wt>qbk)NGsiKx(qJ-G3m*+MXZ8@pb@lyd9T%GRjW=*d@-m
zezIVXJY(x*!=9GOYrDB48NlF!J&0-uNw7aWZO=1T#?MZNPPLr+IDMB>ljZ$sYkc20
z9cH@0p%UoqH0#fzmm)1$PCV*@9!JdUoTM&I%U!2_(Yb&_G=l%Ht;>!}JlhsrZE-=^
J(=UK-2LSZmL|y;@

delta 188
zcmcaGlj*`trVUlrj0~Hrt>qbk)NGsiKx(qJ-G3m*+MXZ8@pb@lyd9T%GRjQ;*d@-m
zZn9vHJmZqdhCMBl*LHJ9wv+}kSoI1xGXTMX`f~dt)Al@bW&G^4?^MgFkJEQKHCo=E
zw#N63(_y9?94dj%PP6_jdMVP9<;1Bj=yAln&PnppwA^*-7o7_@L?ihB+PZAM#ItR|
O)fN|oJ^cdcb^rj;XGiV;

diff --git a/tests/regression_tests/deplete_with_transfer_rates/ref_depletion_with_ext_source.h5 b/tests/regression_tests/deplete_with_transfer_rates/ref_depletion_with_ext_source.h5
index aa09e1bcf4e352f94798f2cc266718b5f77fcec1..3ed38f3d6ce3973fd63e7967b1246c8012ebf063 100644
GIT binary patch
delta 573
zcmcbxnCZe|rVR`F>USrv(vX|WXU6~qyH0cH%&q$X=g+=t^ep6Lzb#Dua_|(E`n7U!
z`OpUY8PRu^!TFp!5AV8dqXFkLXH|aMzsJTdai`9if9wC*N=+~R;`TwqZr%q@#>vMW
z>+M2=7h3)}_}|vA%{uA8q-(a1430%d*ek#d;K<LB-de|O4|BllRUiIo8!Ui3=<`<3
z&-+*C!__bS%`0JZZy%f=>yj&d@wzFTe}eISsP{QfDBqBQp=`JI)^`&u;R?d{==2-s
zn85i4+}(om7e3hUe7)&`_3n9-&-csvB%GdVFCu4QX!&=O^UBAH7Cgt6IE(*mwJO-W
z!+B#-()4p%W;omJ+hwTxAkH~rf6|xw^SRCkbPHbShXuGq-=Fp1_xl4b?*bke6n-^y
zop{ire!6Y<g-g{!a8GT1pfqo0s6U(^DDH5{-S?LbED)xD5r1=gNg7<f=hC|C>fa~A
z`G>st!}S=N;QSVAKG6xqjke{loDWa*Y_R=tvTbGL<5t_Jzg2Rbe=QTV4LP>`DVuYd
qE#LJSX19KO*iJk+f&V#c|I6bKZ`<qsdUii=N7v-_6J=RI9tQxR`o*9C

delta 573
zcmcbxnCZe|rVR`F>L*S*BN4Zf-;Mza^!fgFR4sY~=W9JMXb+E@U<;F%eyzpw?}G$f
ze)Gy%UgoEkBKXS}J_viL2<N-ZC~(<gY-lI4-shj)*FUyL&Kcfcr=xE7bD`ua?GKLi
zc1z0+#L7PWW6NWa)c$bYRon3Y_u>_L6yOG&csZHnKpC?=%mLfnR=CAvFMvD9oBznV
zqnB0S>Nofw-+U=(Kb)WN=XuMA3PU*m=_M_}>1EDPz99oc+Y7dX%{&%x1(U>L`t6%^
z;rwj^>$QDbKic0|`k<=UfA-|_{jxsMcTd<i3OL6loZI9)HGJLd?Ji55Lo%*jeQCbK
z`I}a+(tnMa&f7J1XJ}rHb)MNbcWe8_9Oq{nmkAq&1-R7j6$$?F{(wvD6rSk9uZFG@
z4|>!`B(0EYX%U5cO4Fn(^ugf(IDf*fXIeAUe%rtTVWP(z{T8K6xcp-+g@m2Oli~cY
z_8Yz(KhX^5UsVyDSAC|*cGsRc8_S~`Y%_B{pSqdfZW}E*kxR;Ng`jP~r~K%tS{1f?
n8cfoa<2`IA9-P4cX<O^!{r7I!pUoD~OjGNgyndoA3&`UDTkgR>

diff --git a/tests/regression_tests/deplete_with_transfer_rates/ref_depletion_with_feed.h5 b/tests/regression_tests/deplete_with_transfer_rates/ref_depletion_with_feed.h5
index 284d5cbe4ed05d7404222e70200aa0e0318cf2ad..a147022322a1887615f9000e41992c5c48d74b2a 100644
GIT binary patch
delta 717
zcmcbxnCZe|rVR`F>gOe|(vX|WXU6~qYff|M%&q$X=kK^{^ep6Lzb#CDaqtwD`n7U!
zdH)9c8PRu^!TCZv5AV8dqXFlOWL19JzsJTdd8f{qf9wC*GE6W2;`TwqZvF>O#>vMW
z>+K?f7h3)}_}|vI%{uA8q-(b4430%d*ek#d;LOjF-de|O4|BlPRUiIo8!Ui3=;l_>
z&-+*C!_{a1=9RFyw-3%Ybjg*zc-<7vKh5|))cc$#lyAtu(7IcD>$?e-a0MZIboz~R
zOyGQP?ruT(3m@!@Uu}9|y?fr|^Zl~kA6`$k=Qw;%{8){FvvcdQXY9&)&ZVj=*Y*GQ
zcUIMi-=o>4?fmA&+b2`DoO06kuX0?If5++kIY!TB^^49N8-L!}`Q6rK!!Iw<=~r7O
zFJzOSctNZFTF2%|S(S*0C|s5`;f2h5xHBBre&uRhjfjW`SG13b{1t)A-=CGGc<$wL
zIR8qJf2zn9B{*N%O<42R2Wz`Ka~{gSpZw4Eu=GCZ`cvw5m-XMRyYT`T5z3O0*{A0H
zw|y(K@ZtBDS8XrUEGjZQpa?f$`}FH;U8>mO5mDqhlRNnoA|fiv^jAdgMp(Fe@4O<l
zg@@q!{jxU7Jj+Hzgt$brUaomCR2~=+E*tME*zK`^Ybbv%)>_hH1m{<OJ`#Ah>Z83w
SSj4ikALmS7KT(zi6cGSL_T?-9

delta 717
zcmcbxnCZe|rVR`F>Z>Q6k%(K#Z^r-yrhI=psusP0^GzNYw1>w{u!YGhz1Cv+_dx<K
zzhmVrFY{AN;rx}$7d{Aks0inq&nR%&Vr*!~yWZ!Y-Pb?12hJJZU#FvP_j94-D(w%B
z^>&NP4#dhn{A0^(k<|Wh-BsJr|M%h*dKBOW?0h+y<v<y;J<I{?+*Y{7WG{d_$e;hn
zx}%p>;ObZUAK!c_Xg{3q_2+rZhYCYD|M(>>!RckrP`)7pL+cB+gUvh^a0Q`aG5z*U
zx^VtBf%V$Htsm_@mprKI^`AZYe7~&sYnLPTmp{prCHEUR$1T<sSawd|c}hLw%E(54
zXML_7^USq6&Wf70s%<8xoTjf|81?e&Z70demv*(PUvzfyG7DY%-PYyODY5eDS6e18
zWRstGL95>G&#&!W<$Q2!!`1IB-Ej;N5!0{b+rRUf2={k~U!{g>uQ*)&PJ@EH%d-&?
zv251r#m0Md;PMYsT&2IAGO^p5Gi%Br#(%aq@3aQkhilmFN&Hwn>mM*8mT*7TX*=`Z
zwt{2n!_WCwZSQ>Ezqein5fMMv?y6B-%LI>z_act7zf3_y1n2dO2G`ao!!6ADq}sxh
zz7Nj7>Gdal$rd9xfBV_aVvaLzP(CmsY;-j9-Sf@i3i5Lu<Jtcqk{WxRzPZVZ5BA>C
RXJ+^N&Yiq|qAUw2A^@aa;FkaZ

diff --git a/tests/regression_tests/deplete_with_transfer_rates/ref_depletion_with_removal.h5 b/tests/regression_tests/deplete_with_transfer_rates/ref_depletion_with_removal.h5
index 271af24103cda8f8c4886da551422a824dcde360..3d48105d7b444cc16f5b6438f97f897d2c1657fd 100644
GIT binary patch
delta 717
zcmcbxnCZe|rVR`F>dz&w(vX|WXU6~q2Tyb8%&q$X=Wn@d^ep6Lzb#Due()5Q`n7U!
z`TPd^8PRu^!TIt#5AV8dqXFmhW>tRLzsJU|WT(!Vf9wC*>P;{H;`TwqZr%q@#>vMW
z>+LFn7h3)}_}@05%{uA8q-(Yx430%d*ek#dV9C#s-de|O4|Bk$RUiIo8!Ui3==fI8
z&-+*C!_~L{=9RFyw-3$_cgdB$c-<7vf6Mqj)cc$#lyAtuuxPjT)^`&u;R;&z==2-s
zn85kA+}(om7e3hcKic%bdiT7^=lf;7H{6|M&vy8p_^}!T=jcGby9shC&i7u-xMcat
z$~pA#Y~B-YD$Z|SynQld%PA)V|0>5d`FEVopJViFR=?=XvGM1fo!@O;HvIAuoqn}t
z@<KNGi5Il$<7LlEbw~-ot<^c5X?7{_J)Ez;efC-17Zc$AzQ<g*RcpEwT>e^A&a^!z
zm&5rcyWUx><kp7sYo9!0Y}syYH*rOz#w4%5wtrf5cX}Sxu&bNBg2h<IsosvyPj7Wi
z#edu1-KRHCIC;g^!7Jimm8%lmfRq33-Ptgc4IUADoEZGrvKGP})Gl@0XzNu~xO&l}
z5i4z!4#N2btO49h=Uc(~YKBer!6!qYd|*UqoV&!h{3;?MVmpKm%>09hxs&f_`!`Sj
VXwNUzwei-J#go@hlw|=$1OPN1;b8y(

delta 717
zcmcbxnCZe|rVR`F>gy++k%(K#Z^r-yDtv!CsusP0^9>&uw1>w{u!YGBzt&>;_dx<K
zzkB5@FY{AN;rzwR7d{Aks0inq%_wl$Vr*#lf1S@iyRUz2_nb4lzfMQp?)O5;RoWjM
z>+NQg9f*~E_{a92c~bksbysb}{@;sN=uv<hu;ArnmIGzX_Am$Ra9iOPlf3}$AZPv~
z>yBPlfvZ2^e|+<$p#5;Z|DWeAA1Vyt{JWR51gDodL-~db3=?0l9c<>YfGa2!i|My-
z(uMQ43ar=mZT)CJaoK~aUjNyX&-crE#|Iv<zxGL{EV<vn`Qg{RfT$lT&I|LOMmpA6
zIkQ+*o6r8H;;g7?tJ-FA%4z!gg;6iR-gc6ld}&v!`bB3KFSF3K-)&tkof0dbezj%t
zLN@t{7qsd%+_^k%^dTZbc(u!pO^%3&n7=Z+Cw&njB4ol|FH!z24tJ)-EdRC1XO_eH
z2Knhu>}INP{)7tx6Eos$?XLQE^liNG$9B=L2kMWFHSAOaoMeuQJJs6-)vVvY{?k8O
zspAIh*B@Q6{eOIxY33&-xB*dIRqgfJZ19LU;gjhyOKT}SB8+d$GkZ555pgSi)EBKf
zbOf%yE#J#=dW8|3-#w>-M>{qE$_GY7zQGThP)|#^g0zW8_ZB}jh4YuP%(^MC>7%{#
SA|unRp9?3ipD4=$iU<H+q24tB

diff --git a/tests/regression_tests/deplete_with_transfer_rates/ref_depletion_with_transfer.h5 b/tests/regression_tests/deplete_with_transfer_rates/ref_depletion_with_transfer.h5
index 25365f6f3a486e7cc6ffa3ce844d4ed3fa17a95c..97855478ca4d73ff5c858121166ffe22c63962f4 100644
GIT binary patch
delta 746
zcmcbxnCZe|rVR`F>X#+2(vX|WXU6~qyH0cH%&q$X=Wn`e^ep6Lzb#CDd+-#N`n7U!
z`IrX#8PRu^!TAb15AV8dqXFlC%dGsge~*n_-A<h||JMJrm6=}r#qEQJ-P{kHjFXQ$
z*4w2AFSPt|@V{+Ln|0EGN!M&27#xd^uvdT^z?PpQy|s?n9_D~gt3LeGHdp|6(4VcI
zpZBlOhpV6Un^(f--aa@#(<N8>;&oFv{}$u>Q15e|P`)7p!=l~VTi;Evge%D1qtkDk
zV*=+pad!*KU-)4E>eHqN*1P9TKHo2!)37kyp6&2G@nbax&M|>}cN64PoNv6Camn(P
zm2<@5*}Ny*RGdG&c>83^mQzj^{#A}^^6xmEKga0VtbWm%W8=>|JHOkyZ209RI{j*k
z3(R9V(tYc89{BE5o9(gi=5`%t6VaSgOtzn$CLYwNcm9*T$@mvP+)a1mnv~+^B4SCo
zZr5|hjT7L3GQY57;b(PGxcW^med7*YSOMn?x|uY2Emw#0S+bVLP7d<2GwSB&i_`gQ
zJ4yO}r$L>DUE&<Ysz?4#^>)SKSN!BG{@MnWyivQn?6U1_U8ScdJQU#uY&hR_VsSVN
zJeG>jY&!A(IU<(gR@u*yXVrqMe<&KNyDj`6oWDZ*mch47V>o|bqV#$FH-S(-FqR^g
s=I%XEfruqnxjPE4$_?Qfo~}9FJWJrCy}=2UnHJG=Ca<3;%L0le0PHO5YybcN

delta 746
zcmcbxnCZe|rVR`F>T4#Qk%(K#Z^r-yW_*7;susP0^K~8=w1>w{u!YIXz1Cv+_dx<K
zzjoy;FY{AN;r!Lh7d{Aks0imf%qVc#Vr*!~y58rX-Pb?12hJJZU#FvP_iLf#D(w%B
z^>%a14#dhn{A2syJgNQRx~sM+|L?^s^eDg$*#B}e%Yiaxdzb^(xUF!D$zA|=kRAV#
zbw@9&z}2tyKfd`=(0({S;m`Ay4;6-R{<TY5g44^Kp?pIIh6yj&4mR^xz!gjqi|My-
z(uMQ42&~ukZT)C3vFt%rum9}H=lf-I7DyJ^U-=|cmfUaPeE(}+K-3Qv=LPvsBOU9k
zoc~!?o6r8H;;g7?tJ-FA%4ypAg;6iR-gc6ld}&v!`bB3KFSF3K-)&tkof0dbeznB~
z=COi%549UM{cw6OaP|JC1v<{VE1xMC-1+P@@t{Wi^ECczx*2?MH?3<A7x2FQ8qQxY
zl-m|1FcBUo?i#Q8v!{x|<wazCHpQPn#FFxEi{pZe_2BXeOgbqaBJJ$L(n9uGFZ^d~
z&%YzWTtd@scfhY(EA|0n>6&=+wTWB**-qGV;bF=3YqmGLJkO*^A);C4=!e+weTZ1P
zCY7A2K5HS|LHcS*TLX*{f$E%~rnCOy0k{LQa}G}kWHf>Ew;UIGeQCQZln;!hYZ(Uu
qcNJK|6-ZtZE_-kTVW3Cr%Slr*KH2}%S!Z)VVd3QU6J=RIu>=5#9qAhY

diff --git a/tests/regression_tests/deplete_with_transfer_rates/ref_no_depletion_only_feed.h5 b/tests/regression_tests/deplete_with_transfer_rates/ref_no_depletion_only_feed.h5
index d080b447093018f62b3eced413db81fa606d3338..70a4a3d67a513287b449b1afb36556bf48bbff7b 100644
GIT binary patch
delta 30
lcmcbxnCZe|rVVfUnI9~hG&#{#e&Pk8%?cCNFtPyo_5kbT4rc%W

delta 30
lcmcbxnCZe|rVVfUnG5_5Pfm1|pLjuNv%-Wmj4VLDJpkRP4LJY+

diff --git a/tests/regression_tests/deplete_with_transfer_rates/ref_no_depletion_only_removal.h5 b/tests/regression_tests/deplete_with_transfer_rates/ref_no_depletion_only_removal.h5
index 36f89e0090b147be206c995014745f3e9cb6c884..b41218a9b295a14f08c076e026adb858b4cb5b0b 100644
GIT binary patch
delta 30
lcmcbxnCZe|rVVfUnLWNvnw;n=Kk<UlW`zlB7+HXPdjRBa4b=bu

delta 30
lcmcbxnCZe|rVVfUnG3a#PEK@{pLjuNv%-Wmj4VLDJpkI~4EX>6

diff --git a/tests/regression_tests/deplete_with_transfer_rates/ref_no_depletion_with_ext_source.h5 b/tests/regression_tests/deplete_with_transfer_rates/ref_no_depletion_with_ext_source.h5
index f3b1b171ebcab9d99fb7b73f5b8273ac72187971..71bfdae11234c73d8c7e38e2f6883813cf73f85e 100644
GIT binary patch
delta 30
lcmcbxnCZe|rVVfUnKN>yOipx_pLjuNv%-Wmj4VLDJpkM04G91M

delta 30
lcmcbxnCZe|rVVfUnH}aGnVje<Kk<UlW`zlB7+HXPdjQ}Z4SN6p

diff --git a/tests/regression_tests/deplete_with_transfer_rates/ref_no_depletion_with_transfer.h5 b/tests/regression_tests/deplete_with_transfer_rates/ref_no_depletion_with_transfer.h5
index b0ba997407f2471adcb32897dd08378bfe312814..ccf92b39915aa425b0a6746905f23038985196fe 100644
GIT binary patch
delta 30
lcmcbxnCZe|rVVfUnHjPoCnvhfPrM+sSz*E&MiwC79stcq3%vjU

delta 30
lcmcbxnCZe|rVVfUnIEhwnw;n=Kk<UlW`zlB7+HXPdjRRY4le)z

diff --git a/tests/regression_tests/deplete_with_transfer_rates/test.py b/tests/regression_tests/deplete_with_transfer_rates/test.py
index 4ad009d22..9784a07f6 100644
--- a/tests/regression_tests/deplete_with_transfer_rates/test.py
+++ b/tests/regression_tests/deplete_with_transfer_rates/test.py
@@ -40,10 +40,9 @@ def model():
     geometry = openmc.Geometry([cell_f, cell_w])
 
     settings = openmc.Settings()
-    settings.particles = 100
+    settings.particles = 150
     settings.inactive = 0
     settings.batches = 10
-    settings.seed = 1
 
     return openmc.Model(geometry, materials, settings)
 
diff --git a/tests/regression_tests/deplete_with_transport/last_step_reference_materials.xml b/tests/regression_tests/deplete_with_transport/last_step_reference_materials.xml
index 242e2e7db..2dca55992 100644
--- a/tests/regression_tests/deplete_with_transport/last_step_reference_materials.xml
+++ b/tests/regression_tests/deplete_with_transport/last_step_reference_materials.xml
@@ -4,993 +4,993 @@
     <density units="sum"/>
     <nuclide name="O16" ao="0.046295399999999994"/>
     <nuclide name="O17" ao="0.00011276839999999999"/>
-    <nuclide name="Cs135" ao="4.4180489845847837e-07"/>
-    <nuclide name="Gd156" ao="7.2549793284842195e-09"/>
-    <nuclide name="Gd157" ao="4.6150717465438587e-10"/>
-    <nuclide name="I135" ao="8.610759149890541e-09"/>
-    <nuclide name="U234" ao="1.00447595096247e-05"/>
-    <nuclide name="U235" ao="0.001021319968105753"/>
-    <nuclide name="U238" ao="0.022134492490415457"/>
-    <nuclide name="Xe135" ao="4.898883540853392e-09"/>
-    <nuclide name="Xe136" ao="1.5016036288896978e-06"/>
+    <nuclide name="Cs135" ao="4.2356868043329955e-07"/>
+    <nuclide name="Gd156" ao="6.865124946086107e-09"/>
+    <nuclide name="Gd157" ao="5.541422693730839e-10"/>
+    <nuclide name="I135" ao="8.398855591278969e-09"/>
+    <nuclide name="U234" ao="1.0044849802108137e-05"/>
+    <nuclide name="U235" ao="0.0010241568543408182"/>
+    <nuclide name="U238" ao="0.02213444658452529"/>
+    <nuclide name="Xe135" ao="5.102657017430096e-09"/>
+    <nuclide name="Xe136" ao="1.3680520508276297e-06"/>
   </material>
   <material id="2" depletable="true" volume="0.06674732823364922" temperature="293.6">
     <density units="sum"/>
     <nuclide name="O16" ao="0.046295399999999994"/>
     <nuclide name="O17" ao="0.00011276839999999999"/>
-    <nuclide name="Cs135" ao="4.7109992046231964e-07"/>
-    <nuclide name="Gd156" ao="7.042063874024541e-09"/>
-    <nuclide name="Gd157" ao="6.027071887061818e-10"/>
-    <nuclide name="I135" ao="7.95412956238769e-09"/>
-    <nuclide name="U234" ao="1.0044351820098593e-05"/>
-    <nuclide name="U235" ao="0.00102408632740032"/>
-    <nuclide name="U238" ao="0.02213423274784442"/>
-    <nuclide name="Xe135" ao="4.973037106302515e-09"/>
-    <nuclide name="Xe136" ao="1.3283930174680673e-06"/>
+    <nuclide name="Cs135" ao="4.2319130817070604e-07"/>
+    <nuclide name="Gd156" ao="7.3426396109268715e-09"/>
+    <nuclide name="Gd157" ao="4.620907180916395e-10"/>
+    <nuclide name="I135" ao="8.145047277711335e-09"/>
+    <nuclide name="U234" ao="1.0044620516536351e-05"/>
+    <nuclide name="U235" ao="0.0010214254323774594"/>
+    <nuclide name="U238" ao="0.02213434395408555"/>
+    <nuclide name="Xe135" ao="4.409408608714128e-09"/>
+    <nuclide name="Xe136" ao="1.517924707536826e-06"/>
   </material>
   <material id="3" depletable="true" volume="0.06674732823364922" temperature="293.6">
     <density units="sum"/>
     <nuclide name="O16" ao="0.046295399999999994"/>
     <nuclide name="O17" ao="0.00011276839999999999"/>
-    <nuclide name="Cs135" ao="4.5196882278137964e-07"/>
-    <nuclide name="Gd156" ao="7.390520641508283e-09"/>
-    <nuclide name="Gd157" ao="6.1139624340991e-10"/>
-    <nuclide name="I135" ao="7.339426249127244e-09"/>
-    <nuclide name="U234" ao="1.0044458911815349e-05"/>
-    <nuclide name="U235" ao="0.0010213846058415266"/>
-    <nuclide name="U238" ao="0.02213428321817386"/>
-    <nuclide name="Xe135" ao="5.052047240880656e-09"/>
-    <nuclide name="Xe136" ao="1.492502282115296e-06"/>
+    <nuclide name="Cs135" ao="4.4178313721689144e-07"/>
+    <nuclide name="Gd156" ao="8.116163111173852e-09"/>
+    <nuclide name="Gd157" ao="4.4088366729959583e-10"/>
+    <nuclide name="I135" ao="9.554417472347754e-09"/>
+    <nuclide name="U234" ao="1.0044450212208804e-05"/>
+    <nuclide name="U235" ao="0.0010161482310562272"/>
+    <nuclide name="U238" ao="0.022134327045989218"/>
+    <nuclide name="Xe135" ao="5.136728188559948e-09"/>
+    <nuclide name="Xe136" ao="1.7812317019106522e-06"/>
   </material>
   <material id="4" depletable="true" volume="0.06674732823364922" temperature="293.6">
     <density units="sum"/>
     <nuclide name="O16" ao="0.046295399999999994"/>
     <nuclide name="O17" ao="0.00011276839999999999"/>
-    <nuclide name="Cs135" ao="4.610385562797368e-07"/>
-    <nuclide name="Gd156" ao="7.2542350999039044e-09"/>
-    <nuclide name="Gd157" ao="4.694384504892065e-10"/>
-    <nuclide name="I135" ao="8.99963252548058e-09"/>
-    <nuclide name="U234" ao="1.0044557857503748e-05"/>
-    <nuclide name="U235" ao="0.0010213889405514816"/>
-    <nuclide name="U238" ao="0.022134477440110358"/>
-    <nuclide name="Xe135" ao="5.198618342135029e-09"/>
-    <nuclide name="Xe136" ao="1.4782292628750817e-06"/>
+    <nuclide name="Cs135" ao="4.3049145669157527e-07"/>
+    <nuclide name="Gd156" ao="6.7653891602652035e-09"/>
+    <nuclide name="Gd157" ao="4.3076614826333194e-10"/>
+    <nuclide name="I135" ao="9.284137145929815e-09"/>
+    <nuclide name="U234" ao="1.0044826197174234e-05"/>
+    <nuclide name="U235" ao="0.001023785201297803"/>
+    <nuclide name="U238" ao="0.022134656031119686"/>
+    <nuclide name="Xe135" ao="4.715214663148694e-09"/>
+    <nuclide name="Xe136" ao="1.377211122940915e-06"/>
   </material>
   <material id="5" depletable="true" volume="0.06674732823364922" temperature="293.6">
     <density units="sum"/>
     <nuclide name="O16" ao="0.0464035"/>
-    <nuclide name="Cs135" ao="4.6068906575995227e-07"/>
-    <nuclide name="Gd156" ao="4.45301183633431e-09"/>
-    <nuclide name="Gd157" ao="6.452882105032804e-05"/>
-    <nuclide name="I135" ao="5.350905347436304e-09"/>
-    <nuclide name="U235" ao="0.0010186933910628446"/>
-    <nuclide name="U238" ao="0.02169176973824294"/>
-    <nuclide name="Xe135" ao="6.032753962430652e-09"/>
-    <nuclide name="Xe136" ao="4.88334256170519e-07"/>
+    <nuclide name="Cs135" ao="4.542769181375145e-07"/>
+    <nuclide name="Gd156" ao="4.247507572794269e-09"/>
+    <nuclide name="Gd157" ao="7.607355725712567e-05"/>
+    <nuclide name="I135" ao="4.588514859330725e-09"/>
+    <nuclide name="U235" ao="0.001019991217833744"/>
+    <nuclide name="U238" ao="0.02169178849756869"/>
+    <nuclide name="Xe135" ao="6.09774089179803e-09"/>
+    <nuclide name="Xe136" ao="4.2535577148444276e-07"/>
   </material>
   <material id="6" depletable="true" volume="0.06674732823364922" temperature="293.6">
     <density units="sum"/>
     <nuclide name="O16" ao="0.046295399999999994"/>
     <nuclide name="O17" ao="0.00011276839999999999"/>
-    <nuclide name="Cs135" ao="4.5448917916965475e-07"/>
-    <nuclide name="Gd156" ao="7.987183377412963e-09"/>
-    <nuclide name="Gd157" ao="4.865379817976642e-10"/>
-    <nuclide name="I135" ao="8.523326262987082e-09"/>
-    <nuclide name="U234" ao="1.004449677662597e-05"/>
-    <nuclide name="U235" ao="0.0010175799065569445"/>
-    <nuclide name="U238" ao="0.02213426568393913"/>
-    <nuclide name="Xe135" ao="4.86982078246298e-09"/>
-    <nuclide name="Xe136" ao="1.6938385702297322e-06"/>
+    <nuclide name="Cs135" ao="4.6222292701827685e-07"/>
+    <nuclide name="Gd156" ao="7.641679056086077e-09"/>
+    <nuclide name="Gd157" ao="4.503928459086066e-10"/>
+    <nuclide name="I135" ao="9.492328031362914e-09"/>
+    <nuclide name="U234" ao="1.0044915140880888e-05"/>
+    <nuclide name="U235" ao="0.001018053212441644"/>
+    <nuclide name="U238" ao="0.022134616684476378"/>
+    <nuclide name="Xe135" ao="5.254185581334344e-09"/>
+    <nuclide name="Xe136" ao="1.6535711743231454e-06"/>
   </material>
   <material id="7" depletable="true" volume="0.06674732823364922" temperature="293.6">
     <density units="sum"/>
     <nuclide name="O16" ao="0.046295399999999994"/>
     <nuclide name="O17" ao="0.00011276839999999999"/>
-    <nuclide name="Cs135" ao="4.365851597102055e-07"/>
-    <nuclide name="Gd156" ao="7.885461639644807e-09"/>
-    <nuclide name="Gd157" ao="3.6063871000919685e-10"/>
-    <nuclide name="I135" ao="1.136967239656431e-08"/>
-    <nuclide name="U234" ao="1.004435753347176e-05"/>
-    <nuclide name="U235" ao="0.0010176281979544044"/>
-    <nuclide name="U238" ao="0.02213438660359147"/>
-    <nuclide name="Xe135" ao="5.3728946653715295e-09"/>
-    <nuclide name="Xe136" ao="1.7038388316063246e-06"/>
+    <nuclide name="Cs135" ao="4.1000667812728663e-07"/>
+    <nuclide name="Gd156" ao="6.689077801385136e-09"/>
+    <nuclide name="Gd157" ao="4.130425397110701e-10"/>
+    <nuclide name="I135" ao="9.092777384969168e-09"/>
+    <nuclide name="U234" ao="1.0045299655814742e-05"/>
+    <nuclide name="U235" ao="0.0010228116906663574"/>
+    <nuclide name="U238" ao="0.02213494596654602"/>
+    <nuclide name="Xe135" ao="4.988829222570771e-09"/>
+    <nuclide name="Xe136" ao="1.4452170325218717e-06"/>
   </material>
   <material id="8" depletable="true" volume="0.06674732823364922" temperature="293.6">
     <density units="sum"/>
     <nuclide name="O16" ao="0.046295399999999994"/>
     <nuclide name="O17" ao="0.00011276839999999999"/>
-    <nuclide name="Cs135" ao="4.5625540310461215e-07"/>
-    <nuclide name="Gd156" ao="7.771490180621292e-09"/>
-    <nuclide name="Gd157" ao="4.146823023983641e-10"/>
-    <nuclide name="I135" ao="9.209488335030714e-09"/>
-    <nuclide name="U234" ao="1.0044402337263812e-05"/>
-    <nuclide name="U235" ao="0.0010186458655452861"/>
-    <nuclide name="U238" ao="0.022134339049317633"/>
-    <nuclide name="Xe135" ao="5.497659457987619e-09"/>
-    <nuclide name="Xe136" ao="1.6322553919462217e-06"/>
+    <nuclide name="Cs135" ao="4.7609555432396866e-07"/>
+    <nuclide name="Gd156" ao="7.089929911931423e-09"/>
+    <nuclide name="Gd157" ao="5.88943800256365e-10"/>
+    <nuclide name="I135" ao="8.091275299857685e-09"/>
+    <nuclide name="U234" ao="1.0045375663431424e-05"/>
+    <nuclide name="U235" ao="0.0010201278176149879"/>
+    <nuclide name="U238" ao="0.022134941505628638"/>
+    <nuclide name="Xe135" ao="6.198198965862743e-09"/>
+    <nuclide name="Xe136" ao="1.5232979501057869e-06"/>
   </material>
   <material id="9" depletable="true" volume="0.06674732823364922" temperature="293.6">
     <density units="sum"/>
     <nuclide name="O16" ao="0.046295399999999994"/>
     <nuclide name="O17" ao="0.00011276839999999999"/>
-    <nuclide name="Cs135" ao="4.4849047261874304e-07"/>
-    <nuclide name="Gd156" ao="7.046983082489661e-09"/>
-    <nuclide name="Gd157" ao="4.957093622147675e-10"/>
-    <nuclide name="I135" ao="1.0283911483340312e-08"/>
-    <nuclide name="U234" ao="1.0044263707893839e-05"/>
-    <nuclide name="U235" ao="0.0010240145184075352"/>
-    <nuclide name="U238" ao="0.02213424387109948"/>
-    <nuclide name="Xe135" ao="5.102740934580265e-09"/>
-    <nuclide name="Xe136" ao="1.3522284050998152e-06"/>
+    <nuclide name="Cs135" ao="4.4863029159691885e-07"/>
+    <nuclide name="Gd156" ao="7.869887235954523e-09"/>
+    <nuclide name="Gd157" ao="4.871567704930168e-10"/>
+    <nuclide name="I135" ao="1.0122891892022287e-08"/>
+    <nuclide name="U234" ao="1.0044744554427128e-05"/>
+    <nuclide name="U235" ao="0.0010170220133291787"/>
+    <nuclide name="U238" ao="0.02213450565150903"/>
+    <nuclide name="Xe135" ao="5.427465866595839e-09"/>
+    <nuclide name="Xe136" ao="1.7236218194635904e-06"/>
   </material>
   <material id="10" depletable="true" volume="0.06674732823364922" temperature="293.6">
     <density units="sum"/>
     <nuclide name="O16" ao="0.046295399999999994"/>
     <nuclide name="O17" ao="0.00011276839999999999"/>
-    <nuclide name="Cs135" ao="4.54649330746641e-07"/>
-    <nuclide name="Gd156" ao="8.140359772312664e-09"/>
-    <nuclide name="Gd157" ao="5.697645603089687e-10"/>
-    <nuclide name="I135" ao="7.546282979584689e-09"/>
-    <nuclide name="U234" ao="1.0044621491322387e-05"/>
-    <nuclide name="U235" ao="0.0010168499066742598"/>
-    <nuclide name="U238" ao="0.022134202939750564"/>
-    <nuclide name="Xe135" ao="5.110958338411566e-09"/>
-    <nuclide name="Xe136" ao="1.7346785903470948e-06"/>
+    <nuclide name="Cs135" ao="4.288626509063128e-07"/>
+    <nuclide name="Gd156" ao="6.99761637650265e-09"/>
+    <nuclide name="Gd157" ao="5.869131475432082e-10"/>
+    <nuclide name="I135" ao="8.605440672743045e-09"/>
+    <nuclide name="U234" ao="1.0044858746487949e-05"/>
+    <nuclide name="U235" ao="0.0010241805594391042"/>
+    <nuclide name="U238" ao="0.02213428053355166"/>
+    <nuclide name="Xe135" ao="5.381799114058718e-09"/>
+    <nuclide name="Xe136" ao="1.3636968684764211e-06"/>
   </material>
   <material id="11" depletable="true" volume="0.06674732823364922" temperature="293.6">
     <density units="sum"/>
     <nuclide name="O16" ao="0.046295399999999994"/>
     <nuclide name="O17" ao="0.00011276839999999999"/>
-    <nuclide name="Cs135" ao="4.356328087111304e-07"/>
-    <nuclide name="Gd156" ao="7.482536561844464e-09"/>
-    <nuclide name="Gd157" ao="4.256220744995123e-10"/>
-    <nuclide name="I135" ao="9.633889473449001e-09"/>
-    <nuclide name="U234" ao="1.0044260492856067e-05"/>
-    <nuclide name="U235" ao="0.0010215775522793961"/>
-    <nuclide name="U238" ao="0.022134138392005908"/>
-    <nuclide name="Xe135" ao="4.875694297039386e-09"/>
-    <nuclide name="Xe136" ao="1.4987118043030461e-06"/>
+    <nuclide name="Cs135" ao="4.261923165300342e-07"/>
+    <nuclide name="Gd156" ao="6.888728848648422e-09"/>
+    <nuclide name="Gd157" ao="4.5870701686996404e-10"/>
+    <nuclide name="I135" ao="8.088423684066541e-09"/>
+    <nuclide name="U234" ao="1.0044994812479192e-05"/>
+    <nuclide name="U235" ao="0.0010229754755960263"/>
+    <nuclide name="U238" ao="0.022134637796734684"/>
+    <nuclide name="Xe135" ao="5.001469151555239e-09"/>
+    <nuclide name="Xe136" ao="1.4262445718279605e-06"/>
   </material>
   <material id="12" depletable="true" volume="0.06674732823364922" temperature="293.6">
     <density units="sum"/>
     <nuclide name="O16" ao="0.046295399999999994"/>
     <nuclide name="O17" ao="0.00011276839999999999"/>
-    <nuclide name="Cs135" ao="4.5499172002525965e-07"/>
-    <nuclide name="Gd156" ao="7.90039271767826e-09"/>
-    <nuclide name="Gd157" ao="5.043357296023378e-10"/>
-    <nuclide name="I135" ao="9.717794257343092e-09"/>
-    <nuclide name="U234" ao="1.0044246640051479e-05"/>
-    <nuclide name="U235" ao="0.001018955480032775"/>
-    <nuclide name="U238" ao="0.022134093110617634"/>
-    <nuclide name="Xe135" ao="5.099520096684825e-09"/>
-    <nuclide name="Xe136" ao="1.6207687623132563e-06"/>
+    <nuclide name="Cs135" ao="4.427125049968549e-07"/>
+    <nuclide name="Gd156" ao="7.103027348134599e-09"/>
+    <nuclide name="Gd157" ao="4.983820280370249e-10"/>
+    <nuclide name="I135" ao="7.178777085694258e-09"/>
+    <nuclide name="U234" ao="1.0044975670928517e-05"/>
+    <nuclide name="U235" ao="0.0010219904449890577"/>
+    <nuclide name="U238" ao="0.022134544307168158"/>
+    <nuclide name="Xe135" ao="4.755312716308315e-09"/>
+    <nuclide name="Xe136" ao="1.4653655149739397e-06"/>
   </material>
   <material id="13" depletable="true" volume="0.06674732823364922" temperature="293.6">
     <density units="sum"/>
     <nuclide name="O16" ao="0.046295399999999994"/>
     <nuclide name="O17" ao="0.00011276839999999999"/>
-    <nuclide name="Cs135" ao="4.2085912253520763e-07"/>
-    <nuclide name="Gd156" ao="7.387032997276892e-09"/>
-    <nuclide name="Gd157" ao="4.536377596093003e-10"/>
-    <nuclide name="I135" ao="9.623102601466089e-09"/>
-    <nuclide name="U234" ao="1.0044648049703634e-05"/>
-    <nuclide name="U235" ao="0.0010212601078170274"/>
-    <nuclide name="U238" ao="0.022134335203923612"/>
-    <nuclide name="Xe135" ao="4.8698368764839335e-09"/>
-    <nuclide name="Xe136" ao="1.5273484191647258e-06"/>
+    <nuclide name="Cs135" ao="4.275393001671307e-07"/>
+    <nuclide name="Gd156" ao="6.673390732809918e-09"/>
+    <nuclide name="Gd157" ao="4.689698161353729e-10"/>
+    <nuclide name="I135" ao="9.619422577491376e-09"/>
+    <nuclide name="U234" ao="1.0044613559837513e-05"/>
+    <nuclide name="U235" ao="0.0010256201677289899"/>
+    <nuclide name="U238" ao="0.02213441873539166"/>
+    <nuclide name="Xe135" ao="4.949562238246029e-09"/>
+    <nuclide name="Xe136" ao="1.2847994319562556e-06"/>
   </material>
   <material id="14" depletable="true" volume="0.06674732823364922" temperature="293.6">
     <density units="sum"/>
     <nuclide name="O16" ao="0.0464035"/>
-    <nuclide name="Cs135" ao="4.2242275017886855e-07"/>
-    <nuclide name="Gd156" ao="4.046777209581165e-09"/>
-    <nuclide name="Gd157" ao="7.77190237760579e-05"/>
-    <nuclide name="I135" ao="4.244203293759763e-09"/>
-    <nuclide name="U235" ao="0.0010210841866332414"/>
-    <nuclide name="U238" ao="0.02169184057611082"/>
-    <nuclide name="Xe135" ao="5.204749875515762e-09"/>
-    <nuclide name="Xe136" ao="3.9883254526072304e-07"/>
+    <nuclide name="Cs135" ao="5.580496812202369e-07"/>
+    <nuclide name="Gd156" ao="4.702408461035458e-09"/>
+    <nuclide name="Gd157" ao="7.547257783602748e-05"/>
+    <nuclide name="I135" ao="5.642099634431421e-09"/>
+    <nuclide name="U235" ao="0.0010160660276181052"/>
+    <nuclide name="U238" ao="0.021691959786351647"/>
+    <nuclide name="Xe135" ao="7.067646686442554e-09"/>
+    <nuclide name="Xe136" ao="5.278288799755373e-07"/>
   </material>
   <material id="15" depletable="true" volume="0.06674732823364922" temperature="293.6">
     <density units="sum"/>
     <nuclide name="O16" ao="0.046295399999999994"/>
     <nuclide name="O17" ao="0.00011276839999999999"/>
-    <nuclide name="Cs135" ao="4.6297695279308207e-07"/>
-    <nuclide name="Gd156" ao="8.043395705978296e-09"/>
-    <nuclide name="Gd157" ao="4.5962909889223416e-10"/>
-    <nuclide name="I135" ao="9.79459763465254e-09"/>
-    <nuclide name="U234" ao="1.0044275982599374e-05"/>
-    <nuclide name="U235" ao="0.0010173553197709228"/>
-    <nuclide name="U238" ao="0.022134228674554737"/>
-    <nuclide name="Xe135" ao="5.337501828657589e-09"/>
-    <nuclide name="Xe136" ao="1.69630230513062e-06"/>
+    <nuclide name="Cs135" ao="4.4436288811909033e-07"/>
+    <nuclide name="Gd156" ao="7.442360470960013e-09"/>
+    <nuclide name="Gd157" ao="4.0799152072238066e-10"/>
+    <nuclide name="I135" ao="1.068148448055684e-08"/>
+    <nuclide name="U234" ao="1.0045012588375937e-05"/>
+    <nuclide name="U235" ao="0.0010199764261813909"/>
+    <nuclide name="U238" ao="0.02213450810669218"/>
+    <nuclide name="Xe135" ao="5.466841621058404e-09"/>
+    <nuclide name="Xe136" ao="1.5683793675705094e-06"/>
   </material>
   <material id="16" depletable="true" volume="0.06674732823364922" temperature="293.6">
     <density units="sum"/>
     <nuclide name="O16" ao="0.046295399999999994"/>
     <nuclide name="O17" ao="0.00011276839999999999"/>
-    <nuclide name="Cs135" ao="4.2439923646596987e-07"/>
-    <nuclide name="Gd156" ao="7.51993097842057e-09"/>
-    <nuclide name="Gd157" ao="3.8006059505546623e-10"/>
-    <nuclide name="I135" ao="1.0767865102277833e-08"/>
-    <nuclide name="U234" ao="1.0044208116408632e-05"/>
-    <nuclide name="U235" ao="0.0010205777538804912"/>
-    <nuclide name="U238" ao="0.022134290624025953"/>
-    <nuclide name="Xe135" ao="5.118002643684298e-09"/>
-    <nuclide name="Xe136" ao="1.5598554985375204e-06"/>
+    <nuclide name="Cs135" ao="4.2907994042887604e-07"/>
+    <nuclide name="Gd156" ao="7.862867528370996e-09"/>
+    <nuclide name="Gd157" ao="4.1495998038846624e-10"/>
+    <nuclide name="I135" ao="1.021256419917343e-08"/>
+    <nuclide name="U234" ao="1.0044687226276803e-05"/>
+    <nuclide name="U235" ao="0.0010166872672099227"/>
+    <nuclide name="U238" ao="0.022134559897124737"/>
+    <nuclide name="Xe135" ao="5.374082697844283e-09"/>
+    <nuclide name="Xe136" ao="1.7602563326352594e-06"/>
   </material>
   <material id="17" depletable="true" volume="0.06674732823364922" temperature="293.6">
     <density units="sum"/>
     <nuclide name="O16" ao="0.046295399999999994"/>
     <nuclide name="O17" ao="0.00011276839999999999"/>
-    <nuclide name="Cs135" ao="4.712249224999332e-07"/>
-    <nuclide name="Gd156" ao="8.12439225407168e-09"/>
-    <nuclide name="Gd157" ao="3.918401546635954e-10"/>
-    <nuclide name="I135" ao="1.110080811911908e-08"/>
-    <nuclide name="U234" ao="1.004444860785254e-05"/>
-    <nuclide name="U235" ao="0.001015325533738875"/>
-    <nuclide name="U238" ao="0.022134518675913453"/>
-    <nuclide name="Xe135" ao="6.162820906594628e-09"/>
-    <nuclide name="Xe136" ao="1.7903377642474933e-06"/>
+    <nuclide name="Cs135" ao="4.6057011626339797e-07"/>
+    <nuclide name="Gd156" ao="7.459223669721799e-09"/>
+    <nuclide name="Gd157" ao="4.2676637994580216e-10"/>
+    <nuclide name="I135" ao="1.1396302940914086e-08"/>
+    <nuclide name="U234" ao="1.0045038824287894e-05"/>
+    <nuclide name="U235" ao="0.0010189290436290195"/>
+    <nuclide name="U238" ao="0.022134694821230178"/>
+    <nuclide name="Xe135" ao="6.139798202801719e-09"/>
+    <nuclide name="Xe136" ao="1.6040641148298025e-06"/>
   </material>
   <material id="18" depletable="true" volume="0.06674732823364922" temperature="293.6">
     <density units="sum"/>
     <nuclide name="O16" ao="0.046295399999999994"/>
     <nuclide name="O17" ao="0.00011276839999999999"/>
-    <nuclide name="Cs135" ao="4.531153595367313e-07"/>
-    <nuclide name="Gd156" ao="7.502808414768136e-09"/>
-    <nuclide name="Gd157" ao="3.8778800535383123e-10"/>
-    <nuclide name="I135" ao="1.0507636646210905e-08"/>
-    <nuclide name="U234" ao="1.0044253708465351e-05"/>
-    <nuclide name="U235" ao="0.0010201327804558217"/>
-    <nuclide name="U238" ao="0.02213439545238702"/>
-    <nuclide name="Xe135" ao="5.3962772783966446e-09"/>
-    <nuclide name="Xe136" ao="1.5533402153334209e-06"/>
+    <nuclide name="Cs135" ao="4.438602446703226e-07"/>
+    <nuclide name="Gd156" ao="8.071345883859342e-09"/>
+    <nuclide name="Gd157" ao="3.956782953085406e-10"/>
+    <nuclide name="I135" ao="1.175826735582652e-08"/>
+    <nuclide name="U234" ao="1.004452000579268e-05"/>
+    <nuclide name="U235" ao="0.0010155547076801004"/>
+    <nuclide name="U238" ao="0.022134533494143006"/>
+    <nuclide name="Xe135" ao="5.34772835943691e-09"/>
+    <nuclide name="Xe136" ao="1.8052924936043486e-06"/>
   </material>
   <material id="19" depletable="true" volume="0.06674732823364922" temperature="293.6">
     <density units="sum"/>
     <nuclide name="O16" ao="0.046295399999999994"/>
     <nuclide name="O17" ao="0.00011276839999999999"/>
-    <nuclide name="Cs135" ao="4.2805824385921033e-07"/>
-    <nuclide name="Gd156" ao="6.895063372358365e-09"/>
-    <nuclide name="Gd157" ao="4.725046335047864e-10"/>
-    <nuclide name="I135" ao="8.97107842759746e-09"/>
-    <nuclide name="U234" ao="1.0044434844325525e-05"/>
-    <nuclide name="U235" ao="0.0010246197579365402"/>
-    <nuclide name="U238" ao="0.022134292112283606"/>
-    <nuclide name="Xe135" ao="4.989035402383652e-09"/>
-    <nuclide name="Xe136" ao="1.3407496363522234e-06"/>
+    <nuclide name="Cs135" ao="4.4738219114823265e-07"/>
+    <nuclide name="Gd156" ao="7.722053180022245e-09"/>
+    <nuclide name="Gd157" ao="4.598492493366322e-10"/>
+    <nuclide name="I135" ao="1.0549877047526988e-08"/>
+    <nuclide name="U234" ao="1.0044362759795854e-05"/>
+    <nuclide name="U235" ao="0.0010191937604383024"/>
+    <nuclide name="U238" ao="0.022134284354645446"/>
+    <nuclide name="Xe135" ao="5.253655366292355e-09"/>
+    <nuclide name="Xe136" ao="1.611463911771161e-06"/>
   </material>
   <material id="20" depletable="true" volume="0.06674732823364922" temperature="293.6">
     <density units="sum"/>
     <nuclide name="O16" ao="0.046295399999999994"/>
     <nuclide name="O17" ao="0.00011276839999999999"/>
-    <nuclide name="Cs135" ao="4.572319631300454e-07"/>
-    <nuclide name="Gd156" ao="7.169872287546151e-09"/>
-    <nuclide name="Gd157" ao="4.5318180282038245e-10"/>
-    <nuclide name="I135" ao="9.303299219244154e-09"/>
-    <nuclide name="U234" ao="1.0044424717868887e-05"/>
-    <nuclide name="U235" ao="0.001023039411729011"/>
-    <nuclide name="U238" ao="0.022134264483889672"/>
-    <nuclide name="Xe135" ao="5.090119271586464e-09"/>
-    <nuclide name="Xe136" ao="1.3965662648477194e-06"/>
+    <nuclide name="Cs135" ao="4.4139030986537467e-07"/>
+    <nuclide name="Gd156" ao="7.2224747292782175e-09"/>
+    <nuclide name="Gd157" ao="4.050695639031127e-10"/>
+    <nuclide name="I135" ao="9.560738303794912e-09"/>
+    <nuclide name="U234" ao="1.0044945123885857e-05"/>
+    <nuclide name="U235" ao="0.001021586686109334"/>
+    <nuclide name="U238" ao="0.022134480622808213"/>
+    <nuclide name="Xe135" ao="5.2979009615072705e-09"/>
+    <nuclide name="Xe136" ao="1.4865100970134077e-06"/>
   </material>
   <material id="21" depletable="true" volume="0.06674732823364922" temperature="293.6">
     <density units="sum"/>
     <nuclide name="O16" ao="0.046295399999999994"/>
     <nuclide name="O17" ao="0.00011276839999999999"/>
-    <nuclide name="Cs135" ao="4.450648347516283e-07"/>
-    <nuclide name="Gd156" ao="7.79123186528617e-09"/>
-    <nuclide name="Gd157" ao="4.801783348351781e-10"/>
-    <nuclide name="I135" ao="1.0146797229298853e-08"/>
-    <nuclide name="U234" ao="1.004438612044785e-05"/>
-    <nuclide name="U235" ao="0.0010197543471808291"/>
-    <nuclide name="U238" ao="0.02213407924687299"/>
-    <nuclide name="Xe135" ao="5.115335215214215e-09"/>
-    <nuclide name="Xe136" ao="1.587513649367174e-06"/>
+    <nuclide name="Cs135" ao="4.521203102805715e-07"/>
+    <nuclide name="Gd156" ao="7.526410035030314e-09"/>
+    <nuclide name="Gd157" ao="4.754092321471406e-10"/>
+    <nuclide name="I135" ao="8.132834520704866e-09"/>
+    <nuclide name="U234" ao="1.0044865826405913e-05"/>
+    <nuclide name="U235" ao="0.0010191760398785574"/>
+    <nuclide name="U238" ao="0.02213452460914868"/>
+    <nuclide name="Xe135" ao="5.2776616522524135e-09"/>
+    <nuclide name="Xe136" ao="1.6061361654146656e-06"/>
   </material>
   <material id="22" depletable="true" volume="0.06674732823364922" temperature="293.6">
     <density units="sum"/>
     <nuclide name="O16" ao="0.046295399999999994"/>
     <nuclide name="O17" ao="0.00011276839999999999"/>
-    <nuclide name="Cs135" ao="4.445115368004072e-07"/>
-    <nuclide name="Gd156" ao="7.610438516335627e-09"/>
-    <nuclide name="Gd157" ao="5.481423369261682e-10"/>
-    <nuclide name="I135" ao="7.563161653056015e-09"/>
-    <nuclide name="U234" ao="1.0044714261323595e-05"/>
-    <nuclide name="U235" ao="0.0010191890430702683"/>
-    <nuclide name="U238" ao="0.022134442627520262"/>
-    <nuclide name="Xe135" ao="5.049292264895614e-09"/>
-    <nuclide name="Xe136" ao="1.6151855322977993e-06"/>
+    <nuclide name="Cs135" ao="4.224915985672951e-07"/>
+    <nuclide name="Gd156" ao="6.7166296866198615e-09"/>
+    <nuclide name="Gd157" ao="4.6102796878833536e-10"/>
+    <nuclide name="I135" ao="1.123110174319396e-08"/>
+    <nuclide name="U234" ao="1.0045020046448608e-05"/>
+    <nuclide name="U235" ao="0.0010239641856834333"/>
+    <nuclide name="U238" ao="0.022134692482687637"/>
+    <nuclide name="Xe135" ao="5.466847643597257e-09"/>
+    <nuclide name="Xe136" ao="1.372284571187507e-06"/>
   </material>
   <material id="23" depletable="true" volume="0.06674732823364922" temperature="293.6">
     <density units="sum"/>
     <nuclide name="O16" ao="0.0464035"/>
-    <nuclide name="Cs135" ao="4.007687837996293e-07"/>
-    <nuclide name="Gd156" ao="4.15563926329356e-09"/>
-    <nuclide name="Gd157" ao="6.084196393046683e-05"/>
-    <nuclide name="I135" ao="4.565764370958123e-09"/>
-    <nuclide name="U235" ao="0.001020914637247464"/>
-    <nuclide name="U238" ao="0.021691729016809345"/>
-    <nuclide name="Xe135" ao="4.9812486691849115e-09"/>
-    <nuclide name="Xe136" ao="4.313187001180846e-07"/>
+    <nuclide name="Cs135" ao="4.572367036211901e-07"/>
+    <nuclide name="Gd156" ao="4.238816529467732e-09"/>
+    <nuclide name="Gd157" ao="6.399394571790123e-05"/>
+    <nuclide name="I135" ao="5.573694451691441e-09"/>
+    <nuclide name="U235" ao="0.0010187481798537364"/>
+    <nuclide name="U238" ao="0.021692045650867034"/>
+    <nuclide name="Xe135" ao="6.251637826357686e-09"/>
+    <nuclide name="Xe136" ao="4.839132354823211e-07"/>
   </material>
   <material id="24" depletable="true" volume="0.06674732823364922" temperature="293.6">
     <density units="sum"/>
     <nuclide name="O16" ao="0.046295399999999994"/>
     <nuclide name="O17" ao="0.00011276839999999999"/>
-    <nuclide name="Cs135" ao="4.672347214537883e-07"/>
-    <nuclide name="Gd156" ao="7.510614517842352e-09"/>
-    <nuclide name="Gd157" ao="3.8800984116567243e-10"/>
-    <nuclide name="I135" ao="1.0221972095676418e-08"/>
-    <nuclide name="U234" ao="1.0044436788944246e-05"/>
-    <nuclide name="U235" ao="0.001020189192511756"/>
-    <nuclide name="U238" ao="0.022134340717921346"/>
-    <nuclide name="Xe135" ao="5.448196054594672e-09"/>
-    <nuclide name="Xe136" ao="1.5373005222115101e-06"/>
+    <nuclide name="Cs135" ao="4.745965709396841e-07"/>
+    <nuclide name="Gd156" ao="7.03679146106453e-09"/>
+    <nuclide name="Gd157" ao="4.352819882177805e-10"/>
+    <nuclide name="I135" ao="9.8521517219287e-09"/>
+    <nuclide name="U234" ao="1.004476195123227e-05"/>
+    <nuclide name="U235" ao="0.0010226381731520508"/>
+    <nuclide name="U238" ao="0.022134499612283986"/>
+    <nuclide name="Xe135" ao="5.441081811959051e-09"/>
+    <nuclide name="Xe136" ao="1.3960336648826932e-06"/>
   </material>
   <material id="25" depletable="true" volume="0.06674732823364922" temperature="293.6">
     <density units="sum"/>
     <nuclide name="O16" ao="0.046295399999999994"/>
     <nuclide name="O17" ao="0.00011276839999999999"/>
-    <nuclide name="Cs135" ao="4.211443960749324e-07"/>
-    <nuclide name="Gd156" ao="7.581311246517837e-09"/>
-    <nuclide name="Gd157" ao="4.035443346440247e-10"/>
-    <nuclide name="I135" ao="1.0963506656542743e-08"/>
-    <nuclide name="U234" ao="1.0044361025775531e-05"/>
-    <nuclide name="U235" ao="0.0010200126803834853"/>
-    <nuclide name="U238" ao="0.022134322371965366"/>
-    <nuclide name="Xe135" ao="4.9316754226086145e-09"/>
-    <nuclide name="Xe136" ao="1.5929594432571348e-06"/>
+    <nuclide name="Cs135" ao="4.474697387767062e-07"/>
+    <nuclide name="Gd156" ao="8.473898267442943e-09"/>
+    <nuclide name="Gd157" ao="3.5247656519322743e-10"/>
+    <nuclide name="I135" ao="1.029331380974141e-08"/>
+    <nuclide name="U234" ao="1.0044995942761205e-05"/>
+    <nuclide name="U235" ao="0.0010125496897043598"/>
+    <nuclide name="U238" ao="0.022134596199889823"/>
+    <nuclide name="Xe135" ao="5.480108625481525e-09"/>
+    <nuclide name="Xe136" ao="1.9635455261001944e-06"/>
   </material>
   <material id="26" depletable="true" volume="0.06674732823364922" temperature="293.6">
     <density units="sum"/>
     <nuclide name="O16" ao="0.046295399999999994"/>
     <nuclide name="O17" ao="0.00011276839999999999"/>
-    <nuclide name="Cs135" ao="4.6367556413001594e-07"/>
-    <nuclide name="Gd156" ao="8.098562238364125e-09"/>
-    <nuclide name="Gd157" ao="4.2570401128256144e-10"/>
-    <nuclide name="I135" ao="1.1873408939235887e-08"/>
-    <nuclide name="U234" ao="1.0044164596280645e-05"/>
-    <nuclide name="U235" ao="0.001016466422386754"/>
-    <nuclide name="U238" ao="0.02213432992062079"/>
-    <nuclide name="Xe135" ao="6.092134003743775e-09"/>
-    <nuclide name="Xe136" ao="1.7389259816658934e-06"/>
+    <nuclide name="Cs135" ao="4.497696098407701e-07"/>
+    <nuclide name="Gd156" ao="6.991766424724991e-09"/>
+    <nuclide name="Gd157" ao="4.5018671657206944e-10"/>
+    <nuclide name="I135" ao="9.041468772947733e-09"/>
+    <nuclide name="U234" ao="1.004483741914852e-05"/>
+    <nuclide name="U235" ao="0.0010227029114301637"/>
+    <nuclide name="U238" ao="0.02213456822223278"/>
+    <nuclide name="Xe135" ao="5.2631261126672175e-09"/>
+    <nuclide name="Xe136" ao="1.4172484702362767e-06"/>
   </material>
   <material id="27" depletable="true" volume="0.06674732823364922" temperature="293.6">
     <density units="sum"/>
     <nuclide name="O16" ao="0.046295399999999994"/>
     <nuclide name="O17" ao="0.00011276839999999999"/>
-    <nuclide name="Cs135" ao="4.523424314106055e-07"/>
-    <nuclide name="Gd156" ao="6.7483826383441804e-09"/>
-    <nuclide name="Gd157" ao="4.1066179871436127e-10"/>
-    <nuclide name="I135" ao="9.692240087722253e-09"/>
-    <nuclide name="U234" ao="1.0044564874269356e-05"/>
-    <nuclide name="U235" ao="0.0010247727656697873"/>
-    <nuclide name="U238" ao="0.02213446365544743"/>
-    <nuclide name="Xe135" ao="5.465219842757615e-09"/>
-    <nuclide name="Xe136" ao="1.3042444615190524e-06"/>
+    <nuclide name="Cs135" ao="4.4537649986462676e-07"/>
+    <nuclide name="Gd156" ao="7.55534873639626e-09"/>
+    <nuclide name="Gd157" ao="4.1813313914967e-10"/>
+    <nuclide name="I135" ao="8.752767893523314e-09"/>
+    <nuclide name="U234" ao="1.0044746588074114e-05"/>
+    <nuclide name="U235" ao="0.001018814944904993"/>
+    <nuclide name="U238" ao="0.022134566710790612"/>
+    <nuclide name="Xe135" ao="5.0267366207150515e-09"/>
+    <nuclide name="Xe136" ao="1.631249233770074e-06"/>
   </material>
   <material id="28" depletable="true" volume="0.06674732823364922" temperature="293.6">
     <density units="sum"/>
     <nuclide name="O16" ao="0.046295399999999994"/>
     <nuclide name="O17" ao="0.00011276839999999999"/>
-    <nuclide name="Cs135" ao="4.466675187113592e-07"/>
-    <nuclide name="Gd156" ao="7.191858535557372e-09"/>
-    <nuclide name="Gd157" ao="4.638430627464777e-10"/>
-    <nuclide name="I135" ao="8.708423441592281e-09"/>
-    <nuclide name="U234" ao="1.004436720894081e-05"/>
-    <nuclide name="U235" ao="0.0010227318971276944"/>
-    <nuclide name="U238" ao="0.02213430292852833"/>
-    <nuclide name="Xe135" ao="5.1906248659837924e-09"/>
-    <nuclide name="Xe136" ao="1.4235382163510006e-06"/>
+    <nuclide name="Cs135" ao="4.4344110288749866e-07"/>
+    <nuclide name="Gd156" ao="6.908915682853683e-09"/>
+    <nuclide name="Gd157" ao="5.934946370967679e-10"/>
+    <nuclide name="I135" ao="8.375988639290607e-09"/>
+    <nuclide name="U234" ao="1.0044557704773099e-05"/>
+    <nuclide name="U235" ao="0.001024498562939052"/>
+    <nuclide name="U238" ao="0.022134331002914672"/>
+    <nuclide name="Xe135" ao="5.0606485437592054e-09"/>
+    <nuclide name="Xe136" ao="1.3317673345706552e-06"/>
   </material>
   <material id="29" depletable="true" volume="0.06674732823364922" temperature="293.6">
     <density units="sum"/>
     <nuclide name="O16" ao="0.046295399999999994"/>
     <nuclide name="O17" ao="0.00011276839999999999"/>
-    <nuclide name="Cs135" ao="4.564848163546606e-07"/>
-    <nuclide name="Gd156" ao="7.046950146855969e-09"/>
-    <nuclide name="Gd157" ao="5.361052662717774e-10"/>
-    <nuclide name="I135" ao="8.542724931158602e-09"/>
-    <nuclide name="U234" ao="1.004459756695043e-05"/>
-    <nuclide name="U235" ao="0.0010231530917557043"/>
-    <nuclide name="U238" ao="0.0221344016807911"/>
-    <nuclide name="Xe135" ao="4.758669320515469e-09"/>
-    <nuclide name="Xe136" ao="1.3900523043059956e-06"/>
+    <nuclide name="Cs135" ao="4.5585909608905684e-07"/>
+    <nuclide name="Gd156" ao="7.93352049129454e-09"/>
+    <nuclide name="Gd157" ao="4.1811046813596756e-10"/>
+    <nuclide name="I135" ao="1.0208486318467056e-08"/>
+    <nuclide name="U234" ao="1.0044503764372291e-05"/>
+    <nuclide name="U235" ao="0.0010183071861208314"/>
+    <nuclide name="U238" ao="0.022134170083908025"/>
+    <nuclide name="Xe135" ao="5.138637627693547e-09"/>
+    <nuclide name="Xe136" ao="1.6529633168019763e-06"/>
   </material>
   <material id="30" depletable="true" volume="0.06674732823364922" temperature="293.6">
     <density units="sum"/>
     <nuclide name="O16" ao="0.046295399999999994"/>
     <nuclide name="O17" ao="0.00011276839999999999"/>
-    <nuclide name="Cs135" ao="4.437067605151325e-07"/>
-    <nuclide name="Gd156" ao="7.1363891343374635e-09"/>
-    <nuclide name="Gd157" ao="5.566402231094469e-10"/>
-    <nuclide name="I135" ao="8.587230430892402e-09"/>
-    <nuclide name="U234" ao="1.0044808841280893e-05"/>
-    <nuclide name="U235" ao="0.0010226876654417763"/>
-    <nuclide name="U238" ao="0.022134380741743336"/>
-    <nuclide name="Xe135" ao="5.468326095113349e-09"/>
-    <nuclide name="Xe136" ao="1.4274298357254412e-06"/>
+    <nuclide name="Cs135" ao="4.417001986603486e-07"/>
+    <nuclide name="Gd156" ao="7.93895317464451e-09"/>
+    <nuclide name="Gd157" ao="4.659145697449449e-10"/>
+    <nuclide name="I135" ao="8.045440211058187e-09"/>
+    <nuclide name="U234" ao="1.0044897032315457e-05"/>
+    <nuclide name="U235" ao="0.0010157760835164344"/>
+    <nuclide name="U238" ao="0.02213464445493243"/>
+    <nuclide name="Xe135" ao="5.120320906374075e-09"/>
+    <nuclide name="Xe136" ao="1.7976635229970948e-06"/>
   </material>
   <material id="31" depletable="true" volume="0.06674732823364922" temperature="293.6">
     <density units="sum"/>
     <nuclide name="O16" ao="0.046295399999999994"/>
     <nuclide name="O17" ao="0.00011276839999999999"/>
-    <nuclide name="Cs135" ao="4.663927579774932e-07"/>
-    <nuclide name="Gd156" ao="7.445447078931686e-09"/>
-    <nuclide name="Gd157" ao="3.884396962343153e-10"/>
-    <nuclide name="I135" ao="9.880795035286334e-09"/>
-    <nuclide name="U234" ao="1.0045110543061514e-05"/>
-    <nuclide name="U235" ao="0.0010185051659907308"/>
-    <nuclide name="U238" ao="0.022134793050126972"/>
-    <nuclide name="Xe135" ao="5.628930766753173e-09"/>
-    <nuclide name="Xe136" ao="1.621458196093815e-06"/>
+    <nuclide name="Cs135" ao="4.4837918815155374e-07"/>
+    <nuclide name="Gd156" ao="6.881128111183882e-09"/>
+    <nuclide name="Gd157" ao="4.467555735033164e-10"/>
+    <nuclide name="I135" ao="1.0913513805740671e-08"/>
+    <nuclide name="U234" ao="1.0045003891749759e-05"/>
+    <nuclide name="U235" ao="0.0010229940007813422"/>
+    <nuclide name="U238" ao="0.022134661445427906"/>
+    <nuclide name="Xe135" ao="5.165905240058592e-09"/>
+    <nuclide name="Xe136" ao="1.3996870806420131e-06"/>
   </material>
   <material id="32" depletable="true" volume="0.06674732823364922" temperature="293.6">
     <density units="sum"/>
     <nuclide name="O16" ao="0.0464035"/>
-    <nuclide name="Cs135" ao="4.1246893900095064e-07"/>
-    <nuclide name="Gd156" ao="4.235600198363761e-09"/>
-    <nuclide name="Gd157" ao="6.270357333732124e-05"/>
-    <nuclide name="I135" ao="4.48554996862083e-09"/>
-    <nuclide name="U235" ao="0.0010204963418181184"/>
-    <nuclide name="U238" ao="0.02169170592871774"/>
-    <nuclide name="Xe135" ao="5.171435873222667e-09"/>
-    <nuclide name="Xe136" ao="4.423753279029928e-07"/>
+    <nuclide name="Cs135" ao="4.654129011274693e-07"/>
+    <nuclide name="Gd156" ao="4.231336803555766e-09"/>
+    <nuclide name="Gd157" ao="7.428074198928876e-05"/>
+    <nuclide name="I135" ao="5.9931775709412285e-09"/>
+    <nuclide name="U235" ao="0.0010193736979669903"/>
+    <nuclide name="U238" ao="0.021691930762582197"/>
+    <nuclide name="Xe135" ao="7.320731533578122e-09"/>
+    <nuclide name="Xe136" ao="4.4248272445891764e-07"/>
   </material>
   <material id="33" depletable="true" volume="0.06674732823364922" temperature="293.6">
     <density units="sum"/>
     <nuclide name="O16" ao="0.046295399999999994"/>
     <nuclide name="O17" ao="0.00011276839999999999"/>
-    <nuclide name="Cs135" ao="4.639536407807289e-07"/>
-    <nuclide name="Gd156" ao="8.26599161641998e-09"/>
-    <nuclide name="Gd157" ao="4.4443900400932014e-10"/>
-    <nuclide name="I135" ao="1.0063162224638636e-08"/>
-    <nuclide name="U234" ao="1.004414762804115e-05"/>
-    <nuclide name="U235" ao="0.0010163626915249942"/>
-    <nuclide name="U238" ao="0.022134124263495966"/>
-    <nuclide name="Xe135" ao="5.381577718295668e-09"/>
-    <nuclide name="Xe136" ao="1.750090777225144e-06"/>
+    <nuclide name="Cs135" ao="4.441341881923673e-07"/>
+    <nuclide name="Gd156" ao="7.729553164150906e-09"/>
+    <nuclide name="Gd157" ao="4.162804202387628e-10"/>
+    <nuclide name="I135" ao="1.0260744311274724e-08"/>
+    <nuclide name="U234" ao="1.0044985693206347e-05"/>
+    <nuclide name="U235" ao="0.001017193281968243"/>
+    <nuclide name="U238" ao="0.022134660566915366"/>
+    <nuclide name="Xe135" ao="5.239269726565813e-09"/>
+    <nuclide name="Xe136" ao="1.7164265808602347e-06"/>
   </material>
   <material id="34" depletable="true" volume="0.06674732823364922" temperature="293.6">
     <density units="sum"/>
     <nuclide name="O16" ao="0.046295399999999994"/>
     <nuclide name="O17" ao="0.00011276839999999999"/>
-    <nuclide name="Cs135" ao="4.559453986372942e-07"/>
-    <nuclide name="Gd156" ao="8.064845626388968e-09"/>
-    <nuclide name="Gd157" ao="4.2591362725932075e-10"/>
-    <nuclide name="I135" ao="1.108912103471219e-08"/>
-    <nuclide name="U234" ao="1.0043946351139754e-05"/>
-    <nuclide name="U235" ao="0.0010171808520812423"/>
-    <nuclide name="U238" ao="0.022134239348941525"/>
-    <nuclide name="Xe135" ao="5.356605996248169e-09"/>
-    <nuclide name="Xe136" ao="1.7112469634330484e-06"/>
+    <nuclide name="Cs135" ao="4.4232274988570903e-07"/>
+    <nuclide name="Gd156" ao="7.239345892427305e-09"/>
+    <nuclide name="Gd157" ao="3.975691352355985e-10"/>
+    <nuclide name="I135" ao="9.781702654198456e-09"/>
+    <nuclide name="U234" ao="1.0044828360873114e-05"/>
+    <nuclide name="U235" ao="0.001019984164684141"/>
+    <nuclide name="U238" ao="0.022134766139901473"/>
+    <nuclide name="Xe135" ao="5.64504964900769e-09"/>
+    <nuclide name="Xe136" ao="1.5665406895276724e-06"/>
   </material>
   <material id="35" depletable="true" volume="0.06674732823364922" temperature="293.6">
     <density units="sum"/>
     <nuclide name="O16" ao="0.046295399999999994"/>
     <nuclide name="O17" ao="0.00011276839999999999"/>
-    <nuclide name="Cs135" ao="4.783500137415771e-07"/>
-    <nuclide name="Gd156" ao="8.278905204746407e-09"/>
-    <nuclide name="Gd157" ao="4.327862005463805e-10"/>
-    <nuclide name="I135" ao="1.0123582674276158e-08"/>
-    <nuclide name="U234" ao="1.0044298863412104e-05"/>
-    <nuclide name="U235" ao="0.0010159230256745024"/>
-    <nuclide name="U238" ao="0.022134198514068757"/>
-    <nuclide name="Xe135" ao="5.871093706243336e-09"/>
-    <nuclide name="Xe136" ao="1.7575689172957885e-06"/>
+    <nuclide name="Cs135" ao="4.411543814778426e-07"/>
+    <nuclide name="Gd156" ao="6.958324488763152e-09"/>
+    <nuclide name="Gd157" ao="3.9559796635777716e-10"/>
+    <nuclide name="I135" ao="1.0756887360947078e-08"/>
+    <nuclide name="U234" ao="1.0044996100551549e-05"/>
+    <nuclide name="U235" ao="0.0010216617851280647"/>
+    <nuclide name="U238" ao="0.022134821725435353"/>
+    <nuclide name="Xe135" ao="5.41783602067941e-09"/>
+    <nuclide name="Xe136" ao="1.4758433304908069e-06"/>
   </material>
   <material id="36" depletable="true" volume="0.06674732823364922" temperature="293.6">
     <density units="sum"/>
     <nuclide name="O16" ao="0.046295399999999994"/>
     <nuclide name="O17" ao="0.00011276839999999999"/>
-    <nuclide name="Cs135" ao="4.7585244231920927e-07"/>
-    <nuclide name="Gd156" ao="7.047102473389166e-09"/>
-    <nuclide name="Gd157" ao="4.290077716150245e-10"/>
-    <nuclide name="I135" ao="9.106329272893031e-09"/>
-    <nuclide name="U234" ao="1.004490745184468e-05"/>
-    <nuclide name="U235" ao="0.001022123397932415"/>
-    <nuclide name="U238" ao="0.02213459705977757"/>
-    <nuclide name="Xe135" ao="4.972382302373317e-09"/>
-    <nuclide name="Xe136" ao="1.4220785344272175e-06"/>
+    <nuclide name="Cs135" ao="4.5244931709467633e-07"/>
+    <nuclide name="Gd156" ao="7.467381378872165e-09"/>
+    <nuclide name="Gd157" ao="5.419341703480825e-10"/>
+    <nuclide name="I135" ao="7.997470788410242e-09"/>
+    <nuclide name="U234" ao="1.0044755404655443e-05"/>
+    <nuclide name="U235" ao="0.0010197133702277137"/>
+    <nuclide name="U238" ao="0.02213452670563579"/>
+    <nuclide name="Xe135" ao="5.141654782603205e-09"/>
+    <nuclide name="Xe136" ao="1.5771591094920164e-06"/>
   </material>
   <material id="37" depletable="true" volume="0.06674732823364922" temperature="293.6">
     <density units="sum"/>
     <nuclide name="O16" ao="0.046295399999999994"/>
     <nuclide name="O17" ao="0.00011276839999999999"/>
-    <nuclide name="Cs135" ao="4.674688590714476e-07"/>
-    <nuclide name="Gd156" ao="7.970289841354939e-09"/>
-    <nuclide name="Gd157" ao="5.153997431956395e-10"/>
-    <nuclide name="I135" ao="8.539123281213609e-09"/>
-    <nuclide name="U234" ao="1.0044902591761455e-05"/>
-    <nuclide name="U235" ao="0.0010166972454515616"/>
-    <nuclide name="U238" ao="0.02213444858676572"/>
-    <nuclide name="Xe135" ao="5.164533017665062e-09"/>
-    <nuclide name="Xe136" ao="1.7250109506134995e-06"/>
+    <nuclide name="Cs135" ao="4.2916125442596817e-07"/>
+    <nuclide name="Gd156" ao="7.422866873976109e-09"/>
+    <nuclide name="Gd157" ao="5.260659570105519e-10"/>
+    <nuclide name="I135" ao="8.434076119609624e-09"/>
+    <nuclide name="U234" ao="1.0044851781772129e-05"/>
+    <nuclide name="U235" ao="0.0010206949525890443"/>
+    <nuclide name="U238" ao="0.022134392419701256"/>
+    <nuclide name="Xe135" ao="5.197575398117099e-09"/>
+    <nuclide name="Xe136" ao="1.5493533597826574e-06"/>
   </material>
   <material id="38" depletable="true" volume="0.06674732823364922" temperature="293.6">
     <density units="sum"/>
     <nuclide name="O16" ao="0.046295399999999994"/>
     <nuclide name="O17" ao="0.00011276839999999999"/>
-    <nuclide name="Cs135" ao="4.62023315208809e-07"/>
-    <nuclide name="Gd156" ao="7.290331357418475e-09"/>
-    <nuclide name="Gd157" ao="5.153301253293083e-10"/>
-    <nuclide name="I135" ao="7.966294229889969e-09"/>
-    <nuclide name="U234" ao="1.0044264900655818e-05"/>
-    <nuclide name="U235" ao="0.0010228069220581829"/>
-    <nuclide name="U238" ao="0.022134157888979544"/>
-    <nuclide name="Xe135" ao="5.177831769145713e-09"/>
-    <nuclide name="Xe136" ao="1.407267343687865e-06"/>
+    <nuclide name="Cs135" ao="4.706928121117111e-07"/>
+    <nuclide name="Gd156" ao="8.209059837573775e-09"/>
+    <nuclide name="Gd157" ao="4.6319779913755764e-10"/>
+    <nuclide name="I135" ao="1.0077638211801402e-08"/>
+    <nuclide name="U234" ao="1.0044751327071161e-05"/>
+    <nuclide name="U235" ao="0.0010159066812131222"/>
+    <nuclide name="U238" ao="0.022134281721259415"/>
+    <nuclide name="Xe135" ao="5.246844262414808e-09"/>
+    <nuclide name="Xe136" ao="1.7653958809589554e-06"/>
   </material>
   <material id="39" depletable="true" volume="0.06674732823364922" temperature="293.6">
     <density units="sum"/>
     <nuclide name="O16" ao="0.046295399999999994"/>
     <nuclide name="O17" ao="0.00011276839999999999"/>
-    <nuclide name="Cs135" ao="4.3174845937654533e-07"/>
-    <nuclide name="Gd156" ao="7.496333189305309e-09"/>
-    <nuclide name="Gd157" ao="5.231502669312121e-10"/>
-    <nuclide name="I135" ao="7.935273960925948e-09"/>
-    <nuclide name="U234" ao="1.004438265081768e-05"/>
-    <nuclide name="U235" ao="0.0010216587449263061"/>
-    <nuclide name="U238" ao="0.022134102890114152"/>
-    <nuclide name="Xe135" ao="4.985811384270827e-09"/>
-    <nuclide name="Xe136" ao="1.5003890282364684e-06"/>
+    <nuclide name="Cs135" ao="4.4460972144810034e-07"/>
+    <nuclide name="Gd156" ao="8.453126686865042e-09"/>
+    <nuclide name="Gd157" ao="3.955629812162645e-10"/>
+    <nuclide name="I135" ao="1.0836556337629717e-08"/>
+    <nuclide name="U234" ao="1.0044831997483167e-05"/>
+    <nuclide name="U235" ao="0.0010135713357786915"/>
+    <nuclide name="U238" ao="0.022134396257674598"/>
+    <nuclide name="Xe135" ao="5.297472114424319e-09"/>
+    <nuclide name="Xe136" ao="1.9143721307549865e-06"/>
   </material>
   <material id="40" depletable="true" volume="0.06674732823364922" temperature="293.6">
     <density units="sum"/>
     <nuclide name="O16" ao="0.046295399999999994"/>
     <nuclide name="O17" ao="0.00011276839999999999"/>
-    <nuclide name="Cs135" ao="4.550660196109939e-07"/>
-    <nuclide name="Gd156" ao="7.934623609364992e-09"/>
-    <nuclide name="Gd157" ao="4.037668757136327e-10"/>
-    <nuclide name="I135" ao="1.0501733366702875e-08"/>
-    <nuclide name="U234" ao="1.0044738839596202e-05"/>
-    <nuclide name="U235" ao="0.0010172584673257196"/>
-    <nuclide name="U238" ao="0.022134388757146573"/>
-    <nuclide name="Xe135" ao="5.426068046034702e-09"/>
-    <nuclide name="Xe136" ao="1.7059955089306178e-06"/>
+    <nuclide name="Cs135" ao="4.5745840060661735e-07"/>
+    <nuclide name="Gd156" ao="7.370697558914219e-09"/>
+    <nuclide name="Gd157" ao="4.505679837164328e-10"/>
+    <nuclide name="I135" ao="1.0377760473877478e-08"/>
+    <nuclide name="U234" ao="1.0044994843654978e-05"/>
+    <nuclide name="U235" ao="0.0010197070673602466"/>
+    <nuclide name="U238" ao="0.02213465847623944"/>
+    <nuclide name="Xe135" ao="5.3008902997890396e-09"/>
+    <nuclide name="Xe136" ao="1.5677930704921993e-06"/>
   </material>
   <material id="41" depletable="true" volume="0.06674732823364922" temperature="293.6">
     <density units="sum"/>
     <nuclide name="O16" ao="0.0464035"/>
-    <nuclide name="Cs135" ao="4.7373311464679697e-07"/>
-    <nuclide name="Gd156" ao="5.5215753216139325e-09"/>
-    <nuclide name="Gd157" ao="1.4494880135466953e-05"/>
-    <nuclide name="I135" ao="7.152901553393514e-09"/>
-    <nuclide name="U235" ao="0.001012425534201963"/>
-    <nuclide name="U238" ao="0.02169158720273659"/>
-    <nuclide name="Xe135" ao="6.145213330919855e-09"/>
-    <nuclide name="Xe136" ao="8.133607629171309e-07"/>
+    <nuclide name="Cs135" ao="4.2597280201410055e-07"/>
+    <nuclide name="Gd156" ao="5.062647451454465e-09"/>
+    <nuclide name="Gd157" ao="1.1116049121664088e-05"/>
+    <nuclide name="I135" ao="6.751909071069161e-09"/>
+    <nuclide name="U235" ao="0.0010143580079690889"/>
+    <nuclide name="U238" ao="0.021691815343013475"/>
+    <nuclide name="Xe135" ao="5.426874053349338e-09"/>
+    <nuclide name="Xe136" ao="7.546238420535257e-07"/>
   </material>
   <material id="42" depletable="true" volume="0.06674732823364922" temperature="293.6">
     <density units="sum"/>
     <nuclide name="O16" ao="0.046295399999999994"/>
     <nuclide name="O17" ao="0.00011276839999999999"/>
-    <nuclide name="Cs135" ao="4.552489408257274e-07"/>
-    <nuclide name="Gd156" ao="8.417844454382996e-09"/>
-    <nuclide name="Gd157" ao="3.298239390088616e-10"/>
-    <nuclide name="I135" ao="1.1627214840198228e-08"/>
-    <nuclide name="U234" ao="1.0044467618118171e-05"/>
-    <nuclide name="U235" ao="0.0010132122009064637"/>
-    <nuclide name="U238" ao="0.022134533704800487"/>
-    <nuclide name="Xe135" ao="5.2441194996454685e-09"/>
-    <nuclide name="Xe136" ao="1.9200927095463644e-06"/>
+    <nuclide name="Cs135" ao="4.4020493934013244e-07"/>
+    <nuclide name="Gd156" ao="7.8813074655816e-09"/>
+    <nuclide name="Gd157" ao="3.6537023326052893e-10"/>
+    <nuclide name="I135" ao="1.04632999180102e-08"/>
+    <nuclide name="U234" ao="1.0045163011064941e-05"/>
+    <nuclide name="U235" ao="0.0010156741214122716"/>
+    <nuclide name="U238" ao="0.022134767804729706"/>
+    <nuclide name="Xe135" ao="5.161149709361226e-09"/>
+    <nuclide name="Xe136" ao="1.8001615310524176e-06"/>
   </material>
   <material id="43" depletable="true" volume="0.06674732823364922" temperature="293.6">
     <density units="sum"/>
     <nuclide name="O16" ao="0.046295399999999994"/>
     <nuclide name="O17" ao="0.00011276839999999999"/>
-    <nuclide name="Cs135" ao="4.6621088555426265e-07"/>
-    <nuclide name="Gd156" ao="8.403287883759693e-09"/>
-    <nuclide name="Gd157" ao="3.669166752999124e-10"/>
-    <nuclide name="I135" ao="1.0403690981836015e-08"/>
-    <nuclide name="U234" ao="1.0044333944166113e-05"/>
-    <nuclide name="U235" ao="0.0010143215164151278"/>
-    <nuclide name="U238" ao="0.02213434952981268"/>
-    <nuclide name="Xe135" ao="5.451035317592364e-09"/>
-    <nuclide name="Xe136" ao="1.8535025407324627e-06"/>
+    <nuclide name="Cs135" ao="4.356330453116348e-07"/>
+    <nuclide name="Gd156" ao="7.138156244231682e-09"/>
+    <nuclide name="Gd157" ao="3.9362121967096176e-10"/>
+    <nuclide name="I135" ao="9.944490910387945e-09"/>
+    <nuclide name="U234" ao="1.0045289965268601e-05"/>
+    <nuclide name="U235" ao="0.0010204073333786806"/>
+    <nuclide name="U238" ao="0.02213482731236702"/>
+    <nuclide name="Xe135" ao="5.172330421543257e-09"/>
+    <nuclide name="Xe136" ao="1.5497653458793468e-06"/>
   </material>
   <material id="44" depletable="true" volume="0.06674732823364922" temperature="293.6">
     <density units="sum"/>
     <nuclide name="O16" ao="0.046295399999999994"/>
     <nuclide name="O17" ao="0.00011276839999999999"/>
-    <nuclide name="Cs135" ao="4.7386490418530295e-07"/>
-    <nuclide name="Gd156" ao="8.2685227302447e-09"/>
-    <nuclide name="Gd157" ao="3.776944576757155e-10"/>
-    <nuclide name="I135" ao="1.0842502886868061e-08"/>
-    <nuclide name="U234" ao="1.0044550501199754e-05"/>
-    <nuclide name="U235" ao="0.0010150062559977334"/>
-    <nuclide name="U238" ao="0.022134385320256817"/>
-    <nuclide name="Xe135" ao="5.7229967592843554e-09"/>
-    <nuclide name="Xe136" ao="1.8077253263384327e-06"/>
+    <nuclide name="Cs135" ao="4.534692623199661e-07"/>
+    <nuclide name="Gd156" ao="7.18842986217477e-09"/>
+    <nuclide name="Gd157" ao="4.655379462638907e-10"/>
+    <nuclide name="I135" ao="8.63735242566927e-09"/>
+    <nuclide name="U234" ao="1.0045057015722533e-05"/>
+    <nuclide name="U235" ao="0.0010206303207932791"/>
+    <nuclide name="U238" ao="0.02213471727747181"/>
+    <nuclide name="Xe135" ao="5.372459543066949e-09"/>
+    <nuclide name="Xe136" ao="1.522848866514532e-06"/>
   </material>
   <material id="45" depletable="true" volume="0.06674732823364922" temperature="293.6">
     <density units="sum"/>
     <nuclide name="O16" ao="0.046295399999999994"/>
     <nuclide name="O17" ao="0.00011276839999999999"/>
-    <nuclide name="Cs135" ao="4.407652401199493e-07"/>
-    <nuclide name="Gd156" ao="7.327810416041793e-09"/>
-    <nuclide name="Gd157" ao="3.7455808995871114e-10"/>
-    <nuclide name="I135" ao="1.17295932855595e-08"/>
-    <nuclide name="U234" ao="1.0044575831769265e-05"/>
-    <nuclide name="U235" ao="0.001020781061160739"/>
-    <nuclide name="U238" ao="0.022134501621275452"/>
-    <nuclide name="Xe135" ao="5.314959906762633e-09"/>
-    <nuclide name="Xe136" ao="1.5279472503684031e-06"/>
+    <nuclide name="Cs135" ao="4.5365922789789034e-07"/>
+    <nuclide name="Gd156" ao="8.858149700420162e-09"/>
+    <nuclide name="Gd157" ao="4.332020465422528e-10"/>
+    <nuclide name="I135" ao="1.028282554081369e-08"/>
+    <nuclide name="U234" ao="1.0044921809086835e-05"/>
+    <nuclide name="U235" ao="0.001010476953333626"/>
+    <nuclide name="U238" ao="0.022134485892410107"/>
+    <nuclide name="Xe135" ao="5.342710615231918e-09"/>
+    <nuclide name="Xe136" ao="2.0707509143802184e-06"/>
   </material>
   <material id="46" depletable="true" volume="0.06674732823364922" temperature="293.6">
     <density units="sum"/>
     <nuclide name="O16" ao="0.046295399999999994"/>
     <nuclide name="O17" ao="0.00011276839999999999"/>
-    <nuclide name="Cs135" ao="4.7039361271991246e-07"/>
-    <nuclide name="Gd156" ao="7.55749566950451e-09"/>
-    <nuclide name="Gd157" ao="4.707485798456035e-10"/>
-    <nuclide name="I135" ao="1.0634554158124267e-08"/>
-    <nuclide name="U234" ao="1.0044530555935427e-05"/>
-    <nuclide name="U235" ao="0.0010209326507167006"/>
-    <nuclide name="U238" ao="0.02213417530217058"/>
-    <nuclide name="Xe135" ao="6.353270400959161e-09"/>
-    <nuclide name="Xe136" ao="1.4955326812707174e-06"/>
+    <nuclide name="Cs135" ao="4.5834547949302155e-07"/>
+    <nuclide name="Gd156" ao="8.026197153018181e-09"/>
+    <nuclide name="Gd157" ao="4.361133395774851e-10"/>
+    <nuclide name="I135" ao="1.0483977175773358e-08"/>
+    <nuclide name="U234" ao="1.0044572755597826e-05"/>
+    <nuclide name="U235" ao="0.0010175195584231885"/>
+    <nuclide name="U238" ao="0.022134225353378213"/>
+    <nuclide name="Xe135" ao="5.61745982443462e-09"/>
+    <nuclide name="Xe136" ao="1.6911700913844984e-06"/>
   </material>
   <material id="47" depletable="true" volume="0.06674732823364922" temperature="293.6">
     <density units="sum"/>
     <nuclide name="O16" ao="0.046295399999999994"/>
     <nuclide name="O17" ao="0.00011276839999999999"/>
-    <nuclide name="Cs135" ao="4.636034601798797e-07"/>
-    <nuclide name="Gd156" ao="7.495433091678523e-09"/>
-    <nuclide name="Gd157" ao="4.36374537601735e-10"/>
-    <nuclide name="I135" ao="8.674778390989408e-09"/>
-    <nuclide name="U234" ao="1.0044596524270627e-05"/>
-    <nuclide name="U235" ao="0.0010204096991334123"/>
-    <nuclide name="U238" ao="0.0221343532758111"/>
-    <nuclide name="Xe135" ao="4.62877874149118e-09"/>
-    <nuclide name="Xe136" ao="1.5312284248009385e-06"/>
+    <nuclide name="Cs135" ao="4.576752324813388e-07"/>
+    <nuclide name="Gd156" ao="8.6156027277259e-09"/>
+    <nuclide name="Gd157" ao="3.3802094687172253e-10"/>
+    <nuclide name="I135" ao="1.2931370445383781e-08"/>
+    <nuclide name="U234" ao="1.0044908430005215e-05"/>
+    <nuclide name="U235" ao="0.0010116782132456041"/>
+    <nuclide name="U238" ao="0.02213457788430782"/>
+    <nuclide name="Xe135" ao="5.4436361491951264e-09"/>
+    <nuclide name="Xe136" ao="1.997899896365067e-06"/>
   </material>
   <material id="48" depletable="true" volume="0.06674732823364922" temperature="293.6">
     <density units="sum"/>
     <nuclide name="O16" ao="0.046295399999999994"/>
     <nuclide name="O17" ao="0.00011276839999999999"/>
-    <nuclide name="Cs135" ao="4.4387693534608117e-07"/>
-    <nuclide name="Gd156" ao="7.97630803398477e-09"/>
-    <nuclide name="Gd157" ao="3.969215102824579e-10"/>
-    <nuclide name="I135" ao="9.776870256795282e-09"/>
-    <nuclide name="U234" ao="1.0044607832822283e-05"/>
-    <nuclide name="U235" ao="0.0010166668071861533"/>
-    <nuclide name="U238" ao="0.02213444463686793"/>
-    <nuclide name="Xe135" ao="4.95812790098165e-09"/>
-    <nuclide name="Xe136" ao="1.7492896428784499e-06"/>
+    <nuclide name="Cs135" ao="4.36447155435789e-07"/>
+    <nuclide name="Gd156" ao="7.997492714990758e-09"/>
+    <nuclide name="Gd157" ao="3.795656912348026e-10"/>
+    <nuclide name="I135" ao="9.692026519039567e-09"/>
+    <nuclide name="U234" ao="1.004464798112071e-05"/>
+    <nuclide name="U235" ao="0.0010164793054092294"/>
+    <nuclide name="U238" ao="0.022134450122323755"/>
+    <nuclide name="Xe135" ao="4.856565975454262e-09"/>
+    <nuclide name="Xe136" ao="1.7668961083956216e-06"/>
   </material>
   <material id="49" depletable="true" volume="0.06674732823364922" temperature="293.6">
     <density units="sum"/>
     <nuclide name="O16" ao="0.046295399999999994"/>
     <nuclide name="O17" ao="0.00011276839999999999"/>
-    <nuclide name="Cs135" ao="4.455185803084232e-07"/>
-    <nuclide name="Gd156" ao="7.337855344976119e-09"/>
-    <nuclide name="Gd157" ao="5.288107893183848e-10"/>
-    <nuclide name="I135" ao="8.95876232200072e-09"/>
-    <nuclide name="U234" ao="1.0044618229856552e-05"/>
-    <nuclide name="U235" ao="0.0010217889366581374"/>
-    <nuclide name="U238" ao="0.022134293599384607"/>
-    <nuclide name="Xe135" ao="5.4164245821971194e-09"/>
-    <nuclide name="Xe136" ao="1.4750501825751544e-06"/>
+    <nuclide name="Cs135" ao="4.300183076281302e-07"/>
+    <nuclide name="Gd156" ao="7.598140030265794e-09"/>
+    <nuclide name="Gd157" ao="3.9917853857754555e-10"/>
+    <nuclide name="I135" ao="1.0067413382344453e-08"/>
+    <nuclide name="U234" ao="1.0044744439434109e-05"/>
+    <nuclide name="U235" ao="0.0010187794588991865"/>
+    <nuclide name="U238" ao="0.022134535032998708"/>
+    <nuclide name="Xe135" ao="5.245189716367788e-09"/>
+    <nuclide name="Xe136" ao="1.64749752044767e-06"/>
   </material>
   <material id="50" depletable="true" volume="0.06674732823364922" temperature="293.6">
     <density units="sum"/>
     <nuclide name="O16" ao="0.0464035"/>
-    <nuclide name="Cs135" ao="4.517900944075939e-07"/>
-    <nuclide name="Gd156" ao="5.045016111938287e-09"/>
-    <nuclide name="Gd157" ao="1.8134984977801202e-05"/>
-    <nuclide name="I135" ao="6.482226189748327e-09"/>
-    <nuclide name="U235" ao="0.0010147629176538704"/>
-    <nuclide name="U238" ao="0.021691761128726353"/>
-    <nuclide name="Xe135" ao="5.763098998610832e-09"/>
-    <nuclide name="Xe136" ao="7.078497671706068e-07"/>
+    <nuclide name="Cs135" ao="4.648929619093973e-07"/>
+    <nuclide name="Gd156" ao="4.862400393077113e-09"/>
+    <nuclide name="Gd157" ao="2.0880306758915243e-05"/>
+    <nuclide name="I135" ao="6.150183210612089e-09"/>
+    <nuclide name="U235" ao="0.001014414875863557"/>
+    <nuclide name="U238" ao="0.02169207104686604"/>
+    <nuclide name="Xe135" ao="5.640851795356453e-09"/>
+    <nuclide name="Xe136" ao="7.088764811841627e-07"/>
   </material>
   <material id="51" depletable="true" volume="0.06674732823364922" temperature="293.6">
     <density units="sum"/>
     <nuclide name="O16" ao="0.046295399999999994"/>
     <nuclide name="O17" ao="0.00011276839999999999"/>
-    <nuclide name="Cs135" ao="4.659699944335705e-07"/>
-    <nuclide name="Gd156" ao="8.025074976583637e-09"/>
-    <nuclide name="Gd157" ao="4.09445695785748e-10"/>
-    <nuclide name="I135" ao="1.0945335150467282e-08"/>
-    <nuclide name="U234" ao="1.0044581154205115e-05"/>
-    <nuclide name="U235" ao="0.0010164858220320235"/>
-    <nuclide name="U238" ao="0.022134422188635136"/>
-    <nuclide name="Xe135" ao="5.551411019664158e-09"/>
-    <nuclide name="Xe136" ao="1.7355327775146165e-06"/>
+    <nuclide name="Cs135" ao="4.437124865229794e-07"/>
+    <nuclide name="Gd156" ao="8.016905754040356e-09"/>
+    <nuclide name="Gd157" ao="3.5289993168407985e-10"/>
+    <nuclide name="I135" ao="1.260804694231904e-08"/>
+    <nuclide name="U234" ao="1.0044923583442758e-05"/>
+    <nuclide name="U235" ao="0.0010159875333159742"/>
+    <nuclide name="U238" ao="0.022134530607927503"/>
+    <nuclide name="Xe135" ao="5.530633992333283e-09"/>
+    <nuclide name="Xe136" ao="1.781158198656219e-06"/>
   </material>
   <material id="52" depletable="true" volume="0.06674732823364922" temperature="293.6">
     <density units="sum"/>
     <nuclide name="O16" ao="0.046295399999999994"/>
     <nuclide name="O17" ao="0.00011276839999999999"/>
-    <nuclide name="Cs135" ao="4.681457035455898e-07"/>
-    <nuclide name="Gd156" ao="8.71361864735632e-09"/>
-    <nuclide name="Gd157" ao="3.174701733038042e-10"/>
-    <nuclide name="I135" ao="1.4020730679274332e-08"/>
-    <nuclide name="U234" ao="1.0044099278017894e-05"/>
-    <nuclide name="U235" ao="0.0010126690056941115"/>
-    <nuclide name="U238" ao="0.022134261447381454"/>
-    <nuclide name="Xe135" ao="5.6399359283499295e-09"/>
-    <nuclide name="Xe136" ao="1.9380616593817735e-06"/>
+    <nuclide name="Cs135" ao="4.4088318777366177e-07"/>
+    <nuclide name="Gd156" ao="8.335826519457065e-09"/>
+    <nuclide name="Gd157" ao="3.3690014771163424e-10"/>
+    <nuclide name="I135" ao="1.2329096504118369e-08"/>
+    <nuclide name="U234" ao="1.004490981324685e-05"/>
+    <nuclide name="U235" ao="0.0010129134482408286"/>
+    <nuclide name="U238" ao="0.02213467535322287"/>
+    <nuclide name="Xe135" ao="5.252221605049846e-09"/>
+    <nuclide name="Xe136" ao="1.9474833660967375e-06"/>
   </material>
   <material id="53" depletable="true" volume="0.06674732823364922" temperature="293.6">
     <density units="sum"/>
     <nuclide name="O16" ao="0.046295399999999994"/>
     <nuclide name="O17" ao="0.00011276839999999999"/>
-    <nuclide name="Cs135" ao="4.544946942071967e-07"/>
-    <nuclide name="Gd156" ao="8.336100255413542e-09"/>
-    <nuclide name="Gd157" ao="3.349693677637064e-10"/>
-    <nuclide name="I135" ao="1.300729943471215e-08"/>
-    <nuclide name="U234" ao="1.0044366612084531e-05"/>
-    <nuclide name="U235" ao="0.0010141681490291126"/>
-    <nuclide name="U238" ao="0.022134460848195252"/>
-    <nuclide name="Xe135" ao="5.834616975029099e-09"/>
-    <nuclide name="Xe136" ao="1.8686662601249285e-06"/>
+    <nuclide name="Cs135" ao="4.4310786279116983e-07"/>
+    <nuclide name="Gd156" ao="8.342085743057625e-09"/>
+    <nuclide name="Gd157" ao="3.648429008278969e-10"/>
+    <nuclide name="I135" ao="1.2170378659000809e-08"/>
+    <nuclide name="U234" ao="1.0045369948108429e-05"/>
+    <nuclide name="U235" ao="0.001011930901687823"/>
+    <nuclide name="U238" ao="0.022134898294671235"/>
+    <nuclide name="Xe135" ao="5.6447652886274e-09"/>
+    <nuclide name="Xe136" ao="1.9942040669492326e-06"/>
   </material>
   <material id="54" depletable="true" volume="0.06674732823364922" temperature="293.6">
     <density units="sum"/>
     <nuclide name="O16" ao="0.046295399999999994"/>
     <nuclide name="O17" ao="0.00011276839999999999"/>
-    <nuclide name="Cs135" ao="4.5766121557221316e-07"/>
-    <nuclide name="Gd156" ao="8.656426219093345e-09"/>
-    <nuclide name="Gd157" ao="3.5094506543349145e-10"/>
-    <nuclide name="I135" ao="1.3877107412830242e-08"/>
-    <nuclide name="U234" ao="1.004416295609268e-05"/>
-    <nuclide name="U235" ao="0.0010140243853248815"/>
-    <nuclide name="U238" ao="0.022134042904509686"/>
-    <nuclide name="Xe135" ao="5.594497813916764e-09"/>
-    <nuclide name="Xe136" ao="1.8794069149000725e-06"/>
+    <nuclide name="Cs135" ao="4.4790394288124285e-07"/>
+    <nuclide name="Gd156" ao="7.802031841317641e-09"/>
+    <nuclide name="Gd157" ao="4.048900724402593e-10"/>
+    <nuclide name="I135" ao="1.0802180436070214e-08"/>
+    <nuclide name="U234" ao="1.0045014775719684e-05"/>
+    <nuclide name="U235" ao="0.0010166049461619643"/>
+    <nuclide name="U238" ao="0.022134694244162183"/>
+    <nuclide name="Xe135" ao="5.546801858449189e-09"/>
+    <nuclide name="Xe136" ao="1.7428929528914597e-06"/>
   </material>
   <material id="55" depletable="true" volume="0.06674732823364922" temperature="293.6">
     <density units="sum"/>
     <nuclide name="O16" ao="0.046295399999999994"/>
     <nuclide name="O17" ao="0.00011276839999999999"/>
-    <nuclide name="Cs135" ao="4.5070044982225826e-07"/>
-    <nuclide name="Gd156" ao="8.307166786809273e-09"/>
-    <nuclide name="Gd157" ao="4.852995067853279e-10"/>
-    <nuclide name="I135" ao="8.43006813520517e-09"/>
-    <nuclide name="U234" ao="1.0044124057308204e-05"/>
-    <nuclide name="U235" ao="0.0010154726348555639"/>
-    <nuclide name="U238" ao="0.02213418651112704"/>
-    <nuclide name="Xe135" ao="4.949152601376445e-09"/>
-    <nuclide name="Xe136" ao="1.8122564453895658e-06"/>
+    <nuclide name="Cs135" ao="4.40063143890264e-07"/>
+    <nuclide name="Gd156" ao="7.79097538010152e-09"/>
+    <nuclide name="Gd157" ao="4.353639441936699e-10"/>
+    <nuclide name="I135" ao="1.0574538871867868e-08"/>
+    <nuclide name="U234" ao="1.0044673990436049e-05"/>
+    <nuclide name="U235" ao="0.0010182630261004757"/>
+    <nuclide name="U238" ao="0.022134384743672325"/>
+    <nuclide name="Xe135" ao="5.3174030076499996e-09"/>
+    <nuclide name="Xe136" ao="1.6670890146271627e-06"/>
   </material>
   <material id="56" depletable="true" volume="0.06674732823364922" temperature="293.6">
     <density units="sum"/>
     <nuclide name="O16" ao="0.046295399999999994"/>
     <nuclide name="O17" ao="0.00011276839999999999"/>
-    <nuclide name="Cs135" ao="4.836978536882764e-07"/>
-    <nuclide name="Gd156" ao="7.537362091239518e-09"/>
-    <nuclide name="Gd157" ao="4.5126076517149186e-10"/>
-    <nuclide name="I135" ao="9.60199687518672e-09"/>
-    <nuclide name="U234" ao="1.0044685059092674e-05"/>
-    <nuclide name="U235" ao="0.0010196381990756533"/>
-    <nuclide name="U238" ao="0.02213445285182628"/>
-    <nuclide name="Xe135" ao="5.494845522710317e-09"/>
-    <nuclide name="Xe136" ao="1.5491995716680678e-06"/>
+    <nuclide name="Cs135" ao="4.353616627535185e-07"/>
+    <nuclide name="Gd156" ao="7.92443342913152e-09"/>
+    <nuclide name="Gd157" ao="3.9473995419002534e-10"/>
+    <nuclide name="I135" ao="1.0239114224834276e-08"/>
+    <nuclide name="U234" ao="1.0045074594623477e-05"/>
+    <nuclide name="U235" ao="0.0010167759054608633"/>
+    <nuclide name="U238" ao="0.02213449359445418"/>
+    <nuclide name="Xe135" ao="5.365203876551046e-09"/>
+    <nuclide name="Xe136" ao="1.7502462038606024e-06"/>
   </material>
   <material id="57" depletable="true" volume="0.06674732823364922" temperature="293.6">
     <density units="sum"/>
     <nuclide name="O16" ao="0.046295399999999994"/>
     <nuclide name="O17" ao="0.00011276839999999999"/>
-    <nuclide name="Cs135" ao="4.4186301588556743e-07"/>
-    <nuclide name="Gd156" ao="7.826608358738061e-09"/>
-    <nuclide name="Gd157" ao="4.0312953112338433e-10"/>
-    <nuclide name="I135" ao="1.0758074378707132e-08"/>
-    <nuclide name="U234" ao="1.0044350307434386e-05"/>
-    <nuclide name="U235" ao="0.001018512023981224"/>
-    <nuclide name="U238" ao="0.022134272283106108"/>
-    <nuclide name="Xe135" ao="5.184367150914981e-09"/>
-    <nuclide name="Xe136" ao="1.653697557847264e-06"/>
+    <nuclide name="Cs135" ao="4.575245185246091e-07"/>
+    <nuclide name="Gd156" ao="8.376387094718435e-09"/>
+    <nuclide name="Gd157" ao="3.6735049090872877e-10"/>
+    <nuclide name="I135" ao="1.0906477140768573e-08"/>
+    <nuclide name="U234" ao="1.0044646703193044e-05"/>
+    <nuclide name="U235" ao="0.0010140151569282573"/>
+    <nuclide name="U238" ao="0.022134437886662382"/>
+    <nuclide name="Xe135" ao="5.898208958914623e-09"/>
+    <nuclide name="Xe136" ao="1.8762568336759862e-06"/>
   </material>
   <material id="58" depletable="true" volume="0.06674732823364922" temperature="293.6">
     <density units="sum"/>
     <nuclide name="O16" ao="0.046295399999999994"/>
     <nuclide name="O17" ao="0.00011276839999999999"/>
-    <nuclide name="Cs135" ao="4.5107547790946403e-07"/>
-    <nuclide name="Gd156" ao="7.582888624484162e-09"/>
-    <nuclide name="Gd157" ao="4.1641609325302373e-10"/>
-    <nuclide name="I135" ao="9.359811673300804e-09"/>
-    <nuclide name="U234" ao="1.0044946416861597e-05"/>
-    <nuclide name="U235" ao="0.0010186483802527863"/>
-    <nuclide name="U238" ao="0.02213458421313534"/>
-    <nuclide name="Xe135" ao="5.298991310558835e-09"/>
-    <nuclide name="Xe136" ao="1.6333307494049164e-06"/>
+    <nuclide name="Cs135" ao="4.3097013597230675e-07"/>
+    <nuclide name="Gd156" ao="7.330019029492659e-09"/>
+    <nuclide name="Gd157" ao="3.7010703806383873e-10"/>
+    <nuclide name="I135" ao="1.12403902309595e-08"/>
+    <nuclide name="U234" ao="1.0044973658241964e-05"/>
+    <nuclide name="U235" ao="0.0010199260328263536"/>
+    <nuclide name="U238" ao="0.02213464791088917"/>
+    <nuclide name="Xe135" ao="5.0562409304992e-09"/>
+    <nuclide name="Xe136" ao="1.5820627773170167e-06"/>
   </material>
   <material id="59" depletable="true" volume="0.06674732823364922" temperature="293.6">
     <density units="sum"/>
     <nuclide name="O16" ao="0.0464035"/>
-    <nuclide name="Cs135" ao="4.530550449840411e-07"/>
-    <nuclide name="Gd156" ao="5.152211037545898e-09"/>
-    <nuclide name="Gd157" ao="1.7414078116507776e-05"/>
-    <nuclide name="I135" ao="5.798373035811935e-09"/>
-    <nuclide name="U235" ao="0.0010142210013264637"/>
-    <nuclide name="U238" ao="0.021691726637340612"/>
-    <nuclide name="Xe135" ao="5.2661388117821805e-09"/>
-    <nuclide name="Xe136" ao="7.374647706571651e-07"/>
+    <nuclide name="Cs135" ao="4.5230881849700363e-07"/>
+    <nuclide name="Gd156" ao="4.850070823410614e-09"/>
+    <nuclide name="Gd157" ao="1.8483989393434286e-05"/>
+    <nuclide name="I135" ao="6.725814455601182e-09"/>
+    <nuclide name="U235" ao="0.0010144925922189567"/>
+    <nuclide name="U238" ao="0.021692066927375953"/>
+    <nuclide name="Xe135" ao="5.704892253586948e-09"/>
+    <nuclide name="Xe136" ao="7.167091844599147e-07"/>
   </material>
   <material id="60" depletable="true" volume="0.06674732823364922" temperature="293.6">
     <density units="sum"/>
     <nuclide name="O16" ao="0.046295399999999994"/>
     <nuclide name="O17" ao="0.00011276839999999999"/>
-    <nuclide name="Cs135" ao="4.822049134818106e-07"/>
-    <nuclide name="Gd156" ao="8.452589488490197e-09"/>
-    <nuclide name="Gd157" ao="3.1306244235949564e-10"/>
-    <nuclide name="I135" ao="1.3923826246996677e-08"/>
-    <nuclide name="U234" ao="1.0044676382235605e-05"/>
-    <nuclide name="U235" ao="0.001013658455830591"/>
-    <nuclide name="U238" ao="0.022134405975477205"/>
-    <nuclide name="Xe135" ao="6.044142076870048e-09"/>
-    <nuclide name="Xe136" ao="1.8681097449626251e-06"/>
+    <nuclide name="Cs135" ao="4.454497767683894e-07"/>
+    <nuclide name="Gd156" ao="7.196390006044354e-09"/>
+    <nuclide name="Gd157" ao="4.2031817746046806e-10"/>
+    <nuclide name="I135" ao="9.201065366714289e-09"/>
+    <nuclide name="U234" ao="1.0045186817961686e-05"/>
+    <nuclide name="U235" ao="0.0010208696040929454"/>
+    <nuclide name="U238" ao="0.02213465839772633"/>
+    <nuclide name="Xe135" ao="5.089280209147232e-09"/>
+    <nuclide name="Xe136" ao="1.518671421481773e-06"/>
   </material>
   <material id="61" depletable="true" volume="0.06674732823364922" temperature="293.6">
     <density units="sum"/>
     <nuclide name="O16" ao="0.046295399999999994"/>
     <nuclide name="O17" ao="0.00011276839999999999"/>
-    <nuclide name="Cs135" ao="4.4691043293275517e-07"/>
-    <nuclide name="Gd156" ao="8.012731861896239e-09"/>
-    <nuclide name="Gd157" ao="3.687262378894955e-10"/>
-    <nuclide name="I135" ao="1.1428305598450469e-08"/>
-    <nuclide name="U234" ao="1.0044405456893536e-05"/>
-    <nuclide name="U235" ao="0.0010164498453403522"/>
-    <nuclide name="U238" ao="0.022134450527739345"/>
-    <nuclide name="Xe135" ao="5.061575530060914e-09"/>
-    <nuclide name="Xe136" ao="1.7560831900418087e-06"/>
+    <nuclide name="Cs135" ao="4.4189035801976633e-07"/>
+    <nuclide name="Gd156" ao="8.712564657203808e-09"/>
+    <nuclide name="Gd157" ao="3.811357562661636e-10"/>
+    <nuclide name="I135" ao="1.1620785273405822e-08"/>
+    <nuclide name="U234" ao="1.0044336288632069e-05"/>
+    <nuclide name="U235" ao="0.0010119886383078472"/>
+    <nuclide name="U238" ao="0.022134367811831677"/>
+    <nuclide name="Xe135" ao="5.348901930754654e-09"/>
+    <nuclide name="Xe136" ao="2.0018476265410578e-06"/>
   </material>
   <material id="62" depletable="true" volume="0.06674732823364922" temperature="293.6">
     <density units="sum"/>
     <nuclide name="O16" ao="0.046295399999999994"/>
     <nuclide name="O17" ao="0.00011276839999999999"/>
-    <nuclide name="Cs135" ao="4.7251741651739154e-07"/>
-    <nuclide name="Gd156" ao="8.233538582389422e-09"/>
-    <nuclide name="Gd157" ao="4.3498877022171187e-10"/>
-    <nuclide name="I135" ao="1.1406240478828367e-08"/>
-    <nuclide name="U234" ao="1.0044307557051272e-05"/>
-    <nuclide name="U235" ao="0.0010151392434079533"/>
-    <nuclide name="U238" ao="0.02213440855685908"/>
-    <nuclide name="Xe135" ao="6.026621375913049e-09"/>
-    <nuclide name="Xe136" ao="1.8006912731212633e-06"/>
+    <nuclide name="Cs135" ao="4.495089867103096e-07"/>
+    <nuclide name="Gd156" ao="7.906963161591915e-09"/>
+    <nuclide name="Gd157" ao="3.6408897631430517e-10"/>
+    <nuclide name="I135" ao="1.1950713230937776e-08"/>
+    <nuclide name="U234" ao="1.0044642100307903e-05"/>
+    <nuclide name="U235" ao="0.0010172948034290832"/>
+    <nuclide name="U238" ao="0.022134397559942648"/>
+    <nuclide name="Xe135" ao="5.505591746019881e-09"/>
+    <nuclide name="Xe136" ao="1.7079328241951357e-06"/>
   </material>
   <material id="63" depletable="true" volume="0.06674732823364922" temperature="293.6">
     <density units="sum"/>
     <nuclide name="O16" ao="0.046295399999999994"/>
     <nuclide name="O17" ao="0.00011276839999999999"/>
-    <nuclide name="Cs135" ao="4.79794958069132e-07"/>
-    <nuclide name="Gd156" ao="7.497400822054367e-09"/>
-    <nuclide name="Gd157" ao="4.088535129059029e-10"/>
-    <nuclide name="I135" ao="1.020646791660957e-08"/>
-    <nuclide name="U234" ao="1.0044358428004462e-05"/>
-    <nuclide name="U235" ao="0.0010202817074345758"/>
-    <nuclide name="U238" ao="0.022134363783915374"/>
-    <nuclide name="Xe135" ao="5.5919103510501745e-09"/>
-    <nuclide name="Xe136" ao="1.5192672082067856e-06"/>
+    <nuclide name="Cs135" ao="4.462711024188988e-07"/>
+    <nuclide name="Gd156" ao="7.739456100782371e-09"/>
+    <nuclide name="Gd157" ao="3.5314285741732257e-10"/>
+    <nuclide name="I135" ao="1.1695299577237885e-08"/>
+    <nuclide name="U234" ao="1.0044990649080159e-05"/>
+    <nuclide name="U235" ao="0.00101714384855181"/>
+    <nuclide name="U238" ao="0.022134662948265594"/>
+    <nuclide name="Xe135" ao="5.305471689749892e-09"/>
+    <nuclide name="Xe136" ao="1.715407896550972e-06"/>
   </material>
   <material id="64" depletable="true" volume="0.06674732823364922" temperature="293.6">
     <density units="sum"/>
     <nuclide name="O16" ao="0.046295399999999994"/>
     <nuclide name="O17" ao="0.00011276839999999999"/>
-    <nuclide name="Cs135" ao="4.46173095422033e-07"/>
-    <nuclide name="Gd156" ao="7.776020869306452e-09"/>
-    <nuclide name="Gd157" ao="4.4071869092604184e-10"/>
-    <nuclide name="I135" ao="9.58881052529061e-09"/>
-    <nuclide name="U234" ao="1.0044875744723067e-05"/>
-    <nuclide name="U235" ao="0.001017463364101478"/>
-    <nuclide name="U238" ao="0.022134564631230084"/>
-    <nuclide name="Xe135" ao="5.074476802123941e-09"/>
-    <nuclide name="Xe136" ao="1.7022684619273444e-06"/>
+    <nuclide name="Cs135" ao="4.4249695478290833e-07"/>
+    <nuclide name="Gd156" ao="7.906645616692851e-09"/>
+    <nuclide name="Gd157" ao="4.777104853554735e-10"/>
+    <nuclide name="I135" ao="8.818558147298291e-09"/>
+    <nuclide name="U234" ao="1.0044897730985513e-05"/>
+    <nuclide name="U235" ao="0.0010166286079598642"/>
+    <nuclide name="U238" ao="0.022134552806734164"/>
+    <nuclide name="Xe135" ao="5.075769477142743e-09"/>
+    <nuclide name="Xe136" ao="1.7517886490366798e-06"/>
   </material>
   <material id="65" depletable="true" volume="0.06674732823364922" temperature="293.6">
     <density units="sum"/>
     <nuclide name="O16" ao="0.046295399999999994"/>
     <nuclide name="O17" ao="0.00011276839999999999"/>
-    <nuclide name="Cs135" ao="4.5021506681118494e-07"/>
-    <nuclide name="Gd156" ao="7.941170517826359e-09"/>
-    <nuclide name="Gd157" ao="4.87901009317699e-10"/>
-    <nuclide name="I135" ao="8.335158330979799e-09"/>
-    <nuclide name="U234" ao="1.004446486176024e-05"/>
-    <nuclide name="U235" ao="0.0010174211105253887"/>
-    <nuclide name="U238" ao="0.0221343469639183"/>
-    <nuclide name="Xe135" ao="5.045134946055872e-09"/>
-    <nuclide name="Xe136" ao="1.7053442901899206e-06"/>
+    <nuclide name="Cs135" ao="4.27722871661117e-07"/>
+    <nuclide name="Gd156" ao="7.71901195619115e-09"/>
+    <nuclide name="Gd157" ao="4.5635218189574305e-10"/>
+    <nuclide name="I135" ao="8.439589024990906e-09"/>
+    <nuclide name="U234" ao="1.0044805721541428e-05"/>
+    <nuclide name="U235" ao="0.0010195626945820153"/>
+    <nuclide name="U238" ao="0.022134211944598508"/>
+    <nuclide name="Xe135" ao="4.495383369428082e-09"/>
+    <nuclide name="Xe136" ao="1.615305821872234e-06"/>
   </material>
   <material id="66" depletable="true" volume="0.06674732823364922" temperature="293.6">
     <density units="sum"/>
     <nuclide name="O16" ao="0.046295399999999994"/>
     <nuclide name="O17" ao="0.00011276839999999999"/>
-    <nuclide name="Cs135" ao="4.300530779935639e-07"/>
-    <nuclide name="Gd156" ao="8.093213725235949e-09"/>
-    <nuclide name="Gd157" ao="5.14605341601871e-10"/>
-    <nuclide name="I135" ao="9.193679363006245e-09"/>
-    <nuclide name="U234" ao="1.0044529408433637e-05"/>
-    <nuclide name="U235" ao="0.0010168399945276177"/>
-    <nuclide name="U238" ao="0.0221342600989091"/>
-    <nuclide name="Xe135" ao="5.0545078365203945e-09"/>
-    <nuclide name="Xe136" ao="1.7572929664610167e-06"/>
+    <nuclide name="Cs135" ao="4.3610692191296446e-07"/>
+    <nuclide name="Gd156" ao="8.518503835547662e-09"/>
+    <nuclide name="Gd157" ao="4.5399900319492264e-10"/>
+    <nuclide name="I135" ao="9.09249537642733e-09"/>
+    <nuclide name="U234" ao="1.0044488112176157e-05"/>
+    <nuclide name="U235" ao="0.0010131432807183492"/>
+    <nuclide name="U238" ao="0.02213440970679264"/>
+    <nuclide name="Xe135" ao="5.399696603480261e-09"/>
+    <nuclide name="Xe136" ao="1.9473344000461746e-06"/>
   </material>
   <material id="67" depletable="true" volume="0.06674732823364922" temperature="293.6">
     <density units="sum"/>
     <nuclide name="O16" ao="0.046295399999999994"/>
     <nuclide name="O17" ao="0.00011276839999999999"/>
-    <nuclide name="Cs135" ao="4.6387578662097733e-07"/>
-    <nuclide name="Gd156" ao="7.904303216061177e-09"/>
-    <nuclide name="Gd157" ao="3.535144094848107e-10"/>
-    <nuclide name="I135" ao="1.0913558729134318e-08"/>
-    <nuclide name="U234" ao="1.0045224868160921e-05"/>
-    <nuclide name="U235" ao="0.001015358496886946"/>
-    <nuclide name="U238" ao="0.02213479706012655"/>
-    <nuclide name="Xe135" ao="5.161066202726614e-09"/>
-    <nuclide name="Xe136" ao="1.7925321199970005e-06"/>
+    <nuclide name="Cs135" ao="4.4269733316848923e-07"/>
+    <nuclide name="Gd156" ao="6.8834912015221874e-09"/>
+    <nuclide name="Gd157" ao="5.268555293126039e-10"/>
+    <nuclide name="I135" ao="9.72792414512545e-09"/>
+    <nuclide name="U234" ao="1.0045216952994501e-05"/>
+    <nuclide name="U235" ao="0.0010221691167621608"/>
+    <nuclide name="U238" ao="0.02213481142663786"/>
+    <nuclide name="Xe135" ao="5.274398555953527e-09"/>
+    <nuclide name="Xe136" ao="1.4483484958518488e-06"/>
   </material>
   <material id="68" depletable="true" volume="0.06674732823364922" temperature="293.6">
     <density units="sum"/>
     <nuclide name="O16" ao="0.0464035"/>
-    <nuclide name="Cs135" ao="4.4639816193101677e-07"/>
-    <nuclide name="Gd156" ao="5.473484807673252e-09"/>
-    <nuclide name="Gd157" ao="7.873961737997135e-06"/>
-    <nuclide name="I135" ao="7.047514529599939e-09"/>
-    <nuclide name="U235" ao="0.0010125885884101112"/>
-    <nuclide name="U238" ao="0.02169162150365341"/>
-    <nuclide name="Xe135" ao="5.5888114325423076e-09"/>
-    <nuclide name="Xe136" ao="8.320325563583469e-07"/>
+    <nuclide name="Cs135" ao="4.528731473512273e-07"/>
+    <nuclide name="Gd156" ao="5.276079336338315e-09"/>
+    <nuclide name="Gd157" ao="1.3671441071560035e-05"/>
+    <nuclide name="I135" ao="7.288078943337704e-09"/>
+    <nuclide name="U235" ao="0.0010136994033178508"/>
+    <nuclide name="U238" ao="0.021691660200183947"/>
+    <nuclide name="Xe135" ao="5.806302854653707e-09"/>
+    <nuclide name="Xe136" ao="7.647428117364966e-07"/>
   </material>
   <material id="69" depletable="true" volume="0.06674732823364922" temperature="293.6">
     <density units="sum"/>
     <nuclide name="O16" ao="0.046295399999999994"/>
     <nuclide name="O17" ao="0.00011276839999999999"/>
-    <nuclide name="Cs135" ao="4.6223836650122475e-07"/>
-    <nuclide name="Gd156" ao="7.953476976385664e-09"/>
-    <nuclide name="Gd157" ao="4.1027175087519965e-10"/>
-    <nuclide name="I135" ao="9.796423506518835e-09"/>
-    <nuclide name="U234" ao="1.0044187649341062e-05"/>
-    <nuclide name="U235" ao="0.0010170353834242176"/>
-    <nuclide name="U238" ao="0.022134372559487282"/>
-    <nuclide name="Xe135" ao="5.0991030899242805e-09"/>
-    <nuclide name="Xe136" ao="1.7121460733075797e-06"/>
+    <nuclide name="Cs135" ao="4.52926912644081e-07"/>
+    <nuclide name="Gd156" ao="7.605960064126685e-09"/>
+    <nuclide name="Gd157" ao="4.3866976134467753e-10"/>
+    <nuclide name="I135" ao="1.0718373052984328e-08"/>
+    <nuclide name="U234" ao="1.004535540549945e-05"/>
+    <nuclide name="U235" ao="0.0010174852002284081"/>
+    <nuclide name="U238" ao="0.022134763845904754"/>
+    <nuclide name="Xe135" ao="5.519173025530596e-09"/>
+    <nuclide name="Xe136" ao="1.6894993848072207e-06"/>
   </material>
   <material id="70" depletable="true" volume="0.06674732823364922" temperature="293.6">
     <density units="sum"/>
     <nuclide name="O16" ao="0.046295399999999994"/>
     <nuclide name="O17" ao="0.00011276839999999999"/>
-    <nuclide name="Cs135" ao="4.664997159187979e-07"/>
-    <nuclide name="Gd156" ao="9.025781278455481e-09"/>
-    <nuclide name="Gd157" ao="3.190701703279217e-10"/>
-    <nuclide name="I135" ao="1.4711477916054572e-08"/>
-    <nuclide name="U234" ao="1.0043737061563706e-05"/>
-    <nuclide name="U235" ao="0.0010106766373031348"/>
-    <nuclide name="U238" ao="0.02213424099107004"/>
-    <nuclide name="Xe135" ao="5.458886745013372e-09"/>
-    <nuclide name="Xe136" ao="2.0466796921687864e-06"/>
+    <nuclide name="Cs135" ao="4.448681938648973e-07"/>
+    <nuclide name="Gd156" ao="8.193263118004751e-09"/>
+    <nuclide name="Gd157" ao="3.6012099804909225e-10"/>
+    <nuclide name="I135" ao="1.1474071526782658e-08"/>
+    <nuclide name="U234" ao="1.0045002402839991e-05"/>
+    <nuclide name="U235" ao="0.0010131885250163563"/>
+    <nuclide name="U238" ao="0.022134816489828464"/>
+    <nuclide name="Xe135" ao="5.5082893868947435e-09"/>
+    <nuclide name="Xe136" ao="1.9270066654625705e-06"/>
   </material>
   <material id="71" depletable="true" volume="0.06674732823364922" temperature="293.6">
     <density units="sum"/>
     <nuclide name="O16" ao="0.046295399999999994"/>
     <nuclide name="O17" ao="0.00011276839999999999"/>
-    <nuclide name="Cs135" ao="4.6163611872342463e-07"/>
-    <nuclide name="Gd156" ao="8.092676337515914e-09"/>
-    <nuclide name="Gd157" ao="4.0155978871991965e-10"/>
-    <nuclide name="I135" ao="1.1255710201354816e-08"/>
-    <nuclide name="U234" ao="1.0044080156464483e-05"/>
-    <nuclide name="U235" ao="0.0010160767932805275"/>
-    <nuclide name="U238" ao="0.022134404858133214"/>
-    <nuclide name="Xe135" ao="6.1065455616234985e-09"/>
-    <nuclide name="Xe136" ao="1.7613053571588805e-06"/>
+    <nuclide name="Cs135" ao="4.430482643392291e-07"/>
+    <nuclide name="Gd156" ao="6.877045573690475e-09"/>
+    <nuclide name="Gd157" ao="4.989391562034294e-10"/>
+    <nuclide name="I135" ao="9.413699233026816e-09"/>
+    <nuclide name="U234" ao="1.0044755176343187e-05"/>
+    <nuclide name="U235" ao="0.0010220618298066796"/>
+    <nuclide name="U238" ao="0.02213485182592519"/>
+    <nuclide name="Xe135" ao="5.652564774411855e-09"/>
+    <nuclide name="Xe136" ao="1.4530725740390899e-06"/>
   </material>
   <material id="72" depletable="true" volume="0.06674732823364922" temperature="293.6">
     <density units="sum"/>
     <nuclide name="O16" ao="0.046295399999999994"/>
     <nuclide name="O17" ao="0.00011276839999999999"/>
-    <nuclide name="Cs135" ao="4.5571123718376045e-07"/>
-    <nuclide name="Gd156" ao="6.928887839072172e-09"/>
-    <nuclide name="Gd157" ao="4.3753171369940084e-10"/>
-    <nuclide name="I135" ao="8.934890686722866e-09"/>
-    <nuclide name="U234" ao="1.0044610174441688e-05"/>
-    <nuclide name="U235" ao="0.0010236806448679259"/>
-    <nuclide name="U238" ao="0.022134444472317126"/>
-    <nuclide name="Xe135" ao="5.225774688291077e-09"/>
-    <nuclide name="Xe136" ao="1.3609040886582337e-06"/>
+    <nuclide name="Cs135" ao="4.5911326696160503e-07"/>
+    <nuclide name="Gd156" ao="8.189799197570779e-09"/>
+    <nuclide name="Gd157" ao="4.0611758795110294e-10"/>
+    <nuclide name="I135" ao="1.0680038521394817e-08"/>
+    <nuclide name="U234" ao="1.0044781496434218e-05"/>
+    <nuclide name="U235" ao="0.0010152415868637022"/>
+    <nuclide name="U238" ao="0.022134444076722617"/>
+    <nuclide name="Xe135" ao="5.540154017917435e-09"/>
+    <nuclide name="Xe136" ao="1.8091999503945539e-06"/>
   </material>
   <material id="73" volume="0.017528298008244847" temperature="293.6">
     <density units="sum"/>
diff --git a/tests/regression_tests/deplete_with_transport/test_reference.h5 b/tests/regression_tests/deplete_with_transport/test_reference.h5
index e8478250be6497c4d6ada14ca8fd20ae217b4fc6..cc616e79102ff6121285cff1ecaecf84b7f932ce 100644
GIT binary patch
literal 163736
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

literal 163736
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%0D>17(icZ91W!%}Q
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
bH@<dZhFKh)&Hdl|oe$@n5B=HyH}CvE8*^43

diff --git a/tests/regression_tests/diff_tally/results_true.dat b/tests/regression_tests/diff_tally/results_true.dat
index 14729c821..a88081b7c 100644
--- a/tests/regression_tests/diff_tally/results_true.dat
+++ b/tests/regression_tests/diff_tally/results_true.dat
@@ -1,27 +1,27 @@
 d_material,d_nuclide,d_variable,score,mean,std. dev.
-3,,density,flux,-8.7368155e+00,1.5577812e+00
-3,,density,flux,-1.4842625e+01,2.2947682e+00
-1,,density,flux,-2.0922686e-01,4.9935069e-02
-1,,density,flux,-3.4582490e-01,1.7454386e-01
-1,O16,nuclide_density,flux,1.1301782e+01,2.2440389e+01
-1,O16,nuclide_density,flux,3.2481563e+00,3.2342885e+01
-1,U235,nuclide_density,flux,-1.5048665e+03,5.9045681e+02
-1,U235,nuclide_density,flux,-1.6193231e+03,9.7230073e+02
-1,,temperature,flux,-1.0891931e-04,2.3076849e-04
-1,,temperature,flux,-1.3563853e-04,2.0952841e-04
-3,,density,total,-3.9155374e+00,5.4862771e-01
-3,,density,absorption,-4.9210534e-01,3.4700776e-02
-3,,density,scatter,-3.4234320e+00,5.1443821e-01
-3,,density,fission,-3.1088949e-01,8.0540906e-02
-3,,density,nu-fission,-7.6137447e-01,1.9548876e-01
-3,,density,total,-3.8615156e-01,1.0175701e-01
-3,,density,absorption,-3.4458071e-01,9.3381192e-02
-3,,density,scatter,-4.1570854e-02,8.6942039e-03
-3,,density,fission,-2.9864832e-01,8.4711885e-02
-3,,density,nu-fission,-7.2797006e-01,2.0640455e-01
-3,,density,total,1.0491251e+01,9.1787723e+00
-3,,density,absorption,2.9819000e-01,3.0887165e-01
-3,,density,scatter,1.0193061e+01,8.8715930e+00
+3,,density,flux,-9.2822822e+00,1.6880315e+00
+3,,density,flux,-2.0591270e+01,3.0043477e+00
+1,,density,flux,-2.9765141e-01,5.2949290e-02
+1,,density,flux,-4.0095723e-01,1.1716168e-01
+1,O16,nuclide_density,flux,-1.4245069e+01,6.3028710e+00
+1,O16,nuclide_density,flux,-2.5098326e+01,5.7525657e+00
+1,U235,nuclide_density,flux,-2.1513560e+03,6.7234014e+02
+1,U235,nuclide_density,flux,-2.4222736e+03,7.7715656e+02
+1,,temperature,flux,-1.1242141e-04,8.1692839e-05
+1,,temperature,flux,6.1357500e-06,7.4812624e-05
+3,,density,total,-4.2880614e+00,7.0021512e-01
+3,,density,absorption,-5.0324695e-01,4.9079615e-02
+3,,density,scatter,-3.7848144e+00,6.5868388e-01
+3,,density,fission,-2.7732455e-01,6.4647487e-02
+3,,density,nu-fission,-6.7990282e-01,1.5692707e-01
+3,,density,total,-3.8043572e-01,9.6222860e-02
+3,,density,absorption,-3.3518262e-01,8.6810436e-02
+3,,density,scatter,-4.5253106e-02,9.5205809e-03
+3,,density,fission,-2.6400028e-01,6.8175997e-02
+3,,density,nu-fission,-6.4353897e-01,1.6613026e-01
+3,,density,total,-3.2070285e-01,2.8328990e+00
+3,,density,absorption,2.5921007e-02,2.2141808e-02
+3,,density,scatter,-3.4662385e-01,2.8171749e+00
 3,,density,fission,0.0000000e+00,0.0000000e+00
 3,,density,nu-fission,0.0000000e+00,0.0000000e+00
 3,,density,total,0.0000000e+00,0.0000000e+00
@@ -29,19 +29,19 @@ d_material,d_nuclide,d_variable,score,mean,std. dev.
 3,,density,scatter,0.0000000e+00,0.0000000e+00
 3,,density,fission,0.0000000e+00,0.0000000e+00
 3,,density,nu-fission,0.0000000e+00,0.0000000e+00
-1,,density,total,4.7128871e-01,5.7197095e-02
-1,,density,absorption,2.1981833e-02,1.7427232e-02
-1,,density,scatter,4.4930687e-01,4.0030120e-02
-1,,density,fission,6.0712328e-03,1.3719512e-02
-1,,density,nu-fission,1.5474650e-02,3.3437103e-02
-1,,density,total,1.2203418e-02,1.5798741e-02
-1,,density,absorption,7.0228085e-03,1.5294984e-02
-1,,density,scatter,5.1806097e-03,5.0807003e-04
-1,,density,fission,4.1074923e-03,1.3759608e-02
-1,,density,nu-fission,1.0046778e-02,3.3529881e-02
-1,,density,total,-5.2100220e-01,2.7618985e-01
-1,,density,absorption,-1.1039048e-02,6.2043549e-03
-1,,density,scatter,-5.0996315e-01,2.7027892e-01
+1,,density,total,4.0321800e-01,3.5365140e-02
+1,,density,absorption,4.8426976e-03,8.3784362e-03
+1,,density,scatter,3.9837530e-01,2.9076664e-02
+1,,density,fission,-5.4793062e-03,7.1720201e-03
+1,,density,nu-fission,-1.2481616e-02,1.7542625e-02
+1,,density,total,-3.6063021e-03,7.1950060e-03
+1,,density,absorption,-8.2666439e-03,6.9274342e-03
+1,,density,scatter,4.6603417e-03,4.1803496e-04
+1,,density,fission,-7.6315741e-03,7.1774359e-03
+1,,density,nu-fission,-1.8551295e-02,1.7493106e-02
+1,,density,total,-6.2852725e-01,1.9776006e-01
+1,,density,absorption,-1.4850233e-02,4.3086611e-03
+1,,density,scatter,-6.1367701e-01,1.9363188e-01
 1,,density,fission,0.0000000e+00,0.0000000e+00
 1,,density,nu-fission,0.0000000e+00,0.0000000e+00
 1,,density,total,0.0000000e+00,0.0000000e+00
@@ -49,19 +49,19 @@ d_material,d_nuclide,d_variable,score,mean,std. dev.
 1,,density,scatter,0.0000000e+00,0.0000000e+00
 1,,density,fission,0.0000000e+00,0.0000000e+00
 1,,density,nu-fission,0.0000000e+00,0.0000000e+00
-1,O16,nuclide_density,total,5.5744608e+01,1.3811361e+01
-1,O16,nuclide_density,absorption,2.1284059e+00,3.3353171e+00
-1,O16,nuclide_density,scatter,5.3616202e+01,1.0494347e+01
-1,O16,nuclide_density,fission,6.6058671e-01,1.9263932e+00
-1,O16,nuclide_density,nu-fission,1.5973305e+00,4.6977280e+00
-1,O16,nuclide_density,total,9.8433784e-01,2.4053581e+00
-1,O16,nuclide_density,absorption,9.1167507e-01,2.2565683e+00
-1,O16,nuclide_density,scatter,7.2662768e-02,1.5198625e-01
-1,O16,nuclide_density,fission,6.8845700e-01,1.9451444e+00
-1,O16,nuclide_density,nu-fission,1.6768628e+00,4.7395897e+00
-1,O16,nuclide_density,total,8.1604245e+00,3.7248338e+01
-1,O16,nuclide_density,absorption,2.4903834e-01,4.5609671e-01
-1,O16,nuclide_density,scatter,7.9113862e+00,3.6811434e+01
+1,O16,nuclide_density,total,4.2608989e+01,2.6322158e+00
+1,O16,nuclide_density,absorption,-5.9877963e-01,4.2139216e-01
+1,O16,nuclide_density,scatter,4.3207769e+01,2.5312922e+00
+1,O16,nuclide_density,fission,-9.2838585e-01,4.3505041e-01
+1,O16,nuclide_density,nu-fission,-2.2834786e+00,1.0634300e+00
+1,O16,nuclide_density,total,-1.1195412e+00,3.3033730e-01
+1,O16,nuclide_density,absorption,-1.0650267e+00,3.2780477e-01
+1,O16,nuclide_density,scatter,-5.4514540e-02,2.4911965e-02
+1,O16,nuclide_density,fission,-8.6787386e-01,4.4270048e-01
+1,O16,nuclide_density,nu-fission,-2.1159252e+00,1.0787495e+00
+1,O16,nuclide_density,total,-3.1004750e+01,8.0776339e+00
+1,O16,nuclide_density,absorption,-5.0354237e-01,2.6144390e-01
+1,O16,nuclide_density,scatter,-3.0501208e+01,7.8176703e+00
 1,O16,nuclide_density,fission,0.0000000e+00,0.0000000e+00
 1,O16,nuclide_density,nu-fission,0.0000000e+00,0.0000000e+00
 1,O16,nuclide_density,total,0.0000000e+00,0.0000000e+00
@@ -69,19 +69,19 @@ d_material,d_nuclide,d_variable,score,mean,std. dev.
 1,O16,nuclide_density,scatter,0.0000000e+00,0.0000000e+00
 1,O16,nuclide_density,fission,0.0000000e+00,0.0000000e+00
 1,O16,nuclide_density,nu-fission,0.0000000e+00,0.0000000e+00
-1,U235,nuclide_density,total,-2.8654443e+02,3.3721470e+02
-1,U235,nuclide_density,absorption,2.0329180e+02,1.0522263e+02
-1,U235,nuclide_density,scatter,-4.8983623e+02,2.3237977e+02
-1,U235,nuclide_density,fission,2.6089045e+02,7.2578344e+01
-1,U235,nuclide_density,nu-fission,6.3692044e+02,1.7710877e+02
-1,U235,nuclide_density,total,4.5611633e+02,9.1682367e+01
-1,U235,nuclide_density,absorption,3.3831545e+02,8.5035501e+01
-1,U235,nuclide_density,scatter,1.1780088e+02,7.4128809e+00
-1,U235,nuclide_density,fission,2.6094461e+02,7.2102445e+01
-1,U235,nuclide_density,nu-fission,6.3705705e+02,1.7578950e+02
-1,U235,nuclide_density,total,-4.1342174e+03,1.4666097e+03
-1,U235,nuclide_density,absorption,-1.1329170e+02,3.5066579e+01
-1,U235,nuclide_density,scatter,-4.0209257e+03,1.4320401e+03
+1,U235,nuclide_density,total,-5.3578869e+02,3.4044374e+02
+1,U235,nuclide_density,absorption,2.0769087e+02,1.0873543e+02
+1,U235,nuclide_density,scatter,-7.4347956e+02,2.5966153e+02
+1,U235,nuclide_density,fission,2.8982867e+02,8.5348425e+01
+1,U235,nuclide_density,nu-fission,7.0772332e+02,2.0847449e+02
+1,U235,nuclide_density,total,4.8356107e+02,1.0276621e+02
+1,U235,nuclide_density,absorption,3.6683548e+02,9.6924085e+01
+1,U235,nuclide_density,scatter,1.1672558e+02,6.1773010e+00
+1,U235,nuclide_density,fission,2.8941699e+02,8.4475937e+01
+1,U235,nuclide_density,nu-fission,7.0639136e+02,2.0594285e+02
+1,U235,nuclide_density,total,-4.6777522e+03,1.5037171e+03
+1,U235,nuclide_density,absorption,-1.1585081e+02,3.8299177e+01
+1,U235,nuclide_density,scatter,-4.5619014e+03,1.4660078e+03
 1,U235,nuclide_density,fission,0.0000000e+00,0.0000000e+00
 1,U235,nuclide_density,nu-fission,0.0000000e+00,0.0000000e+00
 1,U235,nuclide_density,total,0.0000000e+00,0.0000000e+00
@@ -89,19 +89,19 @@ d_material,d_nuclide,d_variable,score,mean,std. dev.
 1,U235,nuclide_density,scatter,0.0000000e+00,0.0000000e+00
 1,U235,nuclide_density,fission,0.0000000e+00,0.0000000e+00
 1,U235,nuclide_density,nu-fission,0.0000000e+00,0.0000000e+00
-1,,temperature,total,5.3733744e-05,1.1785516e-04
-1,,temperature,absorption,-1.3987780e-05,1.9819801e-05
-1,,temperature,scatter,6.7721524e-05,9.9934995e-05
-1,,temperature,fission,-1.4882696e-05,1.6930666e-05
-1,,temperature,nu-fission,-3.6272065e-05,4.1250892e-05
-1,,temperature,total,-1.8119796e-05,2.2651409e-05
-1,,temperature,absorption,-1.7632076e-05,2.1825006e-05
-1,,temperature,scatter,-4.8771972e-07,1.4270133e-06
-1,,temperature,fission,-1.4890811e-05,1.6935899e-05
-1,,temperature,nu-fission,-3.6292215e-05,4.1263951e-05
-1,,temperature,total,-2.0776498e-04,2.9286552e-04
-1,,temperature,absorption,-3.9068381e-06,3.4912438e-06
-1,,temperature,scatter,-2.0385814e-04,2.8941307e-04
+1,,temperature,total,8.2134941e-05,1.3941434e-05
+1,,temperature,absorption,4.1502002e-05,3.5967068e-05
+1,,temperature,scatter,4.0632939e-05,2.6595574e-05
+1,,temperature,fission,3.1768469e-06,2.1582455e-05
+1,,temperature,nu-fission,7.7368345e-06,5.2593375e-05
+1,,temperature,total,1.0834099e-06,2.6707333e-05
+1,,temperature,absorption,1.6240165e-06,2.6844372e-05
+1,,temperature,scatter,-5.4060665e-07,2.5905412e-07
+1,,temperature,fission,3.1674458e-06,2.1588836e-05
+1,,temperature,nu-fission,7.7134913e-06,5.2609321e-05
+1,,temperature,total,9.5175179e-05,1.0549922e-04
+1,,temperature,absorption,4.3553888e-06,2.9261613e-06
+1,,temperature,scatter,9.0819790e-05,1.0362538e-04
 1,,temperature,fission,0.0000000e+00,0.0000000e+00
 1,,temperature,nu-fission,0.0000000e+00,0.0000000e+00
 1,,temperature,total,0.0000000e+00,0.0000000e+00
@@ -109,68 +109,68 @@ d_material,d_nuclide,d_variable,score,mean,std. dev.
 1,,temperature,scatter,0.0000000e+00,0.0000000e+00
 1,,temperature,fission,0.0000000e+00,0.0000000e+00
 1,,temperature,nu-fission,0.0000000e+00,0.0000000e+00
-3,,density,absorption,-4.5579543e-01,5.5532252e-02
-3,,density,absorption,-1.3526251e-02,1.3917291e-01
-1,,density,absorption,3.8695654e-02,1.5823093e-02
-1,,density,absorption,-1.8171150e-02,1.2999773e-03
-1,O16,nuclide_density,absorption,2.0992238e+00,2.7230754e+00
-1,O16,nuclide_density,absorption,-6.8956953e-01,3.3064989e-01
-1,U235,nuclide_density,absorption,2.5000417e+02,7.3334295e+01
-1,U235,nuclide_density,absorption,-1.0832917e+02,1.1517513e+01
-1,,temperature,absorption,1.1819459e-05,4.2090670e-05
-1,,temperature,absorption,-7.2302974e-06,1.5200299e-05
+3,,density,absorption,-5.4897740e-01,8.6529144e-02
+3,,density,absorption,1.3410763e-01,5.6235628e-02
+1,,density,absorption,2.9551566e-02,1.5215007e-02
+1,,density,absorption,-8.6382033e-03,5.5181454e-03
+1,O16,nuclide_density,absorption,2.7111116e-01,9.6922067e-01
+1,O16,nuclide_density,absorption,-7.3785997e-01,7.7252792e-01
+1,U235,nuclide_density,absorption,2.7361252e+02,1.6168134e+02
+1,U235,nuclide_density,absorption,-9.6885408e+01,1.9390948e+01
+1,,temperature,absorption,1.0054736e-05,4.2876538e-05
+1,,temperature,absorption,-1.8280609e-06,1.0133065e-05
 3,,density,nu-fission,0.0000000e+00,0.0000000e+00
-3,,density,scatter,-7.6858714e-01,3.2467801e-01
+3,,density,scatter,-5.4273849e-01,1.8081153e-01
 3,,density,nu-fission,0.0000000e+00,0.0000000e+00
-3,,density,scatter,3.2513857e-04,3.2513857e-04
-3,,density,nu-fission,-6.4963717e-01,1.8008086e-01
-3,,density,scatter,-2.6911548e+00,2.6336008e-01
-3,,density,nu-fission,-6.3014524e-01,1.8056453e-01
-3,,density,scatter,-3.4247012e-02,2.2649385e-02
+3,,density,scatter,1.3451827e-02,7.2870304e-03
+3,,density,nu-fission,-8.4200508e-01,3.4267126e-01
+3,,density,scatter,-3.1963455e+00,5.0369564e-01
+3,,density,nu-fission,-8.2934702e-01,3.4526131e-01
+3,,density,scatter,-7.0221960e-02,6.8067882e-02
 3,,density,nu-fission,0.0000000e+00,0.0000000e+00
-3,,density,scatter,1.0254549e+01,1.1054242e+01
+3,,density,scatter,1.1368387e+00,1.2091778e+00
 3,,density,nu-fission,0.0000000e+00,0.0000000e+00
 3,,density,scatter,0.0000000e+00,0.0000000e+00
 3,,density,nu-fission,0.0000000e+00,0.0000000e+00
-3,,density,scatter,2.5022850e-01,2.1207285e+00
+3,,density,scatter,-1.5916491e+00,2.3551913e+00
 3,,density,nu-fission,0.0000000e+00,0.0000000e+00
 3,,density,scatter,0.0000000e+00,0.0000000e+00
 1,,density,nu-fission,0.0000000e+00,0.0000000e+00
-1,,density,scatter,8.1153611e-03,3.1226564e-02
+1,,density,scatter,-1.8655633e-03,2.4061808e-02
 1,,density,nu-fission,0.0000000e+00,0.0000000e+00
-1,,density,scatter,2.3728497e-04,9.7166041e-04
-1,,density,nu-fission,2.6248459e-02,3.9328080e-02
-1,,density,scatter,4.2447769e-01,1.2580873e-02
-1,,density,nu-fission,1.9600074e-02,3.8118776e-02
-1,,density,scatter,8.0978391e-03,2.6585488e-03
+1,,density,scatter,-1.7672807e-04,7.4702879e-04
+1,,density,nu-fission,4.4506944e-03,3.1478180e-02
+1,,density,scatter,3.7553200e-01,2.3420342e-02
+1,,density,nu-fission,-1.3567324e-03,3.0610901e-02
+1,,density,scatter,6.9330560e-03,4.6649873e-03
 1,,density,nu-fission,0.0000000e+00,0.0000000e+00
-1,,density,scatter,-3.8358302e-01,2.1525401e-01
+1,,density,scatter,-5.1560927e-01,1.4846253e-01
 1,,density,nu-fission,0.0000000e+00,0.0000000e+00
 1,,density,scatter,0.0000000e+00,0.0000000e+00
 1,,density,nu-fission,0.0000000e+00,0.0000000e+00
-1,,density,scatter,-1.1924803e-01,9.1254221e-02
+1,,density,scatter,-1.0427977e-01,6.6396271e-02
 1,,density,nu-fission,0.0000000e+00,0.0000000e+00
 1,,density,scatter,0.0000000e+00,0.0000000e+00
 1,O16,nuclide_density,nu-fission,0.0000000e+00,0.0000000e+00
-1,O16,nuclide_density,scatter,-1.6577061e-01,1.0793192e-01
-1,O16,nuclide_density,nu-fission,2.4995074e+00,5.7946039e+00
-1,O16,nuclide_density,scatter,5.5800956e-01,5.7675606e-01
+1,O16,nuclide_density,scatter,4.6587151e-02,9.0232672e-02
+1,O16,nuclide_density,nu-fission,-2.1162226e+00,2.4773842e+00
+1,O16,nuclide_density,scatter,6.6533325e-01,2.4693113e-01
 1,O16,nuclide_density,nu-fission,0.0000000e+00,0.0000000e+00
 1,O16,nuclide_density,scatter,0.0000000e+00,0.0000000e+00
 1,O16,nuclide_density,nu-fission,0.0000000e+00,0.0000000e+00
 1,O16,nuclide_density,scatter,0.0000000e+00,0.0000000e+00
 1,U235,nuclide_density,nu-fission,0.0000000e+00,0.0000000e+00
-1,U235,nuclide_density,scatter,5.8641633e+00,2.9488422e+00
-1,U235,nuclide_density,nu-fission,6.7444160e+02,1.1308014e+02
-1,U235,nuclide_density,scatter,1.1592472e+02,2.8886339e+01
+1,U235,nuclide_density,scatter,2.8979849e+01,2.0235325e+01
+1,U235,nuclide_density,nu-fission,8.1210341e+02,2.9252040e+02
+1,U235,nuclide_density,scatter,1.0307302e+02,4.4919960e+01
 1,U235,nuclide_density,nu-fission,0.0000000e+00,0.0000000e+00
 1,U235,nuclide_density,scatter,0.0000000e+00,0.0000000e+00
 1,U235,nuclide_density,nu-fission,0.0000000e+00,0.0000000e+00
 1,U235,nuclide_density,scatter,0.0000000e+00,0.0000000e+00
 1,,temperature,nu-fission,0.0000000e+00,0.0000000e+00
-1,,temperature,scatter,-7.7511866e-07,6.4761261e-07
-1,,temperature,nu-fission,-9.5466386e-05,3.1033330e-05
-1,,temperature,scatter,-2.7127084e-06,2.0699253e-07
+1,,temperature,scatter,-3.3782154e-06,3.8240314e-06
+1,,temperature,nu-fission,-6.8920903e-05,4.4384761e-05
+1,,temperature,scatter,1.6325729e-07,2.3270228e-06
 1,,temperature,nu-fission,0.0000000e+00,0.0000000e+00
 1,,temperature,scatter,0.0000000e+00,0.0000000e+00
 1,,temperature,nu-fission,0.0000000e+00,0.0000000e+00
diff --git a/tests/regression_tests/distribmat/results_true.dat b/tests/regression_tests/distribmat/results_true.dat
index af7b27fe7..166fd4662 100644
--- a/tests/regression_tests/distribmat/results_true.dat
+++ b/tests/regression_tests/distribmat/results_true.dat
@@ -1,5 +1,5 @@
 k-combined:
-1.257344E+00 6.246360E-04
+1.246391E+00 1.414798E-02
 Cell
 	ID             =	11
 	Name           =	
diff --git a/tests/regression_tests/eigenvalue_genperbatch/results_true.dat b/tests/regression_tests/eigenvalue_genperbatch/results_true.dat
index 3f7ea801a..d171c5e87 100644
--- a/tests/regression_tests/eigenvalue_genperbatch/results_true.dat
+++ b/tests/regression_tests/eigenvalue_genperbatch/results_true.dat
@@ -1,5 +1,5 @@
 k-combined:
-3.037481E-01 1.247474E-04
+2.975937E-01 1.293390E-03
 tally 1:
-3.211129E+01
-2.578396E+02
+3.173222E+01
+2.517683E+02
diff --git a/tests/regression_tests/eigenvalue_no_inactive/results_true.dat b/tests/regression_tests/eigenvalue_no_inactive/results_true.dat
index 2b1021608..3ba7485a9 100644
--- a/tests/regression_tests/eigenvalue_no_inactive/results_true.dat
+++ b/tests/regression_tests/eigenvalue_no_inactive/results_true.dat
@@ -1,2 +1,2 @@
 k-combined:
-2.998284E-01 7.587782E-03
+3.072780E-01 6.882841E-03
diff --git a/tests/regression_tests/energy_grid/results_true.dat b/tests/regression_tests/energy_grid/results_true.dat
index deab1e28b..3a042d882 100644
--- a/tests/regression_tests/energy_grid/results_true.dat
+++ b/tests/regression_tests/energy_grid/results_true.dat
@@ -1,2 +1,2 @@
 k-combined:
-3.152586E-01 1.458068E-03
+3.218009E-01 4.687417E-03
diff --git a/tests/regression_tests/energy_laws/results_true.dat b/tests/regression_tests/energy_laws/results_true.dat
index 534a299b5..780278683 100644
--- a/tests/regression_tests/energy_laws/results_true.dat
+++ b/tests/regression_tests/energy_laws/results_true.dat
@@ -1,2 +1,2 @@
 k-combined:
-2.444000E+00 1.044626E-02
+2.458770E+00 9.422203E-03
diff --git a/tests/regression_tests/entropy/results_true.dat b/tests/regression_tests/entropy/results_true.dat
index 1c8b2908b..92d7f091d 100644
--- a/tests/regression_tests/entropy/results_true.dat
+++ b/tests/regression_tests/entropy/results_true.dat
@@ -1,13 +1,13 @@
 k-combined:
-3.070134E-01 3.900396E-03
+2.940336E-01 7.338463E-04
 entropy:
 7.688862E+00
-8.237960E+00
-8.314772E+00
-8.285254E+00
-8.271486E+00
-8.291355E+00
-8.253349E+00
-8.336726E+00
-8.284741E+00
-8.328102E+00
+8.226316E+00
+8.308355E+00
+8.243413E+00
+8.369345E+00
+8.304865E+00
+8.230689E+00
+8.338304E+00
+8.270630E+00
+8.386598E+00
diff --git a/tests/regression_tests/filter_cellfrom/results_true.dat b/tests/regression_tests/filter_cellfrom/results_true.dat
index 5dd43e1f3..408a4965b 100644
--- a/tests/regression_tests/filter_cellfrom/results_true.dat
+++ b/tests/regression_tests/filter_cellfrom/results_true.dat
@@ -1,53 +1,53 @@
 k-combined:
-9.640806E-02 2.655206E-03
+9.035025E-02 2.654309E-03
 tally 1:
-6.025999E+00
-3.635317E+00
+5.994069E+00
+3.594398E+00
 tally 2:
-4.523606E-04
-2.051522E-08
+4.559707E-04
+2.080739E-08
 tally 3:
-6.026452E+00
-3.635862E+00
+5.994525E+00
+3.594945E+00
 tally 4:
 0.000000E+00
 0.000000E+00
 tally 5:
-1.530903E+00
-2.357048E-01
+1.473892E+00
+2.187509E-01
 tally 6:
-4.992646E-05
-2.600391E-10
+5.223875E-05
+2.992861E-10
 tally 7:
-1.530953E+00
-2.357201E-01
+1.473945E+00
+2.187663E-01
 tally 8:
-1.889115E+01
-3.574727E+01
+1.885798E+01
+3.558423E+01
 tally 9:
-7.556902E+00
-5.717680E+00
+7.467961E+00
+5.580255E+00
 tally 10:
-5.022871E-04
-2.531352E-08
+5.082094E-04
+2.584432E-08
 tally 11:
-7.557405E+00
-5.718440E+00
+7.468470E+00
+5.581014E+00
 tally 12:
-1.889115E+01
-3.574727E+01
+1.885798E+01
+3.558423E+01
 tally 13:
 0.000000E+00
 0.000000E+00
 tally 14:
-2.663407E-04
-7.161725E-09
+2.739543E-04
+7.600983E-09
 tally 15:
-2.663407E-04
-7.161725E-09
+2.739543E-04
+7.600983E-09
 tally 16:
-8.025710E+01
-6.459305E+02
+7.881296E+01
+6.221087E+02
 tally 17:
-1.067059E+02
-1.140939E+03
+1.051397E+02
+1.106292E+03
diff --git a/tests/regression_tests/filter_cellinstance/results_true.dat b/tests/regression_tests/filter_cellinstance/results_true.dat
index 079b7d3d2..152986595 100644
--- a/tests/regression_tests/filter_cellinstance/results_true.dat
+++ b/tests/regression_tests/filter_cellinstance/results_true.dat
@@ -1,84 +1,84 @@
 k-combined:
-1.050139E+00 1.886614E-02
+1.097679E+00 8.074294E-03
 tally 1:
-9.724996E-02
-2.784804E-03
-1.146976E-01
-3.173782E-03
-1.698297E-01
-6.569993E-03
-1.158802E-01
-2.959280E-03
-2.533354E-01
-1.539905E-02
-1.908717E-01
-8.360058E-03
-1.738899E-01
-6.713494E-03
-3.172247E-01
-2.124184E-02
-1.363012E-01
-4.653519E-03
-1.698720E-01
-6.753819E-03
-9.934671E-02
-2.371660E-03
-6.038075E-02
-1.204656E-03
-1.038793E+01
-2.590382E+01
-2.841397E+01
-1.865709E+02
-2.786916E+01
-1.923869E+02
-1.085149E+01
-2.907194E+01
-1.038793E+01
-2.590382E+01
-2.841397E+01
-1.865709E+02
-2.786916E+01
-1.923869E+02
-1.085149E+01
-2.907194E+01
+7.125168E-02
+1.412152E-03
+1.254059E-01
+4.145686E-03
+1.609454E-01
+6.174116E-03
+1.444278E-01
+4.523981E-03
+3.363588E-01
+2.342988E-02
+1.751677E-01
+7.108034E-03
+1.384074E-01
+3.949804E-03
+2.856450E-01
+1.824185E-02
+9.680810E-02
+2.256338E-03
+1.691663E-01
+6.456530E-03
+1.160968E-01
+3.233815E-03
+7.334131E-02
+1.456688E-03
+1.168548E+01
+3.210924E+01
+2.860162E+01
+1.876786E+02
+2.857267E+01
+1.996553E+02
+1.050245E+01
+2.569953E+01
+1.168548E+01
+3.210924E+01
+2.860162E+01
+1.876786E+02
+2.857267E+01
+1.996553E+02
+1.050245E+01
+2.569953E+01
 tally 2:
-1.085149E+01
-2.907194E+01
-2.786916E+01
-1.923869E+02
-2.841397E+01
-1.865709E+02
-1.038793E+01
-2.590382E+01
-1.085149E+01
-2.907194E+01
-2.786916E+01
-1.923869E+02
-2.841397E+01
-1.865709E+02
-1.038793E+01
-2.590382E+01
-6.038075E-02
-1.204656E-03
-9.934671E-02
-2.371660E-03
-1.698720E-01
-6.753819E-03
-1.363012E-01
-4.653519E-03
-3.172247E-01
-2.124184E-02
-1.738899E-01
-6.713494E-03
-1.908717E-01
-8.360058E-03
-2.533354E-01
-1.539905E-02
-1.158802E-01
-2.959280E-03
-1.698297E-01
-6.569993E-03
-1.146976E-01
-3.173782E-03
-9.724996E-02
-2.784804E-03
+1.050245E+01
+2.569953E+01
+2.857267E+01
+1.996553E+02
+2.860162E+01
+1.876786E+02
+1.168548E+01
+3.210924E+01
+1.050245E+01
+2.569953E+01
+2.857267E+01
+1.996553E+02
+2.860162E+01
+1.876786E+02
+1.168548E+01
+3.210924E+01
+7.334131E-02
+1.456688E-03
+1.160968E-01
+3.233815E-03
+1.691663E-01
+6.456530E-03
+9.680810E-02
+2.256338E-03
+2.856450E-01
+1.824185E-02
+1.384074E-01
+3.949804E-03
+1.751677E-01
+7.108034E-03
+3.363588E-01
+2.342988E-02
+1.444278E-01
+4.523981E-03
+1.609454E-01
+6.174116E-03
+1.254059E-01
+4.145686E-03
+7.125168E-02
+1.412152E-03
diff --git a/tests/regression_tests/filter_distribcell/case-3/results_true.dat b/tests/regression_tests/filter_distribcell/case-3/results_true.dat
index f30e858f0..77f2a2a87 100644
--- a/tests/regression_tests/filter_distribcell/case-3/results_true.dat
+++ b/tests/regression_tests/filter_distribcell/case-3/results_true.dat
@@ -1 +1 @@
-1d09084dc41305687d53d1e800fb3d0ac3949aa4e1cb0bfbb327d0ec1ad4b74fc97ee73da84b910529296b858aab9b8a5d0924d17ca2cc373625e1a9e197aa94
\ No newline at end of file
+93c1efbc586874a715982d26609e9e79232de25a0b73093a00938d658440644f0ee6bb823902a6ef1b7a2a855e67b2da0a0e767ef550f9ffa4dea723e35af6f5
\ No newline at end of file
diff --git a/tests/regression_tests/filter_distribcell/case-4/results_true.dat b/tests/regression_tests/filter_distribcell/case-4/results_true.dat
index 228456c58..ed84838ee 100644
--- a/tests/regression_tests/filter_distribcell/case-4/results_true.dat
+++ b/tests/regression_tests/filter_distribcell/case-4/results_true.dat
@@ -1,12 +1,12 @@
 k-combined:
-1.068596E-01          INF
+1.069692E-01          INF
 tally 1:
 1.812612E-02
 3.285561E-04
 2.870442E-02
 8.239436E-04
-1.807689E-02
-3.267740E-04
+1.824058E-02
+3.327188E-04
 2.660796E-02
 7.079835E-04
 1.961572E-02
diff --git a/tests/regression_tests/filter_energyfun/results_true.dat b/tests/regression_tests/filter_energyfun/results_true.dat
index 0aadac82e..d64de58a6 100644
--- a/tests/regression_tests/filter_energyfun/results_true.dat
+++ b/tests/regression_tests/filter_energyfun/results_true.dat
@@ -1,10 +1,10 @@
    energyfunction nuclide                    score     mean  std. dev.
-0  448ee8dfd19c4f   Am241  ((n,gamma) / (n,gamma)) 1.74e-01   6.83e-03
+0  448ee8dfd19c4f   Am241  ((n,gamma) / (n,gamma)) 1.74e-01   5.44e-03
    energyfunction nuclide      score     mean  std. dev.
-0  37e006ae6b2e74   Am241  (n,gamma) 8.16e-02   2.24e-03
+0  37e006ae6b2e74   Am241  (n,gamma) 8.35e-02   1.83e-03
    energyfunction nuclide      score     mean  std. dev.
-0  b4e2ac84068d2d   Am241  (n,gamma) 8.19e-02   2.25e-03
+0  b4e2ac84068d2d   Am241  (n,gamma) 8.39e-02   1.84e-03
    energyfunction nuclide      score     mean  std. dev.
-0  dacf88242512ea   Am241  (n,gamma) 7.95e-02   2.19e-03
+0  dacf88242512ea   Am241  (n,gamma) 8.14e-02   1.78e-03
    energyfunction nuclide      score     mean  std. dev.
-0  fe168c70d9e078   Am241  (n,gamma) 1.06e-01   2.96e-03
+0  fe168c70d9e078   Am241  (n,gamma) 1.09e-01   2.41e-03
diff --git a/tests/regression_tests/filter_mesh/results_true.dat b/tests/regression_tests/filter_mesh/results_true.dat
index a91eadb35..34e99c17e 100644
--- a/tests/regression_tests/filter_mesh/results_true.dat
+++ b/tests/regression_tests/filter_mesh/results_true.dat
@@ -1 +1 @@
-bd55ee25094f9ad04fda4439f58ef0fed718632c88b9fde411a484dc624dedcd45dee643e14d8b107d8b92757737b8bb3d9a667de5482457d6d8346afffdf657
\ No newline at end of file
+e07ed2bc8893c69721abf61b123336f1f6128a3bee6ec63b84d1f549f31707a74a6ce885091ccc0eac6b7f16f7cab39ede4784584c08825829e108de878ea5fb
\ No newline at end of file
diff --git a/tests/regression_tests/filter_musurface/results_true.dat b/tests/regression_tests/filter_musurface/results_true.dat
index 39c9f2b92..4cdd7dbf5 100644
--- a/tests/regression_tests/filter_musurface/results_true.dat
+++ b/tests/regression_tests/filter_musurface/results_true.dat
@@ -1,11 +1,11 @@
 k-combined:
-1.157005E-01 7.587090E-03
+1.202075E-01 1.113188E-02
 tally 1:
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-8.770000E-01
-1.608710E-01
-3.909000E+00
-3.063035E+00
+9.230000E-01
+1.791510E-01
+3.869000E+00
+3.002523E+00
diff --git a/tests/regression_tests/filter_translations/results_true.dat b/tests/regression_tests/filter_translations/results_true.dat
index d257d71a6..a63586d2d 100644
--- a/tests/regression_tests/filter_translations/results_true.dat
+++ b/tests/regression_tests/filter_translations/results_true.dat
@@ -1,342 +1,342 @@
 k-combined:
-2.298294E-01 3.256961E-01
+7.729082E-01 3.775399E-02
 tally 1:
-4.880089E-02
-4.894233E-04
-8.221192E-02
-1.373712E-03
-5.205261E-02
-5.584673E-04
-1.272758E-01
-3.371623E-03
-3.599375E-01
-2.655645E-02
-1.377572E-01
-3.835778E-03
-1.646205E-01
-5.916595E-03
-3.806765E-01
-2.947576E-02
-1.470573E-01
-4.360385E-03
-5.568294E-02
-6.368003E-04
-6.775790E-02
-9.447074E-04
-5.580909E-02
-6.303584E-04
-6.674847E-02
-9.080853E-04
-9.747628E-02
-1.934325E-03
-6.824062E-02
-9.908844E-04
-1.891692E-01
-7.211874E-03
-5.976566E-01
-7.206211E-02
-1.805640E-01
-6.599680E-03
-2.114692E-01
-9.202185E-03
-6.514433E-01
-8.523087E-02
-1.905740E-01
-7.287607E-03
-7.633486E-02
-1.216488E-03
-1.117747E-01
-2.538705E-03
-7.438042E-02
-1.127109E-03
-7.356007E-02
-1.090617E-03
-1.161258E-01
-2.734941E-03
-6.745417E-02
-9.371031E-04
-2.153323E-01
-9.293477E-03
-9.414362E-01
-2.261845E-01
-2.016933E-01
-8.270477E-03
-2.370758E-01
-1.150628E-02
-9.973982E-01
-2.489516E-01
-2.152505E-01
-9.424546E-03
-7.502684E-02
-1.208304E-03
-1.244515E-01
-3.168682E-03
-7.515812E-02
-1.151397E-03
-6.355178E-02
-8.423316E-04
-1.040915E-01
-2.224064E-03
-6.902234E-02
-9.843766E-04
-1.978591E-01
-7.894161E-03
-5.162186E-01
-5.357742E-02
-1.897326E-01
-7.231935E-03
-1.827950E-01
-6.839560E-03
-5.780661E-01
-6.799910E-02
-1.881215E-01
-7.093746E-03
-6.083700E-02
-7.861240E-04
-9.978991E-02
-2.022733E-03
-6.004653E-02
-7.428556E-04
-4.951220E-02
-4.952385E-04
-7.401227E-02
-1.124154E-03
-5.151090E-02
-5.339359E-04
-1.356118E-01
-3.711749E-03
-3.400140E-01
-2.367518E-02
-1.385305E-01
-4.060592E-03
-1.438711E-01
-4.191824E-03
-3.276170E-01
-2.210924E-02
-1.279501E-01
-3.435254E-03
-4.852204E-02
-4.919417E-04
-7.229090E-02
-1.062894E-03
-4.344414E-02
-3.825354E-04
+5.296804E-02
+5.661701E-04
+8.356446E-02
+1.412139E-03
+5.041335E-02
+5.143568E-04
+1.299348E-01
+3.467618E-03
+3.929702E-01
+3.147038E-02
+1.379707E-01
+3.888484E-03
+1.405034E-01
+4.473799E-03
+3.785796E-01
+2.940585E-02
+1.422010E-01
+4.113723E-03
+5.647073E-02
+6.735251E-04
+7.911154E-02
+1.329137E-03
+5.160755E-02
+5.361448E-04
+6.669424E-02
+9.090832E-04
+1.008621E-01
+2.134534E-03
+6.808932E-02
+9.355993E-04
+1.873006E-01
+7.135961E-03
+6.221575E-01
+7.819842E-02
+1.856653E-01
+6.954762E-03
+2.014929E-01
+8.327845E-03
+5.853251E-01
+6.945708E-02
+1.709645E-01
+5.917124E-03
+7.214913E-02
+1.058962E-03
+1.027720E-01
+2.138475E-03
+6.099853E-02
+7.493941E-04
+6.892071E-02
+9.630680E-04
+1.035459E-01
+2.173883E-03
+6.973870E-02
+9.904237E-04
+2.125703E-01
+9.112659E-03
+9.012205E-01
+2.163546E-01
+2.066426E-01
+8.617414E-03
+2.258950E-01
+1.039607E-02
+9.476792E-01
+2.350708E-01
+2.225585E-01
+1.017898E-02
+7.111503E-02
+1.036847E-03
+1.117012E-01
+2.530040E-03
+6.870474E-02
+9.551035E-04
+5.738897E-02
+6.699030E-04
+9.522335E-02
+1.835769E-03
+6.570917E-02
+8.656870E-04
+1.945592E-01
+7.593336E-03
+5.514753E-01
+6.122981E-02
+2.144202E-01
+9.421739E-03
+1.971631E-01
+7.944046E-03
+6.088996E-01
+7.442954E-02
+1.965447E-01
+7.765628E-03
+7.005494E-02
+1.012891E-03
+1.010633E-01
+2.084095E-03
+6.145926E-02
+7.694351E-04
+4.999479E-02
+5.129164E-04
+7.238243E-02
+1.062921E-03
+4.902309E-02
+4.852193E-04
+1.324655E-01
+3.642431E-03
+3.305312E-01
+2.265726E-02
+1.332993E-01
+3.728385E-03
+1.547469E-01
+4.894837E-03
+3.625944E-01
+2.747313E-02
+1.435761E-01
+4.334405E-03
+5.789603E-02
+7.065383E-04
+7.589559E-02
+1.205386E-03
+5.210018E-02
+5.790843E-04
 tally 2:
-2.379877E-01
-1.141258E-02
-2.376600E-01
-1.137350E-02
-6.546514E-01
-8.852321E-02
-5.823862E-01
-6.810779E-02
-2.692631E-01
-1.479426E-02
-2.360469E-01
-1.124950E-02
-3.534788E-01
-2.528363E-02
-3.247931E-01
-2.160130E-02
-1.181513E+00
-2.959140E-01
-1.078874E+00
-2.467321E-01
-3.743375E-01
-2.859905E-02
-3.468123E-01
-2.427809E-02
-3.203903E-01
-2.109786E-02
-3.315547E-01
-2.216053E-02
-1.039077E+00
-2.294722E-01
-1.091786E+00
-2.572834E-01
-3.615960E-01
-2.678347E-02
-3.323317E-01
-2.226424E-02
-2.519726E-01
-1.279098E-02
-2.332385E-01
-1.101251E-02
-5.587247E-01
-6.293355E-02
-5.426859E-01
-6.010041E-02
-2.332981E-01
-1.097940E-02
-2.239951E-01
-1.043440E-02
+2.572693E-01
+1.338921E-02
+2.567576E-01
+1.333558E-02
+6.127899E-01
+7.781914E-02
+6.163075E-01
+7.600273E-02
+2.566545E-01
+1.372553E-02
+2.509744E-01
+1.286275E-02
+3.366720E-01
+2.282560E-02
+3.216175E-01
+2.103222E-02
+1.118187E+00
+2.697988E-01
+1.050003E+00
+2.391098E-01
+3.407360E-01
+2.332214E-02
+3.150094E-01
+2.006040E-02
+3.130223E-01
+2.001074E-02
+3.238651E-01
+2.101351E-02
+1.061186E+00
+2.372828E-01
+1.099461E+00
+2.597134E-01
+3.445524E-01
+2.400393E-02
+3.429055E-01
+2.372392E-02
+2.299776E-01
+1.064851E-02
+2.208901E-01
+9.829109E-03
+6.015657E-01
+7.399276E-02
+5.851229E-01
+7.165716E-02
+2.583609E-01
+1.364046E-02
+2.456380E-01
+1.257735E-02
 tally 3:
-4.880089E-02
-4.894233E-04
-8.221192E-02
-1.373712E-03
-5.205261E-02
-5.584673E-04
-1.272758E-01
-3.371623E-03
-3.599375E-01
-2.655645E-02
-1.377572E-01
-3.835778E-03
-1.646205E-01
-5.916595E-03
-3.806765E-01
-2.947576E-02
-1.470573E-01
-4.360385E-03
-5.568294E-02
-6.368003E-04
-6.775790E-02
-9.447074E-04
-5.580909E-02
-6.303584E-04
-6.674847E-02
-9.080853E-04
-9.747628E-02
-1.934325E-03
-6.824062E-02
-9.908844E-04
-1.891692E-01
-7.211874E-03
-5.976566E-01
-7.206211E-02
-1.805640E-01
-6.599680E-03
-2.114692E-01
-9.202185E-03
-6.514433E-01
-8.523087E-02
-1.905740E-01
-7.287607E-03
-7.633486E-02
-1.216488E-03
-1.117747E-01
-2.538705E-03
-7.438042E-02
-1.127109E-03
-7.356007E-02
-1.090617E-03
-1.161258E-01
-2.734941E-03
-6.745417E-02
-9.371031E-04
-2.153323E-01
-9.293477E-03
-9.414362E-01
-2.261845E-01
-2.016933E-01
-8.270477E-03
-2.370758E-01
-1.150628E-02
-9.973982E-01
-2.489516E-01
-2.152505E-01
-9.424546E-03
-7.502684E-02
-1.208304E-03
-1.244515E-01
-3.168682E-03
-7.515812E-02
-1.151397E-03
-6.355178E-02
-8.423316E-04
-1.040915E-01
-2.224064E-03
-6.902234E-02
-9.843766E-04
-1.978591E-01
-7.894161E-03
-5.162186E-01
-5.357742E-02
-1.897326E-01
-7.231935E-03
-1.827950E-01
-6.839560E-03
-5.780661E-01
-6.799910E-02
-1.881215E-01
-7.093746E-03
-6.083700E-02
-7.861240E-04
-9.978991E-02
-2.022733E-03
-6.004653E-02
-7.428556E-04
-4.951220E-02
-4.952385E-04
-7.401227E-02
-1.124154E-03
-5.151090E-02
-5.339359E-04
-1.356118E-01
-3.711749E-03
-3.400140E-01
-2.367518E-02
-1.385305E-01
-4.060592E-03
-1.438711E-01
-4.191824E-03
-3.276170E-01
-2.210924E-02
-1.279501E-01
-3.435254E-03
-4.852204E-02
-4.919417E-04
-7.229090E-02
-1.062894E-03
-4.344414E-02
-3.825354E-04
+5.296804E-02
+5.661701E-04
+8.356446E-02
+1.412139E-03
+5.041335E-02
+5.143568E-04
+1.299348E-01
+3.467618E-03
+3.929702E-01
+3.147038E-02
+1.379707E-01
+3.888484E-03
+1.405034E-01
+4.473799E-03
+3.785796E-01
+2.940585E-02
+1.422010E-01
+4.113723E-03
+5.647073E-02
+6.735251E-04
+7.911154E-02
+1.329137E-03
+5.160755E-02
+5.361448E-04
+6.669424E-02
+9.090832E-04
+1.008621E-01
+2.134534E-03
+6.808932E-02
+9.355993E-04
+1.873006E-01
+7.135961E-03
+6.221575E-01
+7.819842E-02
+1.856653E-01
+6.954762E-03
+2.014929E-01
+8.327845E-03
+5.853251E-01
+6.945708E-02
+1.709645E-01
+5.917124E-03
+7.214913E-02
+1.058962E-03
+1.027720E-01
+2.138475E-03
+6.099853E-02
+7.493941E-04
+6.892071E-02
+9.630680E-04
+1.035459E-01
+2.173883E-03
+6.973870E-02
+9.904237E-04
+2.125703E-01
+9.112659E-03
+9.012205E-01
+2.163546E-01
+2.066426E-01
+8.617414E-03
+2.258950E-01
+1.039607E-02
+9.476792E-01
+2.350708E-01
+2.225585E-01
+1.017898E-02
+7.111503E-02
+1.036847E-03
+1.117012E-01
+2.530040E-03
+6.870474E-02
+9.551035E-04
+5.738897E-02
+6.699030E-04
+9.522335E-02
+1.835769E-03
+6.570917E-02
+8.656870E-04
+1.945592E-01
+7.593336E-03
+5.514753E-01
+6.122981E-02
+2.144202E-01
+9.421739E-03
+1.971631E-01
+7.944046E-03
+6.088996E-01
+7.442954E-02
+1.965447E-01
+7.765628E-03
+7.005494E-02
+1.012891E-03
+1.010633E-01
+2.084095E-03
+6.145926E-02
+7.694351E-04
+4.999479E-02
+5.129164E-04
+7.238243E-02
+1.062921E-03
+4.902309E-02
+4.852193E-04
+1.324655E-01
+3.642431E-03
+3.305312E-01
+2.265726E-02
+1.332993E-01
+3.728385E-03
+1.547469E-01
+4.894837E-03
+3.625944E-01
+2.747313E-02
+1.435761E-01
+4.334405E-03
+5.789603E-02
+7.065383E-04
+7.589559E-02
+1.205386E-03
+5.210018E-02
+5.790843E-04
 tally 4:
-2.379877E-01
-1.141258E-02
-2.376600E-01
-1.137350E-02
-6.546514E-01
-8.852321E-02
-5.823862E-01
-6.810779E-02
-2.692631E-01
-1.479426E-02
-2.360469E-01
-1.124950E-02
-3.534788E-01
-2.528363E-02
-3.247931E-01
-2.160130E-02
-1.181513E+00
-2.959140E-01
-1.078874E+00
-2.467321E-01
-3.743375E-01
-2.859905E-02
-3.468123E-01
-2.427809E-02
-3.203903E-01
-2.109786E-02
-3.315547E-01
-2.216053E-02
-1.039077E+00
-2.294722E-01
-1.091786E+00
-2.572834E-01
-3.615960E-01
-2.678347E-02
-3.323317E-01
-2.226424E-02
-2.519726E-01
-1.279098E-02
-2.332385E-01
-1.101251E-02
-5.587247E-01
-6.293355E-02
-5.426859E-01
-6.010041E-02
-2.332981E-01
-1.097940E-02
-2.239951E-01
-1.043440E-02
+2.572693E-01
+1.338921E-02
+2.567576E-01
+1.333558E-02
+6.127899E-01
+7.781914E-02
+6.163075E-01
+7.600273E-02
+2.566545E-01
+1.372553E-02
+2.509744E-01
+1.286275E-02
+3.366720E-01
+2.282560E-02
+3.216175E-01
+2.103222E-02
+1.118187E+00
+2.697988E-01
+1.050003E+00
+2.391098E-01
+3.407360E-01
+2.332214E-02
+3.150094E-01
+2.006040E-02
+3.130223E-01
+2.001074E-02
+3.238651E-01
+2.101351E-02
+1.061186E+00
+2.372828E-01
+1.099461E+00
+2.597134E-01
+3.445524E-01
+2.400393E-02
+3.429055E-01
+2.372392E-02
+2.299776E-01
+1.064851E-02
+2.208901E-01
+9.829109E-03
+6.015657E-01
+7.399276E-02
+5.851229E-01
+7.165716E-02
+2.583609E-01
+1.364046E-02
+2.456380E-01
+1.257735E-02
diff --git a/tests/regression_tests/ifp/results_true.dat b/tests/regression_tests/ifp/results_true.dat
index a74e2bd78..1d8f69e12 100644
--- a/tests/regression_tests/ifp/results_true.dat
+++ b/tests/regression_tests/ifp/results_true.dat
@@ -1,9 +1,9 @@
 k-combined:
-1.007452E+00 5.705278E-03
+1.006559E+00 5.389391E-03
 tally 1:
-8.996235E-08
-5.461421E-16
-4.800000E-02
-4.680000E-04
-1.512000E+01
-1.526063E+01
+9.109384E-08
+5.667165E-16
+6.500000E-02
+6.710000E-04
+1.489000E+01
+1.480036E+01
diff --git a/tests/regression_tests/infinite_cell/results_true.dat b/tests/regression_tests/infinite_cell/results_true.dat
index 2c4ce082d..4cdbcaf88 100644
--- a/tests/regression_tests/infinite_cell/results_true.dat
+++ b/tests/regression_tests/infinite_cell/results_true.dat
@@ -1,2 +1,2 @@
 k-combined:
-9.589951E-02 8.489144E-04
+9.603664E-02 1.050772E-03
diff --git a/tests/regression_tests/iso_in_lab/results_true.dat b/tests/regression_tests/iso_in_lab/results_true.dat
index aaef22623..0378ec86d 100644
--- a/tests/regression_tests/iso_in_lab/results_true.dat
+++ b/tests/regression_tests/iso_in_lab/results_true.dat
@@ -1,2 +1,2 @@
 k-combined:
-9.015537E-01 1.086850E-01
+9.365837E-01 5.366122E-02
diff --git a/tests/regression_tests/lattice/results_true.dat b/tests/regression_tests/lattice/results_true.dat
index f3e937b36..dca84bd6a 100644
--- a/tests/regression_tests/lattice/results_true.dat
+++ b/tests/regression_tests/lattice/results_true.dat
@@ -1,2 +1,2 @@
 k-combined:
-9.610829E-01 2.522714E-02
+9.182679E-01 5.270201E-02
diff --git a/tests/regression_tests/lattice_distribmat/False/results_true.dat b/tests/regression_tests/lattice_distribmat/False/results_true.dat
index 45a9ddb0a..9ebbb43b8 100644
--- a/tests/regression_tests/lattice_distribmat/False/results_true.dat
+++ b/tests/regression_tests/lattice_distribmat/False/results_true.dat
@@ -1,2 +1,2 @@
 k-combined:
-1.863277E+00 1.289821E-02
+1.848895E+00 1.480242E-02
diff --git a/tests/regression_tests/lattice_distribmat/True/results_true.dat b/tests/regression_tests/lattice_distribmat/True/results_true.dat
index 45a9ddb0a..9ebbb43b8 100644
--- a/tests/regression_tests/lattice_distribmat/True/results_true.dat
+++ b/tests/regression_tests/lattice_distribmat/True/results_true.dat
@@ -1,2 +1,2 @@
 k-combined:
-1.863277E+00 1.289821E-02
+1.848895E+00 1.480242E-02
diff --git a/tests/regression_tests/lattice_distribrho/results_true.dat b/tests/regression_tests/lattice_distribrho/results_true.dat
index d7094f4e3..f7f3da8e6 100644
--- a/tests/regression_tests/lattice_distribrho/results_true.dat
+++ b/tests/regression_tests/lattice_distribrho/results_true.dat
@@ -1,2 +1,2 @@
 k-combined:
-1.904471E+00 5.255549E-03
+1.900249E+00 8.157834E-03
diff --git a/tests/regression_tests/lattice_hex/results_true.dat b/tests/regression_tests/lattice_hex/results_true.dat
index 789bacc40..46db641eb 100644
--- a/tests/regression_tests/lattice_hex/results_true.dat
+++ b/tests/regression_tests/lattice_hex/results_true.dat
@@ -1,2 +1,2 @@
 k-combined:
-2.566607E-01 9.207770E-03
+2.595598E-01 9.089294E-03
diff --git a/tests/regression_tests/lattice_hex_coincident/results_true.dat b/tests/regression_tests/lattice_hex_coincident/results_true.dat
index c134e123f..c798b66e4 100644
--- a/tests/regression_tests/lattice_hex_coincident/results_true.dat
+++ b/tests/regression_tests/lattice_hex_coincident/results_true.dat
@@ -1,2 +1,2 @@
 k-combined:
-1.917792E+00 4.329425E-02
+1.931086E+00 5.968486E-02
diff --git a/tests/regression_tests/lattice_hex_x/results_true.dat b/tests/regression_tests/lattice_hex_x/results_true.dat
index 174dc70cd..44f947283 100644
--- a/tests/regression_tests/lattice_hex_x/results_true.dat
+++ b/tests/regression_tests/lattice_hex_x/results_true.dat
@@ -1,2 +1,2 @@
 k-combined:
-1.367975E+00 2.264887E-02
+1.326294E+00 1.193578E-02
diff --git a/tests/regression_tests/lattice_multiple/results_true.dat b/tests/regression_tests/lattice_multiple/results_true.dat
index 7a06551bd..0866932d2 100644
--- a/tests/regression_tests/lattice_multiple/results_true.dat
+++ b/tests/regression_tests/lattice_multiple/results_true.dat
@@ -1,2 +1,2 @@
 k-combined:
-1.859911E+00 8.282311E-03
+1.843982E+00 5.815875E-03
diff --git a/tests/regression_tests/lattice_rotated/results_true.dat b/tests/regression_tests/lattice_rotated/results_true.dat
index eeaa268fb..9a96a9259 100644
--- a/tests/regression_tests/lattice_rotated/results_true.dat
+++ b/tests/regression_tests/lattice_rotated/results_true.dat
@@ -1,2 +1,2 @@
 k-combined:
-4.426784E-01 6.627506E-03
+4.515246E-01 2.358354E-02
diff --git a/tests/regression_tests/mg_basic/results_true.dat b/tests/regression_tests/mg_basic/results_true.dat
index 15a9f2186..16980732d 100644
--- a/tests/regression_tests/mg_basic/results_true.dat
+++ b/tests/regression_tests/mg_basic/results_true.dat
@@ -1,2 +1,2 @@
 k-combined:
-1.009864E+00 1.107115E-02
+1.004679E+00 1.329350E-02
diff --git a/tests/regression_tests/mg_basic_delayed/results_true.dat b/tests/regression_tests/mg_basic_delayed/results_true.dat
index 6f7c79c1b..f150030b9 100644
--- a/tests/regression_tests/mg_basic_delayed/results_true.dat
+++ b/tests/regression_tests/mg_basic_delayed/results_true.dat
@@ -1,2 +1,2 @@
 k-combined:
-1.024610E+00 9.643746E-03
+1.017078E+00 1.181139E-02
diff --git a/tests/regression_tests/mg_convert/results_true.dat b/tests/regression_tests/mg_convert/results_true.dat
index ff3d7bb91..f8f748cc7 100644
--- a/tests/regression_tests/mg_convert/results_true.dat
+++ b/tests/regression_tests/mg_convert/results_true.dat
@@ -1,24 +1,24 @@
 k-combined:
-9.984888E-01 1.558301E-03
+9.926427E-01 3.067527E-03
 k-combined:
-1.001035E+00 7.622447E-04
+9.932868E-01 2.780271E-03
 k-combined:
-9.984888E-01 1.558301E-03
+9.926427E-01 3.067527E-03
 k-combined:
-9.991101E-01 2.776191E-03
+1.000000E+00 0.000000E+00
 k-combined:
-9.965954E-01 5.185046E-03
+9.902969E-01 1.654717E-02
 k-combined:
-9.987613E-01 4.806845E-04
+9.882796E-01 1.929843E-03
 k-combined:
-9.991101E-01 2.776191E-03
+1.000000E+00 0.000000E+00
 k-combined:
-9.965954E-01 5.185315E-03
+9.902953E-01 1.654291E-02
 k-combined:
-9.987610E-01 4.791528E-04
+9.882814E-01 1.927488E-03
 k-combined:
-9.944808E-01 4.458524E-03
+9.893153E-01 7.576652E-03
 k-combined:
-9.984888E-01 1.558301E-03
+9.926427E-01 3.067527E-03
 k-combined:
-9.984888E-01 1.558301E-03
+9.926427E-01 3.067527E-03
diff --git a/tests/regression_tests/mg_convert/test.py b/tests/regression_tests/mg_convert/test.py
index 8099c89a2..0e50f3a74 100755
--- a/tests/regression_tests/mg_convert/test.py
+++ b/tests/regression_tests/mg_convert/test.py
@@ -1,3 +1,4 @@
+from math import isnan
 import os
 import hashlib
 
@@ -142,10 +143,13 @@ class MGXSTestHarness(PyAPITestHarness):
                 openmc.run(openmc_exec=config['exe'])
 
             with openmc.StatePoint('statepoint.{}.h5'.format(batches)) as sp:
+                # Sometimes NaN results are produced; convert these to 0.0
+                std_dev = 0.0 if isnan(sp.keff.s) else sp.keff.s
+
                 # Write out k-combined.
                 outstr += 'k-combined:\n'
                 form = '{:12.6E} {:12.6E}\n'
-                outstr += form.format(sp.keff.n, sp.keff.s)
+                outstr += form.format(sp.keff.n, std_dev)
 
         return outstr
 
diff --git a/tests/regression_tests/mg_legendre/results_true.dat b/tests/regression_tests/mg_legendre/results_true.dat
index e2989469c..04d9c9874 100644
--- a/tests/regression_tests/mg_legendre/results_true.dat
+++ b/tests/regression_tests/mg_legendre/results_true.dat
@@ -1,2 +1,2 @@
 k-combined:
-1.003646E+00 9.134747E-03
+1.009220E+00 9.571832E-03
diff --git a/tests/regression_tests/mg_max_order/results_true.dat b/tests/regression_tests/mg_max_order/results_true.dat
index e2989469c..04d9c9874 100644
--- a/tests/regression_tests/mg_max_order/results_true.dat
+++ b/tests/regression_tests/mg_max_order/results_true.dat
@@ -1,2 +1,2 @@
 k-combined:
-1.003646E+00 9.134747E-03
+1.009220E+00 9.571832E-03
diff --git a/tests/regression_tests/mg_survival_biasing/results_true.dat b/tests/regression_tests/mg_survival_biasing/results_true.dat
index cddbdaceb..4b26978ad 100644
--- a/tests/regression_tests/mg_survival_biasing/results_true.dat
+++ b/tests/regression_tests/mg_survival_biasing/results_true.dat
@@ -1,2 +1,2 @@
 k-combined:
-9.878738E-01 8.326224E-03
+9.889968E-01 9.144186E-03
diff --git a/tests/regression_tests/mg_tallies/results_true.dat b/tests/regression_tests/mg_tallies/results_true.dat
index 7484dd248..07fe22ce5 100644
--- a/tests/regression_tests/mg_tallies/results_true.dat
+++ b/tests/regression_tests/mg_tallies/results_true.dat
@@ -1,1324 +1,1324 @@
 k-combined:
-1.003646E+00 9.134747E-03
+1.012390E+00 9.679132E-03
 tally 1:
-5.220000E-01
-5.995400E-02
-1.400000E-02
-4.000000E-05
-6.718865E-03
-9.371695E-06
-1.106435E-02
-3.119729E-05
-1.216992E-07
-3.699412E-15
-1.106435E-02
-3.119729E-05
+1.342000E+00
+4.291640E-01
+7.000000E-02
+1.158000E-03
+2.919844E-02
+1.953371E-04
+5.372246E-02
+6.734832E-04
+2.939310E-07
+2.375686E-14
+5.372246E-02
+6.734832E-04
 0.000000E+00
 0.000000E+00
-1.343773E+06
-3.748678E+11
-5.220000E-01
-5.995400E-02
+5.839688E+06
+7.813485E+12
+1.342000E+00
+4.291640E-01
 0.000000E+00
 0.000000E+00
-1.520872E+00
-5.121226E-01
-2.564000E+00
-1.338762E+00
-1.160000E-01
-2.738000E-03
-4.593685E-02
-4.275719E-04
-1.360763E-01
-3.951569E-03
-8.079937E-07
-1.577355E-13
-1.350645E-01
-3.872739E-03
-1.011813E-03
-1.023765E-06
-9.187371E+06
-1.710288E+13
-2.564000E+00
-1.338762E+00
-8.595248E-04
-7.387829E-07
-7.412367E+00
-1.121746E+01
-2.184000E+00
-9.895940E-01
-1.080000E-01
-2.394000E-03
-4.782785E-02
-4.787428E-04
-1.140806E-01
-2.886440E-03
-6.242229E-07
-9.307161E-14
-1.130687E-01
-2.811706E-03
-1.011813E-03
-1.023765E-06
-9.565570E+06
-1.914971E+13
-2.184000E+00
-9.895940E-01
-3.312574E-05
-1.097314E-09
-6.331465E+00
-8.328826E+00
-5.970000E-01
-8.325100E-02
-3.500000E-02
-3.150000E-04
-1.514871E-02
-5.131352E-05
-3.795718E-02
-3.631435E-04
-2.299730E-07
-1.295603E-14
-3.795718E-02
-3.631435E-04
+3.915206E+00
+3.646810E+00
+2.701000E+00
+1.486587E+00
+1.340000E-01
+3.598000E-03
+5.583136E-02
+6.266530E-04
+1.267275E-01
+3.349463E-03
+7.209619E-07
+1.153253E-13
+1.267275E-01
+3.349463E-03
 0.000000E+00
 0.000000E+00
-3.029741E+06
-2.052541E+12
-5.970000E-01
-8.325100E-02
+1.116627E+07
+2.506612E+13
+2.701000E+00
+1.486587E+00
 0.000000E+00
 0.000000E+00
-1.714353E+00
-6.970480E-01
-1.852000E+00
-7.973360E-01
-7.900000E-02
-1.689000E-03
-2.755187E-02
-2.091740E-04
-5.453423E-02
-7.484037E-04
-2.368001E-07
-1.753710E-14
-5.453423E-02
-7.484037E-04
+7.844332E+00
+1.252301E+01
+2.791000E+00
+1.658877E+00
+1.240000E-01
+3.282000E-03
+5.173865E-02
+5.560435E-04
+1.292971E-01
+3.436301E-03
+6.920456E-07
+9.917496E-14
+1.263311E-01
+3.290664E-03
+2.965960E-03
+4.837204E-06
+1.034773E+07
+2.224174E+13
+2.791000E+00
+1.658877E+00
+7.133747E-04
+3.640977E-07
+8.120311E+00
+1.408288E+01
+3.169000E+00
+2.031747E+00
+1.620000E-01
+5.364000E-03
+6.707115E-02
+9.171975E-04
+1.648345E-01
+5.547084E-03
+1.008876E-06
+2.201766E-13
+1.638199E-01
+5.463700E-03
+1.014608E-03
+1.029429E-06
+1.341423E+07
+3.668790E+13
+3.169000E+00
+2.031747E+00
+8.618993E-04
+7.428703E-07
+9.158565E+00
+1.699756E+01
+3.660000E+00
+2.796494E+00
+1.580000E-01
+5.158000E-03
+6.719242E-02
+9.422093E-04
+1.591500E-01
+5.615224E-03
+8.020080E-07
+1.480166E-13
+1.581743E-01
+5.540021E-03
+9.756761E-04
+9.519438E-07
+1.343848E+07
+3.768837E+13
+3.660000E+00
+2.796494E+00
+2.954152E-04
+8.727014E-08
+1.067773E+01
+2.376726E+01
+2.527000E+00
+1.452369E+00
+1.140000E-01
+2.834000E-03
+4.984389E-02
+5.325247E-04
+1.111356E-01
+2.793586E-03
+7.289084E-07
+1.302125E-13
+1.111356E-01
+2.793586E-03
 0.000000E+00
 0.000000E+00
-5.510374E+06
-8.366961E+12
-1.852000E+00
-7.973360E-01
+9.968777E+06
+2.130099E+13
+2.527000E+00
+1.452369E+00
 0.000000E+00
 0.000000E+00
-5.449659E+00
-6.908544E+00
-4.177000E+00
-3.780409E+00
-1.760000E-01
-6.584000E-03
-7.049310E-02
-1.047700E-03
-2.082153E-01
-9.154274E-03
-1.090026E-06
-2.590031E-13
-2.082153E-01
-9.154274E-03
+7.323996E+00
+1.221424E+01
+3.204000E+00
+2.092834E+00
+1.500000E-01
+4.600000E-03
+6.029165E-02
+7.387235E-04
+1.410668E-01
+4.414885E-03
+8.384625E-07
+1.602532E-13
+1.400911E-01
+4.332066E-03
+9.756761E-04
+9.519438E-07
+1.205833E+07
+2.954894E+13
+3.204000E+00
+2.092834E+00
+3.194266E-05
+1.020333E-09
+9.309783E+00
+1.769870E+01
+3.463000E+00
+2.477679E+00
+1.670000E-01
+5.837000E-03
+6.829328E-02
+9.882225E-04
+1.758063E-01
+6.470636E-03
+9.887100E-07
+2.199856E-13
+1.737856E-01
+6.307226E-03
+2.020620E-03
+2.041459E-06
+1.365866E+07
+3.952890E+13
+3.463000E+00
+2.477679E+00
+4.276023E-04
+1.081885E-07
+1.003961E+01
+2.083120E+01
+2.970000E-01
+4.491300E-02
+1.500000E-02
+9.100000E-05
+4.215863E-03
+6.275840E-06
+6.040786E-03
+1.401662E-05
+2.142282E-08
+4.361920E-16
+6.040786E-03
+1.401662E-05
 0.000000E+00
 0.000000E+00
-1.409862E+07
-4.190799E+13
-4.177000E+00
-3.780409E+00
+8.431726E+05
+2.510336E+11
+2.970000E-01
+4.491300E-02
 0.000000E+00
 0.000000E+00
-1.213785E+01
-3.197979E+01
-2.287000E+00
-1.059809E+00
-1.040000E-01
-2.254000E-03
-4.025632E-02
-3.309459E-04
-9.479325E-02
-1.956154E-03
-4.705869E-07
-4.509695E-14
-9.479325E-02
-1.956154E-03
+8.785109E-01
+3.967096E-01
+1.250000E-01
+5.357000E-03
+2.000000E-03
+2.000000E-06
+4.888503E-04
+1.194873E-07
+2.028292E-03
+2.059943E-06
+8.582314E-09
+7.099216E-17
+2.028292E-03
+2.059943E-06
 0.000000E+00
 0.000000E+00
-8.051265E+06
-1.323783E+13
-2.287000E+00
-1.059809E+00
+9.777007E+04
+4.779493E+09
+1.250000E-01
+5.357000E-03
 0.000000E+00
 0.000000E+00
-6.680550E+00
-9.051488E+00
-6.398000E+00
-8.323220E+00
-2.580000E-01
-1.356600E-02
-1.070205E-01
-2.345401E-03
-2.825180E-01
-1.658268E-02
-1.510574E-06
-5.135513E-13
-2.805357E-01
-1.633928E-02
-1.982273E-03
-1.965559E-06
-2.140411E+07
-9.381603E+13
-6.398000E+00
-8.323220E+00
-6.001927E-04
-1.801940E-07
-1.863566E+01
-7.066273E+01
-1.167000E+00
-4.778410E-01
-5.100000E-02
-9.290000E-04
-1.851002E-02
-1.273765E-04
-3.405873E-02
-6.277248E-04
-1.688115E-07
-1.480555E-14
-3.195431E-02
-5.302962E-04
-2.104418E-03
-4.428574E-06
-3.702005E+06
-5.095061E+12
-1.167000E+00
-4.778410E-01
-3.530361E-04
-1.246345E-07
-3.428588E+00
-4.115657E+00
-3.630000E+00
-2.765806E+00
-1.490000E-01
-4.587000E-03
-5.894825E-02
-7.367371E-04
-1.434581E-01
-4.305327E-03
-7.603618E-07
-1.250071E-13
-1.414758E-01
-4.212618E-03
-1.982273E-03
-1.965559E-06
-1.178965E+07
-2.946948E+13
-3.630000E+00
-2.765806E+00
-4.160428E-04
-1.012741E-07
-1.059988E+01
-2.359174E+01
+3.698633E-01
+4.679347E-02
 tally 2:
-5.033991E-01
-5.701830E-02
-2.304219E-02
-1.162005E-04
-9.376617E-03
-1.933443E-05
-2.344154E-02
-1.208402E-04
-1.277674E-07
-3.888071E-15
-2.329292E-02
-1.193128E-04
-1.486195E-04
-4.857250E-09
-1.875323E+06
-7.733771E+11
-5.220000E-01
-5.995400E-02
-6.963583E-05
-1.066362E-09
-1.463809E+00
-4.840945E-01
-2.621546E+00
-1.396717E+00
-1.276380E-01
-3.311549E-03
-5.565805E-02
-6.598224E-04
-1.391451E-01
-4.123890E-03
-8.331879E-07
-1.660597E-13
-1.382629E-01
-4.071765E-03
-8.821806E-04
-1.657624E-07
-1.113161E+07
-2.639289E+13
-2.581000E+00
-1.357455E+00
-4.133468E-04
-3.639153E-08
-7.576783E+00
-1.169599E+01
-2.230626E+00
-1.033217E+00
-1.065165E-01
-2.416670E-03
-4.549248E-02
-4.740035E-04
-1.137312E-01
-2.962522E-03
-6.630810E-07
-1.170893E-13
-1.130101E-01
-2.925076E-03
-7.210562E-04
-1.190805E-07
-9.098495E+06
-1.896014E+13
-2.202000E+00
-1.007194E+00
-3.378518E-04
-2.614296E-08
-6.459596E+00
-8.662758E+00
-5.565395E-01
-7.242839E-02
-2.955239E-02
-1.840142E-04
-1.400990E-02
-4.103227E-05
-3.502476E-02
-2.564517E-04
-2.308081E-07
-1.205491E-14
-3.480270E-02
-2.532102E-04
-2.220571E-04
-1.030824E-08
-2.801981E+06
-1.641291E+12
-6.090000E-01
-8.636300E-02
-1.040451E-04
-2.263074E-09
-1.593637E+00
-6.040566E-01
-1.817267E+00
-7.710225E-01
-7.367627E-02
-1.267666E-03
-2.535616E-02
-1.551036E-04
-6.339039E-02
-9.693976E-04
-2.524798E-07
-1.896478E-14
-6.298850E-02
-9.571446E-04
-4.018954E-04
-3.896557E-08
-5.071232E+06
-6.204145E+12
-1.881000E+00
-8.206930E-01
-1.883086E-04
-8.554511E-09
-5.341905E+00
-6.666854E+00
-4.106914E+00
-3.704316E+00
-1.888617E-01
-7.777635E-03
-7.727973E-02
-1.309080E-03
-1.931993E-01
-8.181751E-03
-1.061590E-06
-2.554724E-13
-1.919744E-01
-8.078335E-03
-1.224884E-03
-3.288708E-07
-1.545595E+07
-5.236321E+13
-4.223000E+00
-3.850821E+00
-5.739211E-04
-7.220038E-08
-1.193698E+01
-3.133321E+01
-2.346339E+00
-1.119793E+00
-1.017476E-01
-2.080323E-03
-3.865443E-02
-3.024337E-04
-9.663608E-02
-1.890211E-03
-4.714003E-07
-4.853805E-14
-9.602340E-02
-1.866319E-03
-6.126731E-04
-7.597824E-08
-7.730886E+06
-1.209735E+13
-2.338000E+00
-1.106368E+00
-2.870687E-04
-1.668028E-08
-6.857029E+00
-9.581045E+00
-6.446883E+00
-8.447751E+00
-2.867793E-01
-1.670093E-02
-1.126541E-01
-2.611201E-03
-2.816352E-01
-1.632001E-02
-1.453669E-06
-4.585416E-13
-2.798496E-01
-1.611372E-02
-1.785568E-03
-6.559933E-07
-2.253081E+07
-1.044480E+14
-6.454000E+00
-8.471478E+00
-8.366302E-04
-1.440169E-07
-1.879692E+01
-7.185693E+01
-1.219419E+00
-5.127750E-01
-4.857020E-02
-8.389250E-04
-1.623897E-02
-1.008738E-04
-4.059741E-02
-6.304611E-04
-1.503579E-07
-1.146797E-14
-4.034003E-02
-6.224921E-04
-2.573878E-04
-2.534179E-08
-3.247793E+06
-4.034951E+12
-1.199000E+00
-4.975810E-01
-1.205994E-04
-5.563543E-09
-3.589772E+00
-4.434695E+00
-3.623361E+00
-2.780040E+00
-1.560708E-01
-5.162316E-03
-5.875078E-02
-7.419979E-04
-1.468770E-01
-4.637487E-03
-7.048177E-07
-1.136014E-13
-1.459458E-01
-4.578870E-03
-9.312005E-04
-1.864068E-07
-1.175016E+07
-2.967992E+13
-3.668000E+00
-2.824270E+00
-4.363151E-04
-4.092380E-08
-1.059543E+01
-2.377944E+01
+1.353006E+00
+4.298474E-01
+6.067126E-02
+9.182923E-04
+2.407597E-02
+1.589874E-04
+6.018994E-02
+9.936715E-04
+3.157310E-07
+3.268202E-14
+5.980833E-02
+9.811116E-04
+3.816044E-04
+3.994127E-08
+4.815195E+06
+6.359497E+12
+1.373000E+00
+4.448330E-01
+1.788012E-04
+8.768717E-09
+3.941968E+00
+3.631126E+00
+2.806910E+00
+1.600166E+00
+1.295488E-01
+3.449533E-03
+5.323702E-02
+5.945274E-04
+1.330925E-01
+3.715796E-03
+7.358638E-07
+1.182977E-13
+1.322487E-01
+3.668829E-03
+8.438073E-04
+1.493588E-07
+1.064740E+07
+2.378109E+13
+2.753000E+00
+1.542179E+00
+3.953669E-04
+3.279028E-08
+8.155605E+00
+1.349706E+01
+2.869647E+00
+1.739405E+00
+1.278179E-01
+3.407189E-03
+5.029332E-02
+5.252401E-04
+1.257333E-01
+3.282751E-03
+6.507109E-07
+8.979533E-14
+1.249362E-01
+3.241257E-03
+7.971497E-04
+1.319523E-07
+1.005866E+07
+2.100960E+13
+2.829000E+00
+1.702143E+00
+3.735055E-04
+2.896884E-08
+8.365907E+00
+1.480669E+01
+3.141043E+00
+1.981851E+00
+1.526263E-01
+4.699686E-03
+6.641498E-02
+9.211853E-04
+1.660374E-01
+5.757408E-03
+9.915981E-07
+2.229928E-13
+1.649848E-01
+5.684636E-03
+1.052678E-03
+2.314228E-07
+1.328300E+07
+3.684741E+13
+3.246000E+00
+2.132054E+00
+4.932336E-04
+5.080661E-08
+9.080077E+00
+1.658064E+01
+3.682383E+00
+2.808072E+00
+1.593265E-01
+5.346789E-03
+6.034523E-02
+7.901305E-04
+1.508631E-01
+4.938316E-03
+7.319663E-07
+1.246559E-13
+1.499066E-01
+4.875896E-03
+9.564725E-04
+1.984988E-07
+1.206905E+07
+3.160522E+13
+3.759000E+00
+2.944479E+00
+4.481564E-04
+4.357848E-08
+1.076370E+01
+2.396100E+01
+2.634850E+00
+1.584334E+00
+1.218122E-01
+3.391010E-03
+5.015643E-02
+5.871038E-04
+1.253911E-01
+3.669399E-03
+6.952485E-07
+1.202338E-13
+1.245961E-01
+3.623018E-03
+7.949798E-04
+1.474939E-07
+1.003129E+07
+2.348415E+13
+2.577000E+00
+1.509201E+00
+3.724888E-04
+3.238084E-08
+7.654439E+00
+1.338000E+01
+3.192584E+00
+2.071165E+00
+1.491327E-01
+4.485370E-03
+6.214556E-02
+7.933462E-04
+1.553639E-01
+4.958414E-03
+8.761442E-07
+1.691919E-13
+1.543789E-01
+4.895740E-03
+9.850078E-04
+1.993067E-07
+1.242911E+07
+3.173385E+13
+3.266000E+00
+2.172442E+00
+4.615266E-04
+4.375584E-08
+9.265396E+00
+1.747782E+01
+3.402213E+00
+2.415762E+00
+1.592235E-01
+5.219460E-03
+6.649290E-02
+9.066793E-04
+1.662323E-01
+5.666746E-03
+9.402303E-07
+1.840541E-13
+1.651783E-01
+5.595119E-03
+1.053913E-03
+2.277785E-07
+1.329858E+07
+3.626717E+13
+3.485000E+00
+2.510947E+00
+4.938123E-04
+5.000655E-08
+9.871966E+00
+2.037665E+01
+3.110378E-01
+5.227746E-02
+1.171121E-02
+6.542918E-05
+3.536640E-03
+5.149982E-06
+8.841599E-03
+3.218739E-05
+2.347065E-08
+5.243075E-16
+8.785544E-03
+3.178055E-05
+5.605578E-05
+1.293793E-09
+7.073280E+05
+2.059993E+11
+3.000000E-01
+4.514200E-02
+2.626500E-05
+2.840396E-10
+9.197485E-01
+4.619575E-01
+1.267544E-01
+5.491246E-03
+4.806410E-03
+8.161899E-06
+1.471497E-03
+8.779657E-07
+3.678743E-03
+5.487286E-06
+1.030812E-08
+1.028225E-16
+3.655420E-03
+5.417928E-06
+2.332325E-05
+2.205650E-10
+2.942995E+05
+3.511863E+10
+1.300000E-01
+5.822000E-03
+1.092814E-05
+4.842290E-11
+3.746117E-01
+4.790053E-02
 tally 3:
-1.092010E+02
-2.386227E+03
-4.975000E+00
-4.950147E+00
-2.009472E+00
-8.076733E-01
-5.000649E+00
-5.012321E+00
-2.728992E-05
-1.491241E-10
-4.964474E+00
-4.939215E+00
-3.617555E-02
-2.875519E-04
-4.018944E+08
-3.230693E+16
-1.092010E+02
-2.386227E+03
-1.333979E-02
-5.019969E-05
-3.176576E+02
-2.019260E+04
-1.042260E+02
-2.173864E+03
-1.042260E+02
-2.173864E+03
+1.098420E+02
+2.414277E+03
+4.993000E+00
+4.986021E+00
+2.023763E+00
+8.192234E-01
+5.037812E+00
+5.086734E+00
+2.745346E-05
+1.509092E-10
+5.002505E+00
+5.014944E+00
+3.530702E-02
+2.695026E-04
+4.047525E+08
+3.276894E+16
+1.098420E+02
+2.414277E+03
+1.059695E-02
+2.782849E-05
+3.195213E+02
+2.042961E+04
+1.048490E+02
+2.199887E+03
+1.048490E+02
+2.199887E+03
 tally 4:
-1.092010E+02
-2.386227E+03
-4.979068E+00
-4.959690E+00
-2.016700E+00
-8.137138E-01
-5.041749E+00
-5.085712E+00
-5.020635E-05
-5.047241E-10
-5.009785E+00
-5.021429E+00
-3.196471E-02
-2.044235E-04
-4.033399E+08
-3.254855E+16
-1.092010E+02
-2.386227E+03
-1.497710E-02
-4.487918E-05
-3.176576E+02
-2.019260E+04
+1.098420E+02
+2.414277E+03
+5.008447E+00
+5.018748E+00
+2.028674E+00
+8.234818E-01
+5.071684E+00
+5.146761E+00
+5.050718E-05
+5.107669E-10
+5.039530E+00
+5.081707E+00
+3.215450E-02
+2.068774E-04
+4.057347E+08
+3.293927E+16
+1.098420E+02
+2.414277E+03
+1.506603E-02
+4.541792E-05
+3.195213E+02
+2.042961E+04
 tally 5:
-1.097121E+02
-2.408636E+03
-5.009145E+00
-5.019563E+00
-2.032191E+00
-8.264420E-01
-5.080477E+00
-5.165263E+00
-2.756641E-05
-1.523527E-10
-5.048267E+00
-5.099975E+00
-3.221025E-02
-2.076211E-04
-4.064382E+08
-3.305768E+16
-1.093810E+02
-2.394075E+03
-1.509215E-02
-4.558119E-05
-3.191033E+02
-2.037736E+04
+1.103689E+02
+2.437562E+03
+5.035611E+00
+5.073005E+00
+2.041209E+00
+8.337913E-01
+5.103022E+00
+5.211196E+00
+2.765405E-05
+1.532759E-10
+5.070669E+00
+5.145327E+00
+3.235318E-02
+2.094674E-04
+4.082417E+08
+3.335165E+16
+1.098580E+02
+2.414983E+03
+1.515912E-02
+4.598653E-05
+3.210351E+02
+2.062463E+04
 tally 6:
-1.042260E+02
-2.173864E+03
-1.042260E+02
-2.173864E+03
-5.000649E+00
-5.012321E+00
+1.048490E+02
+2.199887E+03
+1.048490E+02
+2.199887E+03
+5.037812E+00
+5.086734E+00
 tally 7:
-6.507000E+00
-8.478423E+00
-1.444000E+00
-4.172780E-01
-1.146407E+00
-2.630079E-01
-2.867025E+00
-1.647980E+00
-2.707153E-05
-1.467503E-10
-2.848880E+00
-1.627146E+00
-1.814469E-02
-6.685238E-05
-2.292814E+08
-1.052031E+16
-6.507000E+00
-8.478423E+00
-9.467712E-03
-2.396878E-05
-1.191147E+01
-2.841087E+01
-5.063000E+00
-5.136983E+00
-5.063000E+00
-5.136983E+00
-1.026940E+02
-2.110535E+03
+6.546000E+00
+8.579894E+00
+1.462000E+00
+4.278220E-01
+1.160697E+00
+2.696537E-01
+2.879845E+00
+1.663297E+00
+2.723379E-05
+1.485067E-10
+2.862628E+00
+1.643479E+00
+1.721726E-02
+6.055382E-05
+2.321395E+08
+1.078615E+16
+6.546000E+00
+8.579894E+00
+6.709978E-03
+1.387848E-05
+1.198287E+01
+2.875089E+01
+5.084000E+00
+5.178800E+00
+5.084000E+00
+5.178800E+00
+1.032960E+02
+2.135240E+03
 3.531000E+00
-2.493861E+00
+2.493943E+00
 8.630652E-01
-1.489924E-01
-2.133624E+00
-9.150435E-01
-2.183901E-07
-9.544829E-15
-2.115593E+00
-8.991467E-01
-1.803087E-02
-8.677353E-05
+1.489973E-01
+2.157967E+00
+9.345420E-01
+2.196703E-07
+9.656558E-15
+2.139877E+00
+9.185178E-01
+1.808977E-02
+8.744581E-05
 1.726130E+08
-5.959695E+15
-1.026940E+02
-2.110535E+03
-3.872081E-03
-5.919692E-06
-3.057461E+02
-1.870786E+04
-9.916300E+01
-1.968002E+03
-9.916300E+01
-1.968002E+03
+5.959891E+15
+1.032960E+02
+2.135240E+03
+3.886968E-03
+5.976458E-06
+3.075384E+02
+1.892685E+04
+9.976500E+01
+1.991860E+03
+9.976500E+01
+1.991860E+03
 tally 8:
-6.507000E+00
-8.478423E+00
-1.455344E+00
-4.241161E-01
-1.155413E+00
-2.673178E-01
-2.888532E+00
-1.670737E+00
-4.955615E-05
-4.917547E-10
-2.870219E+00
-1.649619E+00
-1.831331E-02
-6.715634E-05
-2.310826E+08
-1.069271E+16
-6.507000E+00
-8.478423E+00
-8.580723E-03
-1.474352E-05
-1.191147E+01
-2.841087E+01
-1.026940E+02
-2.110535E+03
-3.523724E+00
-2.484884E+00
-8.612868E-01
-1.484560E-01
-2.153217E+00
-9.278503E-01
-6.502027E-07
-8.460574E-14
-2.139566E+00
-9.161225E-01
-1.365140E-02
-3.729555E-05
-1.722574E+08
-5.938242E+15
-1.026940E+02
-2.110535E+03
-6.396382E-03
-8.187874E-06
-3.057461E+02
-1.870786E+04
+6.546000E+00
+8.579894E+00
+1.464067E+00
+4.291919E-01
+1.162338E+00
+2.705171E-01
+2.905845E+00
+1.690732E+00
+4.985316E-05
+4.976401E-10
+2.887422E+00
+1.669362E+00
+1.842307E-02
+6.796008E-05
+2.324676E+08
+1.082069E+16
+6.546000E+00
+8.579894E+00
+8.632151E-03
+1.491997E-05
+1.198287E+01
+2.875089E+01
+1.032960E+02
+2.135240E+03
+3.544380E+00
+2.513971E+00
+8.663357E-01
+1.501938E-01
+2.165839E+00
+9.387115E-01
+6.540142E-07
+8.559612E-14
+2.152108E+00
+9.268463E-01
+1.373143E-02
+3.773212E-05
+1.732671E+08
+6.007753E+15
+1.032960E+02
+2.135240E+03
+6.433878E-03
+8.283719E-06
+3.075384E+02
+1.892685E+04
 tally 9:
-6.573230E+00
-8.663027E+00
-1.470157E+00
-4.333505E-01
-1.167173E+00
-2.731383E-01
-2.917933E+00
-1.707114E+00
-2.734707E-05
-1.499456E-10
-2.899433E+00
-1.685536E+00
-1.849971E-02
-6.861856E-05
-2.334346E+08
-1.092553E+16
-6.518000E+00
-8.507644E+00
-8.668060E-03
-1.506454E-05
-1.203271E+01
-2.902947E+01
-1.031389E+02
-2.128993E+03
-3.538988E+00
-2.506616E+00
-8.650177E-01
-1.497544E-01
-2.162544E+00
-9.359650E-01
-2.193361E-07
-9.628305E-15
-2.148834E+00
-9.241346E-01
-1.371054E-02
-3.762172E-05
-1.730035E+08
-5.990176E+15
-1.028630E+02
-2.117467E+03
-6.424090E-03
-8.259483E-06
-3.070706E+02
-1.887148E+04
+6.593971E+00
+8.715030E+00
+1.474796E+00
+4.359519E-01
+1.170856E+00
+2.747779E-01
+2.927140E+00
+1.717362E+00
+2.743336E-05
+1.508457E-10
+2.908582E+00
+1.695655E+00
+1.855808E-02
+6.903047E-05
+2.341712E+08
+1.099112E+16
+6.547000E+00
+8.582573E+00
+8.695410E-03
+1.515497E-05
+1.207068E+01
+2.920373E+01
+1.037750E+02
+2.155274E+03
+3.560815E+00
+2.537559E+00
+8.703528E-01
+1.516031E-01
+2.175882E+00
+9.475192E-01
+2.206889E-07
+9.747163E-15
+2.162087E+00
+9.355427E-01
+1.379510E-02
+3.808615E-05
+1.740706E+08
+6.064123E+15
+1.033110E+02
+2.135863E+03
+6.463712E-03
+8.361443E-06
+3.089644E+02
+1.910444E+04
 tally 10:
-5.063000E+00
-5.136983E+00
-5.063000E+00
-5.136983E+00
+5.084000E+00
+5.178800E+00
+5.084000E+00
+5.178800E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-2.867025E+00
-1.647980E+00
-1.445000E+00
-4.178610E-01
-1.445000E+00
-4.178610E-01
+2.879845E+00
+1.663297E+00
+1.463000E+00
+4.284330E-01
+1.463000E+00
+4.284330E-01
 0.000000E+00
 0.000000E+00
-9.771800E+01
-1.911083E+03
-9.771800E+01
-1.911083E+03
-2.133624E+00
-9.150435E-01
+9.830200E+01
+1.933884E+03
+9.830200E+01
+1.933884E+03
+2.157967E+00
+9.345420E-01
 tally 11:
-5.220000E-01
-5.995400E-02
-1.400000E-02
-4.000000E-05
-6.718865E-03
-9.371695E-06
-1.106435E-02
-3.119729E-05
-1.216992E-07
-3.699412E-15
-1.106435E-02
-3.119729E-05
+1.342000E+00
+4.291640E-01
+7.000000E-02
+1.158000E-03
+2.919844E-02
+1.953371E-04
+5.372246E-02
+6.734832E-04
+2.939310E-07
+2.375686E-14
+5.372246E-02
+6.734832E-04
 0.000000E+00
 0.000000E+00
-1.343773E+06
-3.748678E+11
-5.220000E-01
-5.995400E-02
+5.839688E+06
+7.813485E+12
+1.342000E+00
+4.291640E-01
 0.000000E+00
 0.000000E+00
-2.564000E+00
-1.338762E+00
-1.160000E-01
-2.738000E-03
-4.593685E-02
-4.275719E-04
-1.360763E-01
-3.951569E-03
-8.079937E-07
-1.577355E-13
-1.350645E-01
-3.872739E-03
-1.011813E-03
-1.023765E-06
-9.187371E+06
-1.710288E+13
-2.564000E+00
-1.338762E+00
-8.595248E-04
-7.387829E-07
-2.184000E+00
-9.895940E-01
-1.080000E-01
-2.394000E-03
-4.782785E-02
-4.787428E-04
-1.140806E-01
-2.886440E-03
-6.242229E-07
-9.307161E-14
-1.130687E-01
-2.811706E-03
-1.011813E-03
-1.023765E-06
-9.565570E+06
-1.914971E+13
-2.184000E+00
-9.895940E-01
-3.312574E-05
-1.097314E-09
-5.970000E-01
-8.325100E-02
-3.500000E-02
-3.150000E-04
-1.514871E-02
-5.131352E-05
-3.795718E-02
-3.631435E-04
-2.299730E-07
-1.295603E-14
-3.795718E-02
-3.631435E-04
+2.701000E+00
+1.486587E+00
+1.340000E-01
+3.598000E-03
+5.583136E-02
+6.266530E-04
+1.267275E-01
+3.349463E-03
+7.209619E-07
+1.153253E-13
+1.267275E-01
+3.349463E-03
 0.000000E+00
 0.000000E+00
-3.029741E+06
-2.052541E+12
-5.970000E-01
-8.325100E-02
+1.116627E+07
+2.506612E+13
+2.701000E+00
+1.486587E+00
 0.000000E+00
 0.000000E+00
-1.852000E+00
-7.973360E-01
-7.900000E-02
-1.689000E-03
-2.755187E-02
-2.091740E-04
-5.453423E-02
-7.484037E-04
-2.368001E-07
-1.753710E-14
-5.453423E-02
-7.484037E-04
+2.791000E+00
+1.658877E+00
+1.240000E-01
+3.282000E-03
+5.173865E-02
+5.560435E-04
+1.292971E-01
+3.436301E-03
+6.920456E-07
+9.917496E-14
+1.263311E-01
+3.290664E-03
+2.965960E-03
+4.837204E-06
+1.034773E+07
+2.224174E+13
+2.791000E+00
+1.658877E+00
+7.133747E-04
+3.640977E-07
+3.169000E+00
+2.031747E+00
+1.620000E-01
+5.364000E-03
+6.707115E-02
+9.171975E-04
+1.648345E-01
+5.547084E-03
+1.008876E-06
+2.201766E-13
+1.638199E-01
+5.463700E-03
+1.014608E-03
+1.029429E-06
+1.341423E+07
+3.668790E+13
+3.169000E+00
+2.031747E+00
+8.618993E-04
+7.428703E-07
+3.660000E+00
+2.796494E+00
+1.580000E-01
+5.158000E-03
+6.719242E-02
+9.422093E-04
+1.591500E-01
+5.615224E-03
+8.020080E-07
+1.480166E-13
+1.581743E-01
+5.540021E-03
+9.756761E-04
+9.519438E-07
+1.343848E+07
+3.768837E+13
+3.660000E+00
+2.796494E+00
+2.954152E-04
+8.727014E-08
+2.527000E+00
+1.452369E+00
+1.140000E-01
+2.834000E-03
+4.984389E-02
+5.325247E-04
+1.111356E-01
+2.793586E-03
+7.289084E-07
+1.302125E-13
+1.111356E-01
+2.793586E-03
 0.000000E+00
 0.000000E+00
-5.510374E+06
-8.366961E+12
-1.852000E+00
-7.973360E-01
+9.968777E+06
+2.130099E+13
+2.527000E+00
+1.452369E+00
 0.000000E+00
 0.000000E+00
-4.177000E+00
-3.780409E+00
-1.760000E-01
-6.584000E-03
-7.049310E-02
-1.047700E-03
-2.082153E-01
-9.154274E-03
-1.090026E-06
-2.590031E-13
-2.082153E-01
-9.154274E-03
+3.204000E+00
+2.092834E+00
+1.500000E-01
+4.600000E-03
+6.029165E-02
+7.387235E-04
+1.410668E-01
+4.414885E-03
+8.384625E-07
+1.602532E-13
+1.400911E-01
+4.332066E-03
+9.756761E-04
+9.519438E-07
+1.205833E+07
+2.954894E+13
+3.204000E+00
+2.092834E+00
+3.194266E-05
+1.020333E-09
+3.463000E+00
+2.477679E+00
+1.670000E-01
+5.837000E-03
+6.829328E-02
+9.882225E-04
+1.758063E-01
+6.470636E-03
+9.887100E-07
+2.199856E-13
+1.737856E-01
+6.307226E-03
+2.020620E-03
+2.041459E-06
+1.365866E+07
+3.952890E+13
+3.463000E+00
+2.477679E+00
+4.276023E-04
+1.081885E-07
+2.970000E-01
+4.491300E-02
+1.500000E-02
+9.100000E-05
+4.215863E-03
+6.275840E-06
+6.040786E-03
+1.401662E-05
+2.142282E-08
+4.361920E-16
+6.040786E-03
+1.401662E-05
 0.000000E+00
 0.000000E+00
-1.409862E+07
-4.190799E+13
-4.177000E+00
-3.780409E+00
+8.431726E+05
+2.510336E+11
+2.970000E-01
+4.491300E-02
 0.000000E+00
 0.000000E+00
-2.287000E+00
-1.059809E+00
-1.040000E-01
-2.254000E-03
-4.025632E-02
-3.309459E-04
-9.479325E-02
-1.956154E-03
-4.705869E-07
-4.509695E-14
-9.479325E-02
-1.956154E-03
+1.250000E-01
+5.357000E-03
+2.000000E-03
+2.000000E-06
+4.888503E-04
+1.194873E-07
+2.028292E-03
+2.059943E-06
+8.582314E-09
+7.099216E-17
+2.028292E-03
+2.059943E-06
 0.000000E+00
 0.000000E+00
-8.051265E+06
-1.323783E+13
-2.287000E+00
-1.059809E+00
+9.777007E+04
+4.779493E+09
+1.250000E-01
+5.357000E-03
 0.000000E+00
 0.000000E+00
-6.398000E+00
-8.323220E+00
-2.580000E-01
-1.356600E-02
-1.070205E-01
-2.345401E-03
-2.825180E-01
-1.658268E-02
-1.510574E-06
-5.135513E-13
-2.805357E-01
-1.633928E-02
-1.982273E-03
-1.965559E-06
-2.140411E+07
-9.381603E+13
-6.398000E+00
-8.323220E+00
-6.001927E-04
-1.801940E-07
-1.167000E+00
-4.778410E-01
-5.100000E-02
-9.290000E-04
-1.851002E-02
-1.273765E-04
-3.405873E-02
-6.277248E-04
-1.688115E-07
-1.480555E-14
-3.195431E-02
-5.302962E-04
-2.104418E-03
-4.428574E-06
-3.702005E+06
-5.095061E+12
-1.167000E+00
-4.778410E-01
-3.530361E-04
-1.246345E-07
-3.630000E+00
-2.765806E+00
-1.490000E-01
-4.587000E-03
-5.894825E-02
-7.367371E-04
-1.434581E-01
-4.305327E-03
-7.603618E-07
-1.250071E-13
-1.414758E-01
-4.212618E-03
-1.982273E-03
-1.965559E-06
-1.178965E+07
-2.946948E+13
-3.630000E+00
-2.765806E+00
-4.160428E-04
-1.012741E-07
 tally 12:
-5.033991E-01
-5.701830E-02
-2.304219E-02
-1.162005E-04
-9.376617E-03
-1.933443E-05
-2.344154E-02
-1.208402E-04
-1.277674E-07
-3.888071E-15
-2.329292E-02
-1.193128E-04
-1.486195E-04
-4.857250E-09
-1.875323E+06
-7.733771E+11
-5.220000E-01
-5.995400E-02
-6.963583E-05
-1.066362E-09
-2.621546E+00
-1.396717E+00
-1.276380E-01
-3.311549E-03
-5.565805E-02
-6.598224E-04
-1.391451E-01
-4.123890E-03
-8.331879E-07
-1.660597E-13
-1.382629E-01
-4.071765E-03
-8.821806E-04
-1.657624E-07
-1.113161E+07
-2.639289E+13
-2.581000E+00
-1.357455E+00
-4.133468E-04
-3.639153E-08
-2.230626E+00
-1.033217E+00
-1.065165E-01
-2.416670E-03
-4.549248E-02
-4.740035E-04
-1.137312E-01
-2.962522E-03
-6.630810E-07
-1.170893E-13
-1.130101E-01
-2.925076E-03
-7.210562E-04
-1.190805E-07
-9.098495E+06
-1.896014E+13
-2.202000E+00
-1.007194E+00
-3.378518E-04
-2.614296E-08
-5.565395E-01
-7.242839E-02
-2.955239E-02
-1.840142E-04
-1.400990E-02
-4.103227E-05
-3.502476E-02
-2.564517E-04
-2.308081E-07
-1.205491E-14
-3.480270E-02
-2.532102E-04
-2.220571E-04
-1.030824E-08
-2.801981E+06
-1.641291E+12
-6.090000E-01
-8.636300E-02
-1.040451E-04
-2.263074E-09
-1.817267E+00
-7.710225E-01
-7.367627E-02
-1.267666E-03
-2.535616E-02
-1.551036E-04
-6.339039E-02
-9.693976E-04
-2.524798E-07
-1.896478E-14
-6.298850E-02
-9.571446E-04
-4.018954E-04
-3.896557E-08
-5.071232E+06
-6.204145E+12
-1.881000E+00
-8.206930E-01
-1.883086E-04
-8.554511E-09
-4.106914E+00
-3.704316E+00
-1.888617E-01
-7.777635E-03
-7.727973E-02
-1.309080E-03
-1.931993E-01
-8.181751E-03
-1.061590E-06
-2.554724E-13
-1.919744E-01
-8.078335E-03
-1.224884E-03
-3.288708E-07
-1.545595E+07
-5.236321E+13
-4.223000E+00
-3.850821E+00
-5.739211E-04
-7.220038E-08
-2.346339E+00
-1.119793E+00
-1.017476E-01
-2.080323E-03
-3.865443E-02
-3.024337E-04
-9.663608E-02
-1.890211E-03
-4.714003E-07
-4.853805E-14
-9.602340E-02
-1.866319E-03
-6.126731E-04
-7.597824E-08
-7.730886E+06
-1.209735E+13
-2.338000E+00
-1.106368E+00
-2.870687E-04
-1.668028E-08
-6.446883E+00
-8.447751E+00
-2.867793E-01
-1.670093E-02
-1.126541E-01
-2.611201E-03
-2.816352E-01
-1.632001E-02
-1.453669E-06
-4.585416E-13
-2.798496E-01
-1.611372E-02
-1.785568E-03
-6.559933E-07
-2.253081E+07
-1.044480E+14
-6.454000E+00
-8.471478E+00
-8.366302E-04
-1.440169E-07
-1.219419E+00
-5.127750E-01
-4.857020E-02
-8.389250E-04
-1.623897E-02
-1.008738E-04
-4.059741E-02
-6.304611E-04
-1.503579E-07
-1.146797E-14
-4.034003E-02
-6.224921E-04
-2.573878E-04
-2.534179E-08
-3.247793E+06
-4.034951E+12
-1.199000E+00
-4.975810E-01
-1.205994E-04
-5.563543E-09
-3.623361E+00
-2.780040E+00
-1.560708E-01
-5.162316E-03
-5.875078E-02
-7.419979E-04
-1.468770E-01
-4.637487E-03
-7.048177E-07
-1.136014E-13
-1.459458E-01
-4.578870E-03
-9.312005E-04
-1.864068E-07
-1.175016E+07
-2.967992E+13
-3.668000E+00
-2.824270E+00
-4.363151E-04
-4.092380E-08
+1.353006E+00
+4.298474E-01
+6.067126E-02
+9.182923E-04
+2.407597E-02
+1.589874E-04
+6.018994E-02
+9.936715E-04
+3.157310E-07
+3.268202E-14
+5.980833E-02
+9.811116E-04
+3.816044E-04
+3.994127E-08
+4.815195E+06
+6.359497E+12
+1.373000E+00
+4.448330E-01
+1.788012E-04
+8.768717E-09
+2.806910E+00
+1.600166E+00
+1.295488E-01
+3.449533E-03
+5.323702E-02
+5.945274E-04
+1.330925E-01
+3.715796E-03
+7.358638E-07
+1.182977E-13
+1.322487E-01
+3.668829E-03
+8.438073E-04
+1.493588E-07
+1.064740E+07
+2.378109E+13
+2.753000E+00
+1.542179E+00
+3.953669E-04
+3.279028E-08
+2.869647E+00
+1.739405E+00
+1.278179E-01
+3.407189E-03
+5.029332E-02
+5.252401E-04
+1.257333E-01
+3.282751E-03
+6.507109E-07
+8.979533E-14
+1.249362E-01
+3.241257E-03
+7.971497E-04
+1.319523E-07
+1.005866E+07
+2.100960E+13
+2.829000E+00
+1.702143E+00
+3.735055E-04
+2.896884E-08
+3.141043E+00
+1.981851E+00
+1.526263E-01
+4.699686E-03
+6.641498E-02
+9.211853E-04
+1.660374E-01
+5.757408E-03
+9.915981E-07
+2.229928E-13
+1.649848E-01
+5.684636E-03
+1.052678E-03
+2.314228E-07
+1.328300E+07
+3.684741E+13
+3.246000E+00
+2.132054E+00
+4.932336E-04
+5.080661E-08
+3.682383E+00
+2.808072E+00
+1.593265E-01
+5.346789E-03
+6.034523E-02
+7.901305E-04
+1.508631E-01
+4.938316E-03
+7.319663E-07
+1.246559E-13
+1.499066E-01
+4.875896E-03
+9.564725E-04
+1.984988E-07
+1.206905E+07
+3.160522E+13
+3.759000E+00
+2.944479E+00
+4.481564E-04
+4.357848E-08
+2.634850E+00
+1.584334E+00
+1.218122E-01
+3.391010E-03
+5.015643E-02
+5.871038E-04
+1.253911E-01
+3.669399E-03
+6.952485E-07
+1.202338E-13
+1.245961E-01
+3.623018E-03
+7.949798E-04
+1.474939E-07
+1.003129E+07
+2.348415E+13
+2.577000E+00
+1.509201E+00
+3.724888E-04
+3.238084E-08
+3.192584E+00
+2.071165E+00
+1.491327E-01
+4.485370E-03
+6.214556E-02
+7.933462E-04
+1.553639E-01
+4.958414E-03
+8.761442E-07
+1.691919E-13
+1.543789E-01
+4.895740E-03
+9.850078E-04
+1.993067E-07
+1.242911E+07
+3.173385E+13
+3.266000E+00
+2.172442E+00
+4.615266E-04
+4.375584E-08
+3.402213E+00
+2.415762E+00
+1.592235E-01
+5.219460E-03
+6.649290E-02
+9.066793E-04
+1.662323E-01
+5.666746E-03
+9.402303E-07
+1.840541E-13
+1.651783E-01
+5.595119E-03
+1.053913E-03
+2.277785E-07
+1.329858E+07
+3.626717E+13
+3.485000E+00
+2.510947E+00
+4.938123E-04
+5.000655E-08
+3.110378E-01
+5.227746E-02
+1.171121E-02
+6.542918E-05
+3.536640E-03
+5.149982E-06
+8.841599E-03
+3.218739E-05
+2.347065E-08
+5.243075E-16
+8.785544E-03
+3.178055E-05
+5.605578E-05
+1.293793E-09
+7.073280E+05
+2.059993E+11
+3.000000E-01
+4.514200E-02
+2.626500E-05
+2.840396E-10
+1.267544E-01
+5.491246E-03
+4.806410E-03
+8.161899E-06
+1.471497E-03
+8.779657E-07
+3.678743E-03
+5.487286E-06
+1.030812E-08
+1.028225E-16
+3.655420E-03
+5.417928E-06
+2.332325E-05
+2.205650E-10
+2.942995E+05
+3.511863E+10
+1.300000E-01
+5.822000E-03
+1.092814E-05
+4.842290E-11
 tally 13:
-1.092010E+02
-2.386227E+03
-4.975000E+00
-4.950147E+00
-2.009472E+00
-8.076733E-01
-5.000649E+00
-5.012321E+00
-2.728992E-05
-1.491241E-10
-4.964474E+00
-4.939215E+00
-3.617555E-02
-2.875519E-04
-4.018944E+08
-3.230693E+16
-1.092010E+02
-2.386227E+03
-1.333979E-02
-5.019969E-05
-1.042260E+02
-2.173864E+03
-1.042260E+02
-2.173864E+03
+1.098420E+02
+2.414277E+03
+4.993000E+00
+4.986021E+00
+2.023763E+00
+8.192234E-01
+5.037812E+00
+5.086734E+00
+2.745346E-05
+1.509092E-10
+5.002505E+00
+5.014944E+00
+3.530702E-02
+2.695026E-04
+4.047525E+08
+3.276894E+16
+1.098420E+02
+2.414277E+03
+1.059695E-02
+2.782849E-05
+1.048490E+02
+2.199887E+03
+1.048490E+02
+2.199887E+03
 tally 14:
-1.092010E+02
-2.386227E+03
-4.979068E+00
-4.959690E+00
-2.016700E+00
-8.137138E-01
-5.041749E+00
-5.085712E+00
-5.020635E-05
-5.047241E-10
-5.009785E+00
-5.021429E+00
-3.196471E-02
-2.044235E-04
-4.033399E+08
-3.254855E+16
-1.092010E+02
-2.386227E+03
-1.497710E-02
-4.487918E-05
+1.098420E+02
+2.414277E+03
+5.008447E+00
+5.018748E+00
+2.028674E+00
+8.234818E-01
+5.071684E+00
+5.146761E+00
+5.050718E-05
+5.107669E-10
+5.039530E+00
+5.081707E+00
+3.215450E-02
+2.068774E-04
+4.057347E+08
+3.293927E+16
+1.098420E+02
+2.414277E+03
+1.506603E-02
+4.541792E-05
 tally 15:
-1.097121E+02
-2.408636E+03
-5.009145E+00
-5.019563E+00
-2.032191E+00
-8.264420E-01
-5.080477E+00
-5.165263E+00
-2.756641E-05
-1.523527E-10
-5.048267E+00
-5.099975E+00
-3.221025E-02
-2.076211E-04
-4.064382E+08
-3.305768E+16
-1.093810E+02
-2.394075E+03
-1.509215E-02
-4.558119E-05
+1.103689E+02
+2.437562E+03
+5.035611E+00
+5.073005E+00
+2.041209E+00
+8.337913E-01
+5.103022E+00
+5.211196E+00
+2.765405E-05
+1.532759E-10
+5.070669E+00
+5.145327E+00
+3.235318E-02
+2.094674E-04
+4.082417E+08
+3.335165E+16
+1.098580E+02
+2.414983E+03
+1.515912E-02
+4.598653E-05
 tally 16:
-1.042260E+02
-2.173864E+03
-1.042260E+02
-2.173864E+03
-5.000649E+00
-5.012321E+00
+1.048490E+02
+2.199887E+03
+1.048490E+02
+2.199887E+03
+5.037812E+00
+5.086734E+00
 tally 17:
-6.507000E+00
-8.478423E+00
-1.444000E+00
-4.172780E-01
-1.146407E+00
-2.630079E-01
-2.867025E+00
-1.647980E+00
-2.707153E-05
-1.467503E-10
-2.848880E+00
-1.627146E+00
-1.814469E-02
-6.685238E-05
-2.292814E+08
-1.052031E+16
-6.507000E+00
-8.478423E+00
-9.467712E-03
-2.396878E-05
-5.063000E+00
-5.136983E+00
-5.063000E+00
-5.136983E+00
-1.026940E+02
-2.110535E+03
+6.546000E+00
+8.579894E+00
+1.462000E+00
+4.278220E-01
+1.160697E+00
+2.696537E-01
+2.879845E+00
+1.663297E+00
+2.723379E-05
+1.485067E-10
+2.862628E+00
+1.643479E+00
+1.721726E-02
+6.055382E-05
+2.321395E+08
+1.078615E+16
+6.546000E+00
+8.579894E+00
+6.709978E-03
+1.387848E-05
+5.084000E+00
+5.178800E+00
+5.084000E+00
+5.178800E+00
+1.032960E+02
+2.135240E+03
 3.531000E+00
-2.493861E+00
+2.493943E+00
 8.630652E-01
-1.489924E-01
-2.133624E+00
-9.150435E-01
-2.183901E-07
-9.544829E-15
-2.115593E+00
-8.991467E-01
-1.803087E-02
-8.677353E-05
+1.489973E-01
+2.157967E+00
+9.345420E-01
+2.196703E-07
+9.656558E-15
+2.139877E+00
+9.185178E-01
+1.808977E-02
+8.744581E-05
 1.726130E+08
-5.959695E+15
-1.026940E+02
-2.110535E+03
-3.872081E-03
-5.919692E-06
-9.916300E+01
-1.968002E+03
-9.916300E+01
-1.968002E+03
+5.959891E+15
+1.032960E+02
+2.135240E+03
+3.886968E-03
+5.976458E-06
+9.976500E+01
+1.991860E+03
+9.976500E+01
+1.991860E+03
 tally 18:
-6.507000E+00
-8.478423E+00
-1.455344E+00
-4.241161E-01
-1.155413E+00
-2.673178E-01
-2.888532E+00
-1.670737E+00
-4.955615E-05
-4.917547E-10
-2.870219E+00
-1.649619E+00
-1.831331E-02
-6.715634E-05
-2.310826E+08
-1.069271E+16
-6.507000E+00
-8.478423E+00
-8.580723E-03
-1.474352E-05
-1.026940E+02
-2.110535E+03
-3.523724E+00
-2.484884E+00
-8.612868E-01
-1.484560E-01
-2.153217E+00
-9.278503E-01
-6.502027E-07
-8.460574E-14
-2.139566E+00
-9.161225E-01
-1.365140E-02
-3.729555E-05
-1.722574E+08
-5.938242E+15
-1.026940E+02
-2.110535E+03
-6.396382E-03
-8.187874E-06
+6.546000E+00
+8.579894E+00
+1.464067E+00
+4.291919E-01
+1.162338E+00
+2.705171E-01
+2.905845E+00
+1.690732E+00
+4.985316E-05
+4.976401E-10
+2.887422E+00
+1.669362E+00
+1.842307E-02
+6.796008E-05
+2.324676E+08
+1.082069E+16
+6.546000E+00
+8.579894E+00
+8.632151E-03
+1.491997E-05
+1.032960E+02
+2.135240E+03
+3.544380E+00
+2.513971E+00
+8.663357E-01
+1.501938E-01
+2.165839E+00
+9.387115E-01
+6.540142E-07
+8.559612E-14
+2.152108E+00
+9.268463E-01
+1.373143E-02
+3.773212E-05
+1.732671E+08
+6.007753E+15
+1.032960E+02
+2.135240E+03
+6.433878E-03
+8.283719E-06
 tally 19:
-6.573230E+00
-8.663027E+00
-1.470157E+00
-4.333505E-01
-1.167173E+00
-2.731383E-01
-2.917933E+00
-1.707114E+00
-2.734707E-05
-1.499456E-10
-2.899433E+00
-1.685536E+00
-1.849971E-02
-6.861856E-05
-2.334346E+08
-1.092553E+16
-6.518000E+00
-8.507644E+00
-8.668060E-03
-1.506454E-05
-1.031389E+02
-2.128993E+03
-3.538988E+00
-2.506616E+00
-8.650177E-01
-1.497544E-01
-2.162544E+00
-9.359650E-01
-2.193361E-07
-9.628305E-15
-2.148834E+00
-9.241346E-01
-1.371054E-02
-3.762172E-05
-1.730035E+08
-5.990176E+15
-1.028630E+02
-2.117467E+03
-6.424090E-03
-8.259483E-06
+6.593971E+00
+8.715030E+00
+1.474796E+00
+4.359519E-01
+1.170856E+00
+2.747779E-01
+2.927140E+00
+1.717362E+00
+2.743336E-05
+1.508457E-10
+2.908582E+00
+1.695655E+00
+1.855808E-02
+6.903047E-05
+2.341712E+08
+1.099112E+16
+6.547000E+00
+8.582573E+00
+8.695410E-03
+1.515497E-05
+1.037750E+02
+2.155274E+03
+3.560815E+00
+2.537559E+00
+8.703528E-01
+1.516031E-01
+2.175882E+00
+9.475192E-01
+2.206889E-07
+9.747163E-15
+2.162087E+00
+9.355427E-01
+1.379510E-02
+3.808615E-05
+1.740706E+08
+6.064123E+15
+1.033110E+02
+2.135863E+03
+6.463712E-03
+8.361443E-06
 tally 20:
-5.063000E+00
-5.136983E+00
-5.063000E+00
-5.136983E+00
+5.084000E+00
+5.178800E+00
+5.084000E+00
+5.178800E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-2.867025E+00
-1.647980E+00
-1.445000E+00
-4.178610E-01
-1.445000E+00
-4.178610E-01
+2.879845E+00
+1.663297E+00
+1.463000E+00
+4.284330E-01
+1.463000E+00
+4.284330E-01
 0.000000E+00
 0.000000E+00
-9.771800E+01
-1.911083E+03
-9.771800E+01
-1.911083E+03
-2.133624E+00
-9.150435E-01
+9.830200E+01
+1.933884E+03
+9.830200E+01
+1.933884E+03
+2.157967E+00
+9.345420E-01
diff --git a/tests/regression_tests/mg_temperature/results_true.dat b/tests/regression_tests/mg_temperature/results_true.dat
index 19364e1d9..6de4c6bb1 100644
--- a/tests/regression_tests/mg_temperature/results_true.dat
+++ b/tests/regression_tests/mg_temperature/results_true.dat
@@ -1,40 +1,40 @@
 micro, method: nearest, t: 300.0, k-combined:
-1.439563E+00 4.526076E-04
+1.439913E+00 4.285638E-04
 kanalyt
 1.440410E+00
 micro, method: nearest, t: 600.0, k-combined:
-1.409389E+00 4.684481E-04
+1.410750E+00 4.829834E-04
 kanalyt
 1.410164E+00
 micro, method: nearest, t: 900.0, k-combined:
-1.407593E+00 4.410387E-04
+1.408232E+00 4.946310E-04
 kanalyt
 1.407830E+00
 micro, method: interpolation, t: 520.0, k-combined:
-1.418259E+00 4.242856E-04
+1.418877E+00 4.651822E-04
 kanalyt
 1.418514E+00
 micro, method: interpolation, t: 600.0, k-combined:
-1.409389E+00 4.684481E-04
+1.410750E+00 4.829834E-04
 kanalyt
 1.410164E+00
 macro, method: nearest, t: 300.0, k-combined:
-1.439563E+00 4.526076E-04
+1.439913E+00 4.285638E-04
 kanalyt
 1.440410E+00
 macro, method: nearest, t: 600.0, k-combined:
-1.409389E+00 4.684481E-04
+1.410750E+00 4.829834E-04
 kanalyt
 1.410164E+00
 macro, method: nearest, t: 900.0, k-combined:
-1.407593E+00 4.410387E-04
+1.408232E+00 4.946310E-04
 kanalyt
 1.407830E+00
 macro, method: interpolation, t: 520.0, k-combined:
-1.418259E+00 4.242856E-04
+1.418877E+00 4.651822E-04
 kanalyt
 1.418514E+00
 macro, method: interpolation, t: 600, k-combined:
-1.409389E+00 4.684481E-04
+1.410750E+00 4.829834E-04
 kanalyt
 1.410164E+00
diff --git a/tests/regression_tests/mg_temperature_multi/results_true.dat b/tests/regression_tests/mg_temperature_multi/results_true.dat
index 80c2f5622..3e2f990c8 100644
--- a/tests/regression_tests/mg_temperature_multi/results_true.dat
+++ b/tests/regression_tests/mg_temperature_multi/results_true.dat
@@ -1,8 +1,8 @@
 k-combined:
-1.337115E+00 7.221249E-03
+1.309371E+00 6.765039E-03
 tally 1:
-2.549066E+01
-1.299987E+02
+2.532303E+01
+1.282689E+02
 tally 2:
-9.276778E+01
-1.721791E+03
+9.336894E+01
+1.743765E+03
diff --git a/tests/regression_tests/mgxs_library_ce_to_mg/results_true.dat b/tests/regression_tests/mgxs_library_ce_to_mg/results_true.dat
index d95659534..7ce106314 100644
--- a/tests/regression_tests/mgxs_library_ce_to_mg/results_true.dat
+++ b/tests/regression_tests/mgxs_library_ce_to_mg/results_true.dat
@@ -1,2 +1,2 @@
 k-combined:
-1.158563E+00 3.354681E-02
+1.152065E+00 2.768158E-02
diff --git a/tests/regression_tests/mgxs_library_ce_to_mg_nuclides/results_true.dat b/tests/regression_tests/mgxs_library_ce_to_mg_nuclides/results_true.dat
index a4e9dafcc..50c8328c8 100644
--- a/tests/regression_tests/mgxs_library_ce_to_mg_nuclides/results_true.dat
+++ b/tests/regression_tests/mgxs_library_ce_to_mg_nuclides/results_true.dat
@@ -1,2 +1,2 @@
 k-combined:
-6.025533E-01 1.157401E-02
+4.139942E-01 1.181308E-02
diff --git a/tests/regression_tests/mgxs_library_condense/results_true.dat b/tests/regression_tests/mgxs_library_condense/results_true.dat
index ae5bff6e3..98b30932c 100644
--- a/tests/regression_tests/mgxs_library_condense/results_true.dat
+++ b/tests/regression_tests/mgxs_library_condense/results_true.dat
@@ -1,362 +1,362 @@
   mesh 1       group in nuclide      mean std. dev.
        x  y  z                                     
-0      1  1  1        1   total  0.699306  0.028642
-2      1  2  1        1   total  0.687913  0.025966
-1      2  1  1        1   total  0.716035  0.018945
-3      2  2  1        1   total  0.702630  0.028574
+0      1  1  1        1   total  0.702881  0.026175
+2      1  2  1        1   total  0.706921  0.029169
+1      2  1  1        1   total  0.707809  0.024766
+3      2  2  1        1   total  0.717967  0.024008
   mesh 1       group in nuclide      mean std. dev.
        x  y  z                                     
-0      1  1  1        1   total  0.443642  0.030984
-2      1  2  1        1   total  0.429968  0.028072
-1      2  1  1        1   total  0.461535  0.021345
-3      2  2  1        1   total  0.439454  0.031232
+0      1  1  1        1   total  0.431023  0.028803
+2      1  2  1        1   total  0.451864  0.030748
+1      2  1  1        1   total  0.456990  0.026359
+3      2  2  1        1   total  0.450621  0.026744
   mesh 1       group in nuclide      mean std. dev.
        x  y  z                                     
-0      1  1  1        1   total  0.443642  0.030984
-2      1  2  1        1   total  0.429968  0.028072
-1      2  1  1        1   total  0.461535  0.021345
-3      2  2  1        1   total  0.439454  0.031232
+0      1  1  1        1   total  0.431023  0.028803
+2      1  2  1        1   total  0.451864  0.030748
+1      2  1  1        1   total  0.456990  0.026359
+3      2  2  1        1   total  0.450621  0.026744
   mesh 1       group in nuclide      mean std. dev.
        x  y  z                                     
-0      1  1  1        1   total  0.021895  0.001041
-2      1  2  1        1   total  0.021903  0.001108
-1      2  1  1        1   total  0.024895  0.001401
-3      2  2  1        1   total  0.022105  0.001198
+0      1  1  1        1   total  0.022398  0.001401
+2      1  2  1        1   total  0.022325  0.001371
+1      2  1  1        1   total  0.022942  0.000990
+3      2  2  1        1   total  0.022705  0.001322
   mesh 1       group in nuclide      mean std. dev.
        x  y  z                                     
-0      1  1  1        1   total  0.021883  0.001040
-2      1  2  1        1   total  0.021879  0.001108
-1      2  1  1        1   total  0.024875  0.001401
-3      2  2  1        1   total  0.022071  0.001197
+0      1  1  1        1   total  0.022394  0.001401
+2      1  2  1        1   total  0.022321  0.001371
+1      2  1  1        1   total  0.022935  0.000990
+3      2  2  1        1   total  0.022699  0.001322
   mesh 1       group in nuclide      mean std. dev.
        x  y  z                                     
-0      1  1  1        1   total  0.011219  0.000958
-2      1  2  1        1   total  0.011437  0.001013
-1      2  1  1        1   total  0.012947  0.001437
-3      2  2  1        1   total  0.011756  0.001144
+0      1  1  1        1   total  0.011562  0.001544
+2      1  2  1        1   total  0.011852  0.001418
+1      2  1  1        1   total  0.012168  0.000958
+3      2  2  1        1   total  0.011986  0.001418
   mesh 1       group in nuclide      mean std. dev.
        x  y  z                                     
-0      1  1  1        1   total  0.010676  0.000481
-2      1  2  1        1   total  0.010466  0.000446
-1      2  1  1        1   total  0.011948  0.000517
-3      2  2  1        1   total  0.010350  0.000547
+0      1  1  1        1   total  0.010836  0.000803
+2      1  2  1        1   total  0.010473  0.000591
+1      2  1  1        1   total  0.010774  0.000415
+3      2  2  1        1   total  0.010719  0.000688
   mesh 1       group in nuclide      mean std. dev.
        x  y  z                                     
-0      1  1  1        1   total  0.026218  0.001180
-2      1  2  1        1   total  0.025724  0.001093
-1      2  1  1        1   total  0.029326  0.001262
-3      2  2  1        1   total  0.025451  0.001338
+0      1  1  1        1   total  0.026602  0.001957
+2      1  2  1        1   total  0.025695  0.001442
+1      2  1  1        1   total  0.026454  0.001015
+3      2  2  1        1   total  0.026310  0.001678
   mesh 1       group in nuclide          mean      std. dev.
        x  y  z                                              
-0      1  1  1        1   total  2.067337e+06   93152.452502
-2      1  2  1        1   total  2.026907e+06   86377.585629
-1      2  1  1        1   total  2.313358e+06   99980.823985
-3      2  2  1        1   total  2.004370e+06  105820.022073
+0      1  1  1        1   total  2.098256e+06  155243.612264
+2      1  2  1        1   total  2.027699e+06  114334.400924
+1      2  1  1        1   total  2.086255e+06   80325.567787
+3      2  2  1        1   total  2.075596e+06  133128.805680
   mesh 1       group in nuclide      mean std. dev.
        x  y  z                                     
-0      1  1  1        1   total  0.677411  0.027731
-2      1  2  1        1   total  0.666009  0.025155
-1      2  1  1        1   total  0.691140  0.018119
-3      2  2  1        1   total  0.680525  0.027587
+0      1  1  1        1   total  0.680483  0.025407
+2      1  2  1        1   total  0.684597  0.028126
+1      2  1  1        1   total  0.684867  0.024133
+3      2  2  1        1   total  0.695262  0.023087
   mesh 1       group in nuclide      mean std. dev.
        x  y  z                                     
-0      1  1  1        1   total  0.679832  0.030242
-2      1  2  1        1   total  0.663143  0.019259
-1      2  1  1        1   total  0.679503  0.027107
-3      2  2  1        1   total  0.681909  0.033506
+0      1  1  1        1   total  0.678017  0.026288
+2      1  2  1        1   total  0.674888  0.033989
+1      2  1  1        1   total  0.681736  0.025618
+3      2  2  1        1   total  0.683701  0.023788
    mesh 1       group in group out legendre nuclide      mean std. dev.
         x  y  z                                                        
-0       1  1  1        1         1       P0   total  0.679832  0.030426
-1       1  1  1        1         1       P1   total  0.255665  0.011704
-2       1  1  1        1         1       P2   total  0.087020  0.005603
-3       1  1  1        1         1       P3   total  0.006425  0.005919
-8       1  2  1        1         1       P0   total  0.663143  0.019088
-9       1  2  1        1         1       P1   total  0.257945  0.010887
-10      1  2  1        1         1       P2   total  0.095395  0.006988
-11      1  2  1        1         1       P3   total  0.009816  0.003950
-4       2  1  1        1         1       P0   total  0.679503  0.026695
-5       2  1  1        1         1       P1   total  0.254500  0.009901
-6       2  1  1        1         1       P2   total  0.093289  0.005481
-7       2  1  1        1         1       P3   total  0.004631  0.004081
-12      2  2  1        1         1       P0   total  0.681909  0.032740
-13      2  2  1        1         1       P1   total  0.263176  0.012659
-14      2  2  1        1         1       P2   total  0.093102  0.006603
-15      2  2  1        1         1       P3   total  0.007938  0.005673
+0       1  1  1        1         1       P0   total  0.678017  0.026290
+1       1  1  1        1         1       P1   total  0.271858  0.011693
+2       1  1  1        1         1       P2   total  0.095219  0.002950
+3       1  1  1        1         1       P3   total  0.012808  0.004686
+8       1  2  1        1         1       P0   total  0.674888  0.033578
+9       1  2  1        1         1       P1   total  0.255058  0.009912
+10      1  2  1        1         1       P2   total  0.098001  0.005459
+11      1  2  1        1         1       P3   total  0.012058  0.005439
+4       2  1  1        1         1       P0   total  0.681736  0.025439
+5       2  1  1        1         1       P1   total  0.250820  0.009035
+6       2  1  1        1         1       P2   total  0.092563  0.006549
+7       2  1  1        1         1       P3   total  0.008511  0.003905
+12      2  2  1        1         1       P0   total  0.683701  0.024254
+13      2  2  1        1         1       P1   total  0.267345  0.011695
+14      2  2  1        1         1       P2   total  0.096222  0.005551
+15      2  2  1        1         1       P3   total  0.011515  0.003236
    mesh 1       group in group out legendre nuclide      mean std. dev.
         x  y  z                                                        
-0       1  1  1        1         1       P0   total  0.679832  0.030426
-1       1  1  1        1         1       P1   total  0.255665  0.011704
-2       1  1  1        1         1       P2   total  0.087020  0.005603
-3       1  1  1        1         1       P3   total  0.006425  0.005919
-8       1  2  1        1         1       P0   total  0.663143  0.019088
-9       1  2  1        1         1       P1   total  0.257945  0.010887
-10      1  2  1        1         1       P2   total  0.095395  0.006988
-11      1  2  1        1         1       P3   total  0.009816  0.003950
-4       2  1  1        1         1       P0   total  0.679503  0.026695
-5       2  1  1        1         1       P1   total  0.254500  0.009901
-6       2  1  1        1         1       P2   total  0.093289  0.005481
-7       2  1  1        1         1       P3   total  0.004631  0.004081
-12      2  2  1        1         1       P0   total  0.681909  0.032740
-13      2  2  1        1         1       P1   total  0.263176  0.012659
-14      2  2  1        1         1       P2   total  0.093102  0.006603
-15      2  2  1        1         1       P3   total  0.007938  0.005673
+0       1  1  1        1         1       P0   total  0.678017  0.026290
+1       1  1  1        1         1       P1   total  0.271858  0.011693
+2       1  1  1        1         1       P2   total  0.095219  0.002950
+3       1  1  1        1         1       P3   total  0.012808  0.004686
+8       1  2  1        1         1       P0   total  0.674888  0.033578
+9       1  2  1        1         1       P1   total  0.255058  0.009912
+10      1  2  1        1         1       P2   total  0.098001  0.005459
+11      1  2  1        1         1       P3   total  0.012058  0.005439
+4       2  1  1        1         1       P0   total  0.681736  0.025439
+5       2  1  1        1         1       P1   total  0.250820  0.009035
+6       2  1  1        1         1       P2   total  0.092563  0.006549
+7       2  1  1        1         1       P3   total  0.008511  0.003905
+12      2  2  1        1         1       P0   total  0.683701  0.024254
+13      2  2  1        1         1       P1   total  0.267345  0.011695
+14      2  2  1        1         1       P2   total  0.096222  0.005551
+15      2  2  1        1         1       P3   total  0.011515  0.003236
   mesh 1       group in group out nuclide mean std. dev.
        x  y  z                                          
-0      1  1  1        1         1   total  1.0  0.041183
-2      1  2  1        1         1   total  1.0  0.021636
-1      2  1  1        1         1   total  1.0  0.046661
-3      2  2  1        1         1   total  1.0  0.041512
+0      1  1  1        1         1   total  1.0  0.041785
+2      1  2  1        1         1   total  1.0  0.057717
+1      2  1  1        1         1   total  1.0  0.040074
+3      2  2  1        1         1   total  1.0  0.042758
   mesh 1       group in group out nuclide      mean std. dev.
        x  y  z                                               
-0      1  1  1        1         1   total  0.027090  0.002808
-2      1  2  1        1         1   total  0.031522  0.004261
-1      2  1  1        1         1   total  0.021855  0.001457
-3      2  2  1        1         1   total  0.028262  0.002358
+0      1  1  1        1         1   total  0.028438  0.003513
+2      1  2  1        1         1   total  0.022222  0.001560
+1      2  1  1        1         1   total  0.025698  0.002756
+3      2  2  1        1         1   total  0.026501  0.002315
   mesh 1       group in group out nuclide mean std. dev.
        x  y  z                                          
-0      1  1  1        1         1   total  1.0  0.041183
-2      1  2  1        1         1   total  1.0  0.021636
-1      2  1  1        1         1   total  1.0  0.046661
-3      2  2  1        1         1   total  1.0  0.041512
+0      1  1  1        1         1   total  1.0  0.041785
+2      1  2  1        1         1   total  1.0  0.057717
+1      2  1  1        1         1   total  1.0  0.040074
+3      2  2  1        1         1   total  1.0  0.042758
    mesh 1       group in group out legendre nuclide      mean std. dev.
         x  y  z                                                        
-0       1  1  1        1         1       P0   total  0.677411  0.039336
-1       1  1  1        1         1       P1   total  0.254754  0.014995
-2       1  1  1        1         1       P2   total  0.086711  0.006439
-3       1  1  1        1         1       P3   total  0.006402  0.005903
-8       1  2  1        1         1       P0   total  0.666009  0.028990
-9       1  2  1        1         1       P1   total  0.259060  0.013824
-10      1  2  1        1         1       P2   total  0.095807  0.007684
-11      1  2  1        1         1       P3   total  0.009858  0.003980
-4       2  1  1        1         1       P0   total  0.691140  0.036991
-5       2  1  1        1         1       P1   total  0.258859  0.013782
-6       2  1  1        1         1       P2   total  0.094887  0.006555
-7       2  1  1        1         1       P3   total  0.004710  0.004154
-12      2  2  1        1         1       P0   total  0.680525  0.039486
-13      2  2  1        1         1       P1   total  0.262642  0.015259
-14      2  2  1        1         1       P2   total  0.092913  0.007251
-15      2  2  1        1         1       P3   total  0.007921  0.005668
+0       1  1  1        1         1       P0   total  0.680483  0.038131
+1       1  1  1        1         1       P1   total  0.272847  0.016111
+2       1  1  1        1         1       P2   total  0.095565  0.004869
+3       1  1  1        1         1       P3   total  0.012854  0.004731
+8       1  2  1        1         1       P0   total  0.684597  0.048501
+9       1  2  1        1         1       P1   total  0.258727  0.016473
+10      1  2  1        1         1       P2   total  0.099411  0.007470
+11      1  2  1        1         1       P3   total  0.012231  0.005552
+4       2  1  1        1         1       P0   total  0.684867  0.036546
+5       2  1  1        1         1       P1   total  0.251972  0.013220
+6       2  1  1        1         1       P2   total  0.092988  0.007474
+7       2  1  1        1         1       P3   total  0.008550  0.003936
+12      2  2  1        1         1       P0   total  0.695262  0.037640
+13      2  2  1        1         1       P1   total  0.271866  0.016280
+14      2  2  1        1         1       P2   total  0.097849  0.006919
+15      2  2  1        1         1       P3   total  0.011710  0.003325
    mesh 1       group in group out legendre nuclide      mean std. dev.
         x  y  z                                                        
-0       1  1  1        1         1       P0   total  0.677411  0.048224
-1       1  1  1        1         1       P1   total  0.254754  0.018301
-2       1  1  1        1         1       P2   total  0.086711  0.007363
-3       1  1  1        1         1       P3   total  0.006402  0.005909
-8       1  2  1        1         1       P0   total  0.666009  0.032374
-9       1  2  1        1         1       P1   total  0.259060  0.014917
-10      1  2  1        1         1       P2   total  0.095807  0.007958
-11      1  2  1        1         1       P3   total  0.009858  0.003985
-4       2  1  1        1         1       P0   total  0.691140  0.049075
-5       2  1  1        1         1       P1   total  0.258859  0.018326
-6       2  1  1        1         1       P2   total  0.094887  0.007910
-7       2  1  1        1         1       P3   total  0.004710  0.004160
-12      2  2  1        1         1       P0   total  0.680525  0.048551
-13      2  2  1        1         1       P1   total  0.262642  0.018754
-14      2  2  1        1         1       P2   total  0.092913  0.008213
-15      2  2  1        1         1       P3   total  0.007921  0.005677
+0       1  1  1        1         1       P0   total  0.680483  0.047566
+1       1  1  1        1         1       P1   total  0.272847  0.019737
+2       1  1  1        1         1       P2   total  0.095565  0.006297
+3       1  1  1        1         1       P3   total  0.012854  0.004762
+8       1  2  1        1         1       P0   total  0.684597  0.062559
+9       1  2  1        1         1       P1   total  0.258727  0.022234
+10      1  2  1        1         1       P2   total  0.099411  0.009420
+11      1  2  1        1         1       P3   total  0.012231  0.005597
+4       2  1  1        1         1       P0   total  0.684867  0.045704
+5       2  1  1        1         1       P1   total  0.251972  0.016635
+6       2  1  1        1         1       P2   total  0.092988  0.008352
+7       2  1  1        1         1       P3   total  0.008550  0.003951
+12      2  2  1        1         1       P0   total  0.695262  0.047964
+13      2  2  1        1         1       P1   total  0.271866  0.020004
+14      2  2  1        1         1       P2   total  0.097849  0.008086
+15      2  2  1        1         1       P3   total  0.011710  0.003363
   mesh 1       group out nuclide mean std. dev.
        x  y  z                                 
-0      1  1  1         1   total  1.0  0.103333
-2      1  2  1         1   total  1.0  0.118582
-1      2  1  1         1   total  1.0  0.112144
-3      2  2  1         1   total  1.0  0.130701
+0      1  1  1         1   total  1.0  0.142430
+2      1  2  1         1   total  1.0  0.112715
+1      2  1  1         1   total  1.0  0.192385
+3      2  2  1         1   total  1.0  0.109836
   mesh 1       group out nuclide mean std. dev.
        x  y  z                                 
-0      1  1  1         1   total  1.0  0.103333
-2      1  2  1         1   total  1.0  0.118582
-1      2  1  1         1   total  1.0  0.112144
-3      2  2  1         1   total  1.0  0.130701
+0      1  1  1         1   total  1.0  0.143959
+2      1  2  1         1   total  1.0  0.102504
+1      2  1  1         1   total  1.0  0.188381
+3      2  2  1         1   total  1.0  0.116230
   mesh 1       group in nuclide          mean     std. dev.
        x  y  z                                             
-0      1  1  1        1   total  5.304285e-07  2.560239e-08
-2      1  2  1        1   total  4.940321e-07  2.410417e-08
-1      2  1  1        1   total  5.587365e-07  3.382787e-08
-3      2  2  1        1   total  5.232210e-07  2.482800e-08
+0      1  1  1        1   total  5.060544e-07  3.651604e-08
+2      1  2  1        1   total  5.101988e-07  4.947639e-08
+1      2  1  1        1   total  5.206450e-07  2.814648e-08
+3      2  2  1        1   total  5.278759e-07  3.171554e-08
   mesh 1       group in nuclide      mean std. dev.
        x  y  z                                     
-0      1  1  1        1   total  0.026032  0.001172
-2      1  2  1        1   total  0.025542  0.001086
-1      2  1  1        1   total  0.029121  0.001254
-3      2  2  1        1   total  0.025271  0.001329
+0      1  1  1        1   total  0.026414  0.001944
+2      1  2  1        1   total  0.025515  0.001432
+1      2  1  1        1   total  0.026267  0.001008
+3      2  2  1        1   total  0.026125  0.001667
   mesh 1       group in group out nuclide      mean std. dev.
        x  y  z                                               
-0      1  1  1        1         1   total  0.027090  0.002808
-2      1  2  1        1         1   total  0.031522  0.004261
-1      2  1  1        1         1   total  0.021855  0.001457
-3      2  2  1        1         1   total  0.028262  0.002358
+0      1  1  1        1         1   total  0.028220  0.003510
+2      1  2  1        1         1   total  0.021754  0.001519
+1      2  1  1        1         1   total  0.025487  0.002676
+3      2  2  1        1         1   total  0.026281  0.002263
    mesh 1               group in nuclide   mean std. dev.
         x  y       surf                                  
-3       1  1   x-max in        1   total  4.280  0.164469
-2       1  1  x-max out        1   total  4.250  0.107135
+3       1  1   x-max in        1   total  4.244  0.096333
+2       1  1  x-max out        1   total  4.378  0.107210
 1       1  1   x-min in        1   total  0.000  0.000000
 0       1  1  x-min out        1   total  0.000  0.000000
-7       1  1   y-max in        1   total  4.364  0.105622
-6       1  1  y-max out        1   total  4.412  0.158019
+7       1  1   y-max in        1   total  4.388  0.116508
+6       1  1  y-max out        1   total  4.284  0.129066
 5       1  1   y-min in        1   total  0.000  0.000000
 4       1  1  y-min out        1   total  0.000  0.000000
-19      1  2   x-max in        1   total  4.388  0.102470
-18      1  2  x-max out        1   total  4.428  0.140228
+19      1  2   x-max in        1   total  4.280  0.139971
+18      1  2  x-max out        1   total  4.152  0.117141
 17      1  2   x-min in        1   total  0.000  0.000000
 16      1  2  x-min out        1   total  0.000  0.000000
 23      1  2   y-max in        1   total  0.000  0.000000
 22      1  2  y-max out        1   total  0.000  0.000000
-21      1  2   y-min in        1   total  4.412  0.158019
-20      1  2  y-min out        1   total  4.364  0.105622
+21      1  2   y-min in        1   total  4.284  0.129066
+20      1  2  y-min out        1   total  4.388  0.116508
 11      2  1   x-max in        1   total  0.000  0.000000
 10      2  1  x-max out        1   total  0.000  0.000000
-9       2  1   x-min in        1   total  4.250  0.107135
-8       2  1  x-min out        1   total  4.280  0.164469
-15      2  1   y-max in        1   total  4.402  0.182565
-14      2  1  y-max out        1   total  4.346  0.148189
+9       2  1   x-min in        1   total  4.378  0.107210
+8       2  1  x-min out        1   total  4.244  0.096333
+15      2  1   y-max in        1   total  4.280  0.079070
+14      2  1  y-max out        1   total  4.416  0.093648
 13      2  1   y-min in        1   total  0.000  0.000000
 12      2  1  y-min out        1   total  0.000  0.000000
 27      2  2   x-max in        1   total  0.000  0.000000
 26      2  2  x-max out        1   total  0.000  0.000000
-25      2  2   x-min in        1   total  4.428  0.140228
-24      2  2  x-min out        1   total  4.388  0.102470
+25      2  2   x-min in        1   total  4.152  0.117141
+24      2  2  x-min out        1   total  4.280  0.139971
 31      2  2   y-max in        1   total  0.000  0.000000
 30      2  2  y-max out        1   total  0.000  0.000000
-29      2  2   y-min in        1   total  4.346  0.148189
-28      2  2  y-min out        1   total  4.402  0.182565
+29      2  2   y-min in        1   total  4.416  0.093648
+28      2  2  y-min out        1   total  4.280  0.079070
   mesh 1       group in nuclide      mean std. dev.
        x  y  z                                     
-0      1  1  1        1   total  0.950616  0.095874
-2      1  2  1        1   total  0.932532  0.086323
-1      2  1  1        1   total  0.885723  0.041074
-3      2  2  1        1   total  0.951783  0.101570
+0      1  1  1        1   total  0.943198  0.067915
+2      1  2  1        1   total  0.895741  0.058714
+1      2  1  1        1   total  0.911011  0.068461
+3      2  2  1        1   total  0.927611  0.066426
   mesh 1       group in nuclide      mean std. dev.
        x  y  z                                     
-0      1  1  1        1   total  0.950616  0.095874
-2      1  2  1        1   total  0.932532  0.086323
-1      2  1  1        1   total  0.885723  0.041074
-3      2  2  1        1   total  0.951783  0.101570
+0      1  1  1        1   total  0.943198  0.067915
+2      1  2  1        1   total  0.895741  0.058714
+1      2  1  1        1   total  0.911011  0.068461
+3      2  2  1        1   total  0.927611  0.066426
    mesh 1       delayedgroup group in nuclide      mean     std. dev.
         x  y  z                                                      
-0       1  1  1            1        1   total  0.000006  2.679142e-07
-1       1  1  1            2        1   total  0.000032  1.417723e-06
-2       1  1  1            3        1   total  0.000031  1.376260e-06
-3       1  1  1            4        1   total  0.000072  3.185580e-06
-4       1  1  1            5        1   total  0.000032  1.433425e-06
-5       1  1  1            6        1   total  0.000013  5.956400e-07
-12      1  2  1            1        1   total  0.000006  2.486865e-07
-13      1  2  1            2        1   total  0.000031  1.323941e-06
-14      1  2  1            3        1   total  0.000030  1.292803e-06
-15      1  2  1            4        1   total  0.000071  3.032740e-06
-16      1  2  1            5        1   total  0.000031  1.426193e-06
-17      1  2  1            6        1   total  0.000013  5.903673e-07
-6       2  1  1            1        1   total  0.000007  2.871910e-07
-7       2  1  1            2        1   total  0.000035  1.501590e-06
-8       2  1  1            3        1   total  0.000034  1.448170e-06
-9       2  1  1            4        1   total  0.000079  3.318195e-06
-10      2  1  1            5        1   total  0.000035  1.465737e-06
-11      2  1  1            6        1   total  0.000015  6.097547e-07
-18      2  2  1            1        1   total  0.000006  3.042761e-07
-19      2  2  1            2        1   total  0.000031  1.603780e-06
-20      2  2  1            3        1   total  0.000030  1.553523e-06
-21      2  2  1            4        1   total  0.000070  3.583849e-06
-22      2  2  1            5        1   total  0.000031  1.602620e-06
-23      2  2  1            6        1   total  0.000013  6.662067e-07
+0       1  1  1            1        1   total  0.000006  4.453421e-07
+1       1  1  1            2        1   total  0.000032  2.303082e-06
+2       1  1  1            3        1   total  0.000031  2.202789e-06
+3       1  1  1            4        1   total  0.000072  4.961025e-06
+4       1  1  1            5        1   total  0.000032  2.071919e-06
+5       1  1  1            6        1   total  0.000013  8.662934e-07
+12      1  2  1            1        1   total  0.000006  3.282329e-07
+13      1  2  1            2        1   total  0.000031  1.701766e-06
+14      1  2  1            3        1   total  0.000030  1.629615e-06
+15      1  2  1            4        1   total  0.000070  3.675759e-06
+16      1  2  1            5        1   total  0.000031  1.536226e-06
+17      1  2  1            6        1   total  0.000013  6.423838e-07
+6       2  1  1            1        1   total  0.000006  2.308186e-07
+7       2  1  1            2        1   total  0.000032  1.211112e-06
+8       2  1  1            3        1   total  0.000031  1.169911e-06
+9       2  1  1            4        1   total  0.000072  2.685832e-06
+10      2  1  1            5        1   total  0.000032  1.187072e-06
+11      2  1  1            6        1   total  0.000013  4.939053e-07
+18      2  2  1            1        1   total  0.000006  3.819684e-07
+19      2  2  1            2        1   total  0.000032  1.976073e-06
+20      2  2  1            3        1   total  0.000031  1.889748e-06
+21      2  2  1            4        1   total  0.000072  4.252207e-06
+22      2  2  1            5        1   total  0.000032  1.765565e-06
+23      2  2  1            6        1   total  0.000013  7.386890e-07
    mesh 1       delayedgroup group out nuclide mean std. dev.
         x  y  z                                              
-0       1  1  1            1         1   total  0.0       0.0
-1       1  1  1            2         1   total  0.0       0.0
-2       1  1  1            3         1   total  0.0       0.0
-3       1  1  1            4         1   total  0.0       0.0
-4       1  1  1            5         1   total  0.0       0.0
-5       1  1  1            6         1   total  0.0       0.0
-12      1  2  1            1         1   total  0.0       0.0
-13      1  2  1            2         1   total  0.0       0.0
-14      1  2  1            3         1   total  0.0       0.0
-15      1  2  1            4         1   total  0.0       0.0
-16      1  2  1            5         1   total  0.0       0.0
-17      1  2  1            6         1   total  0.0       0.0
-6       2  1  1            1         1   total  0.0       0.0
-7       2  1  1            2         1   total  0.0       0.0
-8       2  1  1            3         1   total  0.0       0.0
-9       2  1  1            4         1   total  0.0       0.0
-10      2  1  1            5         1   total  0.0       0.0
-11      2  1  1            6         1   total  0.0       0.0
-18      2  2  1            1         1   total  0.0       0.0
-19      2  2  1            2         1   total  0.0       0.0
-20      2  2  1            3         1   total  0.0       0.0
-21      2  2  1            4         1   total  0.0       0.0
-22      2  2  1            5         1   total  0.0       0.0
-23      2  2  1            6         1   total  0.0       0.0
+0       1  1  1            1         1   total  0.0  0.000000
+1       1  1  1            2         1   total  0.0  0.000000
+2       1  1  1            3         1   total  0.0  0.000000
+3       1  1  1            4         1   total  1.0  1.414214
+4       1  1  1            5         1   total  0.0  0.000000
+5       1  1  1            6         1   total  0.0  0.000000
+12      1  2  1            1         1   total  0.0  0.000000
+13      1  2  1            2         1   total  0.0  0.000000
+14      1  2  1            3         1   total  0.0  0.000000
+15      1  2  1            4         1   total  1.0  0.869026
+16      1  2  1            5         1   total  0.0  0.000000
+17      1  2  1            6         1   total  0.0  0.000000
+6       2  1  1            1         1   total  0.0  0.000000
+7       2  1  1            2         1   total  0.0  0.000000
+8       2  1  1            3         1   total  0.0  0.000000
+9       2  1  1            4         1   total  1.0  1.414214
+10      2  1  1            5         1   total  0.0  0.000000
+11      2  1  1            6         1   total  0.0  0.000000
+18      2  2  1            1         1   total  0.0  0.000000
+19      2  2  1            2         1   total  0.0  0.000000
+20      2  2  1            3         1   total  0.0  0.000000
+21      2  2  1            4         1   total  1.0  1.414214
+22      2  2  1            5         1   total  0.0  0.000000
+23      2  2  1            6         1   total  0.0  0.000000
    mesh 1       delayedgroup group in nuclide      mean std. dev.
         x  y  z                                                  
-0       1  1  1            1        1   total  0.000227  0.000011
-1       1  1  1            2        1   total  0.001212  0.000058
-2       1  1  1            3        1   total  0.001180  0.000057
-3       1  1  1            4        1   total  0.002734  0.000131
-4       1  1  1            5        1   total  0.001215  0.000059
-5       1  1  1            6        1   total  0.000506  0.000024
-12      1  2  1            1        1   total  0.000227  0.000010
-13      1  2  1            2        1   total  0.001213  0.000052
-14      1  2  1            3        1   total  0.001182  0.000051
-15      1  2  1            4        1   total  0.002744  0.000120
-16      1  2  1            5        1   total  0.001223  0.000056
-17      1  2  1            6        1   total  0.000509  0.000023
-6       2  1  1            1        1   total  0.000227  0.000013
-7       2  1  1            2        1   total  0.001207  0.000067
-8       2  1  1            3        1   total  0.001173  0.000065
-9       2  1  1            4        1   total  0.002710  0.000150
-10      2  1  1            5        1   total  0.001195  0.000066
-11      2  1  1            6        1   total  0.000498  0.000027
-18      2  2  1            1        1   total  0.000227  0.000014
-19      2  2  1            2        1   total  0.001212  0.000073
-20      2  2  1            3        1   total  0.001180  0.000071
-21      2  2  1            4        1   total  0.002740  0.000163
-22      2  2  1            5        1   total  0.001221  0.000073
-23      2  2  1            6        1   total  0.000508  0.000030
+0       1  1  1            1        1   total  0.000227  0.000023
+1       1  1  1            2        1   total  0.001210  0.000119
+2       1  1  1            3        1   total  0.001176  0.000114
+3       1  1  1            4        1   total  0.002722  0.000261
+4       1  1  1            5        1   total  0.001204  0.000112
+5       1  1  1            6        1   total  0.000501  0.000047
+12      1  2  1            1        1   total  0.000227  0.000017
+13      1  2  1            2        1   total  0.001208  0.000087
+14      1  2  1            3        1   total  0.001174  0.000084
+15      1  2  1            4        1   total  0.002710  0.000192
+16      1  2  1            5        1   total  0.001194  0.000082
+17      1  2  1            6        1   total  0.000497  0.000034
+6       2  1  1            1        1   total  0.000227  0.000010
+7       2  1  1            2        1   total  0.001210  0.000053
+8       2  1  1            3        1   total  0.001177  0.000052
+9       2  1  1            4        1   total  0.002726  0.000119
+10      2  1  1            5        1   total  0.001208  0.000053
+11      2  1  1            6        1   total  0.000503  0.000022
+18      2  2  1            1        1   total  0.000227  0.000019
+19      2  2  1            2        1   total  0.001211  0.000102
+20      2  2  1            3        1   total  0.001178  0.000098
+21      2  2  1            4        1   total  0.002726  0.000223
+22      2  2  1            5        1   total  0.001207  0.000096
+23      2  2  1            6        1   total  0.000503  0.000040
    mesh 1       delayedgroup nuclide      mean std. dev.
         x  y  z                                         
-0       1  1  1            1   total  0.013354  0.000674
-1       1  1  1            2   total  0.032612  0.001720
-2       1  1  1            3   total  0.121057  0.006579
-3       1  1  1            4   total  0.305656  0.017398
-4       1  1  1            5   total  0.861000  0.053768
-5       1  1  1            6   total  2.891889  0.179407
-12      1  2  1            1   total  0.013354  0.000497
-13      1  2  1            2   total  0.032605  0.001150
-14      1  2  1            3   total  0.121071  0.004175
-15      1  2  1            4   total  0.305792  0.010484
-16      1  2  1            5   total  0.861500  0.032627
-17      1  2  1            6   total  2.893589  0.108347
-6       2  1  1            1   total  0.013352  0.000663
-7       2  1  1            2   total  0.032625  0.001570
-8       2  1  1            3   total  0.121029  0.005721
-9       2  1  1            4   total  0.305375  0.014144
-10      2  1  1            5   total  0.859955  0.039608
-11      2  1  1            6   total  2.888337  0.132844
-18      2  2  1            1   total  0.013354  0.000892
-19      2  2  1            2   total  0.032606  0.002209
-20      2  2  1            3   total  0.121069  0.008302
-21      2  2  1            4   total  0.305776  0.021416
-22      2  2  1            5   total  0.861442  0.063571
-23      2  2  1            6   total  2.893392  0.212640
-   mesh 1       delayedgroup group in group out nuclide mean std. dev.
-        x  y  z                                                       
-0       1  1  1            1        1         1   total  0.0       0.0
-1       1  1  1            2        1         1   total  0.0       0.0
-2       1  1  1            3        1         1   total  0.0       0.0
-3       1  1  1            4        1         1   total  0.0       0.0
-4       1  1  1            5        1         1   total  0.0       0.0
-5       1  1  1            6        1         1   total  0.0       0.0
-12      1  2  1            1        1         1   total  0.0       0.0
-13      1  2  1            2        1         1   total  0.0       0.0
-14      1  2  1            3        1         1   total  0.0       0.0
-15      1  2  1            4        1         1   total  0.0       0.0
-16      1  2  1            5        1         1   total  0.0       0.0
-17      1  2  1            6        1         1   total  0.0       0.0
-6       2  1  1            1        1         1   total  0.0       0.0
-7       2  1  1            2        1         1   total  0.0       0.0
-8       2  1  1            3        1         1   total  0.0       0.0
-9       2  1  1            4        1         1   total  0.0       0.0
-10      2  1  1            5        1         1   total  0.0       0.0
-11      2  1  1            6        1         1   total  0.0       0.0
-18      2  2  1            1        1         1   total  0.0       0.0
-19      2  2  1            2        1         1   total  0.0       0.0
-20      2  2  1            3        1         1   total  0.0       0.0
-21      2  2  1            4        1         1   total  0.0       0.0
-22      2  2  1            5        1         1   total  0.0       0.0
-23      2  2  1            6        1         1   total  0.0       0.0
+0       1  1  1            1   total  0.013353  0.001345
+1       1  1  1            2   total  0.032619  0.003120
+2       1  1  1            3   total  0.121042  0.011142
+3       1  1  1            4   total  0.305503  0.026418
+4       1  1  1            5   total  0.860433  0.064665
+5       1  1  1            6   total  2.889963  0.219527
+12      1  2  1            1   total  0.013352  0.001049
+13      1  2  1            2   total  0.032626  0.002465
+14      1  2  1            3   total  0.121027  0.008891
+15      1  2  1            4   total  0.305351  0.021426
+16      1  2  1            5   total  0.859866  0.054490
+17      1  2  1            6   total  2.888034  0.184436
+6       2  1  1            1   total  0.013353  0.000612
+7       2  1  1            2   total  0.032616  0.001412
+8       2  1  1            3   total  0.121047  0.005039
+9       2  1  1            4   total  0.305559  0.012002
+10      2  1  1            5   total  0.860640  0.030707
+11      2  1  1            6   total  2.890664  0.103692
+18      2  2  1            1   total  0.013353  0.001132
+19      2  2  1            2   total  0.032617  0.002633
+20      2  2  1            3   total  0.121046  0.009426
+21      2  2  1            4   total  0.305545  0.022417
+22      2  2  1            5   total  0.860588  0.055030
+23      2  2  1            6   total  2.890489  0.186821
+   mesh 1       delayedgroup group in group out nuclide      mean std. dev.
+        x  y  z                                                            
+0       1  1  1            1        1         1   total  0.000000  0.000000
+1       1  1  1            2        1         1   total  0.000000  0.000000
+2       1  1  1            3        1         1   total  0.000000  0.000000
+3       1  1  1            4        1         1   total  0.000219  0.000219
+4       1  1  1            5        1         1   total  0.000000  0.000000
+5       1  1  1            6        1         1   total  0.000000  0.000000
+12      1  2  1            1        1         1   total  0.000000  0.000000
+13      1  2  1            2        1         1   total  0.000000  0.000000
+14      1  2  1            3        1         1   total  0.000000  0.000000
+15      1  2  1            4        1         1   total  0.000467  0.000287
+16      1  2  1            5        1         1   total  0.000000  0.000000
+17      1  2  1            6        1         1   total  0.000000  0.000000
+6       2  1  1            1        1         1   total  0.000000  0.000000
+7       2  1  1            2        1         1   total  0.000000  0.000000
+8       2  1  1            3        1         1   total  0.000000  0.000000
+9       2  1  1            4        1         1   total  0.000211  0.000211
+10      2  1  1            5        1         1   total  0.000000  0.000000
+11      2  1  1            6        1         1   total  0.000000  0.000000
+18      2  2  1            1        1         1   total  0.000000  0.000000
+19      2  2  1            2        1         1   total  0.000000  0.000000
+20      2  2  1            3        1         1   total  0.000000  0.000000
+21      2  2  1            4        1         1   total  0.000219  0.000219
+22      2  2  1            5        1         1   total  0.000000  0.000000
+23      2  2  1            6        1         1   total  0.000000  0.000000
diff --git a/tests/regression_tests/mgxs_library_correction/results_true.dat b/tests/regression_tests/mgxs_library_correction/results_true.dat
index ff4bd9746..b6aaad044 100644
--- a/tests/regression_tests/mgxs_library_correction/results_true.dat
+++ b/tests/regression_tests/mgxs_library_correction/results_true.dat
@@ -1,60 +1,60 @@
    material  group in  group out nuclide      mean  std. dev.
-3         1         1          1   total  0.342252   0.023795
-2         1         1          2   total  0.000695   0.000327
+3         1         1          1   total  0.353477   0.019952
+2         1         1          2   total  0.000522   0.000349
 1         1         2          1   total  0.000000   0.000000
-0         1         2          2   total  0.388426   0.020840
+0         1         2          2   total  0.414134   0.029955
    material  group in  group out nuclide      mean  std. dev.
-3         1         1          1   total  0.342252   0.023795
-2         1         1          2   total  0.000695   0.000327
+3         1         1          1   total  0.353477   0.019952
+2         1         1          2   total  0.000522   0.000349
 1         1         2          1   total  0.000000   0.000000
-0         1         2          2   total  0.388426   0.020840
+0         1         2          2   total  0.414134   0.029955
    material  group in  group out nuclide      mean  std. dev.
-3         1         1          1   total  0.343021   0.031016
-2         1         1          2   total  0.000697   0.000329
+3         1         1          1   total  0.356124   0.026110
+2         1         1          2   total  0.000526   0.000352
 1         1         2          1   total  0.000000   0.000000
-0         1         2          2   total  0.376544   0.025156
+0         1         2          2   total  0.413622   0.044755
    material  group in  group out nuclide      mean  std. dev.
-3         1         1          1   total  0.343021   0.039761
-2         1         1          2   total  0.000697   0.000566
+3         1         1          1   total  0.356124   0.033873
+2         1         1          2   total  0.000526   0.000608
 1         1         2          1   total  0.000000   0.000000
-0         1         2          2   total  0.376544   0.032140
+0         1         2          2   total  0.413622   0.054899
    material  group in  group out nuclide      mean  std. dev.
-3         2         1          1   total  0.271174   0.022374
+3         2         1          1   total  0.261901   0.016456
 2         2         1          2   total  0.000000   0.000000
 1         2         2          1   total  0.000000   0.000000
-0         2         2          2   total  0.295401   0.032831
+0         2         2          2   total  0.322376   0.044195
    material  group in  group out nuclide      mean  std. dev.
-3         2         1          1   total  0.271174   0.022374
+3         2         1          1   total  0.261901   0.016456
 2         2         1          2   total  0.000000   0.000000
 1         2         2          1   total  0.000000   0.000000
-0         2         2          2   total  0.295401   0.032831
+0         2         2          2   total  0.322376   0.044195
    material  group in  group out nuclide      mean  std. dev.
-3         2         1          1   total  0.264654   0.028288
+3         2         1          1   total  0.266612   0.021169
 2         2         1          2   total  0.000000   0.000000
 1         2         2          1   total  0.000000   0.000000
-0         2         2          2   total  0.295178   0.032530
+0         2         2          2   total  0.321966   0.054140
    material  group in  group out nuclide      mean  std. dev.
-3         2         1          1   total  0.264654   0.036081
+3         2         1          1   total  0.266612   0.025384
 2         2         1          2   total  0.000000   0.000000
 1         2         2          1   total  0.000000   0.000000
-0         2         2          2   total  0.295178   0.044676
+0         2         2          2   total  0.321966   0.068014
    material  group in  group out nuclide      mean  std. dev.
-3         3         1          1   total  0.257831   0.014436
-2         3         1          2   total  0.030826   0.000973
-1         3         2          1   total  0.000467   0.000467
-0         3         2          2   total  1.443057   0.119909
+3         3         1          1   total  0.259426   0.012116
+2         3         1          2   total  0.031650   0.000613
+1         3         2          1   total  0.000474   0.000475
+0         3         2          2   total  1.416407   0.162435
    material  group in  group out nuclide      mean  std. dev.
-3         3         1          1   total  0.257831   0.014436
-2         3         1          2   total  0.030826   0.000973
-1         3         2          1   total  0.000467   0.000467
-0         3         2          2   total  1.443057   0.119909
+3         3         1          1   total  0.259426   0.012116
+2         3         1          2   total  0.031650   0.000613
+1         3         2          1   total  0.000474   0.000475
+0         3         2          2   total  1.416407   0.162435
    material  group in  group out nuclide      mean  std. dev.
-3         3         1          1   total  0.267025   0.029512
-2         3         1          2   total  0.031268   0.001416
-1         3         2          1   total  0.000466   0.000467
-0         3         2          2   total  1.440250   0.164573
+3         3         1          1   total  0.266083   0.024503
+2         3         1          2   total  0.031973   0.001157
+1         3         2          1   total  0.000477   0.000480
+0         3         2          2   total  1.427932   0.269812
    material  group in  group out nuclide      mean  std. dev.
-3         3         1          1   total  0.267025   0.032860
-2         3         1          2   total  0.031268   0.001768
-1         3         2          1   total  0.000466   0.000808
-0         3         2          2   total  1.440250   0.212183
+3         3         1          1   total  0.266083   0.027910
+2         3         1          2   total  0.031973   0.001391
+1         3         2          1   total  0.000477   0.000827
+0         3         2          2   total  1.427932   0.328026
diff --git a/tests/regression_tests/mgxs_library_distribcell/results_true.dat b/tests/regression_tests/mgxs_library_distribcell/results_true.dat
index ef7cb2b96..127df75c1 100644
--- a/tests/regression_tests/mgxs_library_distribcell/results_true.dat
+++ b/tests/regression_tests/mgxs_library_distribcell/results_true.dat
@@ -1,97 +1,97 @@
                                                                                                                                                                                                                                                                                                                                                                                                  sum(distribcell)  group in nuclide      mean  std. dev.
-0  ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),)         1   total  0.455527   0.009851
+0  ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),)         1   total  0.459656   0.010039
                                                                                                                                                                                                                                                                                                                                                                                                  sum(distribcell)  group in nuclide      mean  std. dev.
-0  ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),)         1   total  0.409242   0.011118
-                                                                                                                                                                                                                                                                                                                                                                                                 sum(distribcell)  group in nuclide     mean  std. dev.
-0  ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),)         1   total  0.40929   0.011119
+0  ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),)         1   total  0.416327    0.01121
                                                                                                                                                                                                                                                                                                                                                                                                  sum(distribcell)  group in nuclide      mean  std. dev.
-0  ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),)         1   total  0.066934   0.002424
+0  ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),)         1   total  0.416327    0.01121
                                                                                                                                                                                                                                                                                                                                                                                                  sum(distribcell)  group in nuclide      mean  std. dev.
-0  ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),)         1   total  0.066764   0.002423
+0  ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),)         1   total  0.070545   0.002486
                                                                                                                                                                                                                                                                                                                                                                                                  sum(distribcell)  group in nuclide      mean  std. dev.
-0  ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),)         1   total  0.028358   0.002669
+0  ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),)         1   total  0.070348   0.002485
                                                                                                                                                                                                                                                                                                                                                                                                  sum(distribcell)  group in nuclide      mean  std. dev.
-0  ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),)         1   total  0.038576   0.001526
+0  ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),)         1   total  0.029374   0.002719
                                                                                                                                                                                                                                                                                                                                                                                                  sum(distribcell)  group in nuclide      mean  std. dev.
-0  ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),)         1   total  0.094817   0.003725
+0  ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),)         1   total  0.041172   0.001562
+                                                                                                                                                                                                                                                                                                                                                                                                 sum(distribcell)  group in nuclide      mean  std. dev.
+0  ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),)         1   total  0.101218   0.003812
                                                                                                                                                                                                                                                                                                                                                                                                  sum(distribcell)  group in nuclide          mean      std. dev.
-0  ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),)         1   total  7.470225e+06  295170.385185
+0  ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),)         1   total  7.972654e+06  302079.851251
+                                                                                                                                                                                                                                                                                                                                                                                                 sum(distribcell)  group in nuclide     mean  std. dev.
+0  ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),)         1   total  0.38911    0.00831
                                                                                                                                                                                                                                                                                                                                                                                                  sum(distribcell)  group in nuclide      mean  std. dev.
-0  ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),)         1   total  0.388593   0.008156
-                                                                                                                                                                                                                                                                                                                                                                                                 sum(distribcell)  group in nuclide      mean  std. dev.
-0  ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),)         1   total  0.388874   0.013889
+0  ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),)         1   total  0.394876   0.014019
                                                                                                                                                                                                                                                                                                                                                                                                  sum(distribcell)  group in  group out legendre nuclide      mean  std. dev.
-0  ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),)         1          1       P0   total  0.388711   0.013887
-1  ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),)         1          1       P1   total  0.046285   0.005155
-2  ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),)         1          1       P2   total  0.023632   0.003772
-3  ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),)         1          1       P3   total  0.006997   0.003207
+0  ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),)         1          1       P0   total  0.394876   0.014019
+1  ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),)         1          1       P1   total  0.043329   0.004988
+2  ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),)         1          1       P2   total  0.027490   0.003974
+3  ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),)         1          1       P3   total  0.016004   0.003232
                                                                                                                                                                                                                                                                                                                                                                                                  sum(distribcell)  group in  group out legendre nuclide      mean  std. dev.
-0  ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),)         1          1       P0   total  0.388874   0.013889
-1  ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),)         1          1       P1   total  0.046237   0.005156
-2  ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),)         1          1       P2   total  0.023571   0.003775
-3  ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),)         1          1       P3   total  0.007058   0.003207
-                                                                                                                                                                                                                                                                                                                                                                                                 sum(distribcell)  group in  group out nuclide      mean  std. dev.
-0  ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),)         1          1   total  1.000418   0.036246
-                                                                                                                                                                                                                                                                                                                                                                                                 sum(distribcell)  group in  group out nuclide      mean  std. dev.
-0  ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),)         1          1   total  0.092139   0.005956
+0  ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),)         1          1       P0   total  0.394876   0.014019
+1  ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),)         1          1       P1   total  0.043329   0.004988
+2  ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),)         1          1       P2   total  0.027490   0.003974
+3  ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),)         1          1       P3   total  0.016004   0.003232
                                                                                                                                                                                                                                                                                                                                                                                                  sum(distribcell)  group in  group out nuclide  mean  std. dev.
-0  ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),)         1          1   total   1.0   0.036242
-                                                                                                                                                                                                                                                                                                                                                                                                 sum(distribcell)  group in  group out legendre nuclide      mean  std. dev.
-0  ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),)         1          1       P0   total  0.388593   0.016275
-1  ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),)         1          1       P1   total  0.046271   0.005251
-2  ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),)         1          1       P2   total  0.023624   0.003806
-3  ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),)         1          1       P3   total  0.006995   0.003209
-                                                                                                                                                                                                                                                                                                                                                                                                 sum(distribcell)  group in  group out legendre nuclide      mean  std. dev.
-0  ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),)         1          1       P0   total  0.388755   0.021528
-1  ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),)         1          1       P1   total  0.046290   0.005515
-2  ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),)         1          1       P2   total  0.023634   0.003903
-3  ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),)         1          1       P3   total  0.006998   0.003221
-                                                                                                                                                                                                                                                                                                                                                                                                 sum(distribcell)  group out nuclide  mean  std. dev.
-0  ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),)          1   total   1.0   0.084366
-                                                                                                                                                                                                                                                                                                                                                                                                 sum(distribcell)  group out nuclide  mean  std. dev.
-0  ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),)          1   total   1.0   0.084331
-                                                                                                                                                                                                                                                                                                                                                                                                 sum(distribcell)  group in nuclide          mean     std. dev.
-0  ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),)         1   total  5.253873e-07  2.168462e-08
-                                                                                                                                                                                                                                                                                                                                                                                                 sum(distribcell)  group in nuclide      mean  std. dev.
-0  ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),)         1   total  0.094147   0.003701
+0  ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),)         1          1   total   1.0   0.036306
                                                                                                                                                                                                                                                                                                                                                                                                  sum(distribcell)  group in  group out nuclide      mean  std. dev.
-0  ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),)         1          1   total  0.091593   0.005919
+0  ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),)         1          1   total  0.097856   0.006191
+                                                                                                                                                                                                                                                                                                                                                                                                 sum(distribcell)  group in  group out nuclide  mean  std. dev.
+0  ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),)         1          1   total   1.0   0.036306
+                                                                                                                                                                                                                                                                                                                                                                                                 sum(distribcell)  group in  group out legendre nuclide      mean  std. dev.
+0  ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),)         1          1       P0   total  0.389110   0.016390
+1  ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),)         1          1       P1   total  0.042696   0.005009
+2  ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),)         1          1       P2   total  0.027088   0.003964
+3  ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),)         1          1       P3   total  0.015770   0.003204
+                                                                                                                                                                                                                                                                                                                                                                                                 sum(distribcell)  group in  group out legendre nuclide      mean  std. dev.
+0  ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),)         1          1       P0   total  0.389110   0.021638
+1  ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),)         1          1       P1   total  0.042696   0.005244
+2  ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),)         1          1       P2   total  0.027088   0.004084
+3  ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),)         1          1       P3   total  0.015770   0.003255
+                                                                                                                                                                                                                                                                                                                                                                                                 sum(distribcell)  group out nuclide  mean  std. dev.
+0  ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),)          1   total   1.0   0.082469
+                                                                                                                                                                                                                                                                                                                                                                                                 sum(distribcell)  group out nuclide  mean  std. dev.
+0  ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),)          1   total   1.0   0.082587
+                                                                                                                                                                                                                                                                                                                                                                                                 sum(distribcell)  group in nuclide          mean     std. dev.
+0  ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),)         1   total  5.626624e-07  2.235532e-08
                                                                                                                                                                                                                                                                                                                                                                                                  sum(distribcell)  group in nuclide      mean  std. dev.
-0  ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),)         1   total  0.814514   0.022129
+0  ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),)         1   total  0.100506   0.003787
+                                                                                                                                                                                                                                                                                                                                                                                                 sum(distribcell)  group in  group out nuclide      mean  std. dev.
+0  ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),)         1          1   total  0.097658   0.006185
                                                                                                                                                                                                                                                                                                                                                                                                  sum(distribcell)  group in nuclide      mean  std. dev.
-0  ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),)         1   total  0.814419   0.022125
+0  ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),)         1   total  0.800653   0.021558
+                                                                                                                                                                                                                                                                                                                                                                                                 sum(distribcell)  group in nuclide      mean  std. dev.
+0  ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),)         1   total  0.800653   0.021558
                                                                                                                                                                                                                                                                                                                                                                                                  sum(distribcell)  delayedgroup  group in nuclide      mean     std. dev.
-0  ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),)             1         1   total  0.000021  8.473275e-07
-1  ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),)             2         1   total  0.000115  4.405467e-06
-2  ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),)             3         1   total  0.000112  4.225826e-06
-3  ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),)             4         1   total  0.000259  9.559952e-06
-4  ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),)             5         1   total  0.000115  4.025369e-06
-5  ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),)             6         1   total  0.000048  1.682226e-06
+0  ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),)             1         1   total  0.000023  8.667436e-07
+1  ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),)             2         1   total  0.000122  4.499059e-06
+2  ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),)             3         1   total  0.000119  4.311220e-06
+3  ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),)             4         1   total  0.000275  9.735290e-06
+4  ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),)             5         1   total  0.000122  4.078954e-06
+5  ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),)             6         1   total  0.000051  1.705327e-06
                                                                                                                                                                                                                                                                                                                                                                                                  sum(distribcell)  delayedgroup  group out nuclide  mean  std. dev.
 0  ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),)             1          1   total   0.0   0.000000
-1  ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),)             2          1   total   0.0   0.000000
-2  ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),)             3          1   total   1.0   1.000002
-3  ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),)             4          1   total   1.0   1.414214
+1  ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),)             2          1   total   1.0   1.414214
+2  ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),)             3          1   total   0.0   0.000000
+3  ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),)             4          1   total   0.0   0.000000
 4  ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),)             5          1   total   0.0   0.000000
 5  ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),)             6          1   total   0.0   0.000000
                                                                                                                                                                                                                                                                                                                                                                                                  sum(distribcell)  delayedgroup  group in nuclide      mean  std. dev.
-0  ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),)             1         1   total  0.000227   0.000012
-1  ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),)             2         1   total  0.001210   0.000062
-2  ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),)             3         1   total  0.001177   0.000060
-3  ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),)             4         1   total  0.002728   0.000136
-4  ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),)             5         1   total  0.001211   0.000059
-5  ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),)             6         1   total  0.000504   0.000025
+0  ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),)             1         1   total  0.000227   0.000011
+1  ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),)             2         1   total  0.001208   0.000059
+2  ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),)             3         1   total  0.001175   0.000056
+3  ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),)             4         1   total  0.002721   0.000129
+4  ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),)             5         1   total  0.001206   0.000055
+5  ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),)             6         1   total  0.000502   0.000023
                                                                                                                                                                                                                                                                                                                                                                                                  sum(distribcell)  delayedgroup nuclide      mean  std. dev.
-0  ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),)             1   total  0.013353   0.000692
-1  ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),)             2   total  0.032613   0.001644
-2  ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),)             3   total  0.121054   0.005983
-3  ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),)             4   total  0.305630   0.014645
-4  ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),)             5   total  0.860903   0.038693
-5  ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),)             6   total  2.891558   0.130564
+0  ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),)             1   total  0.013353   0.000658
+1  ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),)             2   total  0.032616   0.001562
+2  ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),)             3   total  0.121048   0.005678
+3  ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),)             4   total  0.305568   0.013868
+4  ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),)             5   total  0.860675   0.036434
+5  ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),)             6   total  2.890786   0.122997
                                                                                                                                                                                                                                                                                                                                                                                                  sum(distribcell)  delayedgroup  group in  group out nuclide      mean  std. dev.
 0  ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),)             1         1          1   total  0.000000   0.000000
-1  ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),)             2         1          1   total  0.000000   0.000000
-2  ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),)             3         1          1   total  0.000362   0.000256
-3  ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),)             4         1          1   total  0.000185   0.000185
+1  ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),)             2         1          1   total  0.000198   0.000198
+2  ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),)             3         1          1   total  0.000000   0.000000
+3  ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),)             4         1          1   total  0.000000   0.000000
 4  ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),)             5         1          1   total  0.000000   0.000000
 5  ((0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, ...),)             6         1          1   total  0.000000   0.000000
diff --git a/tests/regression_tests/mgxs_library_hdf5/results_true.dat b/tests/regression_tests/mgxs_library_hdf5/results_true.dat
index b2ef8eae9..14d7371fe 100644
--- a/tests/regression_tests/mgxs_library_hdf5/results_true.dat
+++ b/tests/regression_tests/mgxs_library_hdf5/results_true.dat
@@ -1,201 +1,201 @@
 domain=1 type=total
-[5.52629207e-01 1.46792426e+00]
-[2.73983948e-02 9.30468557e-02]
+[5.66580451e-01 1.44262943e+00]
+[1.96770003e-02 1.46112369e-01]
 domain=1 type=transport
-[3.09650231e-01 1.14528468e+00]
-[2.96126059e-02 1.01957125e-01]
+[3.14856281e-01 1.05346368e+00]
+[2.15203447e-02 1.60562179e-01]
 domain=1 type=nu-transport
-[3.09650231e-01 1.14528468e+00]
-[2.96126059e-02 1.01957125e-01]
+[3.14856281e-01 1.05346368e+00]
+[2.15203447e-02 1.60562179e-01]
 domain=1 type=absorption
-[7.90251362e-03 9.52195503e-02]
-[7.77996866e-04 5.32017792e-03]
+[8.63921263e-03 9.70718967e-02]
+[7.09849180e-04 9.96697703e-03]
 domain=1 type=reduced absorption
-[7.88836875e-03 9.52195503e-02]
-[7.77877367e-04 5.32017792e-03]
+[8.63459183e-03 9.70718967e-02]
+[7.09826160e-04 9.96697703e-03]
 domain=1 type=capture
-[5.66271991e-03 4.03380329e-02]
-[7.65494411e-04 4.41129849e-03]
+[6.29732743e-03 4.01344183e-02]
+[7.03181817e-04 9.43458504e-03]
 domain=1 type=fission
-[2.23979371e-03 5.48815174e-02]
-[1.44808204e-04 3.21965557e-03]
+[2.34188519e-03 5.69374784e-02]
+[1.04006997e-04 6.19904834e-03]
 domain=1 type=nu-fission
-[5.70078167e-03 1.33729794e-01]
-[3.71908758e-04 7.84533474e-03]
+[5.93985124e-03 1.38739554e-01]
+[2.57215008e-04 1.51052211e-02]
 domain=1 type=kappa-fission
-[4.36283087e+05 1.06143820e+07]
-[2.81939099e+04 6.22698786e+05]
+[4.55876276e+05 1.10120160e+07]
+[2.00450394e+04 1.19892945e+06]
 domain=1 type=scatter
-[5.44726693e-01 1.37270471e+00]
-[2.67443307e-02 8.86578418e-02]
+[5.57941239e-01 1.34555753e+00]
+[1.96103602e-02 1.38008873e-01]
 domain=1 type=nu-scatter
-[5.46058885e-01 1.38608802e+00]
-[2.72733439e-02 9.59957737e-02]
+[5.53883536e-01 1.40126963e+00]
+[1.89917740e-02 1.62647765e-01]
 domain=1 type=scatter matrix
-[[[5.25081070e-01 2.42978975e-01 9.65459393e-02 8.62265123e-03]
-  [2.09778151e-02 5.67750504e-03 -1.86093418e-03 -1.63034937e-03]]
+[[[5.35878034e-01 2.51724170e-01 1.01011269e-01 1.03439439e-02]
+  [1.80055019e-02 5.80562809e-03 -1.57470166e-03 -2.27320020e-03]]
 
  [[0.00000000e+00 0.00000000e+00 0.00000000e+00 0.00000000e+00]
-  [1.38608802e+00 2.92665071e-01 4.65545679e-02 3.43129413e-03]]]
-[[[2.68584158e-02 1.12354079e-02 5.95151250e-03 5.08213314e-03]
-  [1.69810442e-03 1.03379654e-03 3.35798077e-04 8.28775769e-04]]
+  [1.40126963e+00 3.55339640e-01 7.06453615e-02 4.04065595e-02]]]
+[[[1.86010787e-02 8.71440749e-03 3.01351835e-03 5.22968320e-03]
+  [1.36795874e-03 6.67372701e-04 3.26122899e-04 8.68935369e-04]]
 
  [[0.00000000e+00 0.00000000e+00 0.00000000e+00 0.00000000e+00]
-  [9.59957737e-02 3.98634629e-02 1.79245433e-02 2.53788407e-02]]]
+  [1.62647765e-01 6.23420543e-02 9.61788834e-03 8.80966610e-03]]]
 domain=1 type=nu-scatter matrix
-[[[5.25081070e-01 2.42978975e-01 9.65459393e-02 8.62265123e-03]
-  [2.09778151e-02 5.67750504e-03 -1.86093418e-03 -1.63034937e-03]]
+[[[5.35878034e-01 2.51724170e-01 1.01011269e-01 1.03439439e-02]
+  [1.80055019e-02 5.80562809e-03 -1.57470166e-03 -2.27320020e-03]]
 
  [[0.00000000e+00 0.00000000e+00 0.00000000e+00 0.00000000e+00]
-  [1.38608802e+00 2.92665071e-01 4.65545679e-02 3.43129413e-03]]]
-[[[2.68584158e-02 1.12354079e-02 5.95151250e-03 5.08213314e-03]
-  [1.69810442e-03 1.03379654e-03 3.35798077e-04 8.28775769e-04]]
+  [1.40126963e+00 3.55339640e-01 7.06453615e-02 4.04065595e-02]]]
+[[[1.86010787e-02 8.71440749e-03 3.01351835e-03 5.22968320e-03]
+  [1.36795874e-03 6.67372701e-04 3.26122899e-04 8.68935369e-04]]
 
  [[0.00000000e+00 0.00000000e+00 0.00000000e+00 0.00000000e+00]
-  [9.59957737e-02 3.98634629e-02 1.79245433e-02 2.53788407e-02]]]
+  [1.62647765e-01 6.23420543e-02 9.61788834e-03 8.80966610e-03]]]
 domain=1 type=multiplicity matrix
 [[1.00000000e+00 1.00000000e+00]
  [0.00000000e+00 1.00000000e+00]]
-[[4.49973217e-02 9.94834121e-02]
- [0.00000000e+00 8.90267353e-02]]
+[[3.27047397e-02 1.01015254e-01]
+ [0.00000000e+00 1.16966513e-01]]
 domain=1 type=nu-fission matrix
-[[6.79725552e-03 0.00000000e+00]
- [1.34226308e-01 0.00000000e+00]]
-[[1.39232734e-03 0.00000000e+00]
- [1.55126210e-02 0.00000000e+00]]
+[[7.11392182e-03 0.00000000e+00]
+ [1.52683850e-01 0.00000000e+00]]
+[[1.05605314e-03 0.00000000e+00]
+ [2.58713491e-02 0.00000000e+00]]
 domain=1 type=scatter probability matrix
-[[9.61583236e-01 3.84167637e-02]
+[[9.67492260e-01 3.25077399e-02]
  [0.00000000e+00 1.00000000e+00]]
-[[4.25251594e-02 2.94881301e-03]
- [0.00000000e+00 8.90267353e-02]]
+[[3.12124830e-02 2.43439942e-03]
+ [0.00000000e+00 1.16966513e-01]]
 domain=1 type=consistent scatter matrix
-[[[5.23800056e-01 2.42386192e-01 9.63104011e-02 8.60161499e-03]
-  [2.09266366e-02 5.66365392e-03 -1.85639416e-03 -1.62637189e-03]]
+[[[5.39803830e-01 2.53568280e-01 1.01751269e-01 1.04197228e-02]
+  [1.81374087e-02 5.84815962e-03 -1.58623779e-03 -2.28985347e-03]]
 
  [[0.00000000e+00 0.00000000e+00 0.00000000e+00 0.00000000e+00]
-  [1.37270471e+00 2.89839256e-01 4.61050623e-02 3.39816342e-03]]]
-[[[3.46115177e-02 1.51137129e-02 7.17487890e-03 5.08248710e-03]
-  [1.90677851e-03 1.05813829e-03 3.43862086e-04 8.29548315e-04]]
+  [1.34555753e+00 3.41211940e-01 6.78366221e-02 3.88000634e-02]]]
+[[[2.57534994e-02 1.20804286e-02 4.50621873e-03 5.27902298e-03]
+  [1.50041314e-03 6.98980912e-04 3.32589287e-04 8.78503928e-04]]
 
  [[0.00000000e+00 0.00000000e+00 0.00000000e+00 0.00000000e+00]
-  [1.50979688e-01 4.66032426e-02 1.81833349e-02 2.51354735e-02]]]
+  [2.09324012e-01 6.95175402e-02 1.16044952e-02 9.36549883e-03]]]
 domain=1 type=consistent nu-scatter matrix
-[[[5.23800056e-01 2.42386192e-01 9.63104011e-02 8.60161499e-03]
-  [2.09266366e-02 5.66365392e-03 -1.85639416e-03 -1.62637189e-03]]
+[[[5.39803830e-01 2.53568280e-01 1.01751269e-01 1.04197228e-02]
+  [1.81374087e-02 5.84815962e-03 -1.58623779e-03 -2.28985347e-03]]
 
  [[0.00000000e+00 0.00000000e+00 0.00000000e+00 0.00000000e+00]
-  [1.37270471e+00 2.89839256e-01 4.61050623e-02 3.39816342e-03]]]
-[[[4.18746126e-02 1.86381616e-02 8.38211969e-03 5.09720340e-03]
-  [2.82310416e-03 1.19879975e-03 3.90317811e-04 8.45179676e-04]]
+  [1.34555753e+00 3.41211940e-01 6.78366221e-02 3.88000634e-02]]]
+[[[3.12235732e-02 1.46529414e-02 5.60177820e-03 5.29001047e-03]
+  [2.36812824e-03 9.15185125e-04 3.69175618e-04 9.08445666e-04]]
 
  [[0.00000000e+00 0.00000000e+00 0.00000000e+00 0.00000000e+00]
-  [1.94240879e-01 5.32698778e-02 1.86408495e-02 2.51372940e-02]]]
+  [2.61890501e-01 8.01593794e-02 1.40578233e-02 1.04071518e-02]]]
 domain=1 type=chi
 [1.00000000e+00 0.00000000e+00]
-[1.03333203e-01 0.00000000e+00]
+[1.42429813e-01 0.00000000e+00]
 domain=1 type=chi-prompt
 [1.00000000e+00 0.00000000e+00]
-[1.03333203e-01 0.00000000e+00]
+[1.43958515e-01 0.00000000e+00]
 domain=1 type=inverse-velocity
-[5.72461488e-08 3.00999757e-06]
-[2.80644407e-09 1.80993426e-07]
+[6.05275939e-08 2.92408191e-06]
+[4.98534008e-09 2.95326306e-07]
 domain=1 type=prompt-nu-fission
-[5.64594959e-03 1.32859920e-01]
-[3.68364598e-04 7.79430310e-03]
+[5.88433433e-03 1.37837093e-01]
+[2.56012352e-04 1.50069660e-02]
 domain=1 type=prompt-nu-fission matrix
-[[6.79725552e-03 0.00000000e+00]
- [1.34226308e-01 0.00000000e+00]]
-[[1.39232734e-03 0.00000000e+00]
- [1.55126210e-02 0.00000000e+00]]
+[[7.11392182e-03 0.00000000e+00]
+ [1.51190909e-01 0.00000000e+00]]
+[[1.05605314e-03 0.00000000e+00]
+ [2.57973847e-02 0.00000000e+00]]
 domain=1 type=current
-[[[0.00000000e+00 0.00000000e+00 3.54200000e+00 3.59000000e+00
-   0.00000000e+00 0.00000000e+00 3.73400000e+00 3.69000000e+00]
-  [0.00000000e+00 0.00000000e+00 7.08000000e-01 6.90000000e-01
-   0.00000000e+00 0.00000000e+00 6.78000000e-01 6.74000000e-01]]
+[[[0.00000000e+00 0.00000000e+00 3.71800000e+00 3.58600000e+00
+   0.00000000e+00 0.00000000e+00 3.62200000e+00 3.71800000e+00]
+  [0.00000000e+00 0.00000000e+00 6.60000000e-01 6.58000000e-01
+   0.00000000e+00 0.00000000e+00 6.62000000e-01 6.70000000e-01]]
 
- [[3.59000000e+00 3.54200000e+00 0.00000000e+00 0.00000000e+00
-   0.00000000e+00 0.00000000e+00 3.65200000e+00 3.73800000e+00]
-  [6.90000000e-01 7.08000000e-01 0.00000000e+00 0.00000000e+00
-   0.00000000e+00 0.00000000e+00 6.94000000e-01 6.64000000e-01]]
+ [[3.58600000e+00 3.71800000e+00 0.00000000e+00 0.00000000e+00
+   0.00000000e+00 0.00000000e+00 3.71200000e+00 3.60600000e+00]
+  [6.58000000e-01 6.60000000e-01 0.00000000e+00 0.00000000e+00
+   0.00000000e+00 0.00000000e+00 7.04000000e-01 6.74000000e-01]]
 
- [[0.00000000e+00 0.00000000e+00 3.76000000e+00 3.66600000e+00
-   3.69000000e+00 3.73400000e+00 0.00000000e+00 0.00000000e+00]
-  [0.00000000e+00 0.00000000e+00 6.68000000e-01 7.22000000e-01
-   6.74000000e-01 6.78000000e-01 0.00000000e+00 0.00000000e+00]]
+ [[0.00000000e+00 0.00000000e+00 3.48600000e+00 3.60600000e+00
+   3.71800000e+00 3.62200000e+00 0.00000000e+00 0.00000000e+00]
+  [0.00000000e+00 0.00000000e+00 6.66000000e-01 6.74000000e-01
+   6.70000000e-01 6.62000000e-01 0.00000000e+00 0.00000000e+00]]
 
- [[3.66600000e+00 3.76000000e+00 0.00000000e+00 0.00000000e+00
-   3.73800000e+00 3.65200000e+00 0.00000000e+00 0.00000000e+00]
-  [7.22000000e-01 6.68000000e-01 0.00000000e+00 0.00000000e+00
-   6.64000000e-01 6.94000000e-01 0.00000000e+00 0.00000000e+00]]]
-[[[0.00000000e+00 0.00000000e+00 1.04230514e-01 1.61183126e-01
-   0.00000000e+00 0.00000000e+00 1.50419414e-01 1.00498756e-01]
-  [0.00000000e+00 0.00000000e+00 2.47790234e-02 3.27108545e-02
-   0.00000000e+00 0.00000000e+00 4.84148737e-02 3.24961536e-02]]
+ [[3.60600000e+00 3.48600000e+00 0.00000000e+00 0.00000000e+00
+   3.60600000e+00 3.71200000e+00 0.00000000e+00 0.00000000e+00]
+  [6.74000000e-01 6.66000000e-01 0.00000000e+00 0.00000000e+00
+   6.74000000e-01 7.04000000e-01 0.00000000e+00 0.00000000e+00]]]
+[[[0.00000000e+00 0.00000000e+00 9.96192752e-02 8.73269718e-02
+   0.00000000e+00 0.00000000e+00 1.22531629e-01 1.08369737e-01]
+  [0.00000000e+00 0.00000000e+00 3.96232255e-02 4.06693988e-02
+   0.00000000e+00 0.00000000e+00 4.05462699e-02 4.27784993e-02]]
 
- [[1.61183126e-01 1.04230514e-01 0.00000000e+00 0.00000000e+00
-   0.00000000e+00 0.00000000e+00 1.44201248e-01 1.81229137e-01]
-  [3.27108545e-02 2.47790234e-02 0.00000000e+00 0.00000000e+00
-   0.00000000e+00 0.00000000e+00 3.41467422e-02 2.20454077e-02]]
+ [[8.73269718e-02 9.96192752e-02 0.00000000e+00 0.00000000e+00
+   0.00000000e+00 0.00000000e+00 7.09506871e-02 5.27825729e-02]
+  [4.06693988e-02 3.96232255e-02 0.00000000e+00 0.00000000e+00
+   0.00000000e+00 0.00000000e+00 6.11228272e-02 5.88727441e-02]]
 
- [[0.00000000e+00 0.00000000e+00 1.39355660e-01 9.70875893e-02
-   1.00498756e-01 1.50419414e-01 0.00000000e+00 0.00000000e+00]
-  [0.00000000e+00 0.00000000e+00 1.56204994e-02 3.27719392e-02
-   3.24961536e-02 4.84148737e-02 0.00000000e+00 0.00000000e+00]]
+ [[0.00000000e+00 0.00000000e+00 1.00279609e-01 1.31209756e-01
+   1.08369737e-01 1.22531629e-01 0.00000000e+00 0.00000000e+00]
+  [0.00000000e+00 0.00000000e+00 6.05475020e-02 4.87442304e-02
+   4.27784993e-02 4.05462699e-02 0.00000000e+00 0.00000000e+00]]
 
- [[9.70875893e-02 1.39355660e-01 0.00000000e+00 0.00000000e+00
-   1.81229137e-01 1.44201248e-01 0.00000000e+00 0.00000000e+00]
-  [3.27719392e-02 1.56204994e-02 0.00000000e+00 0.00000000e+00
-   2.20454077e-02 3.41467422e-02 0.00000000e+00 0.00000000e+00]]]
+ [[1.31209756e-01 1.00279609e-01 0.00000000e+00 0.00000000e+00
+   5.27825729e-02 7.09506871e-02 0.00000000e+00 0.00000000e+00]
+  [4.87442304e-02 6.05475020e-02 0.00000000e+00 0.00000000e+00
+   5.88727441e-02 6.11228272e-02 0.00000000e+00 0.00000000e+00]]]
 domain=1 type=diffusion-coefficient
-[1.07648340e+00 2.91048451e-01]
-[1.02946730e-01 2.59101197e-02]
+[1.05868408e+00 3.16416542e-01]
+[7.23607812e-02 4.82261806e-02]
 domain=1 type=nu-diffusion-coefficient
-[1.07648340e+00 2.91048451e-01]
-[1.02946730e-01 2.59101197e-02]
+[1.05868408e+00 3.16416542e-01]
+[7.23607812e-02 4.82261806e-02]
 domain=1 type=delayed-nu-fission
-[[1.27862358e-06 3.04521075e-05]
- [7.84219053e-06 1.57184471e-04]
- [8.19703020e-06 1.50062017e-04]
- [2.11585246e-05 3.36451683e-04]
- [1.15983232e-05 1.37940708e-04]
- [4.75823112e-06 5.77828684e-05]]
-[[8.24665595e-08 1.78649023e-06]
- [5.11270396e-07 9.22131636e-06]
- [5.43215007e-07 8.80347339e-06]
- [1.44919046e-06 1.97381285e-05]
- [8.56858673e-07 8.09236929e-06]
- [3.49663884e-07 3.38986452e-06]]
+[[1.33370452e-06 3.15928985e-05]
+ [8.06563789e-06 1.63072885e-04]
+ [8.37555675e-06 1.55683610e-04]
+ [2.14225848e-05 3.49055766e-04]
+ [1.15633419e-05 1.43108212e-04]
+ [4.74849054e-06 5.99475175e-05]]
+[[5.58190638e-08 3.43966581e-06]
+ [2.80924725e-07 1.77545031e-05]
+ [2.81900859e-07 1.69499982e-05]
+ [7.44207592e-07 3.80033227e-05]
+ [4.95821820e-07 1.55808550e-05]
+ [2.00315983e-07 6.52676436e-06]]
 domain=1 type=chi-delayed
 [[0.00000000e+00 0.00000000e+00]
  [0.00000000e+00 0.00000000e+00]
  [0.00000000e+00 0.00000000e+00]
- [0.00000000e+00 0.00000000e+00]
+ [1.00000000e+00 0.00000000e+00]
  [0.00000000e+00 0.00000000e+00]
  [0.00000000e+00 0.00000000e+00]]
 [[0.00000000e+00 0.00000000e+00]
  [0.00000000e+00 0.00000000e+00]
  [0.00000000e+00 0.00000000e+00]
- [0.00000000e+00 0.00000000e+00]
+ [1.41421356e+00 0.00000000e+00]
  [0.00000000e+00 0.00000000e+00]
  [0.00000000e+00 0.00000000e+00]]
 domain=1 type=beta
-[[2.24289169e-04 2.27713711e-04]
- [1.37563425e-03 1.17538857e-03]
- [1.43787829e-03 1.12212853e-03]
- [3.71151288e-03 2.51590669e-03]
- [2.03451453e-03 1.03148823e-03]
- [8.34662928e-04 4.32086724e-04]]
-[[1.75760869e-05 1.28957660e-05]
- [1.08591736e-04 6.65640010e-05]
- [1.14785004e-04 6.35478047e-05]
- [3.03169937e-04 1.42479528e-04]
- [1.75476030e-04 5.84147049e-05]
- [7.17094876e-05 2.44697107e-05]]
+[[2.24535003e-04 2.27713710e-04]
+ [1.35788550e-03 1.17538857e-03]
+ [1.41006170e-03 1.12212852e-03]
+ [3.60658609e-03 2.51590665e-03]
+ [1.94673931e-03 1.03148820e-03]
+ [7.99429201e-04 4.32086711e-04]]
+[[1.15072629e-05 2.77827007e-05]
+ [6.20475481e-05 1.43405806e-04]
+ [6.31808205e-05 1.36907698e-04]
+ [1.64551758e-04 3.06958585e-04]
+ [1.01406915e-04 1.25848924e-04]
+ [4.11875799e-05 5.27176635e-05]]
 domain=1 type=decay-rate
-[1.33535692e-02 3.26115957e-02 1.21057117e-01 3.05655911e-01
- 8.60999995e-01 2.89188863e+00]
-[6.74373067e-04 1.71978136e-03 6.57917554e-03 1.73982053e-02
- 5.37683207e-02 1.79407115e-01]
+[1.33525569e-02 3.26187089e-02 1.21041926e-01 3.05503129e-01
+ 8.60433350e-01 2.88996258e+00]
+[1.34484408e-03 3.11955840e-03 1.11418058e-02 2.64184722e-02
+ 6.46651447e-02 2.19526509e-01]
 domain=1 type=delayed-nu-fission matrix
 [[[0.00000000e+00 0.00000000e+00]
   [0.00000000e+00 0.00000000e+00]]
@@ -207,7 +207,7 @@ domain=1 type=delayed-nu-fission matrix
   [0.00000000e+00 0.00000000e+00]]
 
  [[0.00000000e+00 0.00000000e+00]
-  [0.00000000e+00 0.00000000e+00]]
+  [1.49294023e-03 0.00000000e+00]]
 
  [[0.00000000e+00 0.00000000e+00]
   [0.00000000e+00 0.00000000e+00]]
@@ -224,7 +224,7 @@ domain=1 type=delayed-nu-fission matrix
   [0.00000000e+00 0.00000000e+00]]
 
  [[0.00000000e+00 0.00000000e+00]
-  [0.00000000e+00 0.00000000e+00]]
+  [1.49788268e-03 0.00000000e+00]]
 
  [[0.00000000e+00 0.00000000e+00]
   [0.00000000e+00 0.00000000e+00]]
diff --git a/tests/regression_tests/mgxs_library_histogram/results_true.dat b/tests/regression_tests/mgxs_library_histogram/results_true.dat
index 2fa94cef5..f927d057e 100644
--- a/tests/regression_tests/mgxs_library_histogram/results_true.dat
+++ b/tests/regression_tests/mgxs_library_histogram/results_true.dat
@@ -1,18 +1,18 @@
     material  group in  group out  mu bin nuclide      mean  std. dev.
-33         1         1          1       1   total  0.032861   0.003703
-34         1         1          1       2   total  0.026428   0.003637
-35         1         1          1       3   total  0.029210   0.001648
-36         1         1          1       4   total  0.032513   0.004770
-37         1         1          1       5   total  0.030949   0.003129
-38         1         1          1       6   total  0.027124   0.004029
-39         1         1          1       7   total  0.030079   0.002186
-40         1         1          1       8   total  0.037034   0.002198
-41         1         1          1       9   total  0.038251   0.003825
-42         1         1          1      10   total  0.039294   0.003626
-43         1         1          1      11   total  0.062593   0.005934
-22         1         1          2       1   total  0.000000   0.000000
-23         1         1          2       2   total  0.000174   0.000174
-24         1         1          2       3   total  0.000348   0.000213
+33         1         1          1       1   total  0.029945   0.003043
+34         1         1          1       2   total  0.028378   0.003793
+35         1         1          1       3   total  0.033079   0.002866
+36         1         1          1       4   total  0.030119   0.002259
+37         1         1          1       5   total  0.033601   0.003739
+38         1         1          1       6   total  0.035516   0.001929
+39         1         1          1       7   total  0.032382   0.001744
+40         1         1          1       8   total  0.031860   0.002565
+41         1         1          1       9   total  0.038302   0.004757
+42         1         1          1      10   total  0.041784   0.003047
+43         1         1          1      11   total  0.057453   0.003686
+22         1         1          2       1   total  0.000174   0.000174
+23         1         1          2       2   total  0.000000   0.000000
+24         1         1          2       3   total  0.000174   0.000174
 25         1         1          2       4   total  0.000174   0.000174
 26         1         1          2       5   total  0.000000   0.000000
 27         1         1          2       6   total  0.000000   0.000000
@@ -32,32 +32,32 @@
 19         1         2          1       9   total  0.000000   0.000000
 20         1         2          1      10   total  0.000000   0.000000
 21         1         2          1      11   total  0.000000   0.000000
-0          1         2          2       1   total  0.032383   0.006826
-1          1         2          2       2   total  0.037146   0.001158
-2          1         2          2       3   total  0.036193   0.004463
-3          1         2          2       4   total  0.036193   0.007028
-4          1         2          2       5   total  0.038098   0.006769
-5          1         2          2       6   total  0.024764   0.004638
-6          1         2          2       7   total  0.034288   0.008049
-7          1         2          2       8   total  0.040003   0.007350
-8          1         2          2       9   total  0.032383   0.003211
-9          1         2          2      10   total  0.050480   0.005824
-10         1         2          2      11   total  0.045718   0.013291
+0          1         2          2       1   total  0.037212   0.004892
+1          1         2          2       2   total  0.039224   0.003682
+2          1         2          2       3   total  0.044253   0.005869
+3          1         2          2       4   total  0.043247   0.004970
+4          1         2          2       5   total  0.025144   0.006632
+5          1         2          2       6   total  0.037212   0.009199
+6          1         2          2       7   total  0.035201   0.008964
+7          1         2          2       8   total  0.041235   0.009733
+8          1         2          2       9   total  0.032184   0.002384
+9          1         2          2      10   total  0.026149   0.006714
+10         1         2          2      11   total  0.035201   0.008073
     material  group in  group out  mu bin nuclide      mean  std. dev.
-33         1         1          1       1   total  0.032861   0.003703
-34         1         1          1       2   total  0.026428   0.003637
-35         1         1          1       3   total  0.029210   0.001648
-36         1         1          1       4   total  0.032513   0.004770
-37         1         1          1       5   total  0.030949   0.003129
-38         1         1          1       6   total  0.027124   0.004029
-39         1         1          1       7   total  0.030079   0.002186
-40         1         1          1       8   total  0.037034   0.002198
-41         1         1          1       9   total  0.038251   0.003825
-42         1         1          1      10   total  0.039294   0.003626
-43         1         1          1      11   total  0.062593   0.005934
-22         1         1          2       1   total  0.000000   0.000000
-23         1         1          2       2   total  0.000174   0.000174
-24         1         1          2       3   total  0.000348   0.000213
+33         1         1          1       1   total  0.029945   0.003043
+34         1         1          1       2   total  0.028378   0.003793
+35         1         1          1       3   total  0.033079   0.002866
+36         1         1          1       4   total  0.030119   0.002259
+37         1         1          1       5   total  0.033601   0.003739
+38         1         1          1       6   total  0.035516   0.001929
+39         1         1          1       7   total  0.032382   0.001744
+40         1         1          1       8   total  0.031860   0.002565
+41         1         1          1       9   total  0.038302   0.004757
+42         1         1          1      10   total  0.041784   0.003047
+43         1         1          1      11   total  0.057453   0.003686
+22         1         1          2       1   total  0.000174   0.000174
+23         1         1          2       2   total  0.000000   0.000000
+24         1         1          2       3   total  0.000174   0.000174
 25         1         1          2       4   total  0.000174   0.000174
 26         1         1          2       5   total  0.000000   0.000000
 27         1         1          2       6   total  0.000000   0.000000
@@ -77,33 +77,33 @@
 19         1         2          1       9   total  0.000000   0.000000
 20         1         2          1      10   total  0.000000   0.000000
 21         1         2          1      11   total  0.000000   0.000000
-0          1         2          2       1   total  0.032383   0.006826
-1          1         2          2       2   total  0.037146   0.001158
-2          1         2          2       3   total  0.036193   0.004463
-3          1         2          2       4   total  0.036193   0.007028
-4          1         2          2       5   total  0.038098   0.006769
-5          1         2          2       6   total  0.024764   0.004638
-6          1         2          2       7   total  0.034288   0.008049
-7          1         2          2       8   total  0.040003   0.007350
-8          1         2          2       9   total  0.032383   0.003211
-9          1         2          2      10   total  0.050480   0.005824
-10         1         2          2      11   total  0.045718   0.013291
+0          1         2          2       1   total  0.037212   0.004892
+1          1         2          2       2   total  0.039224   0.003682
+2          1         2          2       3   total  0.044253   0.005869
+3          1         2          2       4   total  0.043247   0.004970
+4          1         2          2       5   total  0.025144   0.006632
+5          1         2          2       6   total  0.037212   0.009199
+6          1         2          2       7   total  0.035201   0.008964
+7          1         2          2       8   total  0.041235   0.009733
+8          1         2          2       9   total  0.032184   0.002384
+9          1         2          2      10   total  0.026149   0.006714
+10         1         2          2      11   total  0.035201   0.008073
     material  group in  group out  mu bin nuclide      mean  std. dev.
-33         1         1          1       1   total  0.032927   0.003848
-34         1         1          1       2   total  0.026481   0.003736
-35         1         1          1       3   total  0.029268   0.001884
-36         1         1          1       4   total  0.032578   0.004885
-37         1         1          1       5   total  0.031010   0.003280
-38         1         1          1       6   total  0.027177   0.004124
-39         1         1          1       7   total  0.030139   0.002382
-40         1         1          1       8   total  0.037108   0.002485
-41         1         1          1       9   total  0.038327   0.004013
-42         1         1          1      10   total  0.039372   0.003833
-43         1         1          1      11   total  0.062717   0.006256
-22         1         1          2       1   total  0.000000   0.000000
-23         1         1          2       2   total  0.000174   0.000174
-24         1         1          2       3   total  0.000348   0.000214
-25         1         1          2       4   total  0.000174   0.000174
+33         1         1          1       1   total  0.030147   0.003165
+34         1         1          1       2   total  0.028570   0.003893
+35         1         1          1       3   total  0.033302   0.003016
+36         1         1          1       4   total  0.030322   0.002411
+37         1         1          1       5   total  0.033828   0.003868
+38         1         1          1       6   total  0.035756   0.002159
+39         1         1          1       7   total  0.032601   0.001955
+40         1         1          1       8   total  0.032075   0.002718
+41         1         1          1       9   total  0.038560   0.004896
+42         1         1          1      10   total  0.042066   0.003262
+43         1         1          1      11   total  0.057840   0.004013
+22         1         1          2       1   total  0.000175   0.000175
+23         1         1          2       2   total  0.000000   0.000000
+24         1         1          2       3   total  0.000175   0.000175
+25         1         1          2       4   total  0.000175   0.000175
 26         1         1          2       5   total  0.000000   0.000000
 27         1         1          2       6   total  0.000000   0.000000
 28         1         1          2       7   total  0.000000   0.000000
@@ -122,33 +122,33 @@
 19         1         2          1       9   total  0.000000   0.000000
 20         1         2          1      10   total  0.000000   0.000000
 21         1         2          1      11   total  0.000000   0.000000
-0          1         2          2       1   total  0.031440   0.006860
-1          1         2          2       2   total  0.036063   0.002322
-2          1         2          2       3   total  0.035138   0.004763
-3          1         2          2       4   total  0.035138   0.007105
-4          1         2          2       5   total  0.036988   0.006894
-5          1         2          2       6   total  0.024042   0.004702
-6          1         2          2       7   total  0.033289   0.008036
-7          1         2          2       8   total  0.038837   0.007464
-8          1         2          2       9   total  0.031440   0.003585
-9          1         2          2      10   total  0.049009   0.006292
-10         1         2          2      11   total  0.044385   0.013144
+0          1         2          2       1   total  0.037164   0.005797
+1          1         2          2       2   total  0.039173   0.004933
+2          1         2          2       3   total  0.044195   0.006937
+3          1         2          2       4   total  0.043191   0.006147
+4          1         2          2       5   total  0.025111   0.006951
+5          1         2          2       6   total  0.037164   0.009702
+6          1         2          2       7   total  0.035155   0.009426
+7          1         2          2       8   total  0.041182   0.010317
+8          1         2          2       9   total  0.032142   0.003598
+9          1         2          2      10   total  0.026115   0.007055
+10         1         2          2      11   total  0.035155   0.008586
     material  group in  group out  mu bin nuclide      mean  std. dev.
-33         1         1          1       1   total  0.032927   0.004236
-34         1         1          1       2   total  0.026481   0.003998
-35         1         1          1       3   total  0.029268   0.002455
-36         1         1          1       4   total  0.032578   0.005190
-37         1         1          1       5   total  0.031010   0.003679
-38         1         1          1       6   total  0.027177   0.004376
-39         1         1          1       7   total  0.030139   0.002881
-40         1         1          1       8   total  0.037108   0.003187
-41         1         1          1       9   total  0.038327   0.004511
-42         1         1          1      10   total  0.039372   0.004379
-43         1         1          1      11   total  0.062717   0.007108
-22         1         1          2       1   total  0.000000   0.000000
-23         1         1          2       2   total  0.000174   0.000209
-24         1         1          2       3   total  0.000348   0.000315
-25         1         1          2       4   total  0.000174   0.000209
+33         1         1          1       1   total  0.030147   0.003454
+34         1         1          1       2   total  0.028570   0.004107
+35         1         1          1       3   total  0.033302   0.003381
+36         1         1          1       4   total  0.030322   0.002783
+37         1         1          1       5   total  0.033828   0.004168
+38         1         1          1       6   total  0.035756   0.002711
+39         1         1          1       7   total  0.032601   0.002461
+40         1         1          1       8   total  0.032075   0.003090
+41         1         1          1       9   total  0.038560   0.005205
+42         1         1          1      10   total  0.042066   0.003790
+43         1         1          1      11   total  0.057840   0.004811
+22         1         1          2       1   total  0.000175   0.000234
+23         1         1          2       2   total  0.000000   0.000000
+24         1         1          2       3   total  0.000175   0.000234
+25         1         1          2       4   total  0.000175   0.000234
 26         1         1          2       5   total  0.000000   0.000000
 27         1         1          2       6   total  0.000000   0.000000
 28         1         1          2       7   total  0.000000   0.000000
@@ -167,29 +167,29 @@
 19         1         2          1       9   total  0.000000   0.000000
 20         1         2          1      10   total  0.000000   0.000000
 21         1         2          1      11   total  0.000000   0.000000
-0          1         2          2       1   total  0.031440   0.007170
-1          1         2          2       2   total  0.036063   0.003334
-2          1         2          2       3   total  0.035138   0.005303
-3          1         2          2       4   total  0.035138   0.007478
-4          1         2          2       5   total  0.036988   0.007318
-5          1         2          2       6   total  0.024042   0.004965
-6          1         2          2       7   total  0.033289   0.008334
-7          1         2          2       8   total  0.038837   0.007896
-8          1         2          2       9   total  0.031440   0.004148
-9          1         2          2      10   total  0.049009   0.007083
-10         1         2          2      11   total  0.044385   0.013469
+0          1         2          2       1   total  0.037164   0.006511
+1          1         2          2       2   total  0.039173   0.005840
+2          1         2          2       3   total  0.044195   0.007782
+3          1         2          2       4   total  0.043191   0.007047
+4          1         2          2       5   total  0.025111   0.007234
+5          1         2          2       6   total  0.037164   0.010146
+6          1         2          2       7   total  0.035155   0.009835
+7          1         2          2       8   total  0.041182   0.010828
+8          1         2          2       9   total  0.032142   0.004419
+9          1         2          2      10   total  0.026115   0.007356
+10         1         2          2      11   total  0.035155   0.009032
     material  group in  group out  mu bin nuclide      mean  std. dev.
-33         2         1          1       1   total  0.026798   0.002892
-34         2         1          1       2   total  0.021339   0.003475
-35         2         1          1       3   total  0.021835   0.003963
-36         2         1          1       4   total  0.018361   0.006133
-37         2         1          1       5   total  0.023820   0.003932
-38         2         1          1       6   total  0.025805   0.003808
-39         2         1          1       7   total  0.026798   0.002299
-40         2         1          1       8   total  0.029279   0.003939
-41         2         1          1       9   total  0.034738   0.004323
-42         2         1          1      10   total  0.032753   0.006086
-43         2         1          1      11   total  0.057069   0.003798
+33         2         1          1       1   total  0.025373   0.004281
+34         2         1          1       2   total  0.023909   0.004395
+35         2         1          1       3   total  0.019518   0.003911
+36         2         1          1       4   total  0.019518   0.003424
+37         2         1          1       5   total  0.020006   0.002901
+38         2         1          1       6   total  0.024885   0.005801
+39         2         1          1       7   total  0.019030   0.002566
+40         2         1          1       8   total  0.030741   0.001410
+41         2         1          1       9   total  0.034156   0.002902
+42         2         1          1      10   total  0.042939   0.004498
+43         2         1          1      11   total  0.054650   0.003865
 22         2         1          2       1   total  0.000000   0.000000
 23         2         1          2       2   total  0.000000   0.000000
 24         2         1          2       3   total  0.000000   0.000000
@@ -212,29 +212,29 @@
 19         2         2          1       9   total  0.000000   0.000000
 20         2         2          1      10   total  0.000000   0.000000
 21         2         2          1      11   total  0.000000   0.000000
-0          2         2          2       1   total  0.032254   0.009449
-1          2         2          2       2   total  0.018815   0.005569
-2          2         2          2       3   total  0.032254   0.009449
-3          2         2          2       4   total  0.024191   0.006844
-4          2         2          2       5   total  0.013439   0.008563
-5          2         2          2       6   total  0.024191   0.005365
-6          2         2          2       7   total  0.043005   0.010420
-7          2         2          2       8   total  0.032254   0.012710
-8          2         2          2       9   total  0.034942   0.007365
-9          2         2          2      10   total  0.021503   0.007051
-10         2         2          2      11   total  0.018815   0.008193
+0          2         2          2       1   total  0.026892   0.012233
+1          2         2          2       2   total  0.034959   0.007449
+2          2         2          2       3   total  0.040337   0.009144
+3          2         2          2       4   total  0.021513   0.003750
+4          2         2          2       5   total  0.018824   0.005602
+5          2         2          2       6   total  0.026892   0.004806
+6          2         2          2       7   total  0.037648   0.012716
+7          2         2          2       8   total  0.026892   0.009768
+8          2         2          2       9   total  0.024202   0.005420
+9          2         2          2      10   total  0.018824   0.010183
+10         2         2          2      11   total  0.018824   0.007033
     material  group in  group out  mu bin nuclide      mean  std. dev.
-33         2         1          1       1   total  0.026798   0.002892
-34         2         1          1       2   total  0.021339   0.003475
-35         2         1          1       3   total  0.021835   0.003963
-36         2         1          1       4   total  0.018361   0.006133
-37         2         1          1       5   total  0.023820   0.003932
-38         2         1          1       6   total  0.025805   0.003808
-39         2         1          1       7   total  0.026798   0.002299
-40         2         1          1       8   total  0.029279   0.003939
-41         2         1          1       9   total  0.034738   0.004323
-42         2         1          1      10   total  0.032753   0.006086
-43         2         1          1      11   total  0.057069   0.003798
+33         2         1          1       1   total  0.025373   0.004281
+34         2         1          1       2   total  0.023909   0.004395
+35         2         1          1       3   total  0.019518   0.003911
+36         2         1          1       4   total  0.019518   0.003424
+37         2         1          1       5   total  0.020006   0.002901
+38         2         1          1       6   total  0.024885   0.005801
+39         2         1          1       7   total  0.019030   0.002566
+40         2         1          1       8   total  0.030741   0.001410
+41         2         1          1       9   total  0.034156   0.002902
+42         2         1          1      10   total  0.042939   0.004498
+43         2         1          1      11   total  0.054650   0.003865
 22         2         1          2       1   total  0.000000   0.000000
 23         2         1          2       2   total  0.000000   0.000000
 24         2         1          2       3   total  0.000000   0.000000
@@ -257,29 +257,29 @@
 19         2         2          1       9   total  0.000000   0.000000
 20         2         2          1      10   total  0.000000   0.000000
 21         2         2          1      11   total  0.000000   0.000000
-0          2         2          2       1   total  0.032254   0.009449
-1          2         2          2       2   total  0.018815   0.005569
-2          2         2          2       3   total  0.032254   0.009449
-3          2         2          2       4   total  0.024191   0.006844
-4          2         2          2       5   total  0.013439   0.008563
-5          2         2          2       6   total  0.024191   0.005365
-6          2         2          2       7   total  0.043005   0.010420
-7          2         2          2       8   total  0.032254   0.012710
-8          2         2          2       9   total  0.034942   0.007365
-9          2         2          2      10   total  0.021503   0.007051
-10         2         2          2      11   total  0.018815   0.008193
+0          2         2          2       1   total  0.026892   0.012233
+1          2         2          2       2   total  0.034959   0.007449
+2          2         2          2       3   total  0.040337   0.009144
+3          2         2          2       4   total  0.021513   0.003750
+4          2         2          2       5   total  0.018824   0.005602
+5          2         2          2       6   total  0.026892   0.004806
+6          2         2          2       7   total  0.037648   0.012716
+7          2         2          2       8   total  0.026892   0.009768
+8          2         2          2       9   total  0.024202   0.005420
+9          2         2          2      10   total  0.018824   0.010183
+10         2         2          2      11   total  0.018824   0.007033
     material  group in  group out  mu bin nuclide      mean  std. dev.
-33         2         1          1       1   total  0.026249   0.003012
-34         2         1          1       2   total  0.020902   0.003500
-35         2         1          1       3   total  0.021388   0.003971
-36         2         1          1       4   total  0.017986   0.006048
-37         2         1          1       5   total  0.023333   0.003958
-38         2         1          1       6   total  0.025277   0.003858
-39         2         1          1       7   total  0.026249   0.002473
-40         2         1          1       8   total  0.028680   0.004017
-41         2         1          1       9   total  0.034027   0.004437
-42         2         1          1      10   total  0.032082   0.006091
-43         2         1          1      11   total  0.055901   0.004311
+33         2         1          1       1   total  0.025753   0.004484
+34         2         1          1       2   total  0.024267   0.004581
+35         2         1          1       3   total  0.019810   0.004060
+36         2         1          1       4   total  0.019810   0.003579
+37         2         1          1       5   total  0.020305   0.003071
+38         2         1          1       6   total  0.025258   0.005987
+39         2         1          1       7   total  0.019315   0.002734
+40         2         1          1       8   total  0.031201   0.001961
+41         2         1          1       9   total  0.034668   0.003301
+42         2         1          1      10   total  0.043582   0.004935
+43         2         1          1      11   total  0.055468   0.004591
 22         2         1          2       1   total  0.000000   0.000000
 23         2         1          2       2   total  0.000000   0.000000
 24         2         1          2       3   total  0.000000   0.000000
@@ -302,29 +302,29 @@
 19         2         2          1       9   total  0.000000   0.000000
 20         2         2          1      10   total  0.000000   0.000000
 21         2         2          1      11   total  0.000000   0.000000
-0          2         2          2       1   total  0.032230   0.009604
-1          2         2          2       2   total  0.018801   0.005658
-2          2         2          2       3   total  0.032230   0.009604
-3          2         2          2       4   total  0.024172   0.006964
-4          2         2          2       5   total  0.013429   0.008588
-5          2         2          2       6   total  0.024172   0.005520
-6          2         2          2       7   total  0.042973   0.010671
-7          2         2          2       8   total  0.032230   0.012821
-8          2         2          2       9   total  0.034915   0.007601
-9          2         2          2      10   total  0.021486   0.007142
-10         2         2          2      11   total  0.018801   0.008251
+0          2         2          2       1   total  0.026854   0.012543
+1          2         2          2       2   total  0.034911   0.008307
+2          2         2          2       3   total  0.040281   0.010079
+3          2         2          2       4   total  0.021483   0.004382
+4          2         2          2       5   total  0.018798   0.005938
+5          2         2          2       6   total  0.026854   0.005579
+6          2         2          2       7   total  0.037596   0.013308
+7          2         2          2       8   total  0.026854   0.010161
+8          2         2          2       9   total  0.024169   0.005987
+9          2         2          2      10   total  0.018798   0.010362
+10         2         2          2      11   total  0.018798   0.007300
     material  group in  group out  mu bin nuclide      mean  std. dev.
-33         2         1          1       1   total  0.026249   0.003460
-34         2         1          1       2   total  0.020902   0.003754
-35         2         1          1       3   total  0.021388   0.004206
-36         2         1          1       4   total  0.017986   0.006160
-37         2         1          1       5   total  0.023333   0.004238
-38         2         1          1       6   total  0.025277   0.004192
-39         2         1          1       7   total  0.026249   0.003003
-40         2         1          1       8   total  0.028680   0.004427
-41         2         1          1       9   total  0.034027   0.004956
-42         2         1          1      10   total  0.032082   0.006437
-43         2         1          1      11   total  0.055901   0.005636
+33         2         1          1       1   total  0.025753   0.004661
+34         2         1          1       2   total  0.024267   0.004736
+35         2         1          1       3   total  0.019810   0.004177
+36         2         1          1       4   total  0.019810   0.003711
+37         2         1          1       5   total  0.020305   0.003231
+38         2         1          1       6   total  0.025258   0.006117
+39         2         1          1       7   total  0.019315   0.002897
+40         2         1          1       8   total  0.031201   0.002497
+41         2         1          1       9   total  0.034668   0.003721
+42         2         1          1      10   total  0.043582   0.005386
+43         2         1          1      11   total  0.055468   0.005350
 22         2         1          2       1   total  0.000000   0.000000
 23         2         1          2       2   total  0.000000   0.000000
 24         2         1          2       3   total  0.000000   0.000000
@@ -347,40 +347,40 @@
 19         2         2          1       9   total  0.000000   0.000000
 20         2         2          1      10   total  0.000000   0.000000
 21         2         2          1      11   total  0.000000   0.000000
-0          2         2          2       1   total  0.032230   0.010330
-1          2         2          2       2   total  0.018801   0.006077
-2          2         2          2       3   total  0.032230   0.010330
-3          2         2          2       4   total  0.024172   0.007526
-4          2         2          2       5   total  0.013429   0.008733
-5          2         2          2       6   total  0.024172   0.006213
-6          2         2          2       7   total  0.042973   0.011815
-7          2         2          2       8   total  0.032230   0.013373
-8          2         2          2       9   total  0.034915   0.008646
-9          2         2          2      10   total  0.021486   0.007579
-10         2         2          2      11   total  0.018801   0.008544
+0          2         2          2       1   total  0.026854   0.013054
+1          2         2          2       2   total  0.034911   0.009546
+2          2         2          2       3   total  0.040281   0.011446
+3          2         2          2       4   total  0.021483   0.005251
+4          2         2          2       5   total  0.018798   0.006456
+5          2         2          2       6   total  0.026854   0.006649
+6          2         2          2       7   total  0.037596   0.014239
+7          2         2          2       8   total  0.026854   0.010785
+8          2         2          2       9   total  0.024169   0.006815
+9          2         2          2      10   total  0.018798   0.010667
+10         2         2          2      11   total  0.018798   0.007727
     material  group in  group out  mu bin nuclide      mean  std. dev.
-33         3         1          1       1   total  0.007006   0.000692
-34         3         1          1       2   total  0.006819   0.000431
-35         3         1          1       3   total  0.005511   0.000591
-36         3         1          1       4   total  0.006165   0.000470
-37         3         1          1       5   total  0.007660   0.000919
-38         3         1          1       6   total  0.012237   0.000938
-39         3         1          1       7   total  0.040914   0.002235
-40         3         1          1       8   total  0.074356   0.001968
-41         3         1          1       9   total  0.121622   0.004662
-42         3         1          1      10   total  0.158707   0.004147
-43         3         1          1      11   total  0.200742   0.007791
-22         3         1          2       1   total  0.000187   0.000187
-23         3         1          2       2   total  0.001028   0.000096
-24         3         1          2       3   total  0.000841   0.000176
-25         3         1          2       4   total  0.000841   0.000310
-26         3         1          2       5   total  0.001308   0.000274
-27         3         1          2       6   total  0.003736   0.000538
-28         3         1          2       7   total  0.003830   0.000703
-29         3         1          2       8   total  0.006259   0.000452
-30         3         1          2       9   total  0.005231   0.000510
-31         3         1          2      10   total  0.005044   0.000440
-32         3         1          2      11   total  0.002522   0.000194
+33         3         1          1       1   total  0.007681   0.001043
+34         3         1          1       2   total  0.005645   0.000710
+35         3         1          1       3   total  0.007403   0.000552
+36         3         1          1       4   total  0.007866   0.000512
+37         3         1          1       5   total  0.007589   0.000524
+38         3         1          1       6   total  0.011198   0.001548
+39         3         1          1       7   total  0.039701   0.002533
+40         3         1          1       8   total  0.075978   0.001897
+41         3         1          1       9   total  0.112532   0.003677
+42         3         1          1      10   total  0.166670   0.005003
+43         3         1          1      11   total  0.210443   0.005656
+22         3         1          2       1   total  0.000463   0.000207
+23         3         1          2       2   total  0.000555   0.000227
+24         3         1          2       3   total  0.000740   0.000429
+25         3         1          2       4   total  0.001111   0.000236
+26         3         1          2       5   total  0.002128   0.000631
+27         3         1          2       6   total  0.003146   0.000645
+28         3         1          2       7   total  0.004905   0.000561
+29         3         1          2       8   total  0.005738   0.000742
+30         3         1          2       9   total  0.005090   0.000672
+31         3         1          2      10   total  0.005367   0.000561
+32         3         1          2      11   total  0.002406   0.000593
 11         3         2          1       1   total  0.000000   0.000000
 12         3         2          1       2   total  0.000000   0.000000
 13         3         2          1       3   total  0.000000   0.000000
@@ -390,42 +390,42 @@
 17         3         2          1       7   total  0.000000   0.000000
 18         3         2          1       8   total  0.000000   0.000000
 19         3         2          1       9   total  0.000000   0.000000
-20         3         2          1      10   total  0.000467   0.000467
-21         3         2          1      11   total  0.000000   0.000000
-0          3         2          2       1   total  0.084030   0.007630
-1          3         2          2       2   total  0.099902   0.010027
-2          3         2          2       3   total  0.112040   0.010928
-3          3         2          2       4   total  0.117642   0.008523
-4          3         2          2       5   total  0.139116   0.009002
-5          3         2          2       6   total  0.161057   0.013537
-6          3         2          2       7   total  0.180664   0.010135
-7          3         2          2       8   total  0.219411   0.014717
-8          3         2          2       9   total  0.239485   0.027005
-9          3         2          2      10   total  0.281033   0.021376
-10         3         2          2      11   total  0.369731   0.027200
+20         3         2          1      10   total  0.000000   0.000000
+21         3         2          1      11   total  0.000474   0.000475
+0          3         2          2       1   total  0.074402   0.007811
+1          3         2          2       2   total  0.103783   0.009042
+2          3         2          2       3   total  0.106153   0.012691
+3          3         2          2       4   total  0.115631   0.011475
+4          3         2          2       5   total  0.128900   0.014096
+5          3         2          2       6   total  0.169655   0.021010
+6          3         2          2       7   total  0.175816   0.016086
+7          3         2          2       8   total  0.217519   0.029631
+8          3         2          2       9   total  0.247374   0.021476
+9          3         2          2      10   total  0.299977   0.031756
+10         3         2          2      11   total  0.351157   0.027654
     material  group in  group out  mu bin nuclide      mean  std. dev.
-33         3         1          1       1   total  0.007006   0.000692
-34         3         1          1       2   total  0.006819   0.000431
-35         3         1          1       3   total  0.005511   0.000591
-36         3         1          1       4   total  0.006165   0.000470
-37         3         1          1       5   total  0.007660   0.000919
-38         3         1          1       6   total  0.012237   0.000938
-39         3         1          1       7   total  0.040914   0.002235
-40         3         1          1       8   total  0.074356   0.001968
-41         3         1          1       9   total  0.121622   0.004662
-42         3         1          1      10   total  0.158707   0.004147
-43         3         1          1      11   total  0.200742   0.007791
-22         3         1          2       1   total  0.000187   0.000187
-23         3         1          2       2   total  0.001028   0.000096
-24         3         1          2       3   total  0.000841   0.000176
-25         3         1          2       4   total  0.000841   0.000310
-26         3         1          2       5   total  0.001308   0.000274
-27         3         1          2       6   total  0.003736   0.000538
-28         3         1          2       7   total  0.003830   0.000703
-29         3         1          2       8   total  0.006259   0.000452
-30         3         1          2       9   total  0.005231   0.000510
-31         3         1          2      10   total  0.005044   0.000440
-32         3         1          2      11   total  0.002522   0.000194
+33         3         1          1       1   total  0.007681   0.001043
+34         3         1          1       2   total  0.005645   0.000710
+35         3         1          1       3   total  0.007403   0.000552
+36         3         1          1       4   total  0.007866   0.000512
+37         3         1          1       5   total  0.007589   0.000524
+38         3         1          1       6   total  0.011198   0.001548
+39         3         1          1       7   total  0.039701   0.002533
+40         3         1          1       8   total  0.075978   0.001897
+41         3         1          1       9   total  0.112532   0.003677
+42         3         1          1      10   total  0.166670   0.005003
+43         3         1          1      11   total  0.210443   0.005656
+22         3         1          2       1   total  0.000463   0.000207
+23         3         1          2       2   total  0.000555   0.000227
+24         3         1          2       3   total  0.000740   0.000429
+25         3         1          2       4   total  0.001111   0.000236
+26         3         1          2       5   total  0.002128   0.000631
+27         3         1          2       6   total  0.003146   0.000645
+28         3         1          2       7   total  0.004905   0.000561
+29         3         1          2       8   total  0.005738   0.000742
+30         3         1          2       9   total  0.005090   0.000672
+31         3         1          2      10   total  0.005367   0.000561
+32         3         1          2      11   total  0.002406   0.000593
 11         3         2          1       1   total  0.000000   0.000000
 12         3         2          1       2   total  0.000000   0.000000
 13         3         2          1       3   total  0.000000   0.000000
@@ -435,42 +435,42 @@
 17         3         2          1       7   total  0.000000   0.000000
 18         3         2          1       8   total  0.000000   0.000000
 19         3         2          1       9   total  0.000000   0.000000
-20         3         2          1      10   total  0.000467   0.000467
-21         3         2          1      11   total  0.000000   0.000000
-0          3         2          2       1   total  0.084030   0.007630
-1          3         2          2       2   total  0.099902   0.010027
-2          3         2          2       3   total  0.112040   0.010928
-3          3         2          2       4   total  0.117642   0.008523
-4          3         2          2       5   total  0.139116   0.009002
-5          3         2          2       6   total  0.161057   0.013537
-6          3         2          2       7   total  0.180664   0.010135
-7          3         2          2       8   total  0.219411   0.014717
-8          3         2          2       9   total  0.239485   0.027005
-9          3         2          2      10   total  0.281033   0.021376
-10         3         2          2      11   total  0.369731   0.027200
+20         3         2          1      10   total  0.000000   0.000000
+21         3         2          1      11   total  0.000474   0.000475
+0          3         2          2       1   total  0.074402   0.007811
+1          3         2          2       2   total  0.103783   0.009042
+2          3         2          2       3   total  0.106153   0.012691
+3          3         2          2       4   total  0.115631   0.011475
+4          3         2          2       5   total  0.128900   0.014096
+5          3         2          2       6   total  0.169655   0.021010
+6          3         2          2       7   total  0.175816   0.016086
+7          3         2          2       8   total  0.217519   0.029631
+8          3         2          2       9   total  0.247374   0.021476
+9          3         2          2      10   total  0.299977   0.031756
+10         3         2          2      11   total  0.351157   0.027654
     material  group in  group out  mu bin nuclide      mean  std. dev.
-33         3         1          1       1   total  0.007106   0.000737
-34         3         1          1       2   total  0.006917   0.000488
-35         3         1          1       3   total  0.005590   0.000624
-36         3         1          1       4   total  0.006254   0.000516
-37         3         1          1       5   total  0.007770   0.000964
-38         3         1          1       6   total  0.012412   0.001029
-39         3         1          1       7   total  0.041501   0.002618
-40         3         1          1       8   total  0.075421   0.003106
-41         3         1          1       9   total  0.123365   0.006125
-42         3         1          1      10   total  0.160981   0.006595
-43         3         1          1      11   total  0.203618   0.010185
-22         3         1          2       1   total  0.000190   0.000190
-23         3         1          2       2   total  0.001042   0.000103
-24         3         1          2       3   total  0.000853   0.000180
-25         3         1          2       4   total  0.000853   0.000316
-26         3         1          2       5   total  0.001327   0.000281
-27         3         1          2       6   total  0.003790   0.000559
-28         3         1          2       7   total  0.003885   0.000724
-29         3         1          2       8   total  0.006348   0.000500
-30         3         1          2       9   total  0.005306   0.000544
-31         3         1          2      10   total  0.005117   0.000475
-32         3         1          2      11   total  0.002558   0.000213
+33         3         1          1       1   total  0.007759   0.001080
+34         3         1          1       2   total  0.005703   0.000738
+35         3         1          1       3   total  0.007479   0.000602
+36         3         1          1       4   total  0.007946   0.000571
+37         3         1          1       5   total  0.007666   0.000578
+38         3         1          1       6   total  0.011312   0.001601
+39         3         1          1       7   total  0.040106   0.002833
+40         3         1          1       8   total  0.076753   0.003016
+41         3         1          1       9   total  0.113680   0.005068
+42         3         1          1      10   total  0.168370   0.007185
+43         3         1          1      11   total  0.212589   0.008616
+22         3         1          2       1   total  0.000467   0.000210
+23         3         1          2       2   total  0.000561   0.000230
+24         3         1          2       3   total  0.000748   0.000434
+25         3         1          2       4   total  0.001122   0.000241
+26         3         1          2       5   total  0.002150   0.000641
+27         3         1          2       6   total  0.003179   0.000659
+28         3         1          2       7   total  0.004955   0.000586
+29         3         1          2       8   total  0.005796   0.000770
+30         3         1          2       9   total  0.005142   0.000697
+31         3         1          2      10   total  0.005422   0.000590
+32         3         1          2      11   total  0.002431   0.000604
 11         3         2          1       1   total  0.000000   0.000000
 12         3         2          1       2   total  0.000000   0.000000
 13         3         2          1       3   total  0.000000   0.000000
@@ -480,42 +480,42 @@
 17         3         2          1       7   total  0.000000   0.000000
 18         3         2          1       8   total  0.000000   0.000000
 19         3         2          1       9   total  0.000000   0.000000
-20         3         2          1      10   total  0.000466   0.000467
-21         3         2          1      11   total  0.000000   0.000000
-0          3         2          2       1   total  0.083912   0.007782
-1          3         2          2       2   total  0.099762   0.010188
-2          3         2          2       3   total  0.111883   0.011115
-3          3         2          2       4   total  0.117477   0.008794
-4          3         2          2       5   total  0.138921   0.009363
-5          3         2          2       6   total  0.160831   0.013853
-6          3         2          2       7   total  0.180411   0.010676
-7          3         2          2       8   total  0.219104   0.015265
-8          3         2          2       9   total  0.239149   0.027341
-9          3         2          2      10   total  0.280639   0.021991
-10         3         2          2      11   total  0.369213   0.028038
+20         3         2          1      10   total  0.000000   0.000000
+21         3         2          1      11   total  0.000477   0.000479
+0          3         2          2       1   total  0.074833   0.009685
+1          3         2          2       2   total  0.104384   0.012046
+2          3         2          2       3   total  0.106768   0.015107
+3          3         2          2       4   total  0.116300   0.014515
+4          3         2          2       5   total  0.129646   0.017242
+5          3         2          2       6   total  0.170637   0.024765
+6          3         2          2       7   total  0.176834   0.020997
+7          3         2          2       8   total  0.218778   0.034093
+8          3         2          2       9   total  0.248807   0.028656
+9          3         2          2      10   total  0.301714   0.039263
+10         3         2          2      11   total  0.353191   0.038577
     material  group in  group out  mu bin nuclide      mean  std. dev.
-33         3         1          1       1   total  0.007106   0.000751
-34         3         1          1       2   total  0.006917   0.000509
-35         3         1          1       3   total  0.005590   0.000635
-36         3         1          1       4   total  0.006254   0.000532
-37         3         1          1       5   total  0.007770   0.000977
-38         3         1          1       6   total  0.012412   0.001060
-39         3         1          1       7   total  0.041501   0.002755
-40         3         1          1       8   total  0.075421   0.003475
-41         3         1          1       9   total  0.123365   0.006634
-42         3         1          1      10   total  0.160981   0.007387
-43         3         1          1      11   total  0.203618   0.011019
-22         3         1          2       1   total  0.000190   0.000190
-23         3         1          2       2   total  0.001042   0.000114
-24         3         1          2       3   total  0.000853   0.000185
-25         3         1          2       4   total  0.000853   0.000319
-26         3         1          2       5   total  0.001327   0.000288
-27         3         1          2       6   total  0.003790   0.000588
-28         3         1          2       7   total  0.003885   0.000748
-29         3         1          2       8   total  0.006348   0.000587
-30         3         1          2       9   total  0.005306   0.000601
-31         3         1          2      10   total  0.005117   0.000535
-32         3         1          2      11   total  0.002558   0.000246
+33         3         1          1       1   total  0.007759   0.001091
+34         3         1          1       2   total  0.005703   0.000746
+35         3         1          1       3   total  0.007479   0.000619
+36         3         1          1       4   total  0.007946   0.000592
+37         3         1          1       5   total  0.007666   0.000598
+38         3         1          1       6   total  0.011312   0.001616
+39         3         1          1       7   total  0.040106   0.002941
+40         3         1          1       8   total  0.076753   0.003373
+41         3         1          1       9   total  0.113680   0.005540
+42         3         1          1      10   total  0.168370   0.007913
+43         3         1          1      11   total  0.212589   0.009578
+22         3         1          2       1   total  0.000467   0.000211
+23         3         1          2       2   total  0.000561   0.000232
+24         3         1          2       3   total  0.000748   0.000436
+25         3         1          2       4   total  0.001122   0.000250
+26         3         1          2       5   total  0.002150   0.000653
+27         3         1          2       6   total  0.003179   0.000684
+28         3         1          2       7   total  0.004955   0.000654
+29         3         1          2       8   total  0.005796   0.000841
+30         3         1          2       9   total  0.005142   0.000759
+31         3         1          2      10   total  0.005422   0.000670
+32         3         1          2      11   total  0.002431   0.000620
 11         3         2          1       1   total  0.000000   0.000000
 12         3         2          1       2   total  0.000000   0.000000
 13         3         2          1       3   total  0.000000   0.000000
@@ -525,16 +525,16 @@
 17         3         2          1       7   total  0.000000   0.000000
 18         3         2          1       8   total  0.000000   0.000000
 19         3         2          1       9   total  0.000000   0.000000
-20         3         2          1      10   total  0.000466   0.000808
-21         3         2          1      11   total  0.000000   0.000000
-0          3         2          2       1   total  0.083912   0.008936
-1          3         2          2       2   total  0.099762   0.011448
-2          3         2          2       3   total  0.111883   0.012563
-3          3         2          2       4   total  0.117477   0.010731
-4          3         2          2       5   total  0.138921   0.011855
-5          3         2          2       6   total  0.160831   0.016211
-6          3         2          2       7   total  0.180411   0.014254
-7          3         2          2       8   total  0.219104   0.019093
-8          3         2          2       9   total  0.239149   0.030071
-9          3         2          2      10   total  0.280639   0.026447
-10         3         2          2      11   total  0.369213   0.034054
+20         3         2          1      10   total  0.000000   0.000000
+21         3         2          1      11   total  0.000477   0.000827
+0          3         2          2       1   total  0.074833   0.011051
+1          3         2          2       2   total  0.104384   0.014150
+2          3         2          2       3   total  0.106768   0.016908
+3          3         2          2       4   total  0.116300   0.016707
+4          3         2          2       5   total  0.129646   0.019553
+5          3         2          2       6   total  0.170637   0.027579
+6          3         2          2       7   total  0.176834   0.024476
+7          3         2          2       8   total  0.218778   0.037476
+8          3         2          2       9   total  0.248807   0.033680
+9          3         2          2      10   total  0.301714   0.044745
+10         3         2          2      11   total  0.353191   0.046035
diff --git a/tests/regression_tests/mgxs_library_mesh/results_true.dat b/tests/regression_tests/mgxs_library_mesh/results_true.dat
index b1e8ac003..16b86870d 100644
--- a/tests/regression_tests/mgxs_library_mesh/results_true.dat
+++ b/tests/regression_tests/mgxs_library_mesh/results_true.dat
@@ -1,362 +1,362 @@
   mesh 1       group in nuclide      mean std. dev.
        x  y  z                                     
-0      1  1  1        1   total  0.102539  0.004894
-2      1  2  1        1   total  0.106476  0.007513
-1      2  1  1        1   total  0.101207  0.004814
-3      2  2  1        1   total  0.101733  0.004445
+0      1  1  1        1   total  0.103374  0.004981
+2      1  2  1        1   total  0.103852  0.004752
+1      2  1  1        1   total  0.103322  0.003613
+3      2  2  1        1   total  0.102889  0.003387
   mesh 1       group in nuclide      mean std. dev.
        x  y  z                                     
-0      1  1  1        1   total  0.073423  0.005232
-2      1  2  1        1   total  0.077906  0.007749
-1      2  1  1        1   total  0.071315  0.005181
-3      2  2  1        1   total  0.071983  0.004856
+0      1  1  1        1   total  0.072760  0.005235
+2      1  2  1        1   total  0.074856  0.004972
+1      2  1  1        1   total  0.074583  0.004000
+3      2  2  1        1   total  0.072925  0.003485
   mesh 1       group in nuclide      mean std. dev.
        x  y  z                                     
-0      1  1  1        1   total  0.073443  0.005235
-2      1  2  1        1   total  0.077909  0.007749
-1      2  1  1        1   total  0.071315  0.005181
-3      2  2  1        1   total  0.071928  0.004865
+0      1  1  1        1   total  0.072768  0.005236
+2      1  2  1        1   total  0.074864  0.004972
+1      2  1  1        1   total  0.074603  0.004002
+3      2  2  1        1   total  0.072881  0.003491
   mesh 1       group in nuclide      mean std. dev.
        x  y  z                                     
-0      1  1  1        1   total  0.013089  0.000762
-2      1  2  1        1   total  0.013802  0.000950
-1      2  1  1        1   total  0.012818  0.000708
-3      2  2  1        1   total  0.012954  0.000699
+0      1  1  1        1   total  0.013309  0.000729
+2      1  2  1        1   total  0.013223  0.000707
+1      2  1  1        1   total  0.013222  0.000596
+3      2  2  1        1   total  0.013282  0.000564
   mesh 1       group in nuclide      mean std. dev.
        x  y  z                                     
-0      1  1  1        1   total  0.013016  0.000761
-2      1  2  1        1   total  0.013715  0.000947
-1      2  1  1        1   total  0.012740  0.000707
-3      2  2  1        1   total  0.012886  0.000698
+0      1  1  1        1   total  0.013241  0.000728
+2      1  2  1        1   total  0.013142  0.000705
+1      2  1  1        1   total  0.013137  0.000596
+3      2  2  1        1   total  0.013221  0.000564
   mesh 1       group in nuclide      mean std. dev.
        x  y  z                                     
-0      1  1  1        1   total  0.001244  0.000926
-2      1  2  1        1   total  0.001345  0.000851
-1      2  1  1        1   total  0.001196  0.000768
-3      2  2  1        1   total  0.001234  0.000843
+0      1  1  1        1   total  0.001281  0.000874
+2      1  2  1        1   total  0.001297  0.000731
+1      2  1  1        1   total  0.001281  0.000744
+3      2  2  1        1   total  0.001288  0.000719
   mesh 1       group in nuclide      mean std. dev.
        x  y  z                                     
-0      1  1  1        1   total  0.011844  0.000690
-2      1  2  1        1   total  0.012457  0.000852
-1      2  1  1        1   total  0.011622  0.000636
-3      2  2  1        1   total  0.011719  0.000633
+0      1  1  1        1   total  0.012029  0.000664
+2      1  2  1        1   total  0.011926  0.000639
+1      2  1  1        1   total  0.011941  0.000545
+3      2  2  1        1   total  0.011994  0.000515
   mesh 1       group in nuclide      mean std. dev.
        x  y  z                                     
-0      1  1  1        1   total  0.030919  0.001784
-2      1  2  1        1   total  0.032495  0.002202
-1      2  1  1        1   total  0.030363  0.001664
-3      2  2  1        1   total  0.030565  0.001671
+0      1  1  1        1   total  0.031361  0.001735
+2      1  2  1        1   total  0.031091  0.001675
+1      2  1  1        1   total  0.031169  0.001418
+3      2  2  1        1   total  0.031255  0.001366
   mesh 1       group in nuclide          mean      std. dev.
        x  y  z                                              
-0      1  1  1        1   total  2.290786e+06  133521.277651
-2      1  2  1        1   total  2.409292e+06  164752.430241
-1      2  1  1        1   total  2.247742e+06  123005.689035
-3      2  2  1        1   total  2.266603e+06  122428.448367
+0      1  1  1        1   total  2.326447e+06  128504.886535
+2      1  2  1        1   total  2.306518e+06  123638.096130
+1      2  1  1        1   total  2.309435e+06  105395.059055
+3      2  2  1        1   total  2.319667e+06   99692.620001
   mesh 1       group in nuclide      mean std. dev.
        x  y  z                                     
-0      1  1  1        1   total  0.089450  0.004147
-2      1  2  1        1   total  0.092674  0.006571
-1      2  1  1        1   total  0.088389  0.004152
-3      2  2  1        1   total  0.088779  0.003763
+0      1  1  1        1   total  0.090065  0.004262
+2      1  2  1        1   total  0.090629  0.004086
+1      2  1  1        1   total  0.090100  0.003045
+3      2  2  1        1   total  0.089607  0.002828
   mesh 1       group in nuclide      mean std. dev.
        x  y  z                                     
-0      1  1  1        1   total  0.089555  0.004061
-2      1  2  1        1   total  0.092658  0.006216
-1      2  1  1        1   total  0.088293  0.004423
-3      2  2  1        1   total  0.088717  0.004937
+0      1  1  1        1   total  0.090188  0.005151
+2      1  2  1        1   total  0.094339  0.004349
+1      2  1  1        1   total  0.088294  0.003953
+3      2  2  1        1   total  0.089633  0.002592
    mesh 1       group in group out legendre nuclide      mean std. dev.
         x  y  z                                                        
-0       1  1  1        1         1       P0   total  0.089523  0.004070
-1       1  1  1        1         1       P1   total  0.029116  0.001851
-2       1  1  1        1         1       P2   total  0.016529  0.000827
-3       1  1  1        1         1       P3   total  0.009975  0.000731
-8       1  2  1        1         1       P0   total  0.092626  0.006233
-9       1  2  1        1         1       P1   total  0.028570  0.001899
-10      1  2  1        1         1       P2   total  0.015737  0.001986
-11      1  2  1        1         1       P3   total  0.008492  0.000859
-4       2  1  1        1         1       P0   total  0.088293  0.004423
-5       2  1  1        1         1       P1   total  0.029892  0.001916
-6       2  1  1        1         1       P2   total  0.016736  0.000714
-7       2  1  1        1         1       P3   total  0.009129  0.000509
-12      2  2  1        1         1       P0   total  0.088617  0.004889
-13      2  2  1        1         1       P1   total  0.029750  0.001954
-14      2  2  1        1         1       P2   total  0.016440  0.001320
-15      2  2  1        1         1       P3   total  0.009758  0.000538
+0       1  1  1        1         1       P0   total  0.090122  0.005149
+1       1  1  1        1         1       P1   total  0.030614  0.001612
+2       1  1  1        1         1       P2   total  0.016490  0.000897
+3       1  1  1        1         1       P3   total  0.010163  0.000829
+8       1  2  1        1         1       P0   total  0.094307  0.004337
+9       1  2  1        1         1       P1   total  0.028996  0.001462
+10      1  2  1        1         1       P2   total  0.017486  0.000808
+11      1  2  1        1         1       P3   total  0.009753  0.000742
+4       2  1  1        1         1       P0   total  0.088198  0.003959
+5       2  1  1        1         1       P1   total  0.028739  0.001715
+6       2  1  1        1         1       P2   total  0.015608  0.000680
+7       2  1  1        1         1       P3   total  0.008232  0.000363
+12      2  2  1        1         1       P0   total  0.089536  0.002551
+13      2  2  1        1         1       P1   total  0.029964  0.000821
+14      2  2  1        1         1       P2   total  0.015742  0.001260
+15      2  2  1        1         1       P3   total  0.008944  0.000385
    mesh 1       group in group out legendre nuclide      mean std. dev.
         x  y  z                                                        
-0       1  1  1        1         1       P0   total  0.089555  0.004061
-1       1  1  1        1         1       P1   total  0.029096  0.001859
-2       1  1  1        1         1       P2   total  0.016532  0.000828
-3       1  1  1        1         1       P3   total  0.009986  0.000734
-8       1  2  1        1         1       P0   total  0.092658  0.006216
-9       1  2  1        1         1       P1   total  0.028567  0.001899
-10      1  2  1        1         1       P2   total  0.015721  0.001995
-11      1  2  1        1         1       P3   total  0.008496  0.000857
-4       2  1  1        1         1       P0   total  0.088293  0.004423
-5       2  1  1        1         1       P1   total  0.029892  0.001916
-6       2  1  1        1         1       P2   total  0.016736  0.000714
-7       2  1  1        1         1       P3   total  0.009129  0.000509
-12      2  2  1        1         1       P0   total  0.088717  0.004937
-13      2  2  1        1         1       P1   total  0.029805  0.001977
-14      2  2  1        1         1       P2   total  0.016448  0.001327
-15      2  2  1        1         1       P3   total  0.009752  0.000534
+0       1  1  1        1         1       P0   total  0.090188  0.005151
+1       1  1  1        1         1       P1   total  0.030606  0.001614
+2       1  1  1        1         1       P2   total  0.016462  0.000898
+3       1  1  1        1         1       P3   total  0.010173  0.000824
+8       1  2  1        1         1       P0   total  0.094339  0.004349
+9       1  2  1        1         1       P1   total  0.028988  0.001462
+10      1  2  1        1         1       P2   total  0.017473  0.000811
+11      1  2  1        1         1       P3   total  0.009763  0.000749
+4       2  1  1        1         1       P0   total  0.088294  0.003953
+5       2  1  1        1         1       P1   total  0.028719  0.001720
+6       2  1  1        1         1       P2   total  0.015571  0.000691
+7       2  1  1        1         1       P3   total  0.008255  0.000361
+12      2  2  1        1         1       P0   total  0.089633  0.002592
+13      2  2  1        1         1       P1   total  0.030008  0.000847
+14      2  2  1        1         1       P2   total  0.015748  0.001284
+15      2  2  1        1         1       P3   total  0.008951  0.000387
   mesh 1       group in group out nuclide      mean std. dev.
        x  y  z                                               
-0      1  1  1        1         1   total  1.000362  0.044694
-2      1  2  1        1         1   total  1.000346  0.059372
-1      2  1  1        1         1   total  1.000000  0.055277
-3      2  2  1        1         1   total  1.001132  0.057130
+0      1  1  1        1         1   total  1.000736  0.060260
+2      1  2  1        1         1   total  1.000346  0.042656
+1      2  1  1        1         1   total  1.001091  0.052736
+3      2  2  1        1         1   total  1.001078  0.038212
   mesh 1       group in group out nuclide      mean std. dev.
        x  y  z                                               
-0      1  1  1        1         1   total  0.031634  0.002236
-2      1  2  1        1         1   total  0.032561  0.002344
-1      2  1  1        1         1   total  0.030820  0.002579
-3      2  2  1        1         1   total  0.029308  0.002507
+0      1  1  1        1         1   total  0.031890  0.002523
+2      1  2  1        1         1   total  0.032714  0.001502
+1      2  1  1        1         1   total  0.030414  0.002369
+3      2  2  1        1         1   total  0.031051  0.001521
   mesh 1       group in group out nuclide mean std. dev.
        x  y  z                                          
-0      1  1  1        1         1   total  1.0  0.044796
-2      1  2  1        1         1   total  1.0  0.059579
-1      2  1  1        1         1   total  1.0  0.055277
-3      2  2  1        1         1   total  1.0  0.056598
+0      1  1  1        1         1   total  1.0  0.060234
+2      1  2  1        1         1   total  1.0  0.042523
+1      2  1  1        1         1   total  1.0  0.052777
+3      2  2  1        1         1   total  1.0  0.037842
    mesh 1       group in group out legendre nuclide      mean std. dev.
         x  y  z                                                        
-0       1  1  1        1         1       P0   total  0.089450  0.005766
-1       1  1  1        1         1       P1   total  0.029092  0.002277
-2       1  1  1        1         1       P2   total  0.016516  0.001119
-3       1  1  1        1         1       P3   total  0.009967  0.000861
-8       1  2  1        1         1       P0   total  0.092674  0.008583
-9       1  2  1        1         1       P1   total  0.028585  0.002630
-10      1  2  1        1         1       P2   total  0.015745  0.002226
-11      1  2  1        1         1       P3   total  0.008496  0.001015
-4       2  1  1        1         1       P0   total  0.088389  0.006412
-5       2  1  1        1         1       P1   total  0.029924  0.002479
-6       2  1  1        1         1       P2   total  0.016754  0.001133
-7       2  1  1        1         1       P3   total  0.009139  0.000699
-12      2  2  1        1         1       P0   total  0.088779  0.006278
-13      2  2  1        1         1       P1   total  0.029804  0.002360
-14      2  2  1        1         1       P2   total  0.016470  0.001510
-15      2  2  1        1         1       P3   total  0.009776  0.000691
+0       1  1  1        1         1       P0   total  0.090065  0.006899
+1       1  1  1        1         1       P1   total  0.030595  0.002243
+2       1  1  1        1         1       P2   total  0.016480  0.001229
+3       1  1  1        1         1       P3   total  0.010157  0.000977
+8       1  2  1        1         1       P0   total  0.090629  0.005616
+9       1  2  1        1         1       P1   total  0.027865  0.001820
+10      1  2  1        1         1       P2   total  0.016804  0.001044
+11      1  2  1        1         1       P3   total  0.009373  0.000813
+4       2  1  1        1         1       P0   total  0.090100  0.005647
+5       2  1  1        1         1       P1   total  0.029359  0.002172
+6       2  1  1        1         1       P2   total  0.015944  0.000984
+7       2  1  1        1         1       P3   total  0.008410  0.000523
+12      2  2  1        1         1       P0   total  0.089607  0.004415
+13      2  2  1        1         1       P1   total  0.029988  0.001459
+14      2  2  1        1         1       P2   total  0.015755  0.001411
+15      2  2  1        1         1       P3   total  0.008951  0.000528
    mesh 1       group in group out legendre nuclide      mean std. dev.
         x  y  z                                                        
-0       1  1  1        1         1       P0   total  0.089483  0.007018
-1       1  1  1        1         1       P1   total  0.029103  0.002623
-2       1  1  1        1         1       P2   total  0.016522  0.001341
-3       1  1  1        1         1       P3   total  0.009971  0.000970
-8       1  2  1        1         1       P0   total  0.092706  0.010197
-9       1  2  1        1         1       P1   total  0.028595  0.003131
-10      1  2  1        1         1       P2   total  0.015750  0.002415
-11      1  2  1        1         1       P3   total  0.008499  0.001134
-4       2  1  1        1         1       P0   total  0.088389  0.008061
-5       2  1  1        1         1       P1   total  0.029924  0.002980
-6       2  1  1        1         1       P2   total  0.016754  0.001463
-7       2  1  1        1         1       P3   total  0.009139  0.000863
-12      2  2  1        1         1       P0   total  0.088880  0.008076
-13      2  2  1        1         1       P1   total  0.029838  0.002912
-14      2  2  1        1         1       P2   total  0.016489  0.001781
-15      2  2  1        1         1       P3   total  0.009787  0.000889
+0       1  1  1        1         1       P0   total  0.090131  0.008782
+1       1  1  1        1         1       P1   total  0.030617  0.002905
+2       1  1  1        1         1       P2   total  0.016492  0.001581
+3       1  1  1        1         1       P3   total  0.010164  0.001154
+8       1  2  1        1         1       P0   total  0.090661  0.006820
+9       1  2  1        1         1       P1   total  0.027875  0.002174
+10      1  2  1        1         1       P2   total  0.016810  0.001267
+11      1  2  1        1         1       P3   total  0.009376  0.000906
+4       2  1  1        1         1       P0   total  0.090199  0.007385
+5       2  1  1        1         1       P1   total  0.029391  0.002669
+6       2  1  1        1         1       P2   total  0.015962  0.001295
+7       2  1  1        1         1       P3   total  0.008419  0.000686
+12      2  2  1        1         1       P0   total  0.089704  0.005591
+13      2  2  1        1         1       P1   total  0.030020  0.001856
+14      2  2  1        1         1       P2   total  0.015772  0.001536
+15      2  2  1        1         1       P3   total  0.008961  0.000629
   mesh 1       group out nuclide mean std. dev.
        x  y  z                                 
-0      1  1  1         1   total  1.0  0.088672
-2      1  2  1         1   total  1.0  0.069731
-1      2  1  1         1   total  1.0  0.109718
-3      2  2  1         1   total  1.0  0.108376
+0      1  1  1         1   total  1.0  0.098093
+2      1  2  1         1   total  1.0  0.042346
+1      2  1  1         1   total  1.0  0.104352
+3      2  2  1         1   total  1.0  0.067889
   mesh 1       group out nuclide mean std. dev.
        x  y  z                                 
-0      1  1  1         1   total  1.0  0.091154
-2      1  2  1         1   total  1.0  0.069438
-1      2  1  1         1   total  1.0  0.109233
-3      2  2  1         1   total  1.0  0.108119
+0      1  1  1         1   total  1.0  0.099401
+2      1  2  1         1   total  1.0  0.042085
+1      2  1  1         1   total  1.0  0.104135
+3      2  2  1         1   total  1.0  0.067307
   mesh 1       group in nuclide          mean     std. dev.
        x  y  z                                             
-0      1  1  1        1   total  8.424136e-10  3.612697e-11
-2      1  2  1        1   total  8.884166e-10  6.324091e-11
-1      2  1  1        1   total  8.415613e-10  4.520088e-11
-3      2  2  1        1   total  8.557929e-10  2.898037e-11
+0      1  1  1        1   total  8.547713e-10  3.477664e-11
+2      1  2  1        1   total  9.057083e-10  4.171858e-11
+1      2  1  1        1   total  8.666731e-10  2.371072e-11
+3      2  2  1        1   total  8.532016e-10  1.638929e-11
   mesh 1       group in nuclide      mean std. dev.
        x  y  z                                     
-0      1  1  1        1   total  0.030724  0.001773
-2      1  2  1        1   total  0.032290  0.002188
-1      2  1  1        1   total  0.030172  0.001654
-3      2  2  1        1   total  0.030372  0.001661
+0      1  1  1        1   total  0.031163  0.001724
+2      1  2  1        1   total  0.030895  0.001664
+1      2  1  1        1   total  0.030973  0.001409
+3      2  2  1        1   total  0.031058  0.001358
   mesh 1       group in group out nuclide      mean std. dev.
        x  y  z                                               
-0      1  1  1        1         1   total  0.031468  0.002273
-2      1  2  1        1         1   total  0.032418  0.002330
-1      2  1  1        1         1   total  0.030706  0.002559
-3      2  2  1        1         1   total  0.029134  0.002487
+0      1  1  1        1         1   total  0.031781  0.002541
+2      1  2  1        1         1   total  0.032490  0.001487
+1      2  1  1        1         1   total  0.030274  0.002354
+3      2  2  1        1         1   total  0.030882  0.001500
    mesh 1               group in nuclide    mean std. dev.
         x  y       surf                                   
-3       1  1   x-max in        1   total  0.1884  0.010255
-2       1  1  x-max out        1   total  0.1798  0.009646
+3       1  1   x-max in        1   total  0.1888  0.008218
+2       1  1  x-max out        1   total  0.1828  0.008212
 1       1  1   x-min in        1   total  0.0000  0.000000
 0       1  1  x-min out        1   total  0.0000  0.000000
-7       1  1   y-max in        1   total  0.1822  0.014739
-6       1  1  y-max out        1   total  0.1806  0.019423
+7       1  1   y-max in        1   total  0.1820  0.012534
+6       1  1  y-max out        1   total  0.1794  0.015302
 5       1  1   y-min in        1   total  0.0000  0.000000
 4       1  1  y-min out        1   total  0.0000  0.000000
-19      1  2   x-max in        1   total  0.1780  0.012514
-18      1  2  x-max out        1   total  0.1886  0.014979
+19      1  2   x-max in        1   total  0.1870  0.011696
+18      1  2  x-max out        1   total  0.1850  0.012919
 17      1  2   x-min in        1   total  0.0000  0.000000
 16      1  2  x-min out        1   total  0.0000  0.000000
 23      1  2   y-max in        1   total  0.0000  0.000000
 22      1  2  y-max out        1   total  0.0000  0.000000
-21      1  2   y-min in        1   total  0.1806  0.019423
-20      1  2  y-min out        1   total  0.1822  0.014739
+21      1  2   y-min in        1   total  0.1794  0.015302
+20      1  2  y-min out        1   total  0.1820  0.012534
 11      2  1   x-max in        1   total  0.0000  0.000000
 10      2  1  x-max out        1   total  0.0000  0.000000
-9       2  1   x-min in        1   total  0.1798  0.009646
-8       2  1  x-min out        1   total  0.1884  0.010255
-15      2  1   y-max in        1   total  0.1812  0.009583
-14      2  1  y-max out        1   total  0.1858  0.012018
+9       2  1   x-min in        1   total  0.1828  0.008212
+8       2  1  x-min out        1   total  0.1888  0.008218
+15      2  1   y-max in        1   total  0.1850  0.011256
+14      2  1  y-max out        1   total  0.1870  0.009597
 13      2  1   y-min in        1   total  0.0000  0.000000
 12      2  1  y-min out        1   total  0.0000  0.000000
 27      2  2   x-max in        1   total  0.0000  0.000000
 26      2  2  x-max out        1   total  0.0000  0.000000
-25      2  2   x-min in        1   total  0.1886  0.014979
-24      2  2  x-min out        1   total  0.1780  0.012514
+25      2  2   x-min in        1   total  0.1850  0.012919
+24      2  2  x-min out        1   total  0.1870  0.011696
 31      2  2   y-max in        1   total  0.0000  0.000000
 30      2  2  y-max out        1   total  0.0000  0.000000
-29      2  2   y-min in        1   total  0.1858  0.012018
-28      2  2  y-min out        1   total  0.1812  0.009583
+29      2  2   y-min in        1   total  0.1870  0.009597
+28      2  2  y-min out        1   total  0.1850  0.011256
   mesh 1       group in nuclide      mean std. dev.
        x  y  z                                     
-0      1  1  1        1   total  4.539911  0.323493
-2      1  2  1        1   total  4.278655  0.425575
-1      2  1  1        1   total  4.674097  0.339600
-3      2  2  1        1   total  4.630700  0.312366
+0      1  1  1        1   total  4.581283  0.329623
+2      1  2  1        1   total  4.452968  0.295762
+1      2  1  1        1   total  4.469295  0.239674
+3      2  2  1        1   total  4.570894  0.218416
   mesh 1       group in nuclide      mean std. dev.
        x  y  z                                     
-0      1  1  1        1   total  4.538654  0.323497
-2      1  2  1        1   total  4.278494  0.425550
-1      2  1  1        1   total  4.674097  0.339600
-3      2  2  1        1   total  4.634259  0.313464
+0      1  1  1        1   total  4.580746  0.329583
+2      1  2  1        1   total  4.452519  0.295716
+1      2  1  1        1   total  4.468066  0.239680
+3      2  2  1        1   total  4.573657  0.219069
    mesh 1       delayedgroup group in nuclide      mean     std. dev.
         x  y  z                                                      
-0       1  1  1            1        1   total  0.000007  3.997262e-07
-1       1  1  1            2        1   total  0.000035  2.063264e-06
-2       1  1  1            3        1   total  0.000034  1.969771e-06
-3       1  1  1            4        1   total  0.000075  4.416388e-06
-4       1  1  1            5        1   total  0.000031  1.810657e-06
-5       1  1  1            6        1   total  0.000013  7.584779e-07
-12      1  2  1            1        1   total  0.000007  4.931656e-07
-13      1  2  1            2        1   total  0.000037  2.545569e-06
-14      1  2  1            3        1   total  0.000035  2.430221e-06
-15      1  2  1            4        1   total  0.000079  5.448757e-06
-16      1  2  1            5        1   total  0.000032  2.233913e-06
-17      1  2  1            6        1   total  0.000014  9.357785e-07
-6       2  1  1            1        1   total  0.000007  3.618632e-07
-7       2  1  1            2        1   total  0.000035  1.867826e-06
-8       2  1  1            3        1   total  0.000033  1.783189e-06
-9       2  1  1            4        1   total  0.000074  3.998058e-06
-10      2  1  1            5        1   total  0.000030  1.639147e-06
-11      2  1  1            6        1   total  0.000013  6.866331e-07
-18      2  2  1            1        1   total  0.000007  3.603080e-07
-19      2  2  1            2        1   total  0.000035  1.859799e-06
-20      2  2  1            3        1   total  0.000033  1.775526e-06
-21      2  2  1            4        1   total  0.000075  3.980875e-06
-22      2  2  1            5        1   total  0.000031  1.632103e-06
-23      2  2  1            6        1   total  0.000013  6.836821e-07
+0       1  1  1            1        1   total  0.000007  3.812309e-07
+1       1  1  1            2        1   total  0.000036  1.967797e-06
+2       1  1  1            3        1   total  0.000034  1.878630e-06
+3       1  1  1            4        1   total  0.000077  4.212043e-06
+4       1  1  1            5        1   total  0.000031  1.726878e-06
+5       1  1  1            6        1   total  0.000013  7.233832e-07
+12      1  2  1            1        1   total  0.000007  3.663985e-07
+13      1  2  1            2        1   total  0.000035  1.891236e-06
+14      1  2  1            3        1   total  0.000034  1.805539e-06
+15      1  2  1            4        1   total  0.000076  4.048166e-06
+16      1  2  1            5        1   total  0.000031  1.659691e-06
+17      1  2  1            6        1   total  0.000013  6.952388e-07
+6       2  1  1            1        1   total  0.000007  3.123173e-07
+7       2  1  1            2        1   total  0.000035  1.612086e-06
+8       2  1  1            3        1   total  0.000034  1.539037e-06
+9       2  1  1            4        1   total  0.000076  3.450649e-06
+10      2  1  1            5        1   total  0.000031  1.414717e-06
+11      2  1  1            6        1   total  0.000013  5.926201e-07
+18      2  2  1            1        1   total  0.000007  2.946716e-07
+19      2  2  1            2        1   total  0.000036  1.521004e-06
+20      2  2  1            3        1   total  0.000034  1.452083e-06
+21      2  2  1            4        1   total  0.000076  3.255689e-06
+22      2  2  1            5        1   total  0.000031  1.334787e-06
+23      2  2  1            6        1   total  0.000013  5.591374e-07
    mesh 1       delayedgroup group out nuclide mean std. dev.
         x  y  z                                              
-0       1  1  1            1         1   total  0.0  0.000000
-1       1  1  1            2         1   total  1.0  0.866877
-2       1  1  1            3         1   total  1.0  0.866877
-3       1  1  1            4         1   total  1.0  1.414214
-4       1  1  1            5         1   total  1.0  1.414214
+0       1  1  1            1         1   total  1.0  1.414214
+1       1  1  1            2         1   total  0.0  0.000000
+2       1  1  1            3         1   total  0.0  0.000000
+3       1  1  1            4         1   total  1.0  0.578922
+4       1  1  1            5         1   total  0.0  0.000000
 5       1  1  1            6         1   total  0.0  0.000000
 12      1  2  1            1         1   total  0.0  0.000000
-13      1  2  1            2         1   total  0.0  0.000000
-14      1  2  1            3         1   total  0.0  0.000000
-15      1  2  1            4         1   total  1.0  0.579346
-16      1  2  1            5         1   total  1.0  1.414214
+13      1  2  1            2         1   total  1.0  0.578922
+14      1  2  1            3         1   total  1.0  1.414214
+15      1  2  1            4         1   total  1.0  1.414214
+16      1  2  1            5         1   total  1.0  0.875472
 17      1  2  1            6         1   total  1.0  1.414214
-6       2  1  1            1         1   total  1.0  1.414214
-7       2  1  1            2         1   total  1.0  1.414214
-8       2  1  1            3         1   total  1.0  0.874781
-9       2  1  1            4         1   total  0.0  0.000000
-10      2  1  1            5         1   total  0.0  0.000000
+6       2  1  1            1         1   total  0.0  0.000000
+7       2  1  1            2         1   total  0.0  0.000000
+8       2  1  1            3         1   total  1.0  1.414214
+9       2  1  1            4         1   total  1.0  0.579392
+10      2  1  1            5         1   total  1.0  1.414214
 11      2  1  1            6         1   total  0.0  0.000000
-18      2  2  1            1         1   total  1.0  1.414214
-19      2  2  1            2         1   total  1.0  0.867902
-20      2  2  1            3         1   total  1.0  1.414214
-21      2  2  1            4         1   total  1.0  1.414214
+18      2  2  1            1         1   total  1.0  0.868163
+19      2  2  1            2         1   total  1.0  1.414214
+20      2  2  1            3         1   total  0.0  0.000000
+21      2  2  1            4         1   total  1.0  0.868969
 22      2  2  1            5         1   total  1.0  1.414214
 23      2  2  1            6         1   total  0.0  0.000000
    mesh 1       delayedgroup group in nuclide      mean std. dev.
         x  y  z                                                  
-0       1  1  1            1        1   total  0.000221  0.000016
-1       1  1  1            2        1   total  0.001138  0.000084
-2       1  1  1            3        1   total  0.001087  0.000080
-3       1  1  1            4        1   total  0.002437  0.000180
-4       1  1  1            5        1   total  0.000999  0.000074
-5       1  1  1            6        1   total  0.000418  0.000031
-12      1  2  1            1        1   total  0.000221  0.000014
-13      1  2  1            2        1   total  0.001138  0.000073
-14      1  2  1            3        1   total  0.001087  0.000069
-15      1  2  1            4        1   total  0.002436  0.000155
-16      1  2  1            5        1   total  0.000999  0.000064
-17      1  2  1            6        1   total  0.000418  0.000027
-6       2  1  1            1        1   total  0.000220  0.000014
-7       2  1  1            2        1   total  0.001137  0.000070
-8       2  1  1            3        1   total  0.001086  0.000067
-9       2  1  1            4        1   total  0.002435  0.000150
-10      2  1  1            5        1   total  0.000998  0.000062
-11      2  1  1            6        1   total  0.000418  0.000026
-18      2  2  1            1        1   total  0.000221  0.000015
-19      2  2  1            2        1   total  0.001141  0.000078
-20      2  2  1            3        1   total  0.001089  0.000074
-21      2  2  1            4        1   total  0.002442  0.000167
-22      2  2  1            5        1   total  0.001001  0.000068
-23      2  2  1            6        1   total  0.000419  0.000029
+0       1  1  1            1        1   total  0.000221  0.000015
+1       1  1  1            2        1   total  0.001140  0.000079
+2       1  1  1            3        1   total  0.001088  0.000075
+3       1  1  1            4        1   total  0.002440  0.000169
+4       1  1  1            5        1   total  0.001001  0.000069
+5       1  1  1            6        1   total  0.000419  0.000029
+12      1  2  1            1        1   total  0.000221  0.000013
+13      1  2  1            2        1   total  0.001139  0.000066
+14      1  2  1            3        1   total  0.001088  0.000063
+15      1  2  1            4        1   total  0.002439  0.000142
+16      1  2  1            5        1   total  0.001000  0.000058
+17      1  2  1            6        1   total  0.000419  0.000024
+6       2  1  1            1        1   total  0.000220  0.000013
+7       2  1  1            2        1   total  0.001138  0.000067
+8       2  1  1            3        1   total  0.001086  0.000064
+9       2  1  1            4        1   total  0.002435  0.000144
+10      2  1  1            5        1   total  0.000998  0.000059
+11      2  1  1            6        1   total  0.000418  0.000025
+18      2  2  1            1        1   total  0.000221  0.000013
+19      2  2  1            2        1   total  0.001141  0.000066
+20      2  2  1            3        1   total  0.001090  0.000063
+21      2  2  1            4        1   total  0.002443  0.000141
+22      2  2  1            5        1   total  0.001002  0.000058
+23      2  2  1            6        1   total  0.000420  0.000024
    mesh 1       delayedgroup nuclide      mean std. dev.
         x  y  z                                         
-0       1  1  1            1   total  0.013336  0.000997
-1       1  1  1            2   total  0.032739  0.002447
-2       1  1  1            3   total  0.120780  0.009028
-3       1  1  1            4   total  0.302780  0.022633
-4       1  1  1            5   total  0.849490  0.063500
-5       1  1  1            6   total  2.853000  0.213262
-12      1  2  1            1   total  0.013336  0.000866
-13      1  2  1            2   total  0.032739  0.002126
-14      1  2  1            3   total  0.120780  0.007843
-15      1  2  1            4   total  0.302780  0.019661
-16      1  2  1            5   total  0.849490  0.055163
-17      1  2  1            6   total  2.853000  0.185263
-6       2  1  1            1   total  0.013336  0.000814
-7       2  1  1            2   total  0.032739  0.001999
-8       2  1  1            3   total  0.120780  0.007373
-9       2  1  1            4   total  0.302780  0.018483
-10      2  1  1            5   total  0.849490  0.051857
-11      2  1  1            6   total  2.853000  0.174163
-18      2  2  1            1   total  0.013336  0.000896
-19      2  2  1            2   total  0.032739  0.002200
-20      2  2  1            3   total  0.120780  0.008117
-21      2  2  1            4   total  0.302780  0.020349
-22      2  2  1            5   total  0.849490  0.057091
-23      2  2  1            6   total  2.853000  0.191738
+0       1  1  1            1   total  0.013336  0.000919
+1       1  1  1            2   total  0.032739  0.002257
+2       1  1  1            3   total  0.120780  0.008325
+3       1  1  1            4   total  0.302780  0.020871
+4       1  1  1            5   total  0.849490  0.058555
+5       1  1  1            6   total  2.853000  0.196656
+12      1  2  1            1   total  0.013336  0.000770
+13      1  2  1            2   total  0.032739  0.001891
+14      1  2  1            3   total  0.120780  0.006977
+15      1  2  1            4   total  0.302780  0.017490
+16      1  2  1            5   total  0.849490  0.049071
+17      1  2  1            6   total  2.853000  0.164804
+6       2  1  1            1   total  0.013336  0.000790
+7       2  1  1            2   total  0.032739  0.001940
+8       2  1  1            3   total  0.120780  0.007157
+9       2  1  1            4   total  0.302780  0.017942
+10      2  1  1            5   total  0.849490  0.050338
+11      2  1  1            6   total  2.853000  0.169061
+18      2  2  1            1   total  0.013336  0.000757
+19      2  2  1            2   total  0.032739  0.001858
+20      2  2  1            3   total  0.120780  0.006855
+21      2  2  1            4   total  0.302780  0.017186
+22      2  2  1            5   total  0.849490  0.048217
+23      2  2  1            6   total  2.853000  0.161935
    mesh 1       delayedgroup group in group out nuclide      mean std. dev.
         x  y  z                                                            
-0       1  1  1            1        1         1   total  0.000000  0.000000
-1       1  1  1            2        1         1   total  0.000056  0.000034
-2       1  1  1            3        1         1   total  0.000056  0.000034
-3       1  1  1            4        1         1   total  0.000029  0.000029
-4       1  1  1            5        1         1   total  0.000026  0.000026
+0       1  1  1            1        1         1   total  0.000026  0.000026
+1       1  1  1            2        1         1   total  0.000000  0.000000
+2       1  1  1            3        1         1   total  0.000000  0.000000
+3       1  1  1            4        1         1   total  0.000083  0.000034
+4       1  1  1            5        1         1   total  0.000000  0.000000
 5       1  1  1            6        1         1   total  0.000000  0.000000
 12      1  2  1            1        1         1   total  0.000000  0.000000
-13      1  2  1            2        1         1   total  0.000000  0.000000
-14      1  2  1            3        1         1   total  0.000000  0.000000
-15      1  2  1            4        1         1   total  0.000079  0.000033
-16      1  2  1            5        1         1   total  0.000032  0.000032
-17      1  2  1            6        1         1   total  0.000032  0.000032
-6       2  1  1            1        1         1   total  0.000029  0.000029
-7       2  1  1            2        1         1   total  0.000027  0.000027
-8       2  1  1            3        1         1   total  0.000058  0.000036
-9       2  1  1            4        1         1   total  0.000000  0.000000
-10      2  1  1            5        1         1   total  0.000000  0.000000
+13      1  2  1            2        1         1   total  0.000081  0.000033
+14      1  2  1            3        1         1   total  0.000026  0.000026
+15      1  2  1            4        1         1   total  0.000026  0.000026
+16      1  2  1            5        1         1   total  0.000059  0.000036
+17      1  2  1            6        1         1   total  0.000033  0.000033
+6       2  1  1            1        1         1   total  0.000000  0.000000
+7       2  1  1            2        1         1   total  0.000000  0.000000
+8       2  1  1            3        1         1   total  0.000032  0.000032
+9       2  1  1            4        1         1   total  0.000080  0.000033
+10      2  1  1            5        1         1   total  0.000028  0.000028
 11      2  1  1            6        1         1   total  0.000000  0.000000
-18      2  2  1            1        1         1   total  0.000027  0.000027
-19      2  2  1            2        1         1   total  0.000056  0.000035
-20      2  2  1            3        1         1   total  0.000028  0.000028
-21      2  2  1            4        1         1   total  0.000030  0.000030
-22      2  2  1            5        1         1   total  0.000033  0.000033
+18      2  2  1            1        1         1   total  0.000054  0.000033
+19      2  2  1            2        1         1   total  0.000029  0.000029
+20      2  2  1            3        1         1   total  0.000000  0.000000
+21      2  2  1            4        1         1   total  0.000054  0.000033
+22      2  2  1            5        1         1   total  0.000032  0.000032
 23      2  2  1            6        1         1   total  0.000000  0.000000
diff --git a/tests/regression_tests/mgxs_library_no_nuclides/results_true.dat b/tests/regression_tests/mgxs_library_no_nuclides/results_true.dat
index c0dba7c0f..aec8e8bbc 100644
--- a/tests/regression_tests/mgxs_library_no_nuclides/results_true.dat
+++ b/tests/regression_tests/mgxs_library_no_nuclides/results_true.dat
@@ -1,227 +1,227 @@
 total
    material  group in nuclide      mean  std. dev.
-1         1         1   total  0.413814   0.018434
-0         1         2   total  0.663001   0.012535
+1         1         1   total  0.422772   0.014069
+0         1         2   total  0.661309   0.049458
 transport
    material  group in nuclide      mean  std. dev.
-1         1         1   total  0.369730   0.019494
-0         1         2   total  0.643777   0.018246
+1         1         1   total  0.383831   0.015331
+0         1         2   total  0.679181   0.050786
 nu-transport
    material  group in nuclide      mean  std. dev.
-1         1         1   total  0.369730   0.019494
-0         1         2   total  0.643777   0.018246
+1         1         1   total  0.383831   0.015331
+0         1         2   total  0.679181   0.050786
 absorption
    material  group in nuclide      mean  std. dev.
-1         1         1   total  0.026013   0.001851
-0         1         2   total  0.267233   0.007475
+1         1         1   total  0.027181   0.001539
+0         1         2   total  0.265559   0.020699
 reduced absorption
    material  group in nuclide      mean  std. dev.
-1         1         1   total  0.025932   0.001850
-0         1         2   total  0.267233   0.007475
+1         1         1   total  0.027162   0.001538
+0         1         2   total  0.265559   0.020699
 capture
    material  group in nuclide      mean  std. dev.
-1         1         1   total  0.018869   0.001758
-0         1         2   total  0.072358   0.008204
+1         1         1   total  0.019717   0.001492
+0         1         2   total  0.072029   0.019378
 fission
    material  group in nuclide      mean  std. dev.
-1         1         1   total  0.007144   0.000317
-0         1         2   total  0.194875   0.005528
+1         1         1   total  0.007464   0.000222
+0         1         2   total  0.193530   0.015119
 nu-fission
    material  group in nuclide      mean  std. dev.
-1         1         1   total  0.018243   0.000827
-0         1         2   total  0.474851   0.013471
+1         1         1   total  0.018925   0.000543
+0         1         2   total  0.471574   0.036840
 kappa-fission
    material  group in nuclide          mean     std. dev.
-1         1         1   total  1.391782e+06  6.192598e+04
-0         1         2   total  3.768981e+07  1.069211e+06
+1         1         1   total  1.453014e+06  4.287190e+04
+0         1         2   total  3.742974e+07  2.924022e+06
 scatter
    material  group in nuclide      mean  std. dev.
-1         1         1   total  0.387802   0.017462
-0         1         2   total  0.395768   0.007541
+1         1         1   total  0.395591   0.013417
+0         1         2   total  0.395750   0.029309
 nu-scatter
    material  group in nuclide      mean  std. dev.
-1         1         1   total  0.387032   0.024325
-0         1         2   total  0.407651   0.016266
+1         1         1   total  0.392941   0.019689
+0         1         2   total  0.396262   0.027471
 scatter matrix
     material  group in  group out legendre nuclide      mean  std. dev.
-12         1         1          1       P0   total  0.386336   0.024297
-13         1         1          1       P1   total  0.044084   0.006343
-14         1         1          1       P2   total  0.027336   0.006403
-15         1         1          1       P3   total  0.011672   0.004897
-8          1         1          2       P0   total  0.000695   0.000327
-9          1         1          2       P1   total -0.000359   0.000201
-10         1         1          2       P2   total -0.000047   0.000081
-11         1         1          2       P3   total  0.000239   0.000099
+12         1         1          1       P0   total  0.392419   0.019837
+13         1         1          1       P1   total  0.038941   0.006089
+14         1         1          1       P2   total  0.019512   0.003548
+15         1         1          1       P3   total  0.012951   0.002399
+8          1         1          2       P0   total  0.000522   0.000349
+9          1         1          2       P1   total -0.000301   0.000185
+10         1         1          2       P2   total  0.000045   0.000147
+11         1         1          2       P3   total  0.000069   0.000162
 4          1         2          1       P0   total  0.000000   0.000000
 5          1         2          1       P1   total  0.000000   0.000000
 6          1         2          1       P2   total  0.000000   0.000000
 7          1         2          1       P3   total  0.000000   0.000000
-0          1         2          2       P0   total  0.407651   0.016266
-1          1         2          2       P1   total  0.021192   0.013171
-2          1         2          2       P2   total  0.010327   0.017230
-3          1         2          2       P3   total  0.005148   0.013732
+0          1         2          2       P0   total  0.396262   0.027471
+1          1         2          2       P1   total -0.016133   0.010911
+2          1         2          2       P2   total -0.001147   0.010536
+3          1         2          2       P3   total  0.005359   0.008143
 nu-scatter matrix
     material  group in  group out legendre nuclide      mean  std. dev.
-12         1         1          1       P0   total  0.386336   0.024297
-13         1         1          1       P1   total  0.044084   0.006343
-14         1         1          1       P2   total  0.027336   0.006403
-15         1         1          1       P3   total  0.011672   0.004897
-8          1         1          2       P0   total  0.000695   0.000327
-9          1         1          2       P1   total -0.000359   0.000201
-10         1         1          2       P2   total -0.000047   0.000081
-11         1         1          2       P3   total  0.000239   0.000099
+12         1         1          1       P0   total  0.392419   0.019837
+13         1         1          1       P1   total  0.038941   0.006089
+14         1         1          1       P2   total  0.019512   0.003548
+15         1         1          1       P3   total  0.012951   0.002399
+8          1         1          2       P0   total  0.000522   0.000349
+9          1         1          2       P1   total -0.000301   0.000185
+10         1         1          2       P2   total  0.000045   0.000147
+11         1         1          2       P3   total  0.000069   0.000162
 4          1         2          1       P0   total  0.000000   0.000000
 5          1         2          1       P1   total  0.000000   0.000000
 6          1         2          1       P2   total  0.000000   0.000000
 7          1         2          1       P3   total  0.000000   0.000000
-0          1         2          2       P0   total  0.407651   0.016266
-1          1         2          2       P1   total  0.021192   0.013171
-2          1         2          2       P2   total  0.010327   0.017230
-3          1         2          2       P3   total  0.005148   0.013732
+0          1         2          2       P0   total  0.396262   0.027471
+1          1         2          2       P1   total -0.016133   0.010911
+2          1         2          2       P2   total -0.001147   0.010536
+3          1         2          2       P3   total  0.005359   0.008143
 multiplicity matrix
    material  group in  group out nuclide  mean  std. dev.
-3         1         1          1   total   1.0   0.064268
-2         1         1          2   total   1.0   0.661438
+3         1         1          1   total   1.0   0.054620
+2         1         1          2   total   1.0   0.942809
 1         1         2          1   total   0.0   0.000000
-0         1         2          2   total   1.0   0.050545
+0         1         2          2   total   1.0   0.080341
 nu-fission matrix
    material  group in  group out nuclide      mean  std. dev.
-3         1         1          1   total  0.024633   0.002205
+3         1         1          1   total  0.019257   0.001831
 2         1         1          2   total  0.000000   0.000000
-1         1         2          1   total  0.435159   0.014743
+1         1         2          1   total  0.459401   0.022054
 0         1         2          2   total  0.000000   0.000000
 scatter probability matrix
    material  group in  group out nuclide      mean  std. dev.
-3         1         1          1   total  0.998203   0.064101
-2         1         1          2   total  0.001797   0.000844
+3         1         1          1   total  0.998671   0.054518
+2         1         1          2   total  0.001329   0.000888
 1         1         2          1   total  0.000000   0.000000
-0         1         2          2   total  1.000000   0.050545
+0         1         2          2   total  1.000000   0.080341
 consistent scatter matrix
     material  group in  group out legendre nuclide      mean  std. dev.
-12         1         1          1       P0   total  0.387105   0.030361
-13         1         1          1       P1   total  0.044172   0.006684
-14         1         1          1       P2   total  0.027391   0.006543
-15         1         1          1       P3   total  0.011695   0.004937
-8          1         1          2       P0   total  0.000697   0.000329
-9          1         1          2       P1   total -0.000360   0.000202
-10         1         1          2       P2   total -0.000047   0.000082
-11         1         1          2       P3   total  0.000239   0.000100
+12         1         1          1       P0   total  0.395065   0.025390
+13         1         1          1       P1   total  0.039204   0.006325
+14         1         1          1       P2   total  0.019644   0.003656
+15         1         1          1       P3   total  0.013039   0.002470
+8          1         1          2       P0   total  0.000526   0.000352
+9          1         1          2       P1   total -0.000303   0.000186
+10         1         1          2       P2   total  0.000045   0.000148
+11         1         1          2       P3   total  0.000069   0.000163
 4          1         2          1       P0   total  0.000000   0.000000
 5          1         2          1       P1   total  0.000000   0.000000
 6          1         2          1       P2   total  0.000000   0.000000
 7          1         2          1       P3   total  0.000000   0.000000
-0          1         2          2       P0   total  0.395768   0.021378
-1          1         2          2       P1   total  0.020575   0.012809
-2          1         2          2       P2   total  0.010026   0.016732
-3          1         2          2       P3   total  0.004998   0.013333
+0          1         2          2       P0   total  0.395750   0.043243
+1          1         2          2       P1   total -0.016112   0.010982
+2          1         2          2       P2   total -0.001146   0.010523
+3          1         2          2       P3   total  0.005353   0.008145
 consistent nu-scatter matrix
     material  group in  group out legendre nuclide      mean  std. dev.
-12         1         1          1       P0   total  0.387105   0.039252
-13         1         1          1       P1   total  0.044172   0.007262
-14         1         1          1       P2   total  0.027391   0.006776
-15         1         1          1       P3   total  0.011695   0.004994
-8          1         1          2       P0   total  0.000697   0.000566
-9          1         1          2       P1   total -0.000360   0.000313
-10         1         1          2       P2   total -0.000047   0.000087
-11         1         1          2       P3   total  0.000239   0.000187
+12         1         1          1       P0   total  0.395065   0.033321
+13         1         1          1       P1   total  0.039204   0.006677
+14         1         1          1       P2   total  0.019644   0.003810
+15         1         1          1       P3   total  0.013039   0.002571
+8          1         1          2       P0   total  0.000526   0.000608
+9          1         1          2       P1   total -0.000303   0.000341
+10         1         1          2       P2   total  0.000045   0.000154
+11         1         1          2       P3   total  0.000069   0.000175
 4          1         2          1       P0   total  0.000000   0.000000
 5          1         2          1       P1   total  0.000000   0.000000
 6          1         2          1       P2   total  0.000000   0.000000
 7          1         2          1       P3   total  0.000000   0.000000
-0          1         2          2       P0   total  0.395768   0.029278
-1          1         2          2       P1   total  0.020575   0.012851
-2          1         2          2       P2   total  0.010026   0.016739
-3          1         2          2       P3   total  0.004998   0.013335
+0          1         2          2       P0   total  0.395750   0.053673
+1          1         2          2       P1   total -0.016112   0.011058
+2          1         2          2       P2   total -0.001146   0.010523
+3          1         2          2       P3   total  0.005353   0.008157
 chi
    material  group out nuclide  mean  std. dev.
-1         1          1   total   1.0   0.039887
+1         1          1   total   1.0   0.015644
 0         1          2   total   0.0   0.000000
 chi-prompt
    material  group out nuclide  mean  std. dev.
-1         1          1   total   1.0   0.039887
+1         1          1   total   1.0   0.017529
 0         1          2   total   0.0   0.000000
 inverse-velocity
    material  group in nuclide          mean     std. dev.
-1         1         1   total  5.956290e-08  2.255751e-09
-0         1         2   total  2.886630e-06  7.418452e-08
+1         1         1   total  6.047675e-08  4.367288e-09
+0         1         2   total  2.861927e-06  2.241423e-07
 prompt-nu-fission
    material  group in nuclide      mean  std. dev.
-1         1         1   total  0.018067   0.000817
-0         1         2   total  0.471762   0.013383
+1         1         1   total  0.018748    0.00054
+0         1         2   total  0.468507    0.03660
 prompt-nu-fission matrix
    material  group in  group out nuclide      mean  std. dev.
-3         1         1          1   total  0.024633   0.002205
+3         1         1          1   total  0.019049   0.001675
 2         1         1          2   total  0.000000   0.000000
-1         1         2          1   total  0.435159   0.014743
+1         1         2          1   total  0.454399   0.022578
 0         1         2          2   total  0.000000   0.000000
 diffusion-coefficient
    material  group in nuclide      mean  std. dev.
-1         1         1   total  0.901559   0.047536
-0         1         2   total  0.517778   0.014675
+1         1         1   total  0.868438   0.034686
+0         1         2   total  0.490787   0.036698
 nu-diffusion-coefficient
    material  group in nuclide      mean  std. dev.
-1         1         1   total  0.901559   0.047536
-0         1         2   total  0.517778   0.014675
+1         1         1   total  0.868438   0.034686
+0         1         2   total  0.490787   0.036698
 (n,elastic)
    material  group in nuclide      mean  std. dev.
-1         1         1   total  0.360179   0.016169
-0         1         2   total  0.395768   0.007541
+1         1         1   total  0.368341   0.013033
+0         1         2   total  0.395750   0.029309
 (n,level)
    material  group in nuclide      mean  std. dev.
-1         1         1   total  0.000568   0.000028
+1         1         1   total  0.000518   0.000016
 0         1         2   total  0.000000   0.000000
 (n,2n)
    material  group in nuclide      mean  std. dev.
-1         1         1   total  0.000079   0.000042
+1         1         1   total  0.000019   0.000012
 0         1         2   total  0.000000   0.000000
 (n,na)
-   material  group in nuclide          mean     std. dev.
-1         1         1   total  8.510945e-07  8.515320e-07
-0         1         2   total  0.000000e+00  0.000000e+00
+   material  group in nuclide  mean  std. dev.
+1         1         1   total   0.0        0.0
+0         1         2   total   0.0        0.0
 (n,nc)
    material  group in nuclide      mean  std. dev.
-1         1         1   total  0.008258   0.000928
+1         1         1   total  0.007599   0.000559
 0         1         2   total  0.000000   0.000000
 (n,gamma)
    material  group in nuclide      mean  std. dev.
-1         1         1   total  0.018749   0.001838
-0         1         2   total  0.072358   0.001951
+1         1         1   total  0.019608   0.001470
+0         1         2   total  0.072029   0.005584
 (n,a)
    material  group in nuclide      mean  std. dev.
-1         1         1   total  0.000119   0.000023
-0         1         2   total  0.000000   0.000000
+1         1         1   total  0.000109    0.00002
+0         1         2   total  0.000000    0.00000
 (n,Xa)
-   material  group in nuclide     mean  std. dev.
-1         1         1   total  0.00012   0.000022
-0         1         2   total  0.00000   0.000000
+   material  group in nuclide      mean  std. dev.
+1         1         1   total  0.000109    0.00002
+0         1         2   total  0.000000    0.00000
 heating
-   material  group in nuclide          mean      std. dev.
-1         1         1   total  1.216089e+06   54827.397330
-0         1         2   total  3.262993e+07  904277.817101
+   material  group in nuclide          mean     std. dev.
+1         1         1   total  1.270644e+06  3.732629e+04
+0         1         2   total  3.241569e+07  2.530346e+06
 damage-energy
    material  group in nuclide         mean   std. dev.
-1         1         1   total  2317.176742  165.734097
-0         1         2   total  1371.933922   38.919660
+1         1         1   total  2405.735342   79.042000
+0         1         2   total  1362.470597  106.435803
 (n,n1)
    material  group in nuclide      mean  std. dev.
-1         1         1   total  0.012055   0.000759
+1         1         1   total  0.011931   0.000455
 0         1         2   total  0.000000   0.000000
 (n,a0)
    material  group in nuclide      mean  std. dev.
-1         1         1   total  0.000109   0.000028
-0         1         2   total  0.000000   0.000000
+1         1         1   total  0.000108    0.00002
+0         1         2   total  0.000000    0.00000
 (n,nc) matrix
    material  group in  group out nuclide      mean  std. dev.
-3         1         1          1   total  0.009563   0.001002
+3         1         1          1   total  0.005745   0.001068
 2         1         1          2   total  0.000000   0.000000
 1         1         2          1   total  0.000000   0.000000
 0         1         2          2   total  0.000000   0.000000
 (n,n1) matrix
    material  group in  group out nuclide      mean  std. dev.
-3         1         1          1   total  0.013909    0.00145
-2         1         1          2   total  0.000000    0.00000
-1         1         2          1   total  0.000000    0.00000
-0         1         2          2   total  0.000000    0.00000
+3         1         1          1   total  0.013232   0.001025
+2         1         1          2   total  0.000000   0.000000
+1         1         2          1   total  0.000000   0.000000
+0         1         2          2   total  0.000000   0.000000
 (n,2n) matrix
    material  group in  group out nuclide  mean  std. dev.
 3         1         1          1   total   0.0        0.0
@@ -230,104 +230,104 @@ damage-energy
 0         1         2          2   total   0.0        0.0
 delayed-nu-fission
     material  delayedgroup  group in nuclide      mean     std. dev.
-1          1             1         1   total  0.000004  1.857100e-07
-3          1             2         1   total  0.000025  1.293123e-06
-5          1             3         1   total  0.000026  1.448812e-06
-7          1             4         1   total  0.000068  4.132525e-06
-9          1             5         1   total  0.000037  2.670208e-06
-11         1             6         1   total  0.000015  1.084541e-06
-0          1             1         2   total  0.000108  3.067510e-06
-2          1             2         2   total  0.000558  1.583355e-05
-4          1             3         2   total  0.000533  1.511609e-05
-6          1             4         2   total  0.001195  3.389154e-05
-8          1             5         2   total  0.000490  1.389508e-05
-10         1             6         2   total  0.000205  5.820598e-06
+1          1             1         1   total  0.000004  1.226367e-07
+3          1             2         1   total  0.000026  6.725093e-07
+5          1             3         1   total  0.000027  7.028316e-07
+7          1             4         1   total  0.000068  1.919534e-06
+9          1             5         1   total  0.000037  1.268939e-06
+11         1             6         1   total  0.000015  5.136452e-07
+0          1             1         2   total  0.000107  8.388866e-06
+2          1             2         2   total  0.000554  4.330076e-05
+4          1             3         2   total  0.000529  4.133869e-05
+6          1             4         2   total  0.001186  9.268481e-05
+8          1             5         2   total  0.000486  3.799954e-05
+10         1             6         2   total  0.000204  1.591787e-05
 chi-delayed
     material  delayedgroup  group out nuclide  mean  std. dev.
-1          1             1          1   total   0.0        0.0
-3          1             2          1   total   0.0        0.0
-5          1             3          1   total   0.0        0.0
-7          1             4          1   total   0.0        0.0
-9          1             5          1   total   0.0        0.0
-11         1             6          1   total   0.0        0.0
-0          1             1          2   total   0.0        0.0
-2          1             2          2   total   0.0        0.0
-4          1             3          2   total   0.0        0.0
-6          1             4          2   total   0.0        0.0
-8          1             5          2   total   0.0        0.0
-10         1             6          2   total   0.0        0.0
+1          1             1          1   total   0.0   0.000000
+3          1             2          1   total   0.0   0.000000
+5          1             3          1   total   0.0   0.000000
+7          1             4          1   total   1.0   0.433956
+9          1             5          1   total   0.0   0.000000
+11         1             6          1   total   0.0   0.000000
+0          1             1          2   total   0.0   0.000000
+2          1             2          2   total   0.0   0.000000
+4          1             3          2   total   0.0   0.000000
+6          1             4          2   total   0.0   0.000000
+8          1             5          2   total   0.0   0.000000
+10         1             6          2   total   0.0   0.000000
 beta
     material  delayedgroup  group in nuclide      mean  std. dev.
-1          1             1         1   total  0.000223   0.000009
-3          1             2         1   total  0.001375   0.000067
-5          1             3         1   total  0.001439   0.000076
-7          1             4         1   total  0.003724   0.000217
-9          1             5         1   total  0.002049   0.000142
-11         1             6         1   total  0.000840   0.000058
-0          1             1         2   total  0.000228   0.000008
-2          1             2         2   total  0.001175   0.000041
-4          1             3         2   total  0.001122   0.000040
-6          1             4         2   total  0.002516   0.000089
-8          1             5         2   total  0.001031   0.000036
-10         1             6         2   total  0.000432   0.000015
+1          1             1         1   total  0.000225   0.000006
+3          1             2         1   total  0.001359   0.000033
+5          1             3         1   total  0.001412   0.000034
+7          1             4         1   total  0.003611   0.000094
+9          1             5         1   total  0.001950   0.000064
+11         1             6         1   total  0.000801   0.000026
+0          1             1         2   total  0.000228   0.000019
+2          1             2         2   total  0.001175   0.000096
+4          1             3         2   total  0.001122   0.000092
+6          1             4         2   total  0.002516   0.000206
+8          1             5         2   total  0.001031   0.000085
+10         1             6         2   total  0.000432   0.000035
 decay-rate
    material  delayedgroup nuclide      mean  std. dev.
-0         1             1   total  0.013353   0.000379
-1         1             2   total  0.032612   0.001002
-2         1             3   total  0.121056   0.003938
-3         1             4   total  0.305642   0.010892
-4         1             5   total  0.860947   0.036893
-5         1             6   total  2.891708   0.122310
+0         1             1   total  0.013352   0.000905
+1         1             2   total  0.032619   0.002094
+2         1             3   total  0.121041   0.007464
+3         1             4   total  0.305491   0.017639
+4         1             5   total  0.860388   0.042833
+5         1             6   total  2.889807   0.145503
 delayed-nu-fission matrix
-    material  delayedgroup  group in  group out nuclide  mean  std. dev.
-3          1             1         1          1   total   0.0        0.0
-7          1             2         1          1   total   0.0        0.0
-11         1             3         1          1   total   0.0        0.0
-15         1             4         1          1   total   0.0        0.0
-19         1             5         1          1   total   0.0        0.0
-23         1             6         1          1   total   0.0        0.0
-2          1             1         1          2   total   0.0        0.0
-6          1             2         1          2   total   0.0        0.0
-10         1             3         1          2   total   0.0        0.0
-14         1             4         1          2   total   0.0        0.0
-18         1             5         1          2   total   0.0        0.0
-22         1             6         1          2   total   0.0        0.0
-1          1             1         2          1   total   0.0        0.0
-5          1             2         2          1   total   0.0        0.0
-9          1             3         2          1   total   0.0        0.0
-13         1             4         2          1   total   0.0        0.0
-17         1             5         2          1   total   0.0        0.0
-21         1             6         2          1   total   0.0        0.0
-0          1             1         2          2   total   0.0        0.0
-4          1             2         2          2   total   0.0        0.0
-8          1             3         2          2   total   0.0        0.0
-12         1             4         2          2   total   0.0        0.0
-16         1             5         2          2   total   0.0        0.0
-20         1             6         2          2   total   0.0        0.0
+    material  delayedgroup  group in  group out nuclide      mean  std. dev.
+3          1             1         1          1   total  0.000000   0.000000
+7          1             2         1          1   total  0.000000   0.000000
+11         1             3         1          1   total  0.000000   0.000000
+15         1             4         1          1   total  0.000207   0.000207
+19         1             5         1          1   total  0.000000   0.000000
+23         1             6         1          1   total  0.000000   0.000000
+2          1             1         1          2   total  0.000000   0.000000
+6          1             2         1          2   total  0.000000   0.000000
+10         1             3         1          2   total  0.000000   0.000000
+14         1             4         1          2   total  0.000000   0.000000
+18         1             5         1          2   total  0.000000   0.000000
+22         1             6         1          2   total  0.000000   0.000000
+1          1             1         2          1   total  0.000000   0.000000
+5          1             2         2          1   total  0.000000   0.000000
+9          1             3         2          1   total  0.000000   0.000000
+13         1             4         2          1   total  0.005002   0.001278
+17         1             5         2          1   total  0.000000   0.000000
+21         1             6         2          1   total  0.000000   0.000000
+0          1             1         2          2   total  0.000000   0.000000
+4          1             2         2          2   total  0.000000   0.000000
+8          1             3         2          2   total  0.000000   0.000000
+12         1             4         2          2   total  0.000000   0.000000
+16         1             5         2          2   total  0.000000   0.000000
+20         1             6         2          2   total  0.000000   0.000000
 total
    material  group in nuclide      mean  std. dev.
-1         2         1   total  0.313574   0.016009
-0         2         2   total  0.300858   0.005911
+1         2         1   total  0.320478   0.012201
+0         2         2   total  0.300681   0.029685
 transport
    material  group in nuclide      mean  std. dev.
-1         2         1   total  0.266154   0.017348
-0         2         2   total  0.300597   0.011062
+1         2         1   total  0.267653   0.015887
+0         2         2   total  0.327250   0.035614
 nu-transport
    material  group in nuclide      mean  std. dev.
-1         2         1   total  0.266154   0.017348
-0         2         2   total  0.300597   0.011062
+1         2         1   total  0.267653   0.015887
+0         2         2   total  0.327250   0.035614
 absorption
-   material  group in nuclide     mean  std. dev.
-1         2         1   total  0.00150   0.000118
-0         2         2   total  0.00542   0.000201
+   material  group in nuclide      mean  std. dev.
+1         2         1   total  0.001040   0.000121
+0         2         2   total  0.005284   0.000548
 reduced absorption
    material  group in nuclide      mean  std. dev.
-1         2         1   total  0.001481   0.000119
-0         2         2   total  0.005420   0.000201
+1         2         1   total  0.001040   0.000121
+0         2         2   total  0.005284   0.000548
 capture
-   material  group in nuclide     mean  std. dev.
-1         2         1   total  0.00150   0.000118
-0         2         2   total  0.00542   0.000201
+   material  group in nuclide      mean  std. dev.
+1         2         1   total  0.001040   0.000121
+0         2         2   total  0.005284   0.000548
 fission
    material  group in nuclide  mean  std. dev.
 1         2         1   total   0.0        0.0
@@ -342,18 +342,18 @@ kappa-fission
 0         2         2   total   0.0        0.0
 scatter
    material  group in nuclide      mean  std. dev.
-1         2         1   total  0.312074   0.015934
-0         2         2   total  0.295438   0.005743
+1         2         1   total  0.319438   0.012181
+0         2         2   total  0.295397   0.029142
 nu-scatter
    material  group in nuclide      mean  std. dev.
-1         2         1   total  0.318594   0.023203
-0         2         2   total  0.295662   0.031486
+1         2         1   total  0.314727   0.014272
+0         2         2   total  0.295807   0.038170
 scatter matrix
     material  group in  group out legendre nuclide      mean  std. dev.
-12         2         1          1       P0   total  0.318594   0.023203
-13         2         1          1       P1   total  0.047420   0.006684
-14         2         1          1       P2   total  0.029426   0.008048
-15         2         1          1       P3   total  0.007335   0.004092
+12         2         1          1       P0   total  0.314727   0.014272
+13         2         1          1       P1   total  0.052826   0.010175
+14         2         1          1       P2   total  0.033176   0.002264
+15         2         1          1       P3   total  0.006129   0.004317
 8          2         1          2       P0   total  0.000000   0.000000
 9          2         1          2       P1   total  0.000000   0.000000
 10         2         1          2       P2   total  0.000000   0.000000
@@ -362,16 +362,16 @@ scatter matrix
 5          2         2          1       P1   total  0.000000   0.000000
 6          2         2          1       P2   total  0.000000   0.000000
 7          2         2          1       P3   total  0.000000   0.000000
-0          2         2          2       P0   total  0.295662   0.031486
-1          2         2          2       P1   total  0.000261   0.009350
-2          2         2          2       P2   total -0.004912   0.007866
-3          2         2          2       P3   total -0.018278   0.012339
+0          2         2          2       P0   total  0.295807   0.038170
+1          2         2          2       P1   total -0.026569   0.019676
+2          2         2          2       P2   total -0.005395   0.007578
+3          2         2          2       P3   total -0.005680   0.012737
 nu-scatter matrix
     material  group in  group out legendre nuclide      mean  std. dev.
-12         2         1          1       P0   total  0.318594   0.023203
-13         2         1          1       P1   total  0.047420   0.006684
-14         2         1          1       P2   total  0.029426   0.008048
-15         2         1          1       P3   total  0.007335   0.004092
+12         2         1          1       P0   total  0.314727   0.014272
+13         2         1          1       P1   total  0.052826   0.010175
+14         2         1          1       P2   total  0.033176   0.002264
+15         2         1          1       P3   total  0.006129   0.004317
 8          2         1          2       P0   total  0.000000   0.000000
 9          2         1          2       P1   total  0.000000   0.000000
 10         2         1          2       P2   total  0.000000   0.000000
@@ -380,16 +380,16 @@ nu-scatter matrix
 5          2         2          1       P1   total  0.000000   0.000000
 6          2         2          1       P2   total  0.000000   0.000000
 7          2         2          1       P3   total  0.000000   0.000000
-0          2         2          2       P0   total  0.295662   0.031486
-1          2         2          2       P1   total  0.000261   0.009350
-2          2         2          2       P2   total -0.004912   0.007866
-3          2         2          2       P3   total -0.018278   0.012339
+0          2         2          2       P0   total  0.295807   0.038170
+1          2         2          2       P1   total -0.026569   0.019676
+2          2         2          2       P2   total -0.005395   0.007578
+3          2         2          2       P3   total -0.005680   0.012737
 multiplicity matrix
    material  group in  group out nuclide  mean  std. dev.
-3         2         1          1   total   1.0   0.071770
+3         2         1          1   total   1.0   0.043852
 2         2         1          2   total   0.0   0.000000
 1         2         2          1   total   0.0   0.000000
-0         2         2          2   total   1.0   0.103652
+0         2         2          2   total   1.0   0.139361
 nu-fission matrix
    material  group in  group out nuclide  mean  std. dev.
 3         2         1          1   total   0.0        0.0
@@ -398,16 +398,16 @@ nu-fission matrix
 0         2         2          2   total   0.0        0.0
 scatter probability matrix
    material  group in  group out nuclide  mean  std. dev.
-3         2         1          1   total   1.0   0.071770
+3         2         1          1   total   1.0   0.043852
 2         2         1          2   total   0.0   0.000000
 1         2         2          1   total   0.0   0.000000
-0         2         2          2   total   1.0   0.103652
+0         2         2          2   total   1.0   0.139361
 consistent scatter matrix
     material  group in  group out legendre nuclide      mean  std. dev.
-12         2         1          1       P0   total  0.312074   0.027487
-13         2         1          1       P1   total  0.046450   0.006939
-14         2         1          1       P2   total  0.028824   0.008012
-15         2         1          1       P3   total  0.007185   0.004024
+12         2         1          1       P0   total  0.319438   0.018563
+13         2         1          1       P1   total  0.053616   0.010510
+14         2         1          1       P2   total  0.033673   0.002604
+15         2         1          1       P3   total  0.006221   0.004387
 8          2         1          2       P0   total  0.000000   0.000000
 9          2         1          2       P1   total  0.000000   0.000000
 10         2         1          2       P2   total  0.000000   0.000000
@@ -416,16 +416,16 @@ consistent scatter matrix
 5          2         2          1       P1   total  0.000000   0.000000
 6          2         2          1       P2   total  0.000000   0.000000
 7          2         2          1       P3   total  0.000000   0.000000
-0          2         2          2       P0   total  0.295438   0.031157
-1          2         2          2       P1   total  0.000261   0.009343
-2          2         2          2       P2   total -0.004909   0.007859
-3          2         2          2       P3   total -0.018264   0.012327
+0          2         2          2       P0   total  0.295397   0.050438
+1          2         2          2       P1   total -0.026532   0.019872
+2          2         2          2       P2   total -0.005388   0.007591
+3          2         2          2       P3   total -0.005672   0.012735
 consistent nu-scatter matrix
     material  group in  group out legendre nuclide      mean  std. dev.
-12         2         1          1       P0   total  0.312074   0.035456
-13         2         1          1       P1   total  0.046450   0.007699
-14         2         1          1       P2   total  0.028824   0.008274
-15         2         1          1       P3   total  0.007185   0.004057
+12         2         1          1       P0   total  0.319438   0.023255
+13         2         1          1       P1   total  0.053616   0.010769
+14         2         1          1       P2   total  0.033673   0.002993
+15         2         1          1       P3   total  0.006221   0.004396
 8          2         1          2       P0   total  0.000000   0.000000
 9          2         1          2       P1   total  0.000000   0.000000
 10         2         1          2       P2   total  0.000000   0.000000
@@ -434,10 +434,10 @@ consistent nu-scatter matrix
 5          2         2          1       P1   total  0.000000   0.000000
 6          2         2          1       P2   total  0.000000   0.000000
 7          2         2          1       P3   total  0.000000   0.000000
-0          2         2          2       P0   total  0.295438   0.043686
-1          2         2          2       P1   total  0.000261   0.009343
-2          2         2          2       P2   total -0.004909   0.007876
-3          2         2          2       P3   total -0.018264   0.012471
+0          2         2          2       P0   total  0.295397   0.065105
+1          2         2          2       P1   total -0.026532   0.020213
+2          2         2          2       P2   total -0.005388   0.007628
+3          2         2          2       P3   total -0.005672   0.012759
 chi
    material  group out nuclide  mean  std. dev.
 1         2          1   total   0.0        0.0
@@ -448,8 +448,8 @@ chi-prompt
 0         2          2   total   0.0        0.0
 inverse-velocity
    material  group in nuclide          mean     std. dev.
-1         2         1   total  6.076563e-08  2.727519e-09
-0         2         2   total  2.996176e-06  1.110139e-07
+1         2         1   total  6.068670e-08  4.861582e-09
+0         2         2   total  2.921021e-06  3.028269e-07
 prompt-nu-fission
    material  group in nuclide  mean  std. dev.
 1         2         1   total   0.0        0.0
@@ -462,72 +462,72 @@ prompt-nu-fission matrix
 0         2         2          2   total   0.0        0.0
 diffusion-coefficient
    material  group in nuclide      mean  std. dev.
-1         2         1   total  1.252406   0.081631
-0         2         2   total  1.108904   0.040809
+1         2         1   total  1.245396   0.073923
+0         2         2   total  1.018589   0.110853
 nu-diffusion-coefficient
    material  group in nuclide      mean  std. dev.
-1         2         1   total  1.252406   0.081631
-0         2         2   total  1.108904   0.040809
+1         2         1   total  1.245396   0.073923
+0         2         2   total  1.018589   0.110853
 (n,elastic)
    material  group in nuclide      mean  std. dev.
-1         2         1   total  0.302664   0.015531
-0         2         2   total  0.295438   0.005743
+1         2         1   total  0.310592   0.012188
+0         2         2   total  0.295397   0.029142
 (n,level)
    material  group in nuclide  mean  std. dev.
 1         2         1   total   0.0        0.0
 0         2         2   total   0.0        0.0
 (n,2n)
-   material  group in nuclide      mean  std. dev.
-1         2         1   total  0.000019   0.000017
-0         2         2   total  0.000000   0.000000
+   material  group in nuclide  mean  std. dev.
+1         2         1   total   0.0        0.0
+0         2         2   total   0.0        0.0
 (n,na)
    material  group in nuclide          mean     std. dev.
-1         2         1   total  4.892570e-09  4.436228e-09
+1         2         1   total  2.157338e-13  1.864239e-13
 0         2         2   total  0.000000e+00  0.000000e+00
 (n,nc)
-   material  group in nuclide      mean  std. dev.
-1         2         1   total  0.001998   0.000408
-0         2         2   total  0.000000   0.000000
+   material  group in nuclide     mean  std. dev.
+1         2         1   total  0.00187   0.000152
+0         2         2   total  0.00000   0.000000
 (n,gamma)
    material  group in nuclide      mean  std. dev.
-1         2         1   total  0.001497   0.000118
-0         2         2   total  0.005419   0.000201
+1         2         1   total  0.001038   0.000121
+0         2         2   total  0.005283   0.000548
 (n,a)
    material  group in nuclide          mean     std. dev.
-1         2         1   total  9.546292e-07  9.180854e-08
-0         2         2   total  2.736059e-07  5.318732e-09
+1         2         1   total  7.402079e-07  3.197538e-08
+0         2         2   total  2.735682e-07  2.698845e-08
 (n,Xa)
    material  group in nuclide          mean     std. dev.
-1         2         1   total  9.595218e-07  9.558005e-08
-0         2         2   total  2.736059e-07  5.318732e-09
+1         2         1   total  7.402081e-07  3.197534e-08
+0         2         2   total  2.735682e-07  2.698845e-08
 heating
    material  group in nuclide         mean   std. dev.
-1         2         1   total  2551.878627  212.765665
-0         2         2   total     2.332139    0.087384
+1         2         1   total  2479.710231  157.161879
+0         2         2   total     2.314706    0.265682
 damage-energy
-   material  group in nuclide         mean   std. dev.
-1         2         1   total  1585.677533  130.382718
-0         2         2   total     0.295108    0.010079
+   material  group in nuclide         mean  std. dev.
+1         2         1   total  1566.139383  61.602407
+0         2         2   total     0.288739   0.029698
 (n,n1)
    material  group in nuclide      mean  std. dev.
-1         2         1   total  0.002835   0.000246
+1         2         1   total  0.002897   0.000181
 0         2         2   total  0.000000   0.000000
 (n,a0)
    material  group in nuclide          mean     std. dev.
-1         2         1   total  7.169006e-07  6.251188e-08
-0         2         2   total  2.733303e-07  5.313375e-09
+1         2         1   total  6.646569e-07  2.959064e-08
+0         2         2   total  2.732927e-07  2.696126e-08
 (n,nc) matrix
    material  group in  group out nuclide      mean  std. dev.
-3         2         1          1   total  0.001489   0.001491
+3         2         1          1   total  0.000488   0.000488
 2         2         1          2   total  0.000000   0.000000
 1         2         2          1   total  0.000000   0.000000
 0         2         2          2   total  0.000000   0.000000
 (n,n1) matrix
-   material  group in  group out nuclide      mean  std. dev.
-3         2         1          1   total  0.001985   0.000507
-2         2         1          2   total  0.000000   0.000000
-1         2         2          1   total  0.000000   0.000000
-0         2         2          2   total  0.000000   0.000000
+   material  group in  group out nuclide     mean  std. dev.
+3         2         1          1   total  0.00244   0.001094
+2         2         1          2   total  0.00000   0.000000
+1         2         2          1   total  0.00000   0.000000
+0         2         2          2   total  0.00000   0.000000
 (n,2n) matrix
    material  group in  group out nuclide  mean  std. dev.
 3         2         1          1   total   0.0        0.0
@@ -612,28 +612,28 @@ delayed-nu-fission matrix
 20         2             6         2          2   total   0.0        0.0
 total
    material  group in nuclide      mean  std. dev.
-1         3         1   total  0.682896   0.024140
-0         3         2   total  2.032938   0.085675
+1         3         1   total  0.692034   0.019973
+0         3         2   total  2.033425   0.189463
 transport
    material  group in nuclide      mean  std. dev.
-1         3         1   total  0.298986   0.026905
-0         3         2   total  1.471887   0.096907
+1         3         1   total  0.298754   0.021602
+0         3         2   total  1.459465   0.197868
 nu-transport
    material  group in nuclide      mean  std. dev.
-1         3         1   total  0.298986   0.026905
-0         3         2   total  1.471887   0.096907
+1         3         1   total  0.298754   0.021602
+0         3         2   total  1.459465   0.197868
 absorption
    material  group in nuclide      mean  std. dev.
-1         3         1   total  0.000693   0.000020
-0         3         2   total  0.031171   0.001403
+1         3         1   total  0.000699   0.000035
+0         3         2   total  0.031056   0.003017
 reduced absorption
    material  group in nuclide      mean  std. dev.
-1         3         1   total  0.000693   0.000020
-0         3         2   total  0.031171   0.001403
+1         3         1   total  0.000699   0.000035
+0         3         2   total  0.031056   0.003017
 capture
    material  group in nuclide      mean  std. dev.
-1         3         1   total  0.000693   0.000020
-0         3         2   total  0.031171   0.001403
+1         3         1   total  0.000699   0.000035
+0         3         2   total  0.031056   0.003017
 fission
    material  group in nuclide  mean  std. dev.
 1         3         1   total   0.0        0.0
@@ -648,54 +648,54 @@ kappa-fission
 0         3         2   total   0.0        0.0
 scatter
    material  group in nuclide      mean  std. dev.
-1         3         1   total  0.682202   0.024123
-0         3         2   total  2.001768   0.084281
+1         3         1   total  0.691336   0.019945
+0         3         2   total  2.002368   0.186454
 nu-scatter
    material  group in nuclide      mean  std. dev.
-1         3         1   total  0.672567   0.017434
-0         3         2   total  2.004576   0.129211
+1         3         1   total  0.684356   0.011639
+0         3         2   total  1.990840   0.178205
 scatter matrix
     material  group in  group out legendre nuclide      mean  std. dev.
-12         3         1          1       P0   total  0.641741   0.016600
-13         3         1          1       P1   total  0.383841   0.011878
-14         3         1          1       P2   total  0.149909   0.005512
-15         3         1          1       P3   total  0.004238   0.002485
-8          3         1          2       P0   total  0.030826   0.000973
-9          3         1          2       P1   total  0.009943   0.000415
-10         3         1          2       P2   total -0.003002   0.000628
-11         3         1          2       P3   total -0.004234   0.000393
-4          3         2          1       P0   total  0.000467   0.000467
-5          3         2          1       P1   total  0.000345   0.000345
-6          3         2          1       P2   total  0.000149   0.000149
-7          3         2          1       P3   total -0.000047   0.000047
-0          3         2          2       P0   total  2.004109   0.129225
-1          3         2          2       P1   total  0.511363   0.043448
-2          3         2          2       P2   total  0.108599   0.014070
-3          3         2          2       P3   total  0.035733   0.021921
+12         3         1          1       P0   total  0.652706   0.011111
+13         3         1          1       P1   total  0.393203   0.008164
+14         3         1          1       P2   total  0.162146   0.003332
+15         3         1          1       P3   total  0.014967   0.004773
+8          3         1          2       P0   total  0.031650   0.000613
+9          3         1          2       P1   total  0.009845   0.000647
+10         3         1          2       P2   total -0.003284   0.000758
+11         3         1          2       P3   total -0.003971   0.000187
+4          3         2          1       P0   total  0.000474   0.000475
+5          3         2          1       P1   total  0.000396   0.000397
+6          3         2          1       P2   total  0.000260   0.000261
+7          3         2          1       P3   total  0.000099   0.000099
+0          3         2          2       P0   total  1.990366   0.178042
+1          3         2          2       P1   total  0.523546   0.053239
+2          3         2          2       P2   total  0.101180   0.015832
+3          3         2          2       P3   total  0.017873   0.005685
 nu-scatter matrix
     material  group in  group out legendre nuclide      mean  std. dev.
-12         3         1          1       P0   total  0.641741   0.016600
-13         3         1          1       P1   total  0.383841   0.011878
-14         3         1          1       P2   total  0.149909   0.005512
-15         3         1          1       P3   total  0.004238   0.002485
-8          3         1          2       P0   total  0.030826   0.000973
-9          3         1          2       P1   total  0.009943   0.000415
-10         3         1          2       P2   total -0.003002   0.000628
-11         3         1          2       P3   total -0.004234   0.000393
-4          3         2          1       P0   total  0.000467   0.000467
-5          3         2          1       P1   total  0.000345   0.000345
-6          3         2          1       P2   total  0.000149   0.000149
-7          3         2          1       P3   total -0.000047   0.000047
-0          3         2          2       P0   total  2.004109   0.129225
-1          3         2          2       P1   total  0.511363   0.043448
-2          3         2          2       P2   total  0.108599   0.014070
-3          3         2          2       P3   total  0.035733   0.021921
+12         3         1          1       P0   total  0.652706   0.011111
+13         3         1          1       P1   total  0.393203   0.008164
+14         3         1          1       P2   total  0.162146   0.003332
+15         3         1          1       P3   total  0.014967   0.004773
+8          3         1          2       P0   total  0.031650   0.000613
+9          3         1          2       P1   total  0.009845   0.000647
+10         3         1          2       P2   total -0.003284   0.000758
+11         3         1          2       P3   total -0.003971   0.000187
+4          3         2          1       P0   total  0.000474   0.000475
+5          3         2          1       P1   total  0.000396   0.000397
+6          3         2          1       P2   total  0.000260   0.000261
+7          3         2          1       P3   total  0.000099   0.000099
+0          3         2          2       P0   total  1.990366   0.178042
+1          3         2          2       P1   total  0.523546   0.053239
+2          3         2          2       P2   total  0.101180   0.015832
+3          3         2          2       P3   total  0.017873   0.005685
 multiplicity matrix
    material  group in  group out nuclide  mean  std. dev.
-3         3         1          1   total   1.0   0.022200
-2         3         1          2   total   1.0   0.033880
+3         3         1          1   total   1.0   0.020267
+2         3         1          2   total   1.0   0.024112
 1         3         2          1   total   1.0   1.414214
-0         3         2          2   total   1.0   0.066922
+0         3         2          2   total   1.0   0.093189
 nu-fission matrix
    material  group in  group out nuclide  mean  std. dev.
 3         3         1          1   total   0.0        0.0
@@ -704,46 +704,46 @@ nu-fission matrix
 0         3         2          2   total   0.0        0.0
 scatter probability matrix
    material  group in  group out nuclide      mean  std. dev.
-3         3         1          1   total  0.954167   0.020729
-2         3         1          2   total  0.045833   0.001296
-1         3         2          1   total  0.000233   0.000233
-0         3         2          2   total  0.999767   0.066899
+3         3         1          1   total  0.953753   0.018903
+2         3         1          2   total  0.046247   0.001011
+1         3         2          1   total  0.000238   0.000239
+0         3         2          2   total  0.999762   0.093156
 consistent scatter matrix
     material  group in  group out legendre nuclide      mean  std. dev.
-12         3         1          1       P0   total  0.650935   0.027014
-13         3         1          1       P1   total  0.389340   0.017459
-14         3         1          1       P2   total  0.152056   0.007457
-15         3         1          1       P3   total  0.004299   0.002525
-8          3         1          2       P0   total  0.031268   0.001416
-9          3         1          2       P1   total  0.010085   0.000533
-10         3         1          2       P2   total -0.003045   0.000645
-11         3         1          2       P3   total -0.004295   0.000423
-4          3         2          1       P0   total  0.000466   0.000467
-5          3         2          1       P1   total  0.000344   0.000345
-6          3         2          1       P2   total  0.000148   0.000149
-7          3         2          1       P3   total -0.000047   0.000047
-0          3         2          2       P0   total  2.001301   0.158219
-1          3         2          2       P1   total  0.510647   0.049275
-2          3         2          2       P2   total  0.108446   0.014900
-3          3         2          2       P3   total  0.035683   0.021951
+12         3         1          1       P0   total  0.659363   0.023079
+13         3         1          1       P1   total  0.397213   0.014683
+14         3         1          1       P2   total  0.163800   0.006035
+15         3         1          1       P3   total  0.015120   0.004843
+8          3         1          2       P0   total  0.031973   0.001157
+9          3         1          2       P1   total  0.009945   0.000721
+10         3         1          2       P2   total -0.003318   0.000772
+11         3         1          2       P3   total -0.004011   0.000225
+4          3         2          1       P0   total  0.000477   0.000480
+5          3         2          1       P1   total  0.000399   0.000401
+6          3         2          1       P2   total  0.000262   0.000264
+7          3         2          1       P3   total  0.000099   0.000100
+0          3         2          2       P0   total  2.001892   0.263710
+1          3         2          2       P1   total  0.526577   0.073894
+2          3         2          2       P2   total  0.101766   0.018719
+3          3         2          2       P3   total  0.017976   0.005976
 consistent nu-scatter matrix
     material  group in  group out legendre nuclide      mean  std. dev.
-12         3         1          1       P0   total  0.650935   0.030637
-13         3         1          1       P1   total  0.389340   0.019481
-14         3         1          1       P2   total  0.152056   0.008185
-15         3         1          1       P3   total  0.004299   0.002526
-8          3         1          2       P0   total  0.031268   0.001768
-9          3         1          2       P1   total  0.010085   0.000633
-10         3         1          2       P2   total -0.003045   0.000653
-11         3         1          2       P3   total -0.004295   0.000447
-4          3         2          1       P0   total  0.000466   0.000808
-5          3         2          1       P1   total  0.000344   0.000597
-6          3         2          1       P2   total  0.000148   0.000257
-7          3         2          1       P3   total -0.000047   0.000081
-0          3         2          2       P0   total  2.001301   0.207294
-1          3         2          2       P1   total  0.510647   0.059966
-2          3         2          2       P2   total  0.108446   0.016574
-3          3         2          2       P3   total  0.035683   0.022080
+12         3         1          1       P0   total  0.659363   0.026669
+13         3         1          1       P1   total  0.397213   0.016746
+14         3         1          1       P2   total  0.163800   0.006888
+15         3         1          1       P3   total  0.015120   0.004853
+8          3         1          2       P0   total  0.031973   0.001391
+9          3         1          2       P1   total  0.009945   0.000759
+10         3         1          2       P2   total -0.003318   0.000776
+11         3         1          2       P3   total -0.004011   0.000245
+4          3         2          1       P0   total  0.000477   0.000827
+5          3         2          1       P1   total  0.000399   0.000692
+6          3         2          1       P2   total  0.000262   0.000455
+7          3         2          1       P3   total  0.000099   0.000172
+0          3         2          2       P0   total  2.001892   0.323026
+1          3         2          2       P1   total  0.526577   0.088703
+2          3         2          2       P2   total  0.101766   0.020985
+3          3         2          2       P3   total  0.017976   0.006207
 chi
    material  group out nuclide  mean  std. dev.
 1         3          1   total   0.0        0.0
@@ -754,8 +754,8 @@ chi-prompt
 0         3          2   total   0.0        0.0
 inverse-velocity
    material  group in nuclide          mean     std. dev.
-1         3         1   total  6.023693e-08  1.678511e-09
-0         3         2   total  2.995346e-06  1.347817e-07
+1         3         1   total  6.187551e-08  3.945367e-09
+0         3         2   total  2.984343e-06  2.898715e-07
 prompt-nu-fission
    material  group in nuclide  mean  std. dev.
 1         3         1   total   0.0        0.0
@@ -768,60 +768,60 @@ prompt-nu-fission matrix
 0         3         2          2   total   0.0        0.0
 diffusion-coefficient
    material  group in nuclide      mean  std. dev.
-1         3         1   total  1.114881   0.100326
-0         3         2   total  0.226467   0.014910
+1         3         1   total  1.115746   0.080676
+0         3         2   total  0.228394   0.030965
 nu-diffusion-coefficient
    material  group in nuclide      mean  std. dev.
-1         3         1   total  1.114881   0.100326
-0         3         2   total  0.226467   0.014910
+1         3         1   total  1.115746   0.080676
+0         3         2   total  0.228394   0.030965
 (n,elastic)
    material  group in nuclide      mean  std. dev.
-1         3         1   total  0.682168   0.024125
-0         3         2   total  2.001768   0.084281
+1         3         1   total  0.691333   0.019945
+0         3         2   total  2.002368   0.186454
 (n,level)
    material  group in nuclide      mean  std. dev.
-1         3         1   total  0.000033   0.000019
+1         3         1   total  0.000003   0.000002
 0         3         2   total  0.000000   0.000000
 (n,2n)
    material  group in nuclide  mean  std. dev.
 1         3         1   total   0.0        0.0
 0         3         2   total   0.0        0.0
 (n,na)
-   material  group in nuclide          mean     std. dev.
-1         3         1   total  9.967562e-07  9.970492e-07
-0         3         2   total  0.000000e+00  0.000000e+00
+   material  group in nuclide  mean  std. dev.
+1         3         1   total   0.0        0.0
+0         3         2   total   0.0        0.0
 (n,nc)
-   material  group in nuclide          mean     std. dev.
-1         3         1   total  8.867935e-07  8.870902e-07
-0         3         2   total  0.000000e+00  0.000000e+00
+   material  group in nuclide  mean  std. dev.
+1         3         1   total   0.0        0.0
+0         3         2   total   0.0        0.0
 (n,gamma)
    material  group in nuclide      mean  std. dev.
-1         3         1   total  0.000219   0.000006
-0         3         2   total  0.010855   0.000488
+1         3         1   total  0.000225   0.000014
+0         3         2   total  0.010815   0.001050
 (n,a)
    material  group in nuclide      mean  std. dev.
-1         3         1   total  0.000474   0.000015
-0         3         2   total  0.020316   0.000914
+1         3         1   total  0.000474   0.000021
+0         3         2   total  0.020241   0.001966
 (n,Xa)
    material  group in nuclide      mean  std. dev.
-1         3         1   total  0.000475   0.000015
-0         3         2   total  0.020316   0.000914
+1         3         1   total  0.000474   0.000021
+0         3         2   total  0.020242   0.001966
 heating
    material  group in nuclide          mean    std. dev.
-1         3         1   total  77986.174023  6103.108384
-0         3         2   total  59060.658662  3576.641806
+1         3         1   total  74978.139095  3970.725596
+0         3         2   total  58539.697122  6443.645451
 damage-energy
    material  group in nuclide         mean  std. dev.
-1         3         1   total  1107.847239  59.901669
-0         3         2   total   331.691439  14.926212
+1         3         1   total  1161.596397  41.187452
+0         3         2   total   330.473159  32.100259
 (n,n1)
-   material  group in nuclide      mean     std. dev.
-1         3         1   total  0.000001  3.988839e-07
-0         3         2   total  0.000000  0.000000e+00
+   material  group in nuclide          mean     std. dev.
+1         3         1   total  2.912377e-07  3.897408e-08
+0         3         2   total  0.000000e+00  0.000000e+00
 (n,a0)
    material  group in nuclide      mean  std. dev.
-1         3         1   total  0.000084   0.000016
-0         3         2   total  0.001278   0.000058
+1         3         1   total  0.000082   0.000009
+0         3         2   total  0.001273   0.000124
 (n,nc) matrix
    material  group in  group out nuclide  mean  std. dev.
 3         3         1          1   total   0.0        0.0
diff --git a/tests/regression_tests/mgxs_library_nuclides/results_true.dat b/tests/regression_tests/mgxs_library_nuclides/results_true.dat
index c2188997d..c05ec9b48 100644
--- a/tests/regression_tests/mgxs_library_nuclides/results_true.dat
+++ b/tests/regression_tests/mgxs_library_nuclides/results_true.dat
@@ -1 +1 @@
-4ae3b5a70ad72b1be261aee3ab19e0261d1c12f4d4ca50b712d1ba76041bd5387c69fa9fa326619ad588db206cd9aaf464b0025d71ea9b8b1137af0102bca87f
\ No newline at end of file
+d1e4ab2c0d85bb5da617db9c7a3731494114e2fd3ba75ae8eaa1f0a36648f73fcbcfb487390789b0124719cabdcbfa84af4bb118f11bdc548d1065e1b5af836a
\ No newline at end of file
diff --git a/tests/regression_tests/mgxs_library_specific_nuclides/results_true.dat b/tests/regression_tests/mgxs_library_specific_nuclides/results_true.dat
index eaf56b966..0c44eb132 100644
--- a/tests/regression_tests/mgxs_library_specific_nuclides/results_true.dat
+++ b/tests/regression_tests/mgxs_library_specific_nuclides/results_true.dat
@@ -1 +1 @@
-08d5c199c51496f86fdd739bf7ee0e143a9a159da0f4d364ec970557e5c1fc92a202d906dcae91812e665fd2e88dd7db1e4913ef6b91f456f23b52093c83f483
\ No newline at end of file
+efcd9fd6be2ed6c98bbe5279cbacdb287597fcbbc4ed49e164b07e0861f28877b1bef2ad82d70fdac95965f7ed0d0990f77c8545718836b1b55a16b4243208d0
\ No newline at end of file
diff --git a/tests/regression_tests/microxs/test_reference_materials_direct.csv b/tests/regression_tests/microxs/test_reference_materials_direct.csv
index 3259d0151..4a63fed85 100644
--- a/tests/regression_tests/microxs/test_reference_materials_direct.csv
+++ b/tests/regression_tests/microxs/test_reference_materials_direct.csv
@@ -1,7 +1,7 @@
 nuclides,reactions,groups,xs
-U235,"(n,gamma)",1,0.14765501510184456
-U235,fission,1,1.2517200956290817
-O16,"(n,gamma)",1,0.00010872314985710938
+U235,"(n,gamma)",1,0.1475718536187164
+U235,fission,1,1.2504996049257149
+O16,"(n,gamma)",1,0.00010981236259441559
 O16,fission,1,0.0
-Xe135,"(n,gamma)",1,0.014333667335215764
+Xe135,"(n,gamma)",1,0.014570546772870611
 Xe135,fission,1,0.0
diff --git a/tests/regression_tests/microxs/test_reference_materials_flux.csv b/tests/regression_tests/microxs/test_reference_materials_flux.csv
index 5023e0d0e..5eb29902e 100644
--- a/tests/regression_tests/microxs/test_reference_materials_flux.csv
+++ b/tests/regression_tests/microxs/test_reference_materials_flux.csv
@@ -1,7 +1,7 @@
 nuclides,reactions,groups,xs
-U235,"(n,gamma)",1,0.15018326758942505
-U235,fission,1,1.2603151141390958
-O16,"(n,gamma)",1,0.00012159621938463765
+U235,"(n,gamma)",1,0.15003016703758473
+U235,fission,1,1.2646269005413537
+O16,"(n,gamma)",1,0.00012069778439640301
 O16,fission,1,0.0
-Xe135,"(n,gamma)",1,0.015180177095633546
+Xe135,"(n,gamma)",1,0.014820264774863562
 Xe135,fission,1,0.0
diff --git a/tests/regression_tests/microxs/test_reference_mesh_direct.csv b/tests/regression_tests/microxs/test_reference_mesh_direct.csv
index bd07a3237..60160ee51 100644
--- a/tests/regression_tests/microxs/test_reference_mesh_direct.csv
+++ b/tests/regression_tests/microxs/test_reference_mesh_direct.csv
@@ -1,7 +1,7 @@
 nuclides,reactions,groups,xs
-U235,"(n,gamma)",1,0.14765501510184456
-U235,fission,1,1.2517200956290815
-O16,"(n,gamma)",1,0.00010872314985710936
+U235,"(n,gamma)",1,0.14757185361871633
+U235,fission,1,1.2504996049257142
+O16,"(n,gamma)",1,0.0001098123625944155
 O16,fission,1,0.0
-Xe135,"(n,gamma)",1,0.014333667335215761
+Xe135,"(n,gamma)",1,0.0145705467728706
 Xe135,fission,1,0.0
diff --git a/tests/regression_tests/microxs/test_reference_mesh_flux.csv b/tests/regression_tests/microxs/test_reference_mesh_flux.csv
index d946ada80..5eb29902e 100644
--- a/tests/regression_tests/microxs/test_reference_mesh_flux.csv
+++ b/tests/regression_tests/microxs/test_reference_mesh_flux.csv
@@ -1,7 +1,7 @@
 nuclides,reactions,groups,xs
-U235,"(n,gamma)",1,0.15018326758942507
-U235,fission,1,1.2603151141390958
-O16,"(n,gamma)",1,0.00012159621938463766
+U235,"(n,gamma)",1,0.15003016703758473
+U235,fission,1,1.2646269005413537
+O16,"(n,gamma)",1,0.00012069778439640301
 O16,fission,1,0.0
-Xe135,"(n,gamma)",1,0.015180177095633546
+Xe135,"(n,gamma)",1,0.014820264774863562
 Xe135,fission,1,0.0
diff --git a/tests/regression_tests/multipole/results_true.dat b/tests/regression_tests/multipole/results_true.dat
index 8eb75b894..40b42b1a0 100644
--- a/tests/regression_tests/multipole/results_true.dat
+++ b/tests/regression_tests/multipole/results_true.dat
@@ -1,36 +1,36 @@
 k-combined:
-1.354889E+00 8.437211E-03
+1.315804E+00 7.070811E-02
 tally 1:
-3.869969E+00
-3.000421E+00
-2.800393E+00
-1.570851E+00
-5.399091E-01
-5.842233E-02
-4.577147E-01
-4.203362E-02
+3.840178E+00
+2.953217E+00
+2.769369E+00
+1.535605E+00
+5.400560E-01
+5.840168E-02
+4.595308E-01
+4.237758E-02
 0.000000E+00
 0.000000E+00
-2.286465E+01
-1.045869E+02
+2.283789E+01
+1.044032E+02
 0.000000E+00
 0.000000E+00
-6.971793E-04
-9.724819E-08
-2.283955E+01
-1.043576E+02
-4.659256E-06
-2.170865E-11
-3.663230E+02
-2.685383E+04
-2.800393E+00
-1.570851E+00
-2.204999E+00
-9.728014E-01
-3.612213E+02
-2.611152E+04
-4.659256E-06
-2.170865E-11
+6.960971E-04
+9.704386E-08
+2.281620E+01
+1.042051E+02
+3.667073E-05
+1.048567E-09
+3.655557E+02
+2.676173E+04
+2.769369E+00
+1.535605E+00
+2.199058E+00
+9.681253E-01
+3.604950E+02
+2.602657E+04
+3.667073E-05
+1.048567E-09
 Cell
 	ID             =	11
 	Name           =	
diff --git a/tests/regression_tests/output/results_true.dat b/tests/regression_tests/output/results_true.dat
index bbf03de94..97b997ae6 100644
--- a/tests/regression_tests/output/results_true.dat
+++ b/tests/regression_tests/output/results_true.dat
@@ -1,2 +1,2 @@
 k-combined:
-3.070134E-01 3.900396E-03
+2.940336E-01 7.338463E-04
diff --git a/tests/regression_tests/particle_restart_eigval/results_true.dat b/tests/regression_tests/particle_restart_eigval/results_true.dat
index bd81920ca..3feeb5e74 100644
--- a/tests/regression_tests/particle_restart_eigval/results_true.dat
+++ b/tests/regression_tests/particle_restart_eigval/results_true.dat
@@ -1,16 +1,16 @@
 current batch:
-1.100000E+01
+8.000000E+00
 current generation:
 1.000000E+00
 particle id:
-2.540000E+02
+6.000000E+01
 run mode:
 eigenvalue
 particle weight:
 1.000000E+00
 particle energy:
-2.220048E+06
+2.028153E+06
 particle xyz:
--4.820850E+01 2.432936E+01 4.397668E+01
+-3.678172E+01 -6.073321E+01 2.756488E+01
 particle uvw:
--3.148565E-01 9.184190E-01 2.395245E-01
+-3.284774E-01 -8.920284E-01 3.104639E-01
diff --git a/tests/regression_tests/particle_restart_eigval/settings.xml b/tests/regression_tests/particle_restart_eigval/settings.xml
index 64b1a4dd4..de580e4c4 100644
--- a/tests/regression_tests/particle_restart_eigval/settings.xml
+++ b/tests/regression_tests/particle_restart_eigval/settings.xml
@@ -6,7 +6,7 @@
   <batches>12</batches>
   <inactive>5</inactive>
   <particles>1200</particles>
-
+  <max_lost_particles>1000000</max_lost_particles>
   <source>
     <space type="box">
       <parameters>-10 -10 -5  10  10  5</parameters>
diff --git a/tests/regression_tests/particle_restart_eigval/test.py b/tests/regression_tests/particle_restart_eigval/test.py
index f9d22edb8..bad3f158c 100644
--- a/tests/regression_tests/particle_restart_eigval/test.py
+++ b/tests/regression_tests/particle_restart_eigval/test.py
@@ -2,5 +2,5 @@ from tests.testing_harness import ParticleRestartTestHarness
 
 
 def test_particle_restart_eigval():
-    harness = ParticleRestartTestHarness('particle_11_254.h5')
+    harness = ParticleRestartTestHarness('particle_8_60.h5')
     harness.main()
diff --git a/tests/regression_tests/periodic/results_true.dat b/tests/regression_tests/periodic/results_true.dat
index 2189597e1..626004b16 100644
--- a/tests/regression_tests/periodic/results_true.dat
+++ b/tests/regression_tests/periodic/results_true.dat
@@ -1,2 +1,2 @@
 k-combined:
-1.623300E+00 2.572983E-02
+1.624889E+00 1.108153E-02
diff --git a/tests/regression_tests/periodic_6fold/results_true.dat b/tests/regression_tests/periodic_6fold/results_true.dat
index e60182809..04aa30878 100644
--- a/tests/regression_tests/periodic_6fold/results_true.dat
+++ b/tests/regression_tests/periodic_6fold/results_true.dat
@@ -1,2 +1,2 @@
 k-combined:
-1.858730E+00 6.824588E-03
+1.848492E+00 2.933785E-03
diff --git a/tests/regression_tests/periodic_hex/results_true.dat b/tests/regression_tests/periodic_hex/results_true.dat
index 584089a15..eff00b6e1 100644
--- a/tests/regression_tests/periodic_hex/results_true.dat
+++ b/tests/regression_tests/periodic_hex/results_true.dat
@@ -1,2 +1,2 @@
 k-combined:
-2.284468E+00 2.781588E-02
+2.285622E+00 2.576768E-03
diff --git a/tests/regression_tests/photon_production_fission/results_true.dat b/tests/regression_tests/photon_production_fission/results_true.dat
index b17b3621a..af325d4b0 100644
--- a/tests/regression_tests/photon_production_fission/results_true.dat
+++ b/tests/regression_tests/photon_production_fission/results_true.dat
@@ -1,12 +1,12 @@
 k-combined:
-2.278476E+00 6.220292E-02
+2.297165E+00 1.955494E-02
 tally 1:
-2.664071E+00
-2.369250E+00
+2.696393E+00
+2.423937E+00
 0.000000E+00
 0.000000E+00
-2.664071E+00
-2.369250E+00
+2.696393E+00
+2.423937E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -18,52 +18,52 @@ tally 1:
 0.000000E+00
 0.000000E+00
 tally 2:
-2.640755E+00
-2.326201E+00
-4.245217E+08
-6.012128E+16
+2.672029E+00
+2.380251E+00
+4.288244E+08
+6.130569E+16
 0.000000E+00
 0.000000E+00
-2.640755E+00
-2.326201E+00
-4.245217E+08
-6.012128E+16
+2.672029E+00
+2.380251E+00
+4.288244E+08
+6.130569E+16
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-1.675918E+05
-9.365733E+09
+1.711908E+05
+9.769096E+09
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-1.675918E+05
-9.365733E+09
+1.711908E+05
+9.769096E+09
 0.000000E+00
 0.000000E+00
 tally 3:
-2.657846E+00
-2.354717E+00
-4.245217E+08
-6.012128E+16
+2.649127E+00
+2.339294E+00
+4.288244E+08
+6.130569E+16
 0.000000E+00
 0.000000E+00
-2.657846E+00
-2.354717E+00
-4.245217E+08
-6.012128E+16
+2.649127E+00
+2.339294E+00
+4.288244E+08
+6.130569E+16
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-1.675918E+05
-9.365733E+09
+1.711908E+05
+9.769096E+09
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-1.675918E+05
-9.365733E+09
+1.711908E+05
+9.769096E+09
 0.000000E+00
 0.000000E+00
diff --git a/tests/regression_tests/ptables_off/results_true.dat b/tests/regression_tests/ptables_off/results_true.dat
index 1652088ce..374274862 100644
--- a/tests/regression_tests/ptables_off/results_true.dat
+++ b/tests/regression_tests/ptables_off/results_true.dat
@@ -1,2 +1,2 @@
 k-combined:
-2.978318E-01 1.560055E-03
+2.968228E-01 1.770320E-03
diff --git a/tests/regression_tests/quadric_surfaces/results_true.dat b/tests/regression_tests/quadric_surfaces/results_true.dat
index 382c4241e..6fb569f52 100644
--- a/tests/regression_tests/quadric_surfaces/results_true.dat
+++ b/tests/regression_tests/quadric_surfaces/results_true.dat
@@ -1,2 +1,2 @@
 k-combined:
-1.193830E+00 1.824184E-02
+1.216213E+00 2.789559E-02
diff --git a/tests/regression_tests/random_ray_adjoint_fixed_source/results_true.dat b/tests/regression_tests/random_ray_adjoint_fixed_source/results_true.dat
index 7178e2f11..e9aa9015b 100644
--- a/tests/regression_tests/random_ray_adjoint_fixed_source/results_true.dat
+++ b/tests/regression_tests/random_ray_adjoint_fixed_source/results_true.dat
@@ -6,4 +6,4 @@ tally 2:
 9.482551E+08
 tally 3:
 1.956327E+05
-7.654469E+09
+7.654468E+09
diff --git a/tests/regression_tests/random_ray_auto_convert/infinite_medium/results_true.dat b/tests/regression_tests/random_ray_auto_convert/infinite_medium/results_true.dat
index a0d7fc545..c7584ab64 100644
--- a/tests/regression_tests/random_ray_auto_convert/infinite_medium/results_true.dat
+++ b/tests/regression_tests/random_ray_auto_convert/infinite_medium/results_true.dat
@@ -1,2 +1,2 @@
 k-combined:
-7.796949E-01 1.055316E-02
+7.797820E-01 1.054725E-02
diff --git a/tests/regression_tests/random_ray_auto_convert/material_wise/results_true.dat b/tests/regression_tests/random_ray_auto_convert/material_wise/results_true.dat
index ebf510cfc..d544a27df 100644
--- a/tests/regression_tests/random_ray_auto_convert/material_wise/results_true.dat
+++ b/tests/regression_tests/random_ray_auto_convert/material_wise/results_true.dat
@@ -1,2 +1,2 @@
 k-combined:
-7.375068E-01 7.015839E-03
+7.356667E-01 6.637270E-03
diff --git a/tests/regression_tests/random_ray_auto_convert/stochastic_slab/results_true.dat b/tests/regression_tests/random_ray_auto_convert/stochastic_slab/results_true.dat
index 2f444fad3..75a10a224 100644
--- a/tests/regression_tests/random_ray_auto_convert/stochastic_slab/results_true.dat
+++ b/tests/regression_tests/random_ray_auto_convert/stochastic_slab/results_true.dat
@@ -1,2 +1,2 @@
 k-combined:
-7.499679E-01 8.107614E-03
+7.551716E-01 8.117378E-03
diff --git a/tests/regression_tests/random_ray_diagonal_stabilization/results_true.dat b/tests/regression_tests/random_ray_diagonal_stabilization/results_true.dat
index c6ce6aab9..f27ad46b4 100644
--- a/tests/regression_tests/random_ray_diagonal_stabilization/results_true.dat
+++ b/tests/regression_tests/random_ray_diagonal_stabilization/results_true.dat
@@ -1,2 +1,2 @@
 k-combined:
-7.152917E-01 1.430362E-02
+7.201808E-01 1.506596E-02
diff --git a/tests/regression_tests/random_ray_fixed_source_linear/linear/results_true.dat b/tests/regression_tests/random_ray_fixed_source_linear/linear/results_true.dat
index 2fc08d0a4..e90d6bfdc 100644
--- a/tests/regression_tests/random_ray_fixed_source_linear/linear/results_true.dat
+++ b/tests/regression_tests/random_ray_fixed_source_linear/linear/results_true.dat
@@ -1,6 +1,6 @@
 tally 1:
-2.339085E+00
-2.747304E-01
+2.339086E+00
+2.747305E-01
 tally 2:
 1.089827E-01
 6.069324E-04
diff --git a/tests/regression_tests/random_ray_fixed_source_subcritical/flat/results_true.dat b/tests/regression_tests/random_ray_fixed_source_subcritical/flat/results_true.dat
index 831eac501..4d2fb6c57 100644
--- a/tests/regression_tests/random_ray_fixed_source_subcritical/flat/results_true.dat
+++ b/tests/regression_tests/random_ray_fixed_source_subcritical/flat/results_true.dat
@@ -83,7 +83,7 @@ tally 1:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-1.073356E+02
+1.073355E+02
 4.630895E+02
 1.263975E+01
 6.427678E+00
@@ -107,7 +107,7 @@ tally 1:
 2.388612E-03
 5.941898E-01
 1.414866E-02
-5.319555E+01
+5.319554E+01
 1.134034E+02
 1.967517E-01
 1.551313E-03
@@ -122,7 +122,7 @@ tally 1:
 8.044764E+01
 2.602455E+02
 3.474828E-01
-4.908567E-03
+4.908566E-03
 9.665057E-01
 3.797493E-02
 1.561720E+02
diff --git a/tests/regression_tests/random_ray_fixed_source_subcritical/linear_xy/results_true.dat b/tests/regression_tests/random_ray_fixed_source_subcritical/linear_xy/results_true.dat
index 49813144d..bf602d3e2 100644
--- a/tests/regression_tests/random_ray_fixed_source_subcritical/linear_xy/results_true.dat
+++ b/tests/regression_tests/random_ray_fixed_source_subcritical/linear_xy/results_true.dat
@@ -23,7 +23,7 @@ tally 1:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-5.235812E+01
+5.235813E+01
 1.099243E+02
 0.000000E+00
 0.000000E+00
@@ -72,12 +72,12 @@ tally 1:
 0.000000E+00
 0.000000E+00
 9.495275E+01
-3.613372E+02
+3.613373E+02
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-5.799250E+01
+5.799251E+01
 1.356178E+02
 0.000000E+00
 0.000000E+00
@@ -86,7 +86,7 @@ tally 1:
 1.066414E+02
 4.570291E+02
 1.254014E+01
-6.325640E+00
+6.325641E+00
 3.052020E+01
 3.746918E+01
 4.977302E+01
@@ -107,7 +107,7 @@ tally 1:
 2.371074E-03
 5.920173E-01
 1.404478E-02
-5.299862E+01
+5.299863E+01
 1.125576E+02
 1.959914E-01
 1.539191E-03
@@ -118,11 +118,11 @@ tally 1:
 5.781230E-02
 1.341759E-04
 1.430525E-01
-8.215326E-04
+8.215327E-04
 7.995734E+01
 2.570099E+02
 3.452934E-01
-4.844058E-03
+4.844059E-03
 9.604162E-01
 3.747587E-02
 1.556795E+02
diff --git a/tests/regression_tests/random_ray_halton_samples/results_true.dat b/tests/regression_tests/random_ray_halton_samples/results_true.dat
index 7eb307da0..b62398935 100644
--- a/tests/regression_tests/random_ray_halton_samples/results_true.dat
+++ b/tests/regression_tests/random_ray_halton_samples/results_true.dat
@@ -21,7 +21,7 @@ tally 1:
 3.807294E-03
 2.376683E+00
 1.151027E+00
-8.060902E-02
+8.060903E-02
 1.323179E-03
 1.961862E-01
 7.837693E-03
@@ -109,7 +109,7 @@ tally 1:
 1.195422E-03
 1.864967E-01
 7.080943E-03
-7.105765E+00
+7.105766E+00
 1.025960E+01
 8.287512E-02
 1.396474E-03
@@ -133,9 +133,9 @@ tally 1:
 7.031793E-01
 4.562478E+00
 4.165199E+00
-2.870213E+00
+2.870214E+00
 1.650126E+00
-4.244068E-01
+4.244069E-01
 3.608745E-02
 1.032921E+00
 2.137598E-01
@@ -151,7 +151,7 @@ tally 1:
 1.251254E-03
 1.906210E-01
 7.411654E-03
-7.162706E+00
+7.162707E+00
 1.042515E+01
 8.273831E-02
 1.391799E-03
diff --git a/tests/regression_tests/random_ray_k_eff/results_true.dat b/tests/regression_tests/random_ray_k_eff/results_true.dat
index a21929d53..37eca77f3 100644
--- a/tests/regression_tests/random_ray_k_eff/results_true.dat
+++ b/tests/regression_tests/random_ray_k_eff/results_true.dat
@@ -24,8 +24,8 @@ tally 1:
 7.808142E-02
 1.242278E-03
 1.900346E-01
-7.358490E-03
-7.134948E+00
+7.358491E-03
+7.134949E+00
 1.034824E+01
 8.272647E-02
 1.391871E-03
@@ -41,7 +41,7 @@ tally 1:
 3.449537E+01
 1.764293E-01
 6.225586E-03
-4.907292E-01
+4.907293E-01
 4.816400E-02
 7.567715E+00
 1.145439E+01
@@ -114,7 +114,7 @@ tally 1:
 8.322052E-02
 1.408294E-03
 2.025446E-01
-8.342070E-03
+8.342071E-03
 2.094832E+01
 8.816715E+01
 3.234739E-02
@@ -150,15 +150,15 @@ tally 1:
 7.951819E-02
 1.286690E-03
 1.935314E-01
-7.621556E-03
-7.119586E+00
+7.621557E-03
+7.119587E+00
 1.030023E+01
 8.428175E-02
 1.442931E-03
 2.051274E-01
 8.547243E-03
 2.046758E+01
-8.418767E+01
+8.418768E+01
 3.181946E-02
 2.034766E-04
 7.873502E-02
diff --git a/tests/regression_tests/random_ray_k_eff_mesh/results_true.dat b/tests/regression_tests/random_ray_k_eff_mesh/results_true.dat
index 535db3b55..83209044b 100644
--- a/tests/regression_tests/random_ray_k_eff_mesh/results_true.dat
+++ b/tests/regression_tests/random_ray_k_eff_mesh/results_true.dat
@@ -1,7 +1,7 @@
 k-combined:
 8.379203E-01 8.057199E-03
 tally 1:
-5.080171E+00
+5.080172E+00
 5.167984E+00
 1.880341E+00
 7.079266E-01
@@ -16,7 +16,7 @@ tally 1:
 1.692643E+00
 5.794069E-01
 5.445214E-02
-5.995212E-04
+5.995213E-04
 1.325256E-01
 3.551193E-03
 2.372336E+00
@@ -35,10 +35,10 @@ tally 1:
 8.394042E+01
 3.100485E-02
 1.932097E-04
-7.671933E-02
+7.671934E-02
 1.182985E-03
 1.313652E+01
-3.451847E+01
+3.451846E+01
 1.764978E-01
 6.230420E-03
 4.909196E-01
@@ -56,7 +56,7 @@ tally 1:
 0.000000E+00
 0.000000E+00
 1.820058E+00
-6.729238E-01
+6.729239E-01
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -96,7 +96,7 @@ tally 1:
 4.104063E-01
 3.377132E-02
 9.988468E-01
-2.000404E-01
+2.000405E-01
 1.660506E+00
 5.567967E-01
 5.427391E-02
@@ -147,13 +147,13 @@ tally 1:
 3.699815E-03
 2.368737E+00
 1.143184E+00
-7.950085E-02
+7.950086E-02
 1.286135E-03
 1.934892E-01
-7.618268E-03
+7.618269E-03
 7.119767E+00
 1.030095E+01
-8.427627E-02
+8.427628E-02
 1.442764E-03
 2.051141E-01
 8.546249E-03
diff --git a/tests/regression_tests/random_ray_linear/linear/results_true.dat b/tests/regression_tests/random_ray_linear/linear/results_true.dat
index 6617c7821..4c0e14370 100644
--- a/tests/regression_tests/random_ray_linear/linear/results_true.dat
+++ b/tests/regression_tests/random_ray_linear/linear/results_true.dat
@@ -24,7 +24,7 @@ tally 1:
 5.733016E-01
 1.643671E-02
 1.395301E+00
-9.736091E-02
+9.736092E-02
 4.539598E+01
 1.030472E+02
 5.263055E-01
@@ -44,7 +44,7 @@ tally 1:
 2.008092E+00
 2.022988E-01
 4.188246E+01
-8.843468E+01
+8.843469E+01
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -111,7 +111,7 @@ tally 1:
 9.671931E-02
 4.539193E+01
 1.030326E+02
-5.345253E-01
+5.345254E-01
 1.428719E-02
 1.300944E+00
 8.463057E-02
diff --git a/tests/regression_tests/random_ray_volume_estimator_linear/hybrid/results_true.dat b/tests/regression_tests/random_ray_volume_estimator_linear/hybrid/results_true.dat
index 2fc08d0a4..e90d6bfdc 100644
--- a/tests/regression_tests/random_ray_volume_estimator_linear/hybrid/results_true.dat
+++ b/tests/regression_tests/random_ray_volume_estimator_linear/hybrid/results_true.dat
@@ -1,6 +1,6 @@
 tally 1:
-2.339085E+00
-2.747304E-01
+2.339086E+00
+2.747305E-01
 tally 2:
 1.089827E-01
 6.069324E-04
diff --git a/tests/regression_tests/reflective_plane/results_true.dat b/tests/regression_tests/reflective_plane/results_true.dat
index a1acfaad7..a4d6edb67 100644
--- a/tests/regression_tests/reflective_plane/results_true.dat
+++ b/tests/regression_tests/reflective_plane/results_true.dat
@@ -1,2 +1,2 @@
 k-combined:
-2.276857E+00 8.776678E-03
+2.279066E+00 4.793565E-03
diff --git a/tests/regression_tests/resonance_scattering/results_true.dat b/tests/regression_tests/resonance_scattering/results_true.dat
index 8316e720e..72f0933b8 100644
--- a/tests/regression_tests/resonance_scattering/results_true.dat
+++ b/tests/regression_tests/resonance_scattering/results_true.dat
@@ -1,2 +1,2 @@
 k-combined:
-1.462509E+00 2.205413E-02
+1.462428E+00 1.828903E-02
diff --git a/tests/regression_tests/rotation/results_true.dat b/tests/regression_tests/rotation/results_true.dat
index 0fb8ba981..6db3d329a 100644
--- a/tests/regression_tests/rotation/results_true.dat
+++ b/tests/regression_tests/rotation/results_true.dat
@@ -1,2 +1,2 @@
 k-combined:
-4.175600E-01 1.117465E-02
+4.459219E-01 1.899168E-02
diff --git a/tests/regression_tests/salphabeta/results_true.dat b/tests/regression_tests/salphabeta/results_true.dat
index d5c7f66e9..75a81075e 100644
--- a/tests/regression_tests/salphabeta/results_true.dat
+++ b/tests/regression_tests/salphabeta/results_true.dat
@@ -1,2 +1,2 @@
 k-combined:
-8.694866E-01 2.033328E-02
+8.628529E-01 3.120924E-02
diff --git a/tests/regression_tests/score_current/results_true.dat b/tests/regression_tests/score_current/results_true.dat
index ff939301d..6bb74445c 100644
--- a/tests/regression_tests/score_current/results_true.dat
+++ b/tests/regression_tests/score_current/results_true.dat
@@ -1,274 +1,490 @@
 k-combined:
-2.298294E-01 3.256961E-01
+7.729082E-01 3.775399E-02
 tally 1:
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-1.150000E-01
-2.753000E-03
-1.820000E-01
-6.756000E-03
+1.200000E-01
+2.924000E-03
+1.740000E-01
+6.270000E-03
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-1.110000E-01
-2.601000E-03
-1.530000E-01
-4.865000E-03
-1.910000E-01
-7.535000E-03
+1.200000E-01
+3.044000E-03
+1.510000E-01
+4.615000E-03
+1.710000E-01
+6.067000E-03
 0.000000E+00
 0.000000E+00
-7.100000E-02
-1.079000E-03
-1.500000E-01
-4.606000E-03
-1.820000E-01
-6.756000E-03
-1.150000E-01
-2.753000E-03
-1.610000E-01
-5.383000E-03
-1.230000E-01
-3.141000E-03
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-1.370000E-01
-3.951000E-03
-2.600000E-01
-1.366400E-02
-1.930000E-01
-7.573000E-03
-0.000000E+00
-0.000000E+00
-8.500000E-02
-1.533000E-03
-2.040000E-01
-8.426000E-03
-1.230000E-01
-3.141000E-03
-1.610000E-01
-5.383000E-03
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-1.250000E-01
-3.311000E-03
-1.620000E-01
-5.346000E-03
-1.860000E-01
-6.932000E-03
-0.000000E+00
-0.000000E+00
-7.100000E-02
-1.083000E-03
-1.630000E-01
-5.617000E-03
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-1.800000E-01
-7.002000E-03
-2.980000E-01
-1.815000E-02
-1.530000E-01
-4.865000E-03
-1.110000E-01
-2.601000E-03
-1.890000E-01
-7.605000E-03
-1.330000E-01
-3.743000E-03
-1.790000E-01
-6.495000E-03
-0.000000E+00
-0.000000E+00
-1.080000E-01
-2.718000E-03
-2.160000E-01
-9.662000E-03
-2.980000E-01
-1.815000E-02
-1.800000E-01
-7.002000E-03
-2.650000E-01
-1.435500E-02
-1.590000E-01
-5.285000E-03
-2.600000E-01
-1.366400E-02
-1.370000E-01
-3.951000E-03
-2.670000E-01
-1.469300E-02
-1.940000E-01
-7.678000E-03
-2.390000E-01
-1.155500E-02
-0.000000E+00
-0.000000E+00
-2.410000E-01
-1.255900E-02
-5.510000E-01
-7.358900E-02
-1.590000E-01
-5.285000E-03
-2.650000E-01
-1.435500E-02
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-1.620000E-01
-5.346000E-03
-1.250000E-01
-3.311000E-03
-1.870000E-01
-7.083000E-03
+6.500000E-02
+9.390000E-04
 1.410000E-01
-3.999000E-03
-2.040000E-01
-8.438000E-03
+4.001000E-03
+1.740000E-01
+6.270000E-03
+1.200000E-01
+2.924000E-03
+1.830000E-01
+6.879000E-03
+1.310000E-01
+3.541000E-03
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+1.750000E-01
+6.659000E-03
+2.820000E-01
+1.605400E-02
+1.980000E-01
+7.932000E-03
+0.000000E+00
+0.000000E+00
+9.400000E-02
+1.912000E-03
+2.200000E-01
+9.958000E-03
+1.310000E-01
+3.541000E-03
+1.830000E-01
+6.879000E-03
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+1.110000E-01
+2.639000E-03
+1.360000E-01
+3.890000E-03
+1.770000E-01
+6.551000E-03
+0.000000E+00
+0.000000E+00
+6.700000E-02
+9.310000E-04
+1.570000E-01
+4.975000E-03
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+1.480000E-01
+4.910000E-03
+2.720000E-01
+1.490600E-02
+1.510000E-01
+4.615000E-03
+1.200000E-01
+3.044000E-03
+1.800000E-01
+6.720000E-03
+1.050000E-01
+2.285000E-03
+1.790000E-01
+6.499000E-03
 0.000000E+00
 0.000000E+00
 9.300000E-02
-1.829000E-03
-2.240000E-01
-1.015800E-02
+1.927000E-03
+2.160000E-01
+9.418000E-03
+2.720000E-01
+1.490600E-02
+1.480000E-01
+4.910000E-03
+2.680000E-01
+1.445800E-02
+1.480000E-01
+4.488000E-03
+2.820000E-01
+1.605400E-02
+1.750000E-01
+6.659000E-03
+2.510000E-01
+1.283100E-02
+1.870000E-01
+7.731000E-03
+2.340000E-01
+1.105000E-02
+0.000000E+00
+0.000000E+00
+2.110000E-01
+9.215000E-03
+5.470000E-01
+7.228300E-02
+1.480000E-01
+4.488000E-03
+2.680000E-01
+1.445800E-02
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+1.360000E-01
+3.890000E-03
+1.110000E-01
+2.639000E-03
+1.540000E-01
+4.804000E-03
+1.280000E-01
+3.302000E-03
+2.200000E-01
+9.834000E-03
+0.000000E+00
+0.000000E+00
+9.900000E-02
+2.127000E-03
+1.860000E-01
+7.198000E-03
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+1.430000E-01
+4.337000E-03
+1.580000E-01
+5.104000E-03
+1.050000E-01
+2.285000E-03
+1.800000E-01
+6.720000E-03
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+1.860000E-01
+7.178000E-03
+0.000000E+00
+0.000000E+00
+7.000000E-02
+1.020000E-03
+1.610000E-01
+5.237000E-03
+1.580000E-01
+5.104000E-03
+1.430000E-01
+4.337000E-03
+1.580000E-01
+5.254000E-03
+1.230000E-01
+3.091000E-03
+1.870000E-01
+7.731000E-03
+2.510000E-01
+1.283100E-02
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+1.980000E-01
+7.934000E-03
+0.000000E+00
+0.000000E+00
+9.500000E-02
+1.949000E-03
+2.150000E-01
+9.289000E-03
+1.230000E-01
+3.091000E-03
+1.580000E-01
+5.254000E-03
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+1.280000E-01
+3.302000E-03
+1.540000E-01
+4.804000E-03
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+1.640000E-01
+5.424000E-03
+0.000000E+00
+0.000000E+00
+6.200000E-02
+8.020000E-04
+1.500000E-01
+4.588000E-03
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+1.700000E-01
+5.884000E-03
+2.280000E-01
+1.084800E-02
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+1.540000E-01
+4.856000E-03
+2.250000E-01
+1.047100E-02
+1.410000E-01
+4.001000E-03
+6.500000E-02
+9.390000E-04
+1.360000E-01
+3.852000E-03
+6.400000E-02
+8.700000E-04
+2.280000E-01
+1.084800E-02
+1.700000E-01
+5.884000E-03
+2.230000E-01
+1.001100E-02
+1.410000E-01
+4.185000E-03
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+1.980000E-01
+8.038000E-03
+5.030000E-01
+5.613900E-02
+2.200000E-01
+9.958000E-03
+9.400000E-02
+1.912000E-03
+2.140000E-01
+9.376000E-03
+7.300000E-02
+1.091000E-03
+1.410000E-01
+4.185000E-03
+2.230000E-01
+1.001100E-02
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+1.540000E-01
+4.808000E-03
+2.340000E-01
+1.119400E-02
+1.570000E-01
+4.975000E-03
+6.700000E-02
+9.310000E-04
+1.600000E-01
+5.134000E-03
+5.300000E-02
+6.110000E-04
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+2.310000E-01
+1.084100E-02
+5.390000E-01
+6.215100E-02
+2.250000E-01
+1.047100E-02
+1.540000E-01
+4.856000E-03
+2.280000E-01
+1.059800E-02
+1.600000E-01
+5.214000E-03
+2.160000E-01
+9.418000E-03
+9.300000E-02
+1.927000E-03
+2.510000E-01
+1.271500E-02
+1.030000E-01
+2.229000E-03
+5.390000E-01
+6.215100E-02
+2.310000E-01
+1.084100E-02
+4.700000E-01
+4.972200E-02
+2.190000E-01
+9.821000E-03
+5.030000E-01
+5.613900E-02
+1.980000E-01
+8.038000E-03
+5.100000E-01
+5.929000E-02
+2.140000E-01
+9.406000E-03
+5.470000E-01
+7.228300E-02
+2.110000E-01
+9.215000E-03
+5.160000E-01
+5.892200E-02
+2.550000E-01
+1.480500E-02
+2.190000E-01
+9.821000E-03
+4.700000E-01
+4.972200E-02
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+2.340000E-01
+1.119400E-02
+1.540000E-01
+4.808000E-03
+2.170000E-01
+9.509000E-03
+1.600000E-01
+5.156000E-03
+1.860000E-01
+7.198000E-03
+9.900000E-02
+2.127000E-03
+2.290000E-01
+1.058700E-02
+9.000000E-02
+1.780000E-03
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+1.550000E-01
+4.913000E-03
+2.380000E-01
+1.153400E-02
+1.600000E-01
+5.214000E-03
+2.280000E-01
+1.059800E-02
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+1.610000E-01
+5.237000E-03
+7.000000E-02
+1.020000E-03
+1.410000E-01
+4.071000E-03
+6.100000E-02
+8.350000E-04
+2.380000E-01
+1.153400E-02
+1.550000E-01
+4.913000E-03
+2.320000E-01
+1.100400E-02
+1.460000E-01
+4.498000E-03
+2.140000E-01
+9.406000E-03
+5.100000E-01
+5.929000E-02
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+2.150000E-01
+9.289000E-03
+9.500000E-02
+1.949000E-03
+1.870000E-01
+7.267000E-03
+1.030000E-01
+2.543000E-03
+1.460000E-01
+4.498000E-03
+2.320000E-01
+1.100400E-02
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+1.600000E-01
+5.156000E-03
+2.170000E-01
+9.509000E-03
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
 1.500000E-01
-4.522000E-03
-1.630000E-01
-5.439000E-03
-1.330000E-01
-3.743000E-03
-1.890000E-01
-7.605000E-03
+4.588000E-03
+6.200000E-02
+8.020000E-04
+1.290000E-01
+3.487000E-03
+6.000000E-02
+8.060000E-04
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
+1.090000E-01
+2.437000E-03
+1.650000E-01
+5.655000E-03
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+1.230000E-01
+3.065000E-03
+1.570000E-01
+4.999000E-03
+6.400000E-02
+8.700000E-04
+1.360000E-01
+3.852000E-03
+1.750000E-01
+6.299000E-03
+0.000000E+00
+0.000000E+00
 1.650000E-01
-5.615000E-03
-0.000000E+00
-0.000000E+00
-7.100000E-02
-1.191000E-03
-1.550000E-01
-5.011000E-03
-1.630000E-01
-5.439000E-03
-1.500000E-01
-4.522000E-03
-1.680000E-01
-5.966000E-03
-1.290000E-01
-3.515000E-03
-1.940000E-01
-7.678000E-03
-2.670000E-01
-1.469300E-02
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-1.810000E-01
-6.765000E-03
-0.000000E+00
-0.000000E+00
-1.080000E-01
-2.694000E-03
-2.070000E-01
-8.673000E-03
-1.290000E-01
-3.515000E-03
-1.680000E-01
-5.966000E-03
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-1.410000E-01
-3.999000E-03
-1.870000E-01
-7.083000E-03
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-1.870000E-01
-7.213000E-03
-0.000000E+00
-0.000000E+00
-8.200000E-02
-1.536000E-03
-1.760000E-01
-6.550000E-03
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-1.750000E-01
-6.163000E-03
-2.570000E-01
-1.347100E-02
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-1.560000E-01
-4.914000E-03
-2.350000E-01
-1.135900E-02
-1.500000E-01
-4.606000E-03
-7.100000E-02
-1.079000E-03
-1.530000E-01
-4.837000E-03
-5.600000E-02
-7.260000E-04
-2.570000E-01
-1.347100E-02
-1.750000E-01
-6.163000E-03
-2.460000E-01
-1.235000E-02
-1.420000E-01
-4.326000E-03
+5.655000E-03
+1.090000E-01
+2.437000E-03
+1.480000E-01
+4.674000E-03
+1.320000E-01
+3.548000E-03
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
+1.440000E-01
+4.282000E-03
+2.190000E-01
+9.683000E-03
+7.300000E-02
+1.091000E-03
+2.140000E-01
+9.376000E-03
 1.830000E-01
-7.133000E-03
-5.110000E-01
-5.696100E-02
-2.040000E-01
-8.426000E-03
-8.500000E-02
-1.533000E-03
-2.100000E-01
-8.928000E-03
-9.100000E-02
-1.807000E-03
-1.420000E-01
-4.326000E-03
-2.460000E-01
-1.235000E-02
+6.803000E-03
+0.000000E+00
+0.000000E+00
+1.320000E-01
+3.548000E-03
+1.480000E-01
+4.674000E-03
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -277,376 +493,160 @@ tally 1:
 0.000000E+00
 0.000000E+00
 0.000000E+00
+1.350000E-01
+3.895000E-03
 1.430000E-01
-4.207000E-03
-2.120000E-01
-9.278000E-03
-1.630000E-01
-5.617000E-03
-7.100000E-02
-1.083000E-03
-1.770000E-01
-6.293000E-03
-7.900000E-02
-1.495000E-03
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-2.300000E-01
-1.081000E-02
-5.200000E-01
-5.835000E-02
-2.350000E-01
-1.135900E-02
-1.560000E-01
-4.914000E-03
-2.370000E-01
-1.142300E-02
-1.360000E-01
-3.882000E-03
-2.160000E-01
-9.662000E-03
-1.080000E-01
-2.718000E-03
-2.090000E-01
-8.841000E-03
-1.030000E-01
-2.271000E-03
-5.200000E-01
-5.835000E-02
-2.300000E-01
-1.081000E-02
-5.110000E-01
-5.615900E-02
-2.430000E-01
-1.228300E-02
-5.110000E-01
-5.696100E-02
-1.830000E-01
-7.133000E-03
-5.130000E-01
-6.002100E-02
-2.420000E-01
-1.209200E-02
-5.510000E-01
-7.358900E-02
-2.410000E-01
-1.255900E-02
-5.140000E-01
-5.890200E-02
-2.100000E-01
-1.004600E-02
-2.430000E-01
-1.228300E-02
-5.110000E-01
-5.615900E-02
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-2.120000E-01
-9.278000E-03
-1.430000E-01
-4.207000E-03
-2.380000E-01
-1.133600E-02
-1.640000E-01
-5.444000E-03
-2.240000E-01
-1.015800E-02
-9.300000E-02
-1.829000E-03
-1.950000E-01
-7.705000E-03
-1.030000E-01
-2.191000E-03
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-1.680000E-01
-5.878000E-03
-2.230000E-01
-1.049900E-02
-1.360000E-01
-3.882000E-03
-2.370000E-01
-1.142300E-02
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-1.550000E-01
-5.011000E-03
-7.100000E-02
-1.191000E-03
-1.510000E-01
-4.845000E-03
-6.400000E-02
-9.460000E-04
-2.230000E-01
-1.049900E-02
-1.680000E-01
-5.878000E-03
-2.490000E-01
-1.255900E-02
-1.280000E-01
-3.448000E-03
-2.420000E-01
-1.209200E-02
-5.130000E-01
-6.002100E-02
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-2.070000E-01
-8.673000E-03
-1.080000E-01
-2.694000E-03
-2.000000E-01
-8.202000E-03
-9.600000E-02
-2.024000E-03
-1.280000E-01
-3.448000E-03
-2.490000E-01
-1.255900E-02
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-1.640000E-01
-5.444000E-03
-2.380000E-01
-1.133600E-02
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-1.760000E-01
-6.550000E-03
-8.200000E-02
-1.536000E-03
-1.670000E-01
-5.653000E-03
-4.900000E-02
-5.630000E-04
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-1.320000E-01
-3.626000E-03
-1.510000E-01
-4.831000E-03
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-1.370000E-01
-3.855000E-03
-1.610000E-01
-5.233000E-03
-5.600000E-02
-7.260000E-04
-1.530000E-01
-4.837000E-03
-1.610000E-01
-5.261000E-03
-0.000000E+00
-0.000000E+00
-1.510000E-01
-4.831000E-03
-1.320000E-01
-3.626000E-03
-1.490000E-01
-4.731000E-03
-1.320000E-01
-3.514000E-03
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-1.550000E-01
-4.921000E-03
-2.410000E-01
-1.168300E-02
-9.100000E-02
-1.807000E-03
-2.100000E-01
-8.928000E-03
-2.090000E-01
-8.775000E-03
-0.000000E+00
-0.000000E+00
-1.320000E-01
-3.514000E-03
-1.490000E-01
-4.731000E-03
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-1.150000E-01
-2.891000E-03
-1.560000E-01
-5.154000E-03
-7.900000E-02
-1.495000E-03
-1.770000E-01
-6.293000E-03
+4.297000E-03
+5.300000E-02
+6.110000E-04
 1.600000E-01
-5.352000E-03
+5.134000E-03
+1.380000E-01
+4.220000E-03
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-1.610000E-01
-5.273000E-03
-2.310000E-01
-1.098100E-02
-1.610000E-01
-5.233000E-03
-1.370000E-01
-3.855000E-03
-1.760000E-01
-6.482000E-03
-1.340000E-01
-3.882000E-03
+1.900000E-01
+7.412000E-03
+2.420000E-01
+1.208400E-02
+1.570000E-01
+4.999000E-03
+1.230000E-01
+3.065000E-03
+1.730000E-01
+6.279000E-03
+1.330000E-01
+3.621000E-03
 1.030000E-01
-2.271000E-03
-2.090000E-01
-8.841000E-03
-1.830000E-01
-6.761000E-03
-0.000000E+00
-0.000000E+00
-2.310000E-01
-1.098100E-02
-1.610000E-01
-5.273000E-03
-2.620000E-01
-1.380600E-02
-1.700000E-01
-5.970000E-03
-2.410000E-01
-1.168300E-02
-1.550000E-01
-4.921000E-03
-2.250000E-01
-1.014100E-02
-1.370000E-01
-3.805000E-03
+2.229000E-03
+2.510000E-01
+1.271500E-02
 2.100000E-01
-1.004600E-02
-5.140000E-01
-5.890200E-02
-2.320000E-01
-1.093000E-02
+8.970000E-03
 0.000000E+00
 0.000000E+00
-1.700000E-01
-5.970000E-03
-2.620000E-01
-1.380600E-02
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-1.560000E-01
-5.154000E-03
-1.150000E-01
-2.891000E-03
-1.430000E-01
-4.163000E-03
-1.120000E-01
-2.640000E-03
-1.030000E-01
-2.191000E-03
-1.950000E-01
-7.705000E-03
-1.760000E-01
-6.392000E-03
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-9.200000E-02
-1.822000E-03
-1.370000E-01
-3.843000E-03
-1.340000E-01
-3.882000E-03
-1.760000E-01
-6.482000E-03
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-6.400000E-02
-9.460000E-04
-1.510000E-01
-4.845000E-03
-1.800000E-01
-6.520000E-03
-0.000000E+00
-0.000000E+00
-1.370000E-01
-3.843000E-03
-9.200000E-02
-1.822000E-03
-1.300000E-01
-3.604000E-03
-1.170000E-01
-2.789000E-03
-1.370000E-01
-3.805000E-03
-2.250000E-01
-1.014100E-02
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-9.600000E-02
-2.024000E-03
+2.420000E-01
+1.208400E-02
+1.900000E-01
+7.412000E-03
+2.610000E-01
+1.399900E-02
 2.000000E-01
-8.202000E-03
-1.820000E-01
-6.660000E-03
+8.410000E-03
+2.190000E-01
+9.683000E-03
+1.440000E-01
+4.282000E-03
+2.690000E-01
+1.478100E-02
+1.540000E-01
+4.986000E-03
+2.550000E-01
+1.480500E-02
+5.160000E-01
+5.892200E-02
+2.310000E-01
+1.098900E-02
+0.000000E+00
+0.000000E+00
+2.000000E-01
+8.410000E-03
+2.610000E-01
+1.399900E-02
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+1.430000E-01
+4.297000E-03
+1.350000E-01
+3.895000E-03
+1.760000E-01
+6.534000E-03
+1.170000E-01
+2.807000E-03
+9.000000E-02
+1.780000E-03
+2.290000E-01
+1.058700E-02
+2.080000E-01
+8.854000E-03
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+1.230000E-01
+3.305000E-03
+1.760000E-01
+6.598000E-03
+1.330000E-01
+3.621000E-03
+1.730000E-01
+6.279000E-03
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+6.100000E-02
+8.350000E-04
+1.410000E-01
+4.071000E-03
+1.800000E-01
+6.574000E-03
+0.000000E+00
+0.000000E+00
+1.760000E-01
+6.598000E-03
+1.230000E-01
+3.305000E-03
+1.690000E-01
+6.135000E-03
+1.220000E-01
+3.344000E-03
+1.540000E-01
+4.986000E-03
+2.690000E-01
+1.478100E-02
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+1.030000E-01
+2.543000E-03
+1.870000E-01
+7.267000E-03
+1.690000E-01
+5.731000E-03
+0.000000E+00
+0.000000E+00
+1.220000E-01
+3.344000E-03
+1.690000E-01
+6.135000E-03
+0.000000E+00
+0.000000E+00
 0.000000E+00
 0.000000E+00
 1.170000E-01
-2.789000E-03
-1.300000E-01
-3.604000E-03
+2.807000E-03
+1.760000E-01
+6.534000E-03
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-1.120000E-01
-2.640000E-03
-1.430000E-01
-4.163000E-03
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-4.900000E-02
-5.630000E-04
-1.670000E-01
-5.653000E-03
-1.670000E-01
-5.701000E-03
+6.000000E-02
+8.060000E-04
+1.290000E-01
+3.487000E-03
+1.790000E-01
+6.747000E-03
 0.000000E+00
 0.000000E+00
 tally 2:
@@ -660,12 +660,12 @@ tally 2:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-1.150000E-01
-2.753000E-03
+1.200000E-01
+2.924000E-03
 0.000000E+00
 0.000000E+00
-1.820000E-01
-6.756000E-03
+1.740000E-01
+6.270000E-03
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -676,256 +676,160 @@ tally 2:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-1.110000E-01
-2.601000E-03
+1.200000E-01
+3.044000E-03
 0.000000E+00
 0.000000E+00
-1.530000E-01
-4.865000E-03
+1.510000E-01
+4.615000E-03
 0.000000E+00
 0.000000E+00
-1.910000E-01
-7.535000E-03
+1.710000E-01
+6.067000E-03
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-7.100000E-02
-1.079000E-03
-0.000000E+00
-0.000000E+00
-1.500000E-01
-4.606000E-03
-0.000000E+00
-0.000000E+00
-1.820000E-01
-6.756000E-03
-0.000000E+00
-0.000000E+00
-1.150000E-01
-2.753000E-03
-0.000000E+00
-0.000000E+00
-1.610000E-01
-5.383000E-03
-0.000000E+00
-0.000000E+00
-1.230000E-01
-3.141000E-03
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-1.370000E-01
-3.951000E-03
-0.000000E+00
-0.000000E+00
-2.600000E-01
-1.366400E-02
-0.000000E+00
-0.000000E+00
-1.930000E-01
-7.573000E-03
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-8.500000E-02
-1.533000E-03
-0.000000E+00
-0.000000E+00
-2.040000E-01
-8.426000E-03
-0.000000E+00
-0.000000E+00
-1.230000E-01
-3.141000E-03
-0.000000E+00
-0.000000E+00
-1.610000E-01
-5.383000E-03
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-1.250000E-01
-3.311000E-03
-0.000000E+00
-0.000000E+00
-1.620000E-01
-5.346000E-03
-0.000000E+00
-0.000000E+00
-1.860000E-01
-6.932000E-03
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-7.100000E-02
-1.083000E-03
-0.000000E+00
-0.000000E+00
-1.630000E-01
-5.617000E-03
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-1.800000E-01
-7.002000E-03
-0.000000E+00
-0.000000E+00
-2.980000E-01
-1.815000E-02
-0.000000E+00
-0.000000E+00
-1.530000E-01
-4.865000E-03
-0.000000E+00
-0.000000E+00
-1.110000E-01
-2.601000E-03
-0.000000E+00
-0.000000E+00
-1.890000E-01
-7.605000E-03
-0.000000E+00
-0.000000E+00
-1.330000E-01
-3.743000E-03
-0.000000E+00
-0.000000E+00
-1.790000E-01
-6.495000E-03
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-1.080000E-01
-2.718000E-03
-0.000000E+00
-0.000000E+00
-2.160000E-01
-9.662000E-03
-0.000000E+00
-0.000000E+00
-2.980000E-01
-1.815000E-02
-0.000000E+00
-0.000000E+00
-1.800000E-01
-7.002000E-03
-0.000000E+00
-0.000000E+00
-2.650000E-01
-1.435500E-02
-0.000000E+00
-0.000000E+00
-1.590000E-01
-5.285000E-03
-0.000000E+00
-0.000000E+00
-2.600000E-01
-1.366400E-02
-0.000000E+00
-0.000000E+00
-1.370000E-01
-3.951000E-03
-0.000000E+00
-0.000000E+00
-2.670000E-01
-1.469300E-02
-0.000000E+00
-0.000000E+00
-1.940000E-01
-7.678000E-03
-0.000000E+00
-0.000000E+00
-2.390000E-01
-1.155500E-02
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-2.410000E-01
-1.255900E-02
-0.000000E+00
-0.000000E+00
-5.510000E-01
-7.358900E-02
-0.000000E+00
-0.000000E+00
-1.590000E-01
-5.285000E-03
-0.000000E+00
-0.000000E+00
-2.650000E-01
-1.435500E-02
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-1.620000E-01
-5.346000E-03
-0.000000E+00
-0.000000E+00
-1.250000E-01
-3.311000E-03
-0.000000E+00
-0.000000E+00
-1.870000E-01
-7.083000E-03
+6.500000E-02
+9.390000E-04
 0.000000E+00
 0.000000E+00
 1.410000E-01
-3.999000E-03
+4.001000E-03
 0.000000E+00
 0.000000E+00
-2.040000E-01
-8.438000E-03
+1.740000E-01
+6.270000E-03
+0.000000E+00
+0.000000E+00
+1.200000E-01
+2.924000E-03
+0.000000E+00
+0.000000E+00
+1.830000E-01
+6.879000E-03
+0.000000E+00
+0.000000E+00
+1.310000E-01
+3.541000E-03
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+1.750000E-01
+6.659000E-03
+0.000000E+00
+0.000000E+00
+2.820000E-01
+1.605400E-02
+0.000000E+00
+0.000000E+00
+1.980000E-01
+7.932000E-03
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+9.400000E-02
+1.912000E-03
+0.000000E+00
+0.000000E+00
+2.200000E-01
+9.958000E-03
+0.000000E+00
+0.000000E+00
+1.310000E-01
+3.541000E-03
+0.000000E+00
+0.000000E+00
+1.830000E-01
+6.879000E-03
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+1.110000E-01
+2.639000E-03
+0.000000E+00
+0.000000E+00
+1.360000E-01
+3.890000E-03
+0.000000E+00
+0.000000E+00
+1.770000E-01
+6.551000E-03
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+6.700000E-02
+9.310000E-04
+0.000000E+00
+0.000000E+00
+1.570000E-01
+4.975000E-03
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+1.480000E-01
+4.910000E-03
+0.000000E+00
+0.000000E+00
+2.720000E-01
+1.490600E-02
+0.000000E+00
+0.000000E+00
+1.510000E-01
+4.615000E-03
+0.000000E+00
+0.000000E+00
+1.200000E-01
+3.044000E-03
+0.000000E+00
+0.000000E+00
+1.800000E-01
+6.720000E-03
+0.000000E+00
+0.000000E+00
+1.050000E-01
+2.285000E-03
+0.000000E+00
+0.000000E+00
+1.790000E-01
+6.499000E-03
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -933,11 +837,659 @@ tally 2:
 0.000000E+00
 0.000000E+00
 9.300000E-02
-1.829000E-03
+1.927000E-03
 0.000000E+00
 0.000000E+00
-2.240000E-01
-1.015800E-02
+2.160000E-01
+9.418000E-03
+0.000000E+00
+0.000000E+00
+2.720000E-01
+1.490600E-02
+0.000000E+00
+0.000000E+00
+1.480000E-01
+4.910000E-03
+0.000000E+00
+0.000000E+00
+2.680000E-01
+1.445800E-02
+0.000000E+00
+0.000000E+00
+1.480000E-01
+4.488000E-03
+0.000000E+00
+0.000000E+00
+2.820000E-01
+1.605400E-02
+0.000000E+00
+0.000000E+00
+1.750000E-01
+6.659000E-03
+0.000000E+00
+0.000000E+00
+2.510000E-01
+1.283100E-02
+0.000000E+00
+0.000000E+00
+1.870000E-01
+7.731000E-03
+0.000000E+00
+0.000000E+00
+2.340000E-01
+1.105000E-02
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+2.110000E-01
+9.215000E-03
+0.000000E+00
+0.000000E+00
+5.470000E-01
+7.228300E-02
+0.000000E+00
+0.000000E+00
+1.480000E-01
+4.488000E-03
+0.000000E+00
+0.000000E+00
+2.680000E-01
+1.445800E-02
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+1.360000E-01
+3.890000E-03
+0.000000E+00
+0.000000E+00
+1.110000E-01
+2.639000E-03
+0.000000E+00
+0.000000E+00
+1.540000E-01
+4.804000E-03
+0.000000E+00
+0.000000E+00
+1.280000E-01
+3.302000E-03
+0.000000E+00
+0.000000E+00
+2.200000E-01
+9.834000E-03
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+9.900000E-02
+2.127000E-03
+0.000000E+00
+0.000000E+00
+1.860000E-01
+7.198000E-03
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+1.430000E-01
+4.337000E-03
+0.000000E+00
+0.000000E+00
+1.580000E-01
+5.104000E-03
+0.000000E+00
+0.000000E+00
+1.050000E-01
+2.285000E-03
+0.000000E+00
+0.000000E+00
+1.800000E-01
+6.720000E-03
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+1.860000E-01
+7.178000E-03
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+7.000000E-02
+1.020000E-03
+0.000000E+00
+0.000000E+00
+1.610000E-01
+5.237000E-03
+0.000000E+00
+0.000000E+00
+1.580000E-01
+5.104000E-03
+0.000000E+00
+0.000000E+00
+1.430000E-01
+4.337000E-03
+0.000000E+00
+0.000000E+00
+1.580000E-01
+5.254000E-03
+0.000000E+00
+0.000000E+00
+1.230000E-01
+3.091000E-03
+0.000000E+00
+0.000000E+00
+1.870000E-01
+7.731000E-03
+0.000000E+00
+0.000000E+00
+2.510000E-01
+1.283100E-02
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+1.980000E-01
+7.934000E-03
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+9.500000E-02
+1.949000E-03
+0.000000E+00
+0.000000E+00
+2.150000E-01
+9.289000E-03
+0.000000E+00
+0.000000E+00
+1.230000E-01
+3.091000E-03
+0.000000E+00
+0.000000E+00
+1.580000E-01
+5.254000E-03
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+1.280000E-01
+3.302000E-03
+0.000000E+00
+0.000000E+00
+1.540000E-01
+4.804000E-03
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+1.640000E-01
+5.424000E-03
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+6.200000E-02
+8.020000E-04
+0.000000E+00
+0.000000E+00
+1.500000E-01
+4.588000E-03
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+1.700000E-01
+5.884000E-03
+0.000000E+00
+0.000000E+00
+2.280000E-01
+1.084800E-02
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+1.540000E-01
+4.856000E-03
+0.000000E+00
+0.000000E+00
+2.250000E-01
+1.047100E-02
+0.000000E+00
+0.000000E+00
+1.410000E-01
+4.001000E-03
+0.000000E+00
+0.000000E+00
+6.500000E-02
+9.390000E-04
+0.000000E+00
+0.000000E+00
+1.360000E-01
+3.852000E-03
+0.000000E+00
+0.000000E+00
+6.400000E-02
+8.700000E-04
+0.000000E+00
+0.000000E+00
+2.280000E-01
+1.084800E-02
+0.000000E+00
+0.000000E+00
+1.700000E-01
+5.884000E-03
+0.000000E+00
+0.000000E+00
+2.230000E-01
+1.001100E-02
+0.000000E+00
+0.000000E+00
+1.410000E-01
+4.185000E-03
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+1.980000E-01
+8.038000E-03
+0.000000E+00
+0.000000E+00
+5.030000E-01
+5.613900E-02
+0.000000E+00
+0.000000E+00
+2.200000E-01
+9.958000E-03
+0.000000E+00
+0.000000E+00
+9.400000E-02
+1.912000E-03
+0.000000E+00
+0.000000E+00
+2.140000E-01
+9.376000E-03
+0.000000E+00
+0.000000E+00
+7.300000E-02
+1.091000E-03
+0.000000E+00
+0.000000E+00
+1.410000E-01
+4.185000E-03
+0.000000E+00
+0.000000E+00
+2.230000E-01
+1.001100E-02
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+1.540000E-01
+4.808000E-03
+0.000000E+00
+0.000000E+00
+2.340000E-01
+1.119400E-02
+0.000000E+00
+0.000000E+00
+1.570000E-01
+4.975000E-03
+0.000000E+00
+0.000000E+00
+6.700000E-02
+9.310000E-04
+0.000000E+00
+0.000000E+00
+1.600000E-01
+5.134000E-03
+0.000000E+00
+0.000000E+00
+5.300000E-02
+6.110000E-04
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+2.310000E-01
+1.084100E-02
+0.000000E+00
+0.000000E+00
+5.390000E-01
+6.215100E-02
+0.000000E+00
+0.000000E+00
+2.250000E-01
+1.047100E-02
+0.000000E+00
+0.000000E+00
+1.540000E-01
+4.856000E-03
+0.000000E+00
+0.000000E+00
+2.280000E-01
+1.059800E-02
+0.000000E+00
+0.000000E+00
+1.600000E-01
+5.214000E-03
+0.000000E+00
+0.000000E+00
+2.160000E-01
+9.418000E-03
+0.000000E+00
+0.000000E+00
+9.300000E-02
+1.927000E-03
+0.000000E+00
+0.000000E+00
+2.510000E-01
+1.271500E-02
+0.000000E+00
+0.000000E+00
+1.030000E-01
+2.229000E-03
+0.000000E+00
+0.000000E+00
+5.390000E-01
+6.215100E-02
+0.000000E+00
+0.000000E+00
+2.310000E-01
+1.084100E-02
+0.000000E+00
+0.000000E+00
+4.700000E-01
+4.972200E-02
+0.000000E+00
+0.000000E+00
+2.190000E-01
+9.821000E-03
+0.000000E+00
+0.000000E+00
+5.030000E-01
+5.613900E-02
+0.000000E+00
+0.000000E+00
+1.980000E-01
+8.038000E-03
+0.000000E+00
+0.000000E+00
+5.100000E-01
+5.929000E-02
+0.000000E+00
+0.000000E+00
+2.140000E-01
+9.406000E-03
+0.000000E+00
+0.000000E+00
+5.470000E-01
+7.228300E-02
+0.000000E+00
+0.000000E+00
+2.110000E-01
+9.215000E-03
+0.000000E+00
+0.000000E+00
+5.160000E-01
+5.892200E-02
+0.000000E+00
+0.000000E+00
+2.550000E-01
+1.480500E-02
+0.000000E+00
+0.000000E+00
+2.190000E-01
+9.821000E-03
+0.000000E+00
+0.000000E+00
+4.700000E-01
+4.972200E-02
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+2.340000E-01
+1.119400E-02
+0.000000E+00
+0.000000E+00
+1.540000E-01
+4.808000E-03
+0.000000E+00
+0.000000E+00
+2.170000E-01
+9.509000E-03
+0.000000E+00
+0.000000E+00
+1.600000E-01
+5.156000E-03
+0.000000E+00
+0.000000E+00
+1.860000E-01
+7.198000E-03
+0.000000E+00
+0.000000E+00
+9.900000E-02
+2.127000E-03
+0.000000E+00
+0.000000E+00
+2.290000E-01
+1.058700E-02
+0.000000E+00
+0.000000E+00
+9.000000E-02
+1.780000E-03
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+1.550000E-01
+4.913000E-03
+0.000000E+00
+0.000000E+00
+2.380000E-01
+1.153400E-02
+0.000000E+00
+0.000000E+00
+1.600000E-01
+5.214000E-03
+0.000000E+00
+0.000000E+00
+2.280000E-01
+1.059800E-02
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+1.610000E-01
+5.237000E-03
+0.000000E+00
+0.000000E+00
+7.000000E-02
+1.020000E-03
+0.000000E+00
+0.000000E+00
+1.410000E-01
+4.071000E-03
+0.000000E+00
+0.000000E+00
+6.100000E-02
+8.350000E-04
+0.000000E+00
+0.000000E+00
+2.380000E-01
+1.153400E-02
+0.000000E+00
+0.000000E+00
+1.550000E-01
+4.913000E-03
+0.000000E+00
+0.000000E+00
+2.320000E-01
+1.100400E-02
+0.000000E+00
+0.000000E+00
+1.460000E-01
+4.498000E-03
+0.000000E+00
+0.000000E+00
+2.140000E-01
+9.406000E-03
+0.000000E+00
+0.000000E+00
+5.100000E-01
+5.929000E-02
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+2.150000E-01
+9.289000E-03
+0.000000E+00
+0.000000E+00
+9.500000E-02
+1.949000E-03
+0.000000E+00
+0.000000E+00
+1.870000E-01
+7.267000E-03
+0.000000E+00
+0.000000E+00
+1.030000E-01
+2.543000E-03
+0.000000E+00
+0.000000E+00
+1.460000E-01
+4.498000E-03
+0.000000E+00
+0.000000E+00
+2.320000E-01
+1.100400E-02
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+1.600000E-01
+5.156000E-03
+0.000000E+00
+0.000000E+00
+2.170000E-01
+9.509000E-03
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -949,19 +1501,19 @@ tally 2:
 0.000000E+00
 0.000000E+00
 1.500000E-01
-4.522000E-03
+4.588000E-03
 0.000000E+00
 0.000000E+00
-1.630000E-01
-5.439000E-03
+6.200000E-02
+8.020000E-04
 0.000000E+00
 0.000000E+00
-1.330000E-01
-3.743000E-03
+1.290000E-01
+3.487000E-03
 0.000000E+00
 0.000000E+00
-1.890000E-01
-7.605000E-03
+6.000000E-02
+8.060000E-04
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -972,220 +1524,100 @@ tally 2:
 0.000000E+00
 0.000000E+00
 0.000000E+00
+1.090000E-01
+2.437000E-03
+0.000000E+00
+0.000000E+00
+1.650000E-01
+5.655000E-03
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+1.230000E-01
+3.065000E-03
+0.000000E+00
+0.000000E+00
+1.570000E-01
+4.999000E-03
+0.000000E+00
+0.000000E+00
+6.400000E-02
+8.700000E-04
+0.000000E+00
+0.000000E+00
+1.360000E-01
+3.852000E-03
+0.000000E+00
+0.000000E+00
+1.750000E-01
+6.299000E-03
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
 1.650000E-01
-5.615000E-03
+5.655000E-03
 0.000000E+00
 0.000000E+00
+1.090000E-01
+2.437000E-03
 0.000000E+00
 0.000000E+00
+1.480000E-01
+4.674000E-03
 0.000000E+00
 0.000000E+00
-7.100000E-02
-1.191000E-03
+1.320000E-01
+3.548000E-03
 0.000000E+00
 0.000000E+00
-1.550000E-01
-5.011000E-03
 0.000000E+00
 0.000000E+00
-1.630000E-01
-5.439000E-03
 0.000000E+00
 0.000000E+00
-1.500000E-01
-4.522000E-03
 0.000000E+00
 0.000000E+00
-1.680000E-01
-5.966000E-03
-0.000000E+00
-0.000000E+00
-1.290000E-01
-3.515000E-03
-0.000000E+00
-0.000000E+00
-1.940000E-01
-7.678000E-03
-0.000000E+00
-0.000000E+00
-2.670000E-01
-1.469300E-02
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-1.810000E-01
-6.765000E-03
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-1.080000E-01
-2.694000E-03
-0.000000E+00
-0.000000E+00
-2.070000E-01
-8.673000E-03
-0.000000E+00
-0.000000E+00
-1.290000E-01
-3.515000E-03
-0.000000E+00
-0.000000E+00
-1.680000E-01
-5.966000E-03
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-1.410000E-01
-3.999000E-03
-0.000000E+00
-0.000000E+00
-1.870000E-01
-7.083000E-03
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-1.870000E-01
-7.213000E-03
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-8.200000E-02
-1.536000E-03
-0.000000E+00
-0.000000E+00
-1.760000E-01
-6.550000E-03
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-1.750000E-01
-6.163000E-03
-0.000000E+00
-0.000000E+00
-2.570000E-01
-1.347100E-02
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-1.560000E-01
-4.914000E-03
-0.000000E+00
-0.000000E+00
-2.350000E-01
-1.135900E-02
-0.000000E+00
-0.000000E+00
-1.500000E-01
-4.606000E-03
-0.000000E+00
-0.000000E+00
-7.100000E-02
-1.079000E-03
-0.000000E+00
-0.000000E+00
-1.530000E-01
-4.837000E-03
-0.000000E+00
-0.000000E+00
-5.600000E-02
-7.260000E-04
-0.000000E+00
-0.000000E+00
-2.570000E-01
-1.347100E-02
-0.000000E+00
-0.000000E+00
-1.750000E-01
-6.163000E-03
-0.000000E+00
-0.000000E+00
-2.460000E-01
-1.235000E-02
-0.000000E+00
-0.000000E+00
-1.420000E-01
-4.326000E-03
 0.000000E+00
 0.000000E+00
+1.440000E-01
+4.282000E-03
 0.000000E+00
 0.000000E+00
+2.190000E-01
+9.683000E-03
 0.000000E+00
 0.000000E+00
+7.300000E-02
+1.091000E-03
 0.000000E+00
 0.000000E+00
+2.140000E-01
+9.376000E-03
 0.000000E+00
 0.000000E+00
 1.830000E-01
-7.133000E-03
+6.803000E-03
 0.000000E+00
 0.000000E+00
-5.110000E-01
-5.696100E-02
 0.000000E+00
 0.000000E+00
-2.040000E-01
-8.426000E-03
 0.000000E+00
 0.000000E+00
-8.500000E-02
-1.533000E-03
+1.320000E-01
+3.548000E-03
 0.000000E+00
 0.000000E+00
-2.100000E-01
-8.928000E-03
-0.000000E+00
-0.000000E+00
-9.100000E-02
-1.807000E-03
-0.000000E+00
-0.000000E+00
-1.420000E-01
-4.326000E-03
-0.000000E+00
-0.000000E+00
-2.460000E-01
-1.235000E-02
+1.480000E-01
+4.674000E-03
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -1204,456 +1636,24 @@ tally 2:
 0.000000E+00
 0.000000E+00
 0.000000E+00
+1.350000E-01
+3.895000E-03
+0.000000E+00
+0.000000E+00
 1.430000E-01
-4.207000E-03
+4.297000E-03
 0.000000E+00
 0.000000E+00
-2.120000E-01
-9.278000E-03
-0.000000E+00
-0.000000E+00
-1.630000E-01
-5.617000E-03
-0.000000E+00
-0.000000E+00
-7.100000E-02
-1.083000E-03
-0.000000E+00
-0.000000E+00
-1.770000E-01
-6.293000E-03
-0.000000E+00
-0.000000E+00
-7.900000E-02
-1.495000E-03
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-2.300000E-01
-1.081000E-02
-0.000000E+00
-0.000000E+00
-5.200000E-01
-5.835000E-02
-0.000000E+00
-0.000000E+00
-2.350000E-01
-1.135900E-02
-0.000000E+00
-0.000000E+00
-1.560000E-01
-4.914000E-03
-0.000000E+00
-0.000000E+00
-2.370000E-01
-1.142300E-02
-0.000000E+00
-0.000000E+00
-1.360000E-01
-3.882000E-03
-0.000000E+00
-0.000000E+00
-2.160000E-01
-9.662000E-03
-0.000000E+00
-0.000000E+00
-1.080000E-01
-2.718000E-03
-0.000000E+00
-0.000000E+00
-2.090000E-01
-8.841000E-03
-0.000000E+00
-0.000000E+00
-1.030000E-01
-2.271000E-03
-0.000000E+00
-0.000000E+00
-5.200000E-01
-5.835000E-02
-0.000000E+00
-0.000000E+00
-2.300000E-01
-1.081000E-02
-0.000000E+00
-0.000000E+00
-5.110000E-01
-5.615900E-02
-0.000000E+00
-0.000000E+00
-2.430000E-01
-1.228300E-02
-0.000000E+00
-0.000000E+00
-5.110000E-01
-5.696100E-02
-0.000000E+00
-0.000000E+00
-1.830000E-01
-7.133000E-03
-0.000000E+00
-0.000000E+00
-5.130000E-01
-6.002100E-02
-0.000000E+00
-0.000000E+00
-2.420000E-01
-1.209200E-02
-0.000000E+00
-0.000000E+00
-5.510000E-01
-7.358900E-02
-0.000000E+00
-0.000000E+00
-2.410000E-01
-1.255900E-02
-0.000000E+00
-0.000000E+00
-5.140000E-01
-5.890200E-02
-0.000000E+00
-0.000000E+00
-2.100000E-01
-1.004600E-02
-0.000000E+00
-0.000000E+00
-2.430000E-01
-1.228300E-02
-0.000000E+00
-0.000000E+00
-5.110000E-01
-5.615900E-02
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-2.120000E-01
-9.278000E-03
-0.000000E+00
-0.000000E+00
-1.430000E-01
-4.207000E-03
-0.000000E+00
-0.000000E+00
-2.380000E-01
-1.133600E-02
-0.000000E+00
-0.000000E+00
-1.640000E-01
-5.444000E-03
-0.000000E+00
-0.000000E+00
-2.240000E-01
-1.015800E-02
-0.000000E+00
-0.000000E+00
-9.300000E-02
-1.829000E-03
-0.000000E+00
-0.000000E+00
-1.950000E-01
-7.705000E-03
-0.000000E+00
-0.000000E+00
-1.030000E-01
-2.191000E-03
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-1.680000E-01
-5.878000E-03
-0.000000E+00
-0.000000E+00
-2.230000E-01
-1.049900E-02
-0.000000E+00
-0.000000E+00
-1.360000E-01
-3.882000E-03
-0.000000E+00
-0.000000E+00
-2.370000E-01
-1.142300E-02
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-1.550000E-01
-5.011000E-03
-0.000000E+00
-0.000000E+00
-7.100000E-02
-1.191000E-03
-0.000000E+00
-0.000000E+00
-1.510000E-01
-4.845000E-03
-0.000000E+00
-0.000000E+00
-6.400000E-02
-9.460000E-04
-0.000000E+00
-0.000000E+00
-2.230000E-01
-1.049900E-02
-0.000000E+00
-0.000000E+00
-1.680000E-01
-5.878000E-03
-0.000000E+00
-0.000000E+00
-2.490000E-01
-1.255900E-02
-0.000000E+00
-0.000000E+00
-1.280000E-01
-3.448000E-03
-0.000000E+00
-0.000000E+00
-2.420000E-01
-1.209200E-02
-0.000000E+00
-0.000000E+00
-5.130000E-01
-6.002100E-02
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-2.070000E-01
-8.673000E-03
-0.000000E+00
-0.000000E+00
-1.080000E-01
-2.694000E-03
-0.000000E+00
-0.000000E+00
-2.000000E-01
-8.202000E-03
-0.000000E+00
-0.000000E+00
-9.600000E-02
-2.024000E-03
-0.000000E+00
-0.000000E+00
-1.280000E-01
-3.448000E-03
-0.000000E+00
-0.000000E+00
-2.490000E-01
-1.255900E-02
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-1.640000E-01
-5.444000E-03
-0.000000E+00
-0.000000E+00
-2.380000E-01
-1.133600E-02
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-1.760000E-01
-6.550000E-03
-0.000000E+00
-0.000000E+00
-8.200000E-02
-1.536000E-03
-0.000000E+00
-0.000000E+00
-1.670000E-01
-5.653000E-03
-0.000000E+00
-0.000000E+00
-4.900000E-02
-5.630000E-04
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-1.320000E-01
-3.626000E-03
-0.000000E+00
-0.000000E+00
-1.510000E-01
-4.831000E-03
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-1.370000E-01
-3.855000E-03
-0.000000E+00
-0.000000E+00
-1.610000E-01
-5.233000E-03
-0.000000E+00
-0.000000E+00
-5.600000E-02
-7.260000E-04
-0.000000E+00
-0.000000E+00
-1.530000E-01
-4.837000E-03
-0.000000E+00
-0.000000E+00
-1.610000E-01
-5.261000E-03
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-1.510000E-01
-4.831000E-03
-0.000000E+00
-0.000000E+00
-1.320000E-01
-3.626000E-03
-0.000000E+00
-0.000000E+00
-1.490000E-01
-4.731000E-03
-0.000000E+00
-0.000000E+00
-1.320000E-01
-3.514000E-03
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-1.550000E-01
-4.921000E-03
-0.000000E+00
-0.000000E+00
-2.410000E-01
-1.168300E-02
-0.000000E+00
-0.000000E+00
-9.100000E-02
-1.807000E-03
-0.000000E+00
-0.000000E+00
-2.100000E-01
-8.928000E-03
-0.000000E+00
-0.000000E+00
-2.090000E-01
-8.775000E-03
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-1.320000E-01
-3.514000E-03
-0.000000E+00
-0.000000E+00
-1.490000E-01
-4.731000E-03
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-1.150000E-01
-2.891000E-03
-0.000000E+00
-0.000000E+00
-1.560000E-01
-5.154000E-03
-0.000000E+00
-0.000000E+00
-7.900000E-02
-1.495000E-03
-0.000000E+00
-0.000000E+00
-1.770000E-01
-6.293000E-03
+5.300000E-02
+6.110000E-04
 0.000000E+00
 0.000000E+00
 1.600000E-01
-5.352000E-03
+5.134000E-03
+0.000000E+00
+0.000000E+00
+1.380000E-01
+4.220000E-03
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -1668,232 +1668,248 @@ tally 2:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-1.610000E-01
-5.273000E-03
+1.900000E-01
+7.412000E-03
 0.000000E+00
 0.000000E+00
-2.310000E-01
-1.098100E-02
+2.420000E-01
+1.208400E-02
 0.000000E+00
 0.000000E+00
-1.610000E-01
-5.233000E-03
+1.570000E-01
+4.999000E-03
 0.000000E+00
 0.000000E+00
-1.370000E-01
-3.855000E-03
+1.230000E-01
+3.065000E-03
 0.000000E+00
 0.000000E+00
-1.760000E-01
-6.482000E-03
+1.730000E-01
+6.279000E-03
 0.000000E+00
 0.000000E+00
-1.340000E-01
-3.882000E-03
+1.330000E-01
+3.621000E-03
 0.000000E+00
 0.000000E+00
 1.030000E-01
-2.271000E-03
+2.229000E-03
 0.000000E+00
 0.000000E+00
-2.090000E-01
-8.841000E-03
-0.000000E+00
-0.000000E+00
-1.830000E-01
-6.761000E-03
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-2.310000E-01
-1.098100E-02
-0.000000E+00
-0.000000E+00
-1.610000E-01
-5.273000E-03
-0.000000E+00
-0.000000E+00
-2.620000E-01
-1.380600E-02
-0.000000E+00
-0.000000E+00
-1.700000E-01
-5.970000E-03
-0.000000E+00
-0.000000E+00
-2.410000E-01
-1.168300E-02
-0.000000E+00
-0.000000E+00
-1.550000E-01
-4.921000E-03
-0.000000E+00
-0.000000E+00
-2.250000E-01
-1.014100E-02
-0.000000E+00
-0.000000E+00
-1.370000E-01
-3.805000E-03
+2.510000E-01
+1.271500E-02
 0.000000E+00
 0.000000E+00
 2.100000E-01
-1.004600E-02
+8.970000E-03
 0.000000E+00
 0.000000E+00
-5.140000E-01
-5.890200E-02
 0.000000E+00
 0.000000E+00
-2.320000E-01
-1.093000E-02
 0.000000E+00
 0.000000E+00
+2.420000E-01
+1.208400E-02
 0.000000E+00
 0.000000E+00
+1.900000E-01
+7.412000E-03
 0.000000E+00
 0.000000E+00
-1.700000E-01
-5.970000E-03
-0.000000E+00
-0.000000E+00
-2.620000E-01
-1.380600E-02
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-1.560000E-01
-5.154000E-03
-0.000000E+00
-0.000000E+00
-1.150000E-01
-2.891000E-03
-0.000000E+00
-0.000000E+00
-1.430000E-01
-4.163000E-03
-0.000000E+00
-0.000000E+00
-1.120000E-01
-2.640000E-03
-0.000000E+00
-0.000000E+00
-1.030000E-01
-2.191000E-03
-0.000000E+00
-0.000000E+00
-1.950000E-01
-7.705000E-03
-0.000000E+00
-0.000000E+00
-1.760000E-01
-6.392000E-03
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-9.200000E-02
-1.822000E-03
-0.000000E+00
-0.000000E+00
-1.370000E-01
-3.843000E-03
-0.000000E+00
-0.000000E+00
-1.340000E-01
-3.882000E-03
-0.000000E+00
-0.000000E+00
-1.760000E-01
-6.482000E-03
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-6.400000E-02
-9.460000E-04
-0.000000E+00
-0.000000E+00
-1.510000E-01
-4.845000E-03
-0.000000E+00
-0.000000E+00
-1.800000E-01
-6.520000E-03
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-1.370000E-01
-3.843000E-03
-0.000000E+00
-0.000000E+00
-9.200000E-02
-1.822000E-03
-0.000000E+00
-0.000000E+00
-1.300000E-01
-3.604000E-03
-0.000000E+00
-0.000000E+00
-1.170000E-01
-2.789000E-03
-0.000000E+00
-0.000000E+00
-1.370000E-01
-3.805000E-03
-0.000000E+00
-0.000000E+00
-2.250000E-01
-1.014100E-02
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-9.600000E-02
-2.024000E-03
+2.610000E-01
+1.399900E-02
 0.000000E+00
 0.000000E+00
 2.000000E-01
-8.202000E-03
+8.410000E-03
+0.000000E+00
+0.000000E+00
+2.190000E-01
+9.683000E-03
+0.000000E+00
+0.000000E+00
+1.440000E-01
+4.282000E-03
+0.000000E+00
+0.000000E+00
+2.690000E-01
+1.478100E-02
+0.000000E+00
+0.000000E+00
+1.540000E-01
+4.986000E-03
+0.000000E+00
+0.000000E+00
+2.550000E-01
+1.480500E-02
+0.000000E+00
+0.000000E+00
+5.160000E-01
+5.892200E-02
+0.000000E+00
+0.000000E+00
+2.310000E-01
+1.098900E-02
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+2.000000E-01
+8.410000E-03
+0.000000E+00
+0.000000E+00
+2.610000E-01
+1.399900E-02
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+1.430000E-01
+4.297000E-03
+0.000000E+00
+0.000000E+00
+1.350000E-01
+3.895000E-03
+0.000000E+00
+0.000000E+00
+1.760000E-01
+6.534000E-03
+0.000000E+00
+0.000000E+00
+1.170000E-01
+2.807000E-03
+0.000000E+00
+0.000000E+00
+9.000000E-02
+1.780000E-03
+0.000000E+00
+0.000000E+00
+2.290000E-01
+1.058700E-02
+0.000000E+00
+0.000000E+00
+2.080000E-01
+8.854000E-03
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+1.230000E-01
+3.305000E-03
+0.000000E+00
+0.000000E+00
+1.760000E-01
+6.598000E-03
+0.000000E+00
+0.000000E+00
+1.330000E-01
+3.621000E-03
+0.000000E+00
+0.000000E+00
+1.730000E-01
+6.279000E-03
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+6.100000E-02
+8.350000E-04
+0.000000E+00
+0.000000E+00
+1.410000E-01
+4.071000E-03
+0.000000E+00
+0.000000E+00
+1.800000E-01
+6.574000E-03
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+1.760000E-01
+6.598000E-03
+0.000000E+00
+0.000000E+00
+1.230000E-01
+3.305000E-03
+0.000000E+00
+0.000000E+00
+1.690000E-01
+6.135000E-03
+0.000000E+00
+0.000000E+00
+1.220000E-01
+3.344000E-03
+0.000000E+00
+0.000000E+00
+1.540000E-01
+4.986000E-03
+0.000000E+00
+0.000000E+00
+2.690000E-01
+1.478100E-02
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+1.030000E-01
+2.543000E-03
+0.000000E+00
+0.000000E+00
+1.870000E-01
+7.267000E-03
+0.000000E+00
+0.000000E+00
+1.690000E-01
+5.731000E-03
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+1.220000E-01
+3.344000E-03
+0.000000E+00
+0.000000E+00
+1.690000E-01
+6.135000E-03
+0.000000E+00
+0.000000E+00
 0.000000E+00
 0.000000E+00
-1.820000E-01
-6.660000E-03
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -1901,11 +1917,11 @@ tally 2:
 0.000000E+00
 0.000000E+00
 1.170000E-01
-2.789000E-03
+2.807000E-03
 0.000000E+00
 0.000000E+00
-1.300000E-01
-3.604000E-03
+1.760000E-01
+6.534000E-03
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -1916,32 +1932,16 @@ tally 2:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-1.120000E-01
-2.640000E-03
+6.000000E-02
+8.060000E-04
 0.000000E+00
 0.000000E+00
-1.430000E-01
-4.163000E-03
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-4.900000E-02
-5.630000E-04
-0.000000E+00
-0.000000E+00
-1.670000E-01
-5.653000E-03
-0.000000E+00
-0.000000E+00
-1.670000E-01
-5.701000E-03
+1.290000E-01
+3.487000E-03
+0.000000E+00
+0.000000E+00
+1.790000E-01
+6.747000E-03
 0.000000E+00
 0.000000E+00
 0.000000E+00
diff --git a/tests/regression_tests/seed/results_true.dat b/tests/regression_tests/seed/results_true.dat
index bcd711825..ff34071c1 100644
--- a/tests/regression_tests/seed/results_true.dat
+++ b/tests/regression_tests/seed/results_true.dat
@@ -1,2 +1,2 @@
 k-combined:
-3.069730E-01 2.632099E-03
+3.015003E-01 5.094212E-03
diff --git a/tests/regression_tests/source/results_true.dat b/tests/regression_tests/source/results_true.dat
index 673d27c8a..951075bbb 100644
--- a/tests/regression_tests/source/results_true.dat
+++ b/tests/regression_tests/source/results_true.dat
@@ -1,2 +1,2 @@
 k-combined:
-2.959436E-01 2.782384E-03
+3.034717E-01 2.799386E-03
diff --git a/tests/regression_tests/source_file/results_true.dat b/tests/regression_tests/source_file/results_true.dat
index 264e3d580..359e0526e 100644
--- a/tests/regression_tests/source_file/results_true.dat
+++ b/tests/regression_tests/source_file/results_true.dat
@@ -1,2 +1,2 @@
 k-combined:
-2.983135E-01 5.116978E-03
+2.827397E-01 1.150437E-03
diff --git a/tests/regression_tests/source_mcpl_file/results_true.dat b/tests/regression_tests/source_mcpl_file/results_true.dat
index 264e3d580..3ba1a4520 100644
--- a/tests/regression_tests/source_mcpl_file/results_true.dat
+++ b/tests/regression_tests/source_mcpl_file/results_true.dat
@@ -1,2 +1,2 @@
 k-combined:
-2.983135E-01 5.116978E-03
+2.827397E-01 1.150438E-03
diff --git a/tests/regression_tests/sourcepoint_batch/results_true.dat b/tests/regression_tests/sourcepoint_batch/results_true.dat
index 2770f25ed..3665bdd08 100644
--- a/tests/regression_tests/sourcepoint_batch/results_true.dat
+++ b/tests/regression_tests/sourcepoint_batch/results_true.dat
@@ -1,3 +1,3 @@
 k-combined:
-3.074376E-01 3.049465E-03
-3.667754E+00 -7.701697E+00 2.213664E+00
+2.920435E-01 9.109227E-04
+1.101997E+00 -8.197502E+00 4.294606E+00
diff --git a/tests/regression_tests/sourcepoint_latest/results_true.dat b/tests/regression_tests/sourcepoint_latest/results_true.dat
index bbf03de94..97b997ae6 100644
--- a/tests/regression_tests/sourcepoint_latest/results_true.dat
+++ b/tests/regression_tests/sourcepoint_latest/results_true.dat
@@ -1,2 +1,2 @@
 k-combined:
-3.070134E-01 3.900396E-03
+2.940336E-01 7.338463E-04
diff --git a/tests/regression_tests/sourcepoint_restart/results_true.dat b/tests/regression_tests/sourcepoint_restart/results_true.dat
index b6d85872d..c20b5f2a0 100644
--- a/tests/regression_tests/sourcepoint_restart/results_true.dat
+++ b/tests/regression_tests/sourcepoint_restart/results_true.dat
@@ -1,46 +1,14 @@
 k-combined:
-3.070134E-01 3.900396E-03
+2.940336E-01 7.338463E-04
 tally 1:
 1.300000E-02
-4.700000E-05
-5.741381E-03
-9.030024E-06
+3.900000E-05
+5.833114E-03
+7.476880E-06
 0.000000E+00
 0.000000E+00
-3.067112E-04
-9.407179E-08
-1.000000E-03
-1.000000E-06
-3.015814E-04
-9.095135E-08
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-2.600000E-02
-1.420000E-04
-1.268989E-02
-3.464490E-05
-0.000000E+00
-0.000000E+00
-2.948908E-04
-8.696057E-08
-1.000000E-03
-1.000000E-06
-1.535009E-03
-1.224718E-06
-1.000000E-03
-1.000000E-06
-0.000000E+00
-0.000000E+00
-3.200000E-02
-2.760000E-04
-1.248507E-02
-3.714039E-05
-0.000000E+00
-0.000000E+00
-9.208601E-04
-4.708050E-07
+1.164000E-03
+5.072152E-07
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -49,602 +17,26 @@ tally 1:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-1.900000E-02
-7.500000E-05
-8.218811E-03
-1.462963E-05
+2.100000E-02
+1.110000E-04
+1.108363E-02
+2.889480E-05
 0.000000E+00
 0.000000E+00
-9.070399E-04
-2.743247E-07
-0.000000E+00
-0.000000E+00
-9.047443E-04
-8.185622E-07
-1.000000E-03
-1.000000E-06
-0.000000E+00
-0.000000E+00
-1.200000E-02
-5.000000E-05
-3.938144E-03
-5.245641E-06
-0.000000E+00
-0.000000E+00
-3.067112E-04
-9.407179E-08
-1.000000E-03
-1.000000E-06
-5.897816E-04
-3.478423E-07
-0.000000E+00
-0.000000E+00
-2.948908E-04
-8.696057E-08
-2.000000E-02
-1.260000E-04
-9.079852E-03
-2.657486E-05
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-3.100000E-02
-2.010000E-04
-1.336346E-02
-3.645780E-05
-0.000000E+00
-0.000000E+00
-2.102710E-03
-1.524522E-06
-1.000000E-03
-1.000000E-06
-9.083133E-04
-4.632477E-07
-1.000000E-03
-1.000000E-06
-0.000000E+00
-0.000000E+00
-2.300000E-02
-1.090000E-04
-1.334578E-02
-3.590708E-05
-0.000000E+00
-0.000000E+00
-6.031628E-04
-3.638054E-07
-1.000000E-03
-1.000000E-06
-1.530605E-03
-1.035684E-06
+5.861433E-04
+3.435640E-07
 2.000000E-03
 2.000000E-06
-6.082927E-04
-1.850231E-07
-1.400000E-02
-4.200000E-05
-7.257468E-03
-1.221578E-05
-0.000000E+00
-0.000000E+00
-2.948908E-04
-8.696057E-08
-0.000000E+00
-0.000000E+00
-8.980536E-04
-4.507660E-07
+2.043490E-03
+1.793389E-06
 2.000000E-03
-4.000000E-06
-0.000000E+00
-0.000000E+00
-9.000000E-03
-2.700000E-05
-5.193169E-03
-1.187321E-05
-0.000000E+00
-0.000000E+00
-3.054379E-04
-9.329231E-08
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-1.000000E-02
-2.400000E-05
-5.170002E-03
-7.361546E-06
-0.000000E+00
-0.000000E+00
-6.003287E-04
-1.802529E-07
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-2.800000E-02
-1.720000E-04
-1.699195E-02
-6.267008E-05
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-2.800000E-02
-1.980000E-04
-1.338750E-02
-4.565234E-05
-0.000000E+00
-0.000000E+00
-9.183134E-04
-4.676871E-07
-1.000000E-03
-1.000000E-06
-1.537188E-03
-2.362946E-06
-2.000000E-03
-4.000000E-06
-0.000000E+00
-0.000000E+00
-2.900000E-02
-1.950000E-04
-1.178615E-02
-3.130999E-05
-0.000000E+00
-0.000000E+00
-3.015814E-04
-9.095135E-08
-0.000000E+00
-0.000000E+00
-1.179563E-03
-1.391369E-06
-1.000000E-03
-1.000000E-06
-0.000000E+00
-0.000000E+00
-1.500000E-02
-6.500000E-05
-5.706064E-03
-9.729293E-06
-0.000000E+00
-0.000000E+00
-2.948908E-04
-8.696057E-08
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-3.000000E-03
-9.000000E-06
-1.516642E-03
-1.579637E-06
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-5.897816E-04
-3.478423E-07
-1.000000E-03
-1.000000E-06
-0.000000E+00
-0.000000E+00
-2.900000E-02
-1.970000E-04
-1.274851E-02
-3.511219E-05
-0.000000E+00
-0.000000E+00
-9.057666E-04
-4.601298E-07
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-1.800000E-02
-7.600000E-05
-8.803642E-03
-1.730938E-05
-0.000000E+00
-0.000000E+00
-3.074376E-04
-9.451786E-08
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-2.900000E-02
-1.830000E-04
-1.245316E-02
-3.378176E-05
-0.000000E+00
-0.000000E+00
-6.016020E-04
-1.810324E-07
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-1.000000E-03
-1.000000E-06
-6.090190E-04
-1.854692E-07
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-6.031628E-04
-3.638054E-07
-1.000000E-03
-1.000000E-06
-0.000000E+00
-0.000000E+00
-1.900000E-02
-8.700000E-05
-8.781239E-03
-1.676750E-05
-0.000000E+00
-0.000000E+00
-6.128755E-04
-1.878102E-07
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-3.500000E-02
-2.930000E-04
-1.372494E-02
-4.750881E-05
-0.000000E+00
-0.000000E+00
-9.090396E-04
-2.755502E-07
-0.000000E+00
-0.000000E+00
-5.897816E-04
-3.478423E-07
-1.000000E-03
-1.000000E-06
-0.000000E+00
-0.000000E+00
-3.700000E-02
-3.270000E-04
-1.492073E-02
-5.134793E-05
-0.000000E+00
-0.000000E+00
-6.134225E-04
-3.762872E-07
-1.000000E-03
-1.000000E-06
-3.074376E-04
-9.451786E-08
-1.000000E-03
-1.000000E-06
-6.148751E-04
-3.780714E-07
-3.500000E-02
-2.810000E-04
-1.728232E-02
-6.621096E-05
-0.000000E+00
-0.000000E+00
-1.214477E-03
-3.688425E-07
-0.000000E+00
-0.000000E+00
-1.481145E-03
-1.482321E-06
-1.000000E-03
-1.000000E-06
-3.015814E-04
-9.095135E-08
-8.000000E-03
-1.800000E-05
-3.359923E-03
-3.081200E-06
-0.000000E+00
-0.000000E+00
-3.067112E-04
-9.407179E-08
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-7.000000E-03
-1.500000E-05
-3.660087E-03
-3.561493E-06
-0.000000E+00
-0.000000E+00
-9.203130E-04
-4.713637E-07
-1.000000E-03
-1.000000E-06
-3.015814E-04
-9.095135E-08
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-3.500000E-02
-2.630000E-04
-1.425810E-02
-4.231681E-05
-0.000000E+00
-0.000000E+00
-1.516059E-03
-4.597939E-07
-0.000000E+00
-0.000000E+00
-1.221752E-03
-1.492677E-06
-1.000000E-03
-1.000000E-06
-0.000000E+00
-0.000000E+00
-2.300000E-02
-1.110000E-04
-1.184871E-02
-2.918189E-05
-0.000000E+00
-0.000000E+00
-6.016020E-04
-1.810324E-07
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-1.600000E-02
-6.600000E-05
-7.879913E-03
-1.566560E-05
-0.000000E+00
-0.000000E+00
-9.039098E-04
-2.724298E-07
-0.000000E+00
-0.000000E+00
-3.067112E-04
-9.407179E-08
-1.000000E-03
-1.000000E-06
-0.000000E+00
-0.000000E+00
-9.000000E-03
-1.900000E-05
-4.256120E-03
-4.431220E-06
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-6.000000E-03
-1.200000E-05
-2.739774E-03
-2.333986E-06
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-1.400000E-02
-6.800000E-05
-7.182805E-03
-1.822340E-05
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-1.500000E-02
-6.300000E-05
-5.734575E-03
-9.207711E-06
-0.000000E+00
-0.000000E+00
-6.070193E-04
-1.842437E-07
-0.000000E+00
-0.000000E+00
-8.846723E-04
-7.826452E-07
-1.000000E-03
-1.000000E-06
-0.000000E+00
-0.000000E+00
+2.000000E-06
+2.930717E-04
+8.589100E-08
 2.000000E-02
-8.800000E-05
-9.416733E-03
-2.020354E-05
-0.000000E+00
-0.000000E+00
-6.003287E-04
-1.802529E-07
-0.000000E+00
-0.000000E+00
-6.031628E-04
-3.638054E-07
-0.000000E+00
-0.000000E+00
-3.015814E-04
-9.095135E-08
-7.000000E-03
-1.500000E-05
-2.413278E-03
-1.439032E-06
-0.000000E+00
-0.000000E+00
-2.948908E-04
-8.696057E-08
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-7.000000E-03
-1.500000E-05
-4.226919E-03
-4.173413E-06
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-2.300000E-02
-1.590000E-04
-1.125341E-02
-3.890966E-05
-0.000000E+00
-0.000000E+00
-5.964722E-04
-1.779119E-07
-0.000000E+00
-0.000000E+00
-8.846723E-04
-7.826452E-07
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-3.200000E-02
-2.260000E-04
-1.458976E-02
-4.416780E-05
-0.000000E+00
-0.000000E+00
-1.814806E-03
-9.096012E-07
-1.000000E-03
-1.000000E-06
-6.031628E-04
-3.638054E-07
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-3.100000E-02
-2.050000E-04
-1.241089E-02
-3.545088E-05
-0.000000E+00
-0.000000E+00
-1.515620E-03
-1.191731E-06
-0.000000E+00
-0.000000E+00
-6.121491E-04
-1.873641E-07
-1.000000E-03
-1.000000E-06
-0.000000E+00
-0.000000E+00
-1.000000E-02
-2.600000E-05
-3.936862E-03
-3.749154E-06
-0.000000E+00
-0.000000E+00
-2.948908E-04
-8.696057E-08
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-1.100000E-02
-4.700000E-05
-5.084641E-03
-9.248485E-06
+9.000000E-05
+9.334862E-03
+1.853104E-05
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -658,45 +50,93 @@ tally 1:
 0.000000E+00
 0.000000E+00
 2.500000E-02
-1.770000E-04
-1.021860E-02
-3.099521E-05
+1.430000E-04
+1.110224E-02
+2.872840E-05
 0.000000E+00
 0.000000E+00
-3.074376E-04
-9.451786E-08
+5.833203E-04
+1.701353E-07
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+5.000000E-03
+1.100000E-05
+1.752967E-03
+1.027501E-06
+0.000000E+00
+0.000000E+00
+2.930717E-04
+8.589100E-08
 0.000000E+00
 0.000000E+00
-9.086007E-04
-4.570977E-07
-2.000000E-03
-2.000000E-06
-3.054379E-04
-9.329231E-08
-1.500000E-02
-5.300000E-05
-7.584986E-03
-1.188822E-05
 0.000000E+00
 0.000000E+00
-6.128755E-04
-1.878102E-07
-1.000000E-03
-1.000000E-06
-6.108758E-04
-3.731692E-07
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
 1.800000E-02
-8.600000E-05
-6.672457E-03
-1.369871E-05
+7.600000E-05
+7.300761E-03
+1.254112E-05
 0.000000E+00
 0.000000E+00
-6.141488E-04
-1.885896E-07
+5.841969E-04
+1.706438E-07
+0.000000E+00
+0.000000E+00
+5.861433E-04
+3.435640E-07
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+3.000000E-02
+1.820000E-04
+1.518122E-02
+4.757233E-05
+0.000000E+00
+0.000000E+00
+2.927374E-04
+8.569516E-08
+2.000000E-03
+2.000000E-06
+2.631167E-03
+3.503358E-06
+1.000000E-03
+1.000000E-06
+2.920435E-04
+8.528942E-08
+2.500000E-02
+1.390000E-04
+9.343205E-03
+1.910189E-05
+0.000000E+00
+0.000000E+00
+2.039724E-03
+1.271217E-06
+1.000000E-03
+1.000000E-06
+5.861433E-04
+3.435640E-07
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+2.400000E-02
+1.340000E-04
+1.080336E-02
+2.533338E-05
+0.000000E+00
+0.000000E+00
+2.914595E-04
+8.494867E-08
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -705,46 +145,14 @@ tally 1:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-1.100000E-02
-2.700000E-05
-3.927884E-03
-3.728010E-06
+1.400000E-02
+5.200000E-05
+6.711472E-03
+1.216306E-05
 0.000000E+00
 0.000000E+00
-3.074376E-04
-9.451786E-08
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-9.000000E-03
-1.900000E-05
-4.217645E-03
-4.306910E-06
-0.000000E+00
-0.000000E+00
-6.128755E-04
-1.878102E-07
+5.847809E-04
+1.709846E-07
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -754,37 +162,89 @@ tally 1:
 0.000000E+00
 0.000000E+00
 1.700000E-02
-7.700000E-05
-7.235504E-03
-1.301737E-05
+7.900000E-05
+6.413106E-03
+1.186604E-05
 0.000000E+00
 0.000000E+00
-3.054379E-04
-9.329231E-08
-0.000000E+00
-0.000000E+00
-1.531736E-03
-8.439742E-07
-3.000000E-03
-3.000000E-06
-3.074376E-04
-9.451786E-08
-9.000000E-03
-1.900000E-05
-3.018298E-03
-2.174671E-06
+5.861433E-04
+3.435640E-07
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-6.141488E-04
-1.885896E-07
+0.000000E+00
+0.000000E+00
+2.900000E-02
+1.770000E-04
+1.314196E-02
+3.678739E-05
+0.000000E+00
+0.000000E+00
+1.167073E-03
+5.110971E-07
+0.000000E+00
+0.000000E+00
+5.861433E-04
+3.435640E-07
 1.000000E-03
 1.000000E-06
-3.074376E-04
-9.451786E-08
+0.000000E+00
+0.000000E+00
+2.900000E-02
+1.830000E-04
+1.372758E-02
+4.360498E-05
+0.000000E+00
+0.000000E+00
+5.858090E-04
+1.715862E-07
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+2.200000E-02
+1.000000E-04
+9.631311E-03
+2.001285E-05
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+5.829191E-04
+3.397947E-07
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+8.000000E-03
+1.800000E-05
+4.094439E-03
+4.622331E-06
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+1.170949E-03
+1.371123E-06
+1.000000E-03
+1.000000E-06
+0.000000E+00
+0.000000E+00
+9.000000E-03
+5.100000E-05
+4.664405E-03
+1.087264E-05
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -797,14 +257,362 @@ tally 1:
 0.000000E+00
 0.000000E+00
 0.000000E+00
+2.200000E-02
+1.300000E-04
+9.644227E-03
+2.300481E-05
+0.000000E+00
+0.000000E+00
+8.771587E-04
+4.270487E-07
+0.000000E+00
+0.000000E+00
+2.927374E-04
+8.569516E-08
+1.000000E-03
+1.000000E-06
+0.000000E+00
+0.000000E+00
+2.500000E-02
+1.630000E-04
+1.257283E-02
+3.946813E-05
+0.000000E+00
+0.000000E+00
+1.171259E-03
+8.583084E-07
+0.000000E+00
+0.000000E+00
+1.462299E-03
+1.112414E-06
+1.000000E-03
+1.000000E-06
+0.000000E+00
+0.000000E+00
+2.400000E-02
+1.400000E-04
+1.138156E-02
+3.565057E-05
+0.000000E+00
+0.000000E+00
+2.930717E-04
+8.589100E-08
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+9.000000E-03
+2.100000E-05
+4.383252E-03
+6.073597E-06
+0.000000E+00
+0.000000E+00
+8.707460E-04
+7.581986E-07
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+1.100000E-02
+3.500000E-05
+6.410606E-03
+1.066242E-05
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+1.000000E-03
+1.000000E-06
+8.756564E-04
+4.254898E-07
+1.000000E-03
+1.000000E-06
+0.000000E+00
+0.000000E+00
+1.600000E-02
+6.000000E-05
+7.287540E-03
+1.279808E-05
+0.000000E+00
+0.000000E+00
+5.822922E-04
+1.695337E-07
+0.000000E+00
+0.000000E+00
+1.172287E-03
+1.374256E-06
+1.000000E-03
+1.000000E-06
+0.000000E+00
+0.000000E+00
+3.400000E-02
+2.820000E-04
+1.603656E-02
+6.229803E-05
+0.000000E+00
+0.000000E+00
+1.460479E-03
+7.689660E-07
+1.000000E-03
+1.000000E-06
+1.165972E-03
+6.797578E-07
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+1.900000E-02
+8.500000E-05
+7.880322E-03
+1.387762E-05
+0.000000E+00
+0.000000E+00
+8.755466E-04
+4.261064E-07
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+8.000000E-03
+2.400000E-05
+4.666802E-03
+4.926489E-06
+0.000000E+00
+0.000000E+00
+5.829191E-04
+3.397947E-07
+0.000000E+00
+0.000000E+00
+8.759908E-04
+4.256857E-07
 2.000000E-03
 2.000000E-06
-1.203204E-03
-7.241295E-07
+0.000000E+00
+0.000000E+00
+1.500000E-02
+5.900000E-05
+8.180347E-03
+1.622409E-05
+0.000000E+00
+0.000000E+00
+2.902487E-04
+8.424429E-08
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+2.300000E-02
+1.390000E-04
+7.593262E-03
+1.708292E-05
+0.000000E+00
+0.000000E+00
+1.750169E-03
+1.193182E-06
+1.000000E-03
+1.000000E-06
+1.461465E-03
+7.684663E-07
+2.000000E-03
+4.000000E-06
+2.914595E-04
+8.494867E-08
+2.300000E-02
+1.350000E-04
+9.639670E-03
+2.161898E-05
+0.000000E+00
+0.000000E+00
+8.781869E-04
+4.288534E-07
+0.000000E+00
+0.000000E+00
+8.707460E-04
+7.581986E-07
+1.000000E-03
+1.000000E-06
+0.000000E+00
+0.000000E+00
+2.100000E-02
+1.090000E-04
+9.045520E-03
+2.171457E-05
+0.000000E+00
+0.000000E+00
+5.851152E-04
+1.711804E-07
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+1.800000E-02
+7.000000E-05
+1.167023E-02
+2.840320E-05
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+1.000000E-03
+1.000000E-06
+5.854747E-04
+3.427806E-07
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+3.000000E-03
+5.000000E-06
+1.171618E-03
+6.863446E-07
+0.000000E+00
+0.000000E+00
+2.930717E-04
+8.589100E-08
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+1.300000E-02
+4.500000E-05
+6.428153E-03
+9.064469E-06
+0.000000E+00
+0.000000E+00
+2.927374E-04
+8.569516E-08
+1.000000E-03
+1.000000E-06
+2.920435E-04
+8.528942E-08
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+1.800000E-02
+9.000000E-05
+8.185938E-03
+1.967120E-05
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+9.000000E-03
+2.300000E-05
+4.665341E-03
+5.426897E-06
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+4.000000E-03
+4.000000E-06
+3.497088E-03
+3.563633E-06
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+5.000000E-03
+9.000000E-06
+2.333045E-03
+1.870613E-06
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+1.172287E-03
+1.374256E-06
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+8.000000E-03
+2.200000E-05
+6.413648E-03
+1.136518E-05
+0.000000E+00
+0.000000E+00
+2.927374E-04
+8.569516E-08
+0.000000E+00
+0.000000E+00
+2.930717E-04
+8.589100E-08
+1.000000E-03
+1.000000E-06
+0.000000E+00
+0.000000E+00
+2.000000E-02
+1.200000E-04
+7.007604E-03
+1.379504E-05
+0.000000E+00
+0.000000E+00
+5.851152E-04
+1.711804E-07
+0.000000E+00
+0.000000E+00
+5.861433E-04
+3.435640E-07
+1.000000E-03
+1.000000E-06
+0.000000E+00
+0.000000E+00
+1.700000E-02
+7.900000E-05
+7.281401E-03
+1.600845E-05
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -818,9 +626,9 @@ tally 1:
 0.000000E+00
 0.000000E+00
 7.000000E-03
-1.500000E-05
-4.818843E-03
-6.474375E-06
+1.900000E-05
+3.218959E-03
+4.543526E-06
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -833,46 +641,10 @@ tally 1:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-2.400000E-02
-1.180000E-04
-1.088639E-02
-2.567229E-05
-0.000000E+00
-0.000000E+00
-3.067112E-04
-9.407179E-08
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-1.300000E-02
-5.100000E-05
-6.002667E-03
-1.149916E-05
-0.000000E+00
-0.000000E+00
-3.015814E-04
-9.095135E-08
-0.000000E+00
-0.000000E+00
-3.067112E-04
-9.407179E-08
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-2.948908E-04
-8.696057E-08
-0.000000E+00
-0.000000E+00
-2.948908E-04
-8.696057E-08
+9.000000E-03
+1.900000E-05
+4.380921E-03
+4.182826E-06
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -885,6 +657,42 @@ tally 1:
 0.000000E+00
 0.000000E+00
 0.000000E+00
+2.100000E-02
+1.050000E-04
+9.932207E-03
+2.153598E-05
+0.000000E+00
+0.000000E+00
+5.854747E-04
+3.427806E-07
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+1.800000E-02
+7.400000E-05
+7.301011E-03
+1.358176E-05
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+5.804973E-04
+3.369772E-07
+1.000000E-03
+1.000000E-06
+0.000000E+00
+0.000000E+00
+2.300000E-02
+1.610000E-04
+9.647933E-03
+2.657983E-05
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -897,14 +705,110 @@ tally 1:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-1.300000E-02
-4.700000E-05
-5.486562E-03
-7.965488E-06
+9.000000E-03
+1.900000E-05
+2.915422E-03
+2.203274E-06
+0.000000E+00
+0.000000E+00
+8.775182E-04
+4.280701E-07
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+1.000000E-03
+1.000000E-06
+2.920435E-04
+8.528942E-08
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+5.000000E-03
+9.000000E-06
+2.044244E-03
+1.796182E-06
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+1.800000E-02
+9.000000E-05
+6.718632E-03
+1.203946E-05
+0.000000E+00
+0.000000E+00
+2.927374E-04
+8.569516E-08
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+1.100000E-02
+2.700000E-05
+4.675703E-03
+5.128811E-06
+0.000000E+00
+0.000000E+00
+2.914595E-04
+8.494867E-08
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+1.000000E-03
+1.000000E-06
+2.914595E-04
+8.494867E-08
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+1.000000E-03
+1.000000E-06
+2.920435E-04
+8.528942E-08
+0.000000E+00
+0.000000E+00
 0.000000E+00
 0.000000E+00
-3.054379E-04
-9.329231E-08
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -914,13 +818,9 @@ tally 1:
 0.000000E+00
 0.000000E+00
 8.000000E-03
-1.800000E-05
-3.334317E-03
-3.609712E-06
-0.000000E+00
-0.000000E+00
-2.948908E-04
-8.696057E-08
+2.600000E-05
+4.670349E-03
+6.133014E-06
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -929,20 +829,120 @@ tally 1:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-2.000000E-02
-1.080000E-04
-9.741552E-03
-2.552400E-05
 0.000000E+00
 0.000000E+00
-3.015814E-04
-9.095135E-08
 0.000000E+00
 0.000000E+00
-1.800986E-03
-1.622276E-06
-1.000000E-03
-1.000000E-06
+1.500000E-02
+6.100000E-05
+8.751735E-03
+1.922421E-05
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+1.400000E-02
+5.000000E-05
+6.126605E-03
+9.620966E-06
+0.000000E+00
+0.000000E+00
+5.835031E-04
+1.702381E-07
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+2.000000E-03
+2.000000E-06
+5.847809E-04
+1.709846E-07
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+2.000000E-03
+2.000000E-06
+8.719569E-04
+4.219258E-07
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+9.000000E-03
+2.700000E-05
+4.085939E-03
+4.936434E-06
+0.000000E+00
+0.000000E+00
+2.930717E-04
+8.589100E-08
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+9.000000E-03
+2.500000E-05
+5.846700E-03
+9.739696E-06
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+1.300000E-02
+3.900000E-05
+6.128455E-03
+1.013669E-05
+0.000000E+00
+0.000000E+00
+5.851152E-04
+1.711804E-07
+0.000000E+00
+0.000000E+00
+1.172287E-03
+1.374256E-06
+0.000000E+00
+0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -962,11 +962,11 @@ tally 1:
 0.000000E+00
 0.000000E+00
 tally 2:
-5.818100E-01
-6.772558E-02
-6.344749E-01
-8.054355E-02
-3.690180E+00
-2.724752E+00
-4.102635E+01
-3.367908E+02
+5.554367E-01
+6.170503E-02
+6.055520E-01
+7.334109E-02
+3.526894E+00
+2.488065E+00
+3.925114E+01
+3.081807E+02
diff --git a/tests/regression_tests/statepoint_batch/__init__.py b/tests/regression_tests/statepoint_batch/__init__.py
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/regression_tests/statepoint_batch/geometry.xml b/tests/regression_tests/statepoint_batch/geometry.xml
deleted file mode 100644
index bc56030e1..000000000
--- a/tests/regression_tests/statepoint_batch/geometry.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<geometry>
-
-  <!-- Sphere with radius 10 -->
-  <surface id="1" type="sphere" coeffs="0 0 0 10" boundary="vacuum"/>
-  <cell id="1" material="1" region="-1" />
-    
-</geometry>
diff --git a/tests/regression_tests/statepoint_batch/materials.xml b/tests/regression_tests/statepoint_batch/materials.xml
deleted file mode 100644
index 2472a7471..000000000
--- a/tests/regression_tests/statepoint_batch/materials.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-<materials>
-
-  <material id="1">
-    <density value="4.5" units="g/cc" />
-    <nuclide name="U235" ao="1.0" />
-  </material>
-
-</materials>
diff --git a/tests/regression_tests/statepoint_batch/results_true.dat b/tests/regression_tests/statepoint_batch/results_true.dat
deleted file mode 100644
index f5c855d77..000000000
--- a/tests/regression_tests/statepoint_batch/results_true.dat
+++ /dev/null
@@ -1,2 +0,0 @@
-k-combined:
-3.048864E-01 1.689118E-03
diff --git a/tests/regression_tests/statepoint_batch/settings.xml b/tests/regression_tests/statepoint_batch/settings.xml
deleted file mode 100644
index e2f8dad47..000000000
--- a/tests/regression_tests/statepoint_batch/settings.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0"?>
-<settings>
-
-  <state_point batches="3 6 9" />
-
-  <run_mode>eigenvalue</run_mode>
-  <batches>10</batches>
-  <inactive>5</inactive>
-  <particles>1000</particles>
-
-  <source>
-    <space type="box">
-      <parameters>-4 -4 -4  4  4  4</parameters>
-    </space>
-  </source>
-
-</settings>
diff --git a/tests/regression_tests/statepoint_batch/test.py b/tests/regression_tests/statepoint_batch/test.py
deleted file mode 100644
index 323b28fc6..000000000
--- a/tests/regression_tests/statepoint_batch/test.py
+++ /dev/null
@@ -1,18 +0,0 @@
-from tests.testing_harness import TestHarness
-
-
-class StatepointTestHarness(TestHarness):
-    def __init__(self):
-        super().__init__(None)
-
-    def _test_output_created(self):
-        """Make sure statepoint files have been created."""
-        sps = ('statepoint.03.h5', 'statepoint.06.h5', 'statepoint.09.h5')
-        for sp in sps:
-            self._sp_name = sp
-            TestHarness._test_output_created(self)
-
-
-def test_statepoint_batch():
-    harness = StatepointTestHarness()
-    harness.main()
diff --git a/tests/regression_tests/statepoint_restart/results_true.dat b/tests/regression_tests/statepoint_restart/results_true.dat
index aebc971f4..b919b3000 100644
--- a/tests/regression_tests/statepoint_restart/results_true.dat
+++ b/tests/regression_tests/statepoint_restart/results_true.dat
@@ -1,66 +1,18 @@
 k-combined:
-3.070134E-01 3.900396E-03
+2.940336E-01 7.338463E-04
 tally 1:
 1.300000E-02
-4.700000E-05
+3.900000E-05
 1.300000E-02
-4.700000E-05
-5.741381E-03
-9.030024E-06
+3.900000E-05
+5.833114E-03
+7.476880E-06
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-3.067112E-04
-9.407179E-08
-1.000000E-03
-1.000000E-06
-1.000000E-03
-1.000000E-06
-3.015814E-04
-9.095135E-08
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-2.600000E-02
-1.420000E-04
-2.600000E-02
-1.420000E-04
-1.268989E-02
-3.464490E-05
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-2.948908E-04
-8.696057E-08
-1.000000E-03
-1.000000E-06
-1.000000E-03
-1.000000E-06
-1.535009E-03
-1.224718E-06
-1.000000E-03
-1.000000E-06
-1.000000E-03
-1.000000E-06
-0.000000E+00
-0.000000E+00
-3.200000E-02
-2.760000E-04
-3.200000E-02
-2.760000E-04
-1.248507E-02
-3.714039E-05
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-9.208601E-04
-4.708050E-07
+1.164000E-03
+5.072152E-07
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -73,900 +25,36 @@ tally 1:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-1.900000E-02
-7.500000E-05
-1.900000E-02
-7.500000E-05
-8.218811E-03
-1.462963E-05
+2.100000E-02
+1.110000E-04
+2.100000E-02
+1.110000E-04
+1.108363E-02
+2.889480E-05
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-9.070399E-04
-2.743247E-07
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-9.047443E-04
-8.185622E-07
-1.000000E-03
-1.000000E-06
-1.000000E-03
-1.000000E-06
-0.000000E+00
-0.000000E+00
-1.200000E-02
-5.000000E-05
-1.200000E-02
-5.000000E-05
-3.938144E-03
-5.245641E-06
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-3.067112E-04
-9.407179E-08
-1.000000E-03
-1.000000E-06
+5.861433E-04
+3.435640E-07
 2.000000E-03
-4.000000E-06
-5.897816E-04
-3.478423E-07
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-2.948908E-04
-8.696057E-08
-2.000000E-02
-1.260000E-04
-2.000000E-02
-1.260000E-04
-9.079852E-03
-2.657486E-05
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-3.100000E-02
-2.010000E-04
-3.100000E-02
-2.010000E-04
-1.336346E-02
-3.645780E-05
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-2.102710E-03
-1.524522E-06
-1.000000E-03
-1.000000E-06
-1.000000E-03
-1.000000E-06
-9.083133E-04
-4.632477E-07
-1.000000E-03
-1.000000E-06
-1.000000E-03
-1.000000E-06
-0.000000E+00
-0.000000E+00
-2.300000E-02
-1.090000E-04
-2.300000E-02
-1.090000E-04
-1.334578E-02
-3.590708E-05
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-6.031628E-04
-3.638054E-07
-1.000000E-03
-1.000000E-06
-1.000000E-03
-1.000000E-06
-1.530605E-03
-1.035684E-06
+2.000000E-06
+3.000000E-03
+5.000000E-06
+2.043490E-03
+1.793389E-06
 2.000000E-03
 2.000000E-06
 2.000000E-03
 2.000000E-06
-6.082927E-04
-1.850231E-07
-1.400000E-02
-4.200000E-05
-1.400000E-02
-4.200000E-05
-7.257468E-03
-1.221578E-05
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-2.948908E-04
-8.696057E-08
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-8.980536E-04
-4.507660E-07
-2.000000E-03
-4.000000E-06
-2.000000E-03
-4.000000E-06
-0.000000E+00
-0.000000E+00
-9.000000E-03
-2.700000E-05
-9.000000E-03
-2.700000E-05
-5.193169E-03
-1.187321E-05
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-3.054379E-04
-9.329231E-08
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-1.000000E-02
-2.400000E-05
-1.000000E-02
-2.400000E-05
-5.170002E-03
-7.361546E-06
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-6.003287E-04
-1.802529E-07
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-2.800000E-02
-1.720000E-04
-2.800000E-02
-1.720000E-04
-1.699195E-02
-6.267008E-05
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-2.800000E-02
-1.980000E-04
-2.800000E-02
-1.980000E-04
-1.338750E-02
-4.565234E-05
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-9.183134E-04
-4.676871E-07
-1.000000E-03
-1.000000E-06
-1.000000E-03
-1.000000E-06
-1.537188E-03
-2.362946E-06
-2.000000E-03
-4.000000E-06
-2.000000E-03
-4.000000E-06
-0.000000E+00
-0.000000E+00
-2.900000E-02
-1.950000E-04
-2.900000E-02
-1.950000E-04
-1.178615E-02
-3.130999E-05
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-3.015814E-04
-9.095135E-08
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-1.179563E-03
-1.391369E-06
-1.000000E-03
-1.000000E-06
-1.000000E-03
-1.000000E-06
-0.000000E+00
-0.000000E+00
-1.500000E-02
-6.500000E-05
-1.500000E-02
-6.500000E-05
-5.706064E-03
-9.729293E-06
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-2.948908E-04
-8.696057E-08
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-3.000000E-03
-9.000000E-06
-3.000000E-03
-9.000000E-06
-1.516642E-03
-1.579637E-06
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-5.897816E-04
-3.478423E-07
-1.000000E-03
-1.000000E-06
-1.000000E-03
-1.000000E-06
-0.000000E+00
-0.000000E+00
-2.900000E-02
-1.970000E-04
-2.900000E-02
-1.970000E-04
-1.274851E-02
-3.511219E-05
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-9.057666E-04
-4.601298E-07
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-1.800000E-02
-7.600000E-05
-1.800000E-02
-7.600000E-05
-8.803642E-03
-1.730938E-05
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-3.074376E-04
-9.451786E-08
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-2.900000E-02
-1.830000E-04
-2.900000E-02
-1.830000E-04
-1.245316E-02
-3.378176E-05
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-6.016020E-04
-1.810324E-07
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-1.000000E-03
-1.000000E-06
-1.000000E-03
-1.000000E-06
-6.090190E-04
-1.854692E-07
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-6.031628E-04
-3.638054E-07
-1.000000E-03
-1.000000E-06
-1.000000E-03
-1.000000E-06
-0.000000E+00
-0.000000E+00
-1.900000E-02
-8.700000E-05
-1.900000E-02
-8.700000E-05
-8.781239E-03
-1.676750E-05
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-6.128755E-04
-1.878102E-07
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-3.500000E-02
-2.930000E-04
-3.500000E-02
-2.930000E-04
-1.372494E-02
-4.750881E-05
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-9.090396E-04
-2.755502E-07
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-5.897816E-04
-3.478423E-07
-1.000000E-03
-1.000000E-06
-1.000000E-03
-1.000000E-06
-0.000000E+00
-0.000000E+00
-3.700000E-02
-3.270000E-04
-3.700000E-02
-3.270000E-04
-1.492073E-02
-5.134793E-05
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-6.134225E-04
-3.762872E-07
-1.000000E-03
-1.000000E-06
-1.000000E-03
-1.000000E-06
-3.074376E-04
-9.451786E-08
-1.000000E-03
-1.000000E-06
-1.000000E-03
-1.000000E-06
-6.148751E-04
-3.780714E-07
-3.500000E-02
-2.810000E-04
-3.500000E-02
-2.810000E-04
-1.728232E-02
-6.621096E-05
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-1.214477E-03
-3.688425E-07
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-1.481145E-03
-1.482321E-06
-1.000000E-03
-1.000000E-06
-1.000000E-03
-1.000000E-06
-3.015814E-04
-9.095135E-08
-8.000000E-03
-1.800000E-05
-8.000000E-03
-1.800000E-05
-3.359923E-03
-3.081200E-06
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-3.067112E-04
-9.407179E-08
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-7.000000E-03
-1.500000E-05
-7.000000E-03
-1.500000E-05
-3.660087E-03
-3.561493E-06
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-9.203130E-04
-4.713637E-07
-1.000000E-03
-1.000000E-06
-1.000000E-03
-1.000000E-06
-3.015814E-04
-9.095135E-08
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-3.500000E-02
-2.630000E-04
-3.500000E-02
-2.630000E-04
-1.425810E-02
-4.231681E-05
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-1.516059E-03
-4.597939E-07
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-1.221752E-03
-1.492677E-06
-1.000000E-03
-1.000000E-06
-1.000000E-03
-1.000000E-06
-0.000000E+00
-0.000000E+00
-2.300000E-02
-1.110000E-04
-2.300000E-02
-1.110000E-04
-1.184871E-02
-2.918189E-05
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-6.016020E-04
-1.810324E-07
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-1.600000E-02
-6.600000E-05
-1.600000E-02
-6.600000E-05
-7.879913E-03
-1.566560E-05
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-9.039098E-04
-2.724298E-07
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-3.067112E-04
-9.407179E-08
-1.000000E-03
-1.000000E-06
-1.000000E-03
-1.000000E-06
-0.000000E+00
-0.000000E+00
-9.000000E-03
-1.900000E-05
-9.000000E-03
-1.900000E-05
-4.256120E-03
-4.431220E-06
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-6.000000E-03
-1.200000E-05
-6.000000E-03
-1.200000E-05
-2.739774E-03
-2.333986E-06
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-1.400000E-02
-6.800000E-05
-1.400000E-02
-6.800000E-05
-7.182805E-03
-1.822340E-05
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-1.500000E-02
-6.300000E-05
-1.500000E-02
-6.300000E-05
-5.734575E-03
-9.207711E-06
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-6.070193E-04
-1.842437E-07
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-8.846723E-04
-7.826452E-07
-1.000000E-03
-1.000000E-06
-1.000000E-03
-1.000000E-06
-0.000000E+00
-0.000000E+00
+2.930717E-04
+8.589100E-08
 2.000000E-02
-8.800000E-05
+9.000000E-05
 2.000000E-02
-8.800000E-05
-9.416733E-03
-2.020354E-05
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-6.003287E-04
-1.802529E-07
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-6.031628E-04
-3.638054E-07
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-3.015814E-04
-9.095135E-08
-7.000000E-03
-1.500000E-05
-7.000000E-03
-1.500000E-05
-2.413278E-03
-1.439032E-06
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-2.948908E-04
-8.696057E-08
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-7.000000E-03
-1.500000E-05
-7.000000E-03
-1.500000E-05
-4.226919E-03
-4.173413E-06
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-2.300000E-02
-1.590000E-04
-2.300000E-02
-1.590000E-04
-1.125341E-02
-3.890966E-05
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-5.964722E-04
-1.779119E-07
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-8.846723E-04
-7.826452E-07
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-3.200000E-02
-2.260000E-04
-3.200000E-02
-2.260000E-04
-1.458976E-02
-4.416780E-05
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-1.814806E-03
-9.096012E-07
-1.000000E-03
-1.000000E-06
-1.000000E-03
-1.000000E-06
-6.031628E-04
-3.638054E-07
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-3.100000E-02
-2.050000E-04
-3.100000E-02
-2.050000E-04
-1.241089E-02
-3.545088E-05
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-1.515620E-03
-1.191731E-06
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-6.121491E-04
-1.873641E-07
-1.000000E-03
-1.000000E-06
-1.000000E-03
-1.000000E-06
-0.000000E+00
-0.000000E+00
-1.000000E-02
-2.600000E-05
-1.000000E-02
-2.600000E-05
-3.936862E-03
-3.749154E-06
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-2.948908E-04
-8.696057E-08
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-1.100000E-02
-4.700000E-05
-1.100000E-02
-4.700000E-05
-5.084641E-03
-9.248485E-06
+9.000000E-05
+9.334862E-03
+1.853104E-05
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -986,65 +74,401 @@ tally 1:
 0.000000E+00
 0.000000E+00
 2.500000E-02
-1.770000E-04
+1.430000E-04
 2.500000E-02
+1.430000E-04
+1.110224E-02
+2.872840E-05
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+5.833203E-04
+1.701353E-07
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+5.000000E-03
+1.100000E-05
+5.000000E-03
+1.100000E-05
+1.752967E-03
+1.027501E-06
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+2.930717E-04
+8.589100E-08
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+1.800000E-02
+7.600000E-05
+1.800000E-02
+7.600000E-05
+7.300761E-03
+1.254112E-05
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+5.841969E-04
+1.706438E-07
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+5.861433E-04
+3.435640E-07
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+3.000000E-02
+1.820000E-04
+3.000000E-02
+1.820000E-04
+1.518122E-02
+4.757233E-05
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+2.927374E-04
+8.569516E-08
+2.000000E-03
+2.000000E-06
+2.000000E-03
+2.000000E-06
+2.631167E-03
+3.503358E-06
+1.000000E-03
+1.000000E-06
+1.000000E-03
+1.000000E-06
+2.920435E-04
+8.528942E-08
+2.500000E-02
+1.390000E-04
+2.500000E-02
+1.390000E-04
+9.343205E-03
+1.910189E-05
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+2.039724E-03
+1.271217E-06
+1.000000E-03
+1.000000E-06
+1.000000E-03
+1.000000E-06
+5.861433E-04
+3.435640E-07
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+2.400000E-02
+1.340000E-04
+2.400000E-02
+1.340000E-04
+1.080336E-02
+2.533338E-05
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+2.914595E-04
+8.494867E-08
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+1.400000E-02
+5.200000E-05
+1.400000E-02
+5.200000E-05
+6.711472E-03
+1.216306E-05
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+5.847809E-04
+1.709846E-07
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+1.700000E-02
+7.900000E-05
+1.700000E-02
+7.900000E-05
+6.413106E-03
+1.186604E-05
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+5.861433E-04
+3.435640E-07
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+2.900000E-02
 1.770000E-04
-1.021860E-02
-3.099521E-05
+2.900000E-02
+1.770000E-04
+1.314196E-02
+3.678739E-05
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-3.074376E-04
-9.451786E-08
+1.167073E-03
+5.110971E-07
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-9.086007E-04
-4.570977E-07
-2.000000E-03
-2.000000E-06
-2.000000E-03
-2.000000E-06
-3.054379E-04
-9.329231E-08
-1.500000E-02
-5.300000E-05
-1.500000E-02
-5.300000E-05
-7.584986E-03
-1.188822E-05
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-6.128755E-04
-1.878102E-07
+5.861433E-04
+3.435640E-07
 1.000000E-03
 1.000000E-06
 1.000000E-03
 1.000000E-06
-6.108758E-04
-3.731692E-07
+0.000000E+00
+0.000000E+00
+2.900000E-02
+1.830000E-04
+2.900000E-02
+1.830000E-04
+1.372758E-02
+4.360498E-05
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+5.858090E-04
+1.715862E-07
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-1.800000E-02
-8.600000E-05
-1.800000E-02
-8.600000E-05
-6.672457E-03
-1.369871E-05
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-6.141488E-04
-1.885896E-07
+0.000000E+00
+0.000000E+00
+2.200000E-02
+1.000000E-04
+2.200000E-02
+1.000000E-04
+9.631311E-03
+2.001285E-05
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+5.829191E-04
+3.397947E-07
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+8.000000E-03
+1.800000E-05
+8.000000E-03
+1.800000E-05
+4.094439E-03
+4.622331E-06
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+1.170949E-03
+1.371123E-06
+1.000000E-03
+1.000000E-06
+1.000000E-03
+1.000000E-06
+0.000000E+00
+0.000000E+00
+9.000000E-03
+5.100000E-05
+9.000000E-03
+5.100000E-05
+4.664405E-03
+1.087264E-05
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+2.200000E-02
+1.300000E-04
+2.200000E-02
+1.300000E-04
+9.644227E-03
+2.300481E-05
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+8.771587E-04
+4.270487E-07
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+2.927374E-04
+8.569516E-08
+1.000000E-03
+1.000000E-06
+1.000000E-03
+1.000000E-06
+0.000000E+00
+0.000000E+00
+2.500000E-02
+1.630000E-04
+2.500000E-02
+1.630000E-04
+1.257283E-02
+3.946813E-05
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+1.171259E-03
+8.583084E-07
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+1.462299E-03
+1.112414E-06
+1.000000E-03
+1.000000E-06
+1.000000E-03
+1.000000E-06
+0.000000E+00
+0.000000E+00
+2.400000E-02
+1.400000E-04
+2.400000E-02
+1.400000E-04
+1.138156E-02
+3.565057E-05
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+2.930717E-04
+8.589100E-08
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+9.000000E-03
+2.100000E-05
+9.000000E-03
+2.100000E-05
+4.383252E-03
+6.073597E-06
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+8.707460E-04
+7.581986E-07
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -1058,129 +482,89 @@ tally 1:
 0.000000E+00
 0.000000E+00
 1.100000E-02
-2.700000E-05
+3.500000E-05
 1.100000E-02
-2.700000E-05
-3.927884E-03
-3.728010E-06
+3.500000E-05
+6.410606E-03
+1.066242E-05
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-3.074376E-04
-9.451786E-08
 0.000000E+00
 0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-9.000000E-03
-1.900000E-05
-9.000000E-03
-1.900000E-05
-4.217645E-03
-4.306910E-06
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-6.128755E-04
-1.878102E-07
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-1.700000E-02
-7.700000E-05
-1.700000E-02
-7.700000E-05
-7.235504E-03
-1.301737E-05
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-3.054379E-04
-9.329231E-08
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-1.531736E-03
-8.439742E-07
-3.000000E-03
-3.000000E-06
-3.000000E-03
-3.000000E-06
-3.074376E-04
-9.451786E-08
-9.000000E-03
-1.900000E-05
-9.000000E-03
-1.900000E-05
-3.018298E-03
-2.174671E-06
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-6.141488E-04
-1.885896E-07
 1.000000E-03
 1.000000E-06
 1.000000E-03
 1.000000E-06
-3.074376E-04
-9.451786E-08
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
+8.756564E-04
+4.254898E-07
+1.000000E-03
+1.000000E-06
+1.000000E-03
+1.000000E-06
+0.000000E+00
+0.000000E+00
+1.600000E-02
+6.000000E-05
+1.600000E-02
+6.000000E-05
+7.287540E-03
+1.279808E-05
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+5.822922E-04
+1.695337E-07
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+1.172287E-03
+1.374256E-06
+1.000000E-03
+1.000000E-06
+1.000000E-03
+1.000000E-06
+0.000000E+00
+0.000000E+00
+3.400000E-02
+2.820000E-04
+3.400000E-02
+2.820000E-04
+1.603656E-02
+6.229803E-05
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+1.460479E-03
+7.689660E-07
+1.000000E-03
+1.000000E-06
+1.000000E-03
+1.000000E-06
+1.165972E-03
+6.797578E-07
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+1.900000E-02
+8.500000E-05
+1.900000E-02
+8.500000E-05
+7.880322E-03
+1.387762E-05
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+8.755466E-04
+4.261064E-07
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -1193,20 +577,348 @@ tally 1:
 0.000000E+00
 0.000000E+00
 0.000000E+00
+8.000000E-03
+2.400000E-05
+8.000000E-03
+2.400000E-05
+4.666802E-03
+4.926489E-06
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
+5.829191E-04
+3.397947E-07
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
+8.759908E-04
+4.256857E-07
 2.000000E-03
 2.000000E-06
 2.000000E-03
 2.000000E-06
-1.203204E-03
-7.241295E-07
+0.000000E+00
+0.000000E+00
+1.500000E-02
+5.900000E-05
+1.500000E-02
+5.900000E-05
+8.180347E-03
+1.622409E-05
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+2.902487E-04
+8.424429E-08
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+2.300000E-02
+1.390000E-04
+2.300000E-02
+1.390000E-04
+7.593262E-03
+1.708292E-05
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+1.750169E-03
+1.193182E-06
+1.000000E-03
+1.000000E-06
+1.000000E-03
+1.000000E-06
+1.461465E-03
+7.684663E-07
+2.000000E-03
+4.000000E-06
+2.000000E-03
+4.000000E-06
+2.914595E-04
+8.494867E-08
+2.300000E-02
+1.350000E-04
+2.300000E-02
+1.350000E-04
+9.639670E-03
+2.161898E-05
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+8.781869E-04
+4.288534E-07
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+8.707460E-04
+7.581986E-07
+1.000000E-03
+1.000000E-06
+1.000000E-03
+1.000000E-06
+0.000000E+00
+0.000000E+00
+2.100000E-02
+1.090000E-04
+2.100000E-02
+1.090000E-04
+9.045520E-03
+2.171457E-05
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+5.851152E-04
+1.711804E-07
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+1.800000E-02
+7.000000E-05
+1.800000E-02
+7.000000E-05
+1.167023E-02
+2.840320E-05
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+1.000000E-03
+1.000000E-06
+1.000000E-03
+1.000000E-06
+5.854747E-04
+3.427806E-07
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+3.000000E-03
+5.000000E-06
+3.000000E-03
+5.000000E-06
+1.171618E-03
+6.863446E-07
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+2.930717E-04
+8.589100E-08
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+1.300000E-02
+4.500000E-05
+1.300000E-02
+4.500000E-05
+6.428153E-03
+9.064469E-06
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+2.927374E-04
+8.569516E-08
+1.000000E-03
+1.000000E-06
+1.000000E-03
+1.000000E-06
+2.920435E-04
+8.528942E-08
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+1.800000E-02
+9.000000E-05
+1.800000E-02
+9.000000E-05
+8.185938E-03
+1.967120E-05
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+9.000000E-03
+2.300000E-05
+9.000000E-03
+2.300000E-05
+4.665341E-03
+5.426897E-06
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+4.000000E-03
+4.000000E-06
+4.000000E-03
+4.000000E-06
+3.497088E-03
+3.563633E-06
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+5.000000E-03
+9.000000E-06
+5.000000E-03
+9.000000E-06
+2.333045E-03
+1.870613E-06
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+1.172287E-03
+1.374256E-06
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+8.000000E-03
+2.200000E-05
+8.000000E-03
+2.200000E-05
+6.413648E-03
+1.136518E-05
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+2.927374E-04
+8.569516E-08
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+2.930717E-04
+8.589100E-08
+1.000000E-03
+1.000000E-06
+1.000000E-03
+1.000000E-06
+0.000000E+00
+0.000000E+00
+2.000000E-02
+1.200000E-04
+2.000000E-02
+1.200000E-04
+7.007604E-03
+1.379504E-05
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+5.851152E-04
+1.711804E-07
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+5.861433E-04
+3.435640E-07
+1.000000E-03
+1.000000E-06
+1.000000E-03
+1.000000E-06
+0.000000E+00
+0.000000E+00
+1.700000E-02
+7.900000E-05
+1.700000E-02
+7.900000E-05
+7.281401E-03
+1.600845E-05
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -1226,11 +938,11 @@ tally 1:
 0.000000E+00
 0.000000E+00
 7.000000E-03
-1.500000E-05
+1.900000E-05
 7.000000E-03
-1.500000E-05
-4.818843E-03
-6.474375E-06
+1.900000E-05
+3.218959E-03
+4.543526E-06
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -1249,18 +961,16 @@ tally 1:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-2.400000E-02
-1.180000E-04
-2.400000E-02
-1.180000E-04
-1.088639E-02
-2.567229E-05
+9.000000E-03
+1.900000E-05
+9.000000E-03
+1.900000E-05
+4.380921E-03
+4.182826E-06
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-3.067112E-04
-9.407179E-08
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -1273,24 +983,22 @@ tally 1:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-1.300000E-02
-5.100000E-05
-1.300000E-02
-5.100000E-05
-6.002667E-03
-1.149916E-05
 0.000000E+00
 0.000000E+00
+2.100000E-02
+1.050000E-04
+2.100000E-02
+1.050000E-04
+9.932207E-03
+2.153598E-05
 0.000000E+00
 0.000000E+00
-3.015814E-04
-9.095135E-08
 0.000000E+00
 0.000000E+00
+5.854747E-04
+3.427806E-07
 0.000000E+00
 0.000000E+00
-3.067112E-04
-9.407179E-08
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -1301,22 +1009,36 @@ tally 1:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-2.948908E-04
-8.696057E-08
+1.800000E-02
+7.400000E-05
+1.800000E-02
+7.400000E-05
+7.301011E-03
+1.358176E-05
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-2.948908E-04
-8.696057E-08
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
+5.804973E-04
+3.369772E-07
+1.000000E-03
+1.000000E-06
+1.000000E-03
+1.000000E-06
 0.000000E+00
 0.000000E+00
+2.300000E-02
+1.610000E-04
+2.300000E-02
+1.610000E-04
+9.647933E-03
+2.657983E-05
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -1335,28 +1057,162 @@ tally 1:
 0.000000E+00
 0.000000E+00
 0.000000E+00
+9.000000E-03
+1.900000E-05
+9.000000E-03
+1.900000E-05
+2.915422E-03
+2.203274E-06
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
+8.775182E-04
+4.280701E-07
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-1.300000E-02
-4.700000E-05
-1.300000E-02
-4.700000E-05
-5.486562E-03
-7.965488E-06
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-3.054379E-04
-9.329231E-08
+0.000000E+00
+0.000000E+00
+1.000000E-03
+1.000000E-06
+1.000000E-03
+1.000000E-06
+2.920435E-04
+8.528942E-08
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+5.000000E-03
+9.000000E-06
+5.000000E-03
+9.000000E-06
+2.044244E-03
+1.796182E-06
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+1.800000E-02
+9.000000E-05
+1.800000E-02
+9.000000E-05
+6.718632E-03
+1.203946E-05
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+2.927374E-04
+8.569516E-08
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+1.100000E-02
+2.700000E-05
+1.100000E-02
+2.700000E-05
+4.675703E-03
+5.128811E-06
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+2.914595E-04
+8.494867E-08
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+1.000000E-03
+1.000000E-06
+1.000000E-03
+1.000000E-06
+2.914595E-04
+8.494867E-08
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+1.000000E-03
+1.000000E-06
+1.000000E-03
+1.000000E-06
+2.920435E-04
+8.528942E-08
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -1370,17 +1226,11 @@ tally 1:
 0.000000E+00
 0.000000E+00
 8.000000E-03
-1.800000E-05
+2.600000E-05
 8.000000E-03
-1.800000E-05
-3.334317E-03
-3.609712E-06
-0.000000E+00
-0.000000E+00
-0.000000E+00
-0.000000E+00
-2.948908E-04
-8.696057E-08
+2.600000E-05
+4.670349E-03
+6.133014E-06
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -1393,28 +1243,178 @@ tally 1:
 0.000000E+00
 0.000000E+00
 0.000000E+00
-2.000000E-02
-1.080000E-04
-2.000000E-02
-1.080000E-04
-9.741552E-03
-2.552400E-05
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-3.015814E-04
-9.095135E-08
+0.000000E+00
+0.000000E+00
+1.500000E-02
+6.100000E-05
+1.500000E-02
+6.100000E-05
+8.751735E-03
+1.922421E-05
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+1.400000E-02
+5.000000E-05
+1.400000E-02
+5.000000E-05
+6.126605E-03
+9.620966E-06
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+5.835031E-04
+1.702381E-07
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+2.000000E-03
+2.000000E-06
+2.000000E-03
+2.000000E-06
+5.847809E-04
+1.709846E-07
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+2.000000E-03
+2.000000E-06
+2.000000E-03
+2.000000E-06
+8.719569E-04
+4.219258E-07
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+9.000000E-03
+2.700000E-05
+9.000000E-03
+2.700000E-05
+4.085939E-03
+4.936434E-06
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+2.930717E-04
+8.589100E-08
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+9.000000E-03
+2.500000E-05
+9.000000E-03
+2.500000E-05
+5.846700E-03
+9.739696E-06
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+1.300000E-02
+3.900000E-05
+1.300000E-02
+3.900000E-05
+6.128455E-03
+1.013669E-05
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+5.851152E-04
+1.711804E-07
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+1.172287E-03
+1.374256E-06
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-1.800986E-03
-1.622276E-06
-1.000000E-03
-1.000000E-06
-1.000000E-03
-1.000000E-06
 0.000000E+00
 0.000000E+00
 0.000000E+00
@@ -1442,11 +1442,11 @@ tally 1:
 0.000000E+00
 0.000000E+00
 tally 2:
-5.818100E-01
-6.772558E-02
-6.344749E-01
-8.054355E-02
-3.690180E+00
-2.724752E+00
-4.102635E+01
-3.367908E+02
+5.554367E-01
+6.170503E-02
+6.055520E-01
+7.334109E-02
+3.526894E+00
+2.488065E+00
+3.925114E+01
+3.081807E+02
diff --git a/tests/regression_tests/statepoint_sourcesep/results_true.dat b/tests/regression_tests/statepoint_sourcesep/results_true.dat
index bbf03de94..97b997ae6 100644
--- a/tests/regression_tests/statepoint_sourcesep/results_true.dat
+++ b/tests/regression_tests/statepoint_sourcesep/results_true.dat
@@ -1,2 +1,2 @@
 k-combined:
-3.070134E-01 3.900396E-03
+2.940336E-01 7.338463E-04
diff --git a/tests/regression_tests/stride/results_true.dat b/tests/regression_tests/stride/results_true.dat
index a65411150..825de3766 100644
--- a/tests/regression_tests/stride/results_true.dat
+++ b/tests/regression_tests/stride/results_true.dat
@@ -1,2 +1,2 @@
 k-combined:
-2.978080E-01 6.106774E-03
+2.953207E-01 2.874356E-03
diff --git a/tests/regression_tests/surface_source/surface_source_true.h5 b/tests/regression_tests/surface_source/surface_source_true.h5
index d056d7328405bedf704f8690fd3b8056ec8aa101..2c2a19038fc1b6d9c7785e8a7f591e9e5c7fd959 100644
GIT binary patch
delta 17120
zcmXwAcU%+86Za6gvl2ihU<+ai76R548(1KAup&0F#tznC1=|A^1y)$Ff<6_jV2vI0
zso24a<)>hc9W3ufY`^d2*8k=+H#<8!eP@%jQ+8>m?6Rth<!^ahKIkk)3ql-Cl_m&-
zsZdczQz{a{NDBaYRU}fY?cO10A3AiRX_A`8R8&zzB_c)Hud4CC&lMD8P9?oqF7116
zjgvOC^D9^CQQ4lRRVLEy*P{pD*=wT^St_d%D-rRy`{ut!zWhbENG>$El8S~`A!2m+
z+i8!Mlv#0kRaDfsDiM#q8uqo%zHe4sN>vplm5Go_BP#2tsv40F-k!Cy?YD{wXG1j=
zEviOro_SMOdrvA=A;NO%S4Bs&?1}h%O2piY*FIbMNGcVLQW0tQ-J50ZnYPO6LLdvV
zWH5E8s-uApL|pMMq?LQWAGBU=SDNWyPc@E2?AKDX*)v9AV{}x}jH*QH=W;P_-3u2h
zn?%S^0=nCE_TP&P|6$!u@1&x}YDBE?-=pR|{cP!(B3D762b}!HL6M`vKj@VMtE;PM
ze03r&GXAJ)pQ9+o44mGcNH6!lEuK2Lsv>Bby^4m`Ai@WlS_77;NyPrqZ~q!v^2NGY
zOidM4tB6oagH*aiXCj?!w6pPrUk#MC!Okk059AeN>A0&IzdO>j`YzN%ZBNZm$HKZV
z7yYYNDU`krDw?Jyc4Y@2`$u}w&5|p%s9`1-A`NTOY5%uXTy1$Su#>BSnjDDqw4}o3
zng<1ifePAD)gt2G=GGzK|N3qf&QMD)RG`_lbTr112tG8|QAhQ)i4aSpYwM`G4iU}w
zhuL-+QH7o<bEQ3;0z}&bBc~jG^sjYw7W8PYLj((TtE;1?x<o1*`e<1D19p7FdMc`|
zPK5R}tU5NRM}+4zx1Np$Yl!fSCTMij0`<Q7P;>c<&*iQD>Eae3dXLgo=`!NCb%Q83
z6}7k#Y3coRn`OHtg>7Jc70rXX?@*zpj^@=T(gDG~Zqbe(9h1TZ7oi+o>FzHDZRzM3
z(37jK#9c*GY7!xd7GQ;;0TEnidIKFL4T<=_l(_OeYAf5tH$)7<7!_PM>+70bmF;q1
zA*m4&PEx-{I$CIj92#S>nn=@E)ZQ_+i<3ea4{KyJmU$QBvr$W=YV+@XDe>iDmahdL
z7b2XYelAe52NCAbXpafvz<#Fp%bF-ICpCe~gXRl$aMjVMCPX}y@?%)%SjBA%@ioJh
zNEbT)`2OaUqU6L{DjL|7NcC>c{8+Chmn5U9ifWn>F>d#PnpKAUXH})K8Dg;(5meL#
zmMy{8?S6A6&WKaK>YJ-*PIDseF|<u;qEUQZ?Wv+!wTT!$ua~w%>z`IGQXRyECz1Ys
z`QZH2D%>Du5QgfAO~6aKUgt@p>JX{t^M`FFpXKT=#3C;*B0Z9*hsSN68)CdviQetR
z!2cqiL~wrz_QqM@ME`kT_D`?KgDayh0>qn$WZeCsTbz`%qiumuXhEdmtLrS9KdZc=
zehZMAdc>|v=d}}?54OgK5e^vMl1N!4n%v^{JPh($B0gFX@xxVBh3zWE@F}g3B<djt
zwi2csDNxZZHQ?+Td#Y+pY+gCho~=D;QEMW4oVohupSsSpUl&)}u8lp-(Gcn8k<w%3
z%JCDZ;jj8OM9RDLeMm|hE?8O{B!IR=aHT<Qbu`|M*ae+8x2V|8Dxw)H%x#JEaZvP{
zOq0EG6knpECPIXHw3O&*Xni@tQtKmx+7Y22&25Je@*zS1P4GdwaVOGG=LX%!9_2E`
zz}dC!i8LVGKJWR!Its_A_6Vf*M3_RoJ0NB{5aB!(I_eS|5NT$|8E^BBb0-aMfJo^`
zq~GbfN0X~nQWlqVL|Akp(y?#h9y`wRQ{{AmU9jBmSkZ@B2P!L+S_Ba3OoYiaqO*=l
zzC@bTxX;0v-?hr;P+!=sA(7TC@A1&(V>tzB!J0x}B3z;lema`rM}%6m7*Kd4A|7CE
zrl(v|TraN?l6Ds&tftvr5I<dsP@6_~)luKZL<}9%Wmk9rw`F6fyBiUwuAJItY^LJM
z;oYF+ZbbN-x^+jL(h{+3bjrGqS1Vi7+C;5AHFYP_=g3ih&o6VaRQ@U&<4=SiG}m88
zi?qb%N(1WZ;You7i1^uKcSqmTiZf;fK;L>IbfsZ>WHdk)>fHm$vk4J4(4ZzzcMl>>
z+|cerFAJ~Lnx4>dPirafsiS6u`PBW>rab86NYA`?r9*oK2zzOIFQk~>1a&E*H*#xJ
zB81Y?rci1hA{0@-K1fA<h&Xcaf)4#>RAKd+!@VM#1t3f1HiH)X62XfW_eC1&M}(C$
zyB}PpIg!eiEzvzmtga|N3o)+`B*HBk9SCuQi1c>Bl7ADOc~pl7;ar|XSWm+|A!HB{
zD;1A9a(=pE4d4E7(f&keN=y6W)JO@cqwTva>(5UZsDt(f$jL5u0Ja`T#KB#jS8(oc
z&$hILq{nmtlB-+YnZoHRiYyv0<ds207(y=%g2xXg;<1kNLmH1%vXf~r^yMX=yTA+T
z9882LDhxq8G=xZ1=Kc6vvq@CglnjBVB3V>*sj6)?(SdgU0(Axl2rp@RFw{Ae2$gBX
zP$)5k2(zeP2yiWk@RLTgfI5NOM;(Sid&7wI{_?{a5r>p`OdO8P-I54p)UPEpI-E#@
zA3dshem~zdAD{Ijh){_}j{qAG8mL1nXmlhI7So`SP~J!)#mpb$oIjf%*LM^$c`G8g
z(P9vqMiINGul6js^w^pbRH4vaC=s8$9XRc?r@(G>hQ=ng4iFm9?AB0b7?E~`hmKj|
z#e*&@42Bvl$9C9gv{r41czy1oM&*k>DH*#hB7ZcIbho`eKlsX>J8%q2=olj0rovd%
znYKjiur8<WgZ4^OP>3ZdV~MbX7T~L491(`o^l@mx2$3G{8B>?8;)y*2c`AP#k(#^>
zvYCC1`;B(I15F>_RxDpIJh4ShiS_e`_}|9c)9?vIdUYkflkYe#McxEt>~=&PeapG0
zX(eyr+95j|h|LcdI?v!qRTGJn@$C*<@5i&7VInd$)}+rRtG(AL(XID^0VWZt+s}=$
zt6J4lTp?`|(!gZd`GY3wXpRq&=)Aavmn(7$sF4uOlZj+#`=LX`C7$Sfr|6~4US(%<
zc5|wXDR9g7#6~lgUT*J6HB*V$?6PTh-Hp!dMsGRdrrOhzsYGgFIGVny3okJGX()#s
zh@|Oeo4MYW%WdiaBTbi^*|6z|7eJe+cR12_M<Vul-}Lu4Z>6P*L9WdUCxSZ_BH-W=
zM5>;xo|avKvnh#CB_b0ah`#-)-yEKagOQ01Gl&$dnd@>ommei(1~TzXA|%s@nG>Wk
z+iY4mk2i>xnXnp|%<8L+FaE(zsqKtXISU<lX3J`;3V9Ug&4Mvz%R)!a*3q=i2=bA`
z=N~=G%ajFcRCB<nTUq)1RZ6=}4Rg?E09h;2q3=pF=T7E=JF3B5?PPViyg!8))gWsw
z5tn~x`T1cN#q}g3E&@g(?k%q7U2Tk#Y6^k#^+QJJwxD&{af$Y8?MhSq>}g;mkvw0_
z%A2PCW35Q|(>x-Et-4xX6;rCTJ@X(Vs>VUu16890U$Z-%Td%LJ^jrG*XnW=pn<EBV
zHXk*<3z4>!tCR36f|o<m74~01q}RqdT6Y)TxtJHgz6+5e3a>BgFL6rKLL8<mk;Xag
zE4N`H*M)?#<F$y0JHo$wyL(D$;$jx55*HJxVzuAW)qy-@f*0e|C|MKsK3Vm)HxELr
z&0kE!u3v^ukEV(yv{9&^QMecQ47&KUsk7qf79hi;iR7O&Yh=gm{Nk4vjaI5VR);+C
z$%<4Co6#M5TtbAgG;#@w;8G%0{@JXb(V4r2VJWodPsDOtThHxzN7>MbB3J~%^R7RF
zul(j}Cd+WtWkeh=e)o4ipcGwcIl>Z)*KJr;yl0Mb0zC?&c{vfBsoM%9xfMjXM@s?a
z1Q5yQdi~?1;7=^-k?{T^!UdZ9*94o3Luiv2Pa3Z$Hk)GUWxXfOiGe#^S+lXpLLLR`
zSePXi*I2JPA-&FU3z&fn?Loxf57r#~xkt$irXIkpBvNTo-&)O&IVuV>t%Oxp5%JQ!
z{39o43+#6=A~|-Ied1~&s_vxLb8D?so#54=>xs-gYiD>?63<yNDBbxWoYp8=HIpeO
z)yBarap=pxIJf^=j#pPpoGP&wkqWlo_F1Xsy=-tVm}(6XY-#2iG%jn2R68K;)B0ZA
z4N}&EH`X-RzNO-YCVWF}Z#Zx~k&@O|DeY08r+h;^>=KWrSbb{g#HmW=BngnBH<AA7
znr#2H%#Aw-R%azZwA+XKdJZq^$f8E!eo`^fo<=1Sv0**kfc-1KS_7pp5wi6m(x`f`
za;81zI?d|?H=;y(XIJ3ac?r)q85EAPj)*y}?tl2OLGdl)I`~#!B7Iota@O-6molX<
zoMN3^RXvhm_9S8#e&v?x&`)cXQzzqGXii*c4>Tw7$wc(rr}}4WoN^d5zJ@X))xSAa
zcg~Y%5fj6y`w?mRv2M4$v$)%mKv*dS_qe{l%qR6C`#ny!W{N#Eq{{U*JryM}kchV&
zw$j1xxU&X1(01$FN<%_EM{nB0lUe+F6!{G(aF#aL9Ygt1LpLBW(fPzrn0fxUE5C)I
zFDe9Kjg5sn_c?P#d2Q57mVwT_qlfY&k+Kn*>rbTP|9BjA>(xN9Mh2QD)g~g|tJ`#3
z@GZqf4VxTj@us%o-Gr@KX?aT6k<HNX0JP?|m48G=aECGufGIZ<X{AH^JDavxV9F`7
zDYw9sTZnXSty4g5H7<7H7APL;lU{ZV>@}GyN<R=1r6H2mzU@87pZ6{qY1k>9h;C8#
zn~#m<DKi~O5gpsSZ2hi-`xGhFgTOJJ*tjmBO|~K;w-WK-xsdR|<CGbPdK;=6+PCR6
z4DDO|HX@auUgNQ@I`?5SK8OBIq+c$6H<Gh?`ZxWJ#sq7sQ}4m3gWHL?yV<I%qXTT&
z?-{ZQx7#P~AkvOnfo$W6Zyl-XkP98U!=8E#!KJv}p;i0(D4rKH1VIDBkCQ*gYsUNu
znw^M+okZA3@9)$l1|!Z~o7rBE`BN~1;p!R4>gj>Yy4n4yMj7znOyuAncdOa{QcRta
z3Eo&8`EYx_p@MBE7VZj_dkn?Ja2JuPj_Z1U^9at<unWGqi-`6MccsTR71(|w&d_c*
z#%)81IK0V#P7R}#tY{euGwvp0m*&GSR$Qj+Bkh5k?IBV-&zfKNF2N8e{<sUhzXvT-
z2$AeA1XkF%?Mp|dX^zb=g`n{5CBk7EyH`gw`-nL7?(5)2kNG8k9}Y2$2#aVW`q+|v
zM4B^EKPjyWKcjv>EW00le)#g=^N#YUQfI*_(bM++Tq))JK<*a?^tAC=MASb0^-F(I
z2^%vAL$irpQ+2`n=9ie~VqDaYW!uxD;fTI2Yg@PYPdOnOffgp42%c0pfEMNekxu`d
z5%X>|nhI5}Jf8_U=r4)0zxSy!Ring3&Ozv81d%Q^{-<#@74KlAk?3F!5up!_IE0S<
zFcCD=?=ZU6kwiT2x8<|pl5*xk&=nrW<ne99w6TwQj`uo(2KxvRcG2P^Xk14Tv3X9F
zr=Hy^v5y)UCUcZMH6A5GG|fJWyQE3J<wTpH&rl-ii{}Tmdcn<V3`G}tj0iVq&@uG!
zfV`;Nai|uAcU*1W?HvTeq_vc@SQsvm$BCe(rT89mf=F+s#QhwW&Q)J@0;&%qf+PJF
zh93T;JPA!WsiWFcn0K`L&+T<3zGKuWXdeCge=S~gs*%8v=Fy0iQ$*a-@J#NDID4jB
zEx1CF$4^6%+XsgB%i)Dla|R|FgMr|x_Fu;I;EPRT(9WMB!gX432JL(fk(TW`T(^;)
z4~uegkU+=6NGCVmsGPtnRm@lfP%e?y4mPx~XgDKFu3orI{m$Z&bCwAIQHOK7#BoF%
zr)gzu?@@tmX#~v<9cNE7&dH}MK8L%~KSX#$v;V<8Ydn!g9PiTOL>3n{emt7?^8}Zg
z=<_h@1tL0|$`3i0$&>5_WaA04Bl}H&{Vo#W35~r71LYwB2KzoU3EWYQd9Xe%7V6of
zqLS-y>AehSDDsHFXl@<~&n0AsyE;Qr0k?(vGMvLegwC|sfNXV{NQWjoZ`#AiD}nj4
z9wSTdD-eI8JY~$Dh&$&MBDJ0S%jeiFOa*-(Sf`9v{e^F|;3|d#xTH+jdOj*=1V0;@
zgpT|gk(R7gJE7KcC%*=NzD|VuG~zmH(j+48kEqw;_Cm#rrO7z(4V<HDl6UM)9s;2^
zaJU;p7)l-Tp`*z}6jtX>s_3W;9tyD}BcBLIX)(SU3ouv7yT0Sonm^al0x0+<5&dS4
z8P=*!b$Q55Gp7Vd&BKopmdeYNYAXEu77-@Wpj+^7Kn<wdZTK&4I!!w?jTv~-LAifs
z-VTuLH0rsN8u6x0bq6}WLxjyV_YNF-nq0{frUAN31T9Ut3)j9!glRPF9xQ;bLG&BG
zTJ8~Pd*RjPE>C!m5Lk$0QHafIS9SQc!a4=U$YaTLf9YQN`cvm7)l`&co(><rk4J+>
zaff@(P*hfOA6kAur0zaF^xb#yQ|CND1cVcD#4xuP?vIsnY6^$u9}=N}Mm$6&c|?Q>
z)bA0z7|;~z@IO?a2qH$k99>pviIVDKBB0v;5n(nh##iHGSuNR*b&0rTjh%gcvDS~P
zFBrEh{S*179Q_0r{vslM9ZDuIaO7P<coFKy3?k;9n!k2xnc~@6+`h~p+`R5dxqvx!
zmE-vqW13Pd4>(GTA>k|{w4r{pV1}neI7M@xLaomTyf@()q{dgwDP}{#&xzni!=6K}
z&xzD^^K<Q0kvm)93mjlJ5o~BN2=iXZ2~K#4Z2VFlI~M>l&LKh*nmq>@;T3N1>)&*{
zG=#@_&MWB4j1I?Z%)jdc`CTyH3<rIUdFS1l=@DP~H6!#j&Oet(LA?sQMD*oKNs}*o
zpj<Vt;MTLHe=a1T^nF7lZEH=<$A7wylsE7`BN04kkP$bMw?t}b-s_cl_E$%mQ|3Y^
zzD03)OT@WXr(FAW$ClRfKuLXPPt92Jh`L20ir(SI+Im*SfUAFs#(PxK_rzw_BYOP3
zCpF=USm)+t);X7F1{JP@fgjKgI#qq_<*&F$#s~C3ABohzL&R_~jJvn-Biwr)5l++G
zc}Vy8Y(H^XNLNpO>C%@VotF?X>u$Zrws94brX%&al-kqa`9!!$6XqkWl%jdL)vMt~
z3)g_T)PaV5YAY2jTUdGHcJ8jGPiUNQ!5nZ_SN%a_E@Tugm|mZW)OyL)f(ILTPKo)f
zO8i2ECA8fa*n5GTy}TFdX#N*Gclm#r*XL_B#g(*Q_0pMB-#uq<<@?5eh2j2{#q#?X
zuCP!}7{Vg>5pa8`!+)4}{YNBm%9g5AY?O;gq6NXWNS+QAfX-+k@)MB-b@CgLrexPE
z*g2H%mG%u0xR?l(rZ0y3ml2^O4Jtz(0rZ%<eMj1lLd-sF-qi7FeYUtiik1!C_1#};
zYga!o!Q`Pxtoi{}{~$sp&HVxA$5pm(xa~CO5j==Oag`1JNrd_|;U|3l7m-4yUAt8y
zhI?DoFXYH*IY1q7tF`=+`FQ`vL4OnBZIU41cuVkJ=cd__YzyN>&2|xNl2!`-(wCE+
zpKZ=kxFnSbDrOJ_BCKQS@*3k(BFv@POLdIc09%1Y*a$i%l^2LO=0KNTp=UJm7y_Bf
zXPG~mgXm>CR)~+nOXgq;!VFu$j1>c>YU>p^Xt|CVD*)@rvMYc>ZwI&~i?#zr)N&%V
z-#Yq{b^^C`;c^vIivp24G(1|fQn=Env2YPWnt>LYF*gb80#^_zedn@jFC4iyWvoy!
zlLP`4D+K|IsR%fN<yHi-<}V_Bnv|8%X+6IW82?hS;7TB{VF{H$tgQ^V2@9(X;@}v$
zcqYW?m<3pA->T~SR=aUA0;_<1UKJ4cVnS6AYh$f>K32z4ssekP6#&Z&)c{Xq>D54C
z0mW$Qy%O5A2fOX{|9V^gzS4fMczdvuR3I*5eku^>tt67EaPfSzE6@F!RVr2p0?B*S
zrM9nZe{`gQ{agfrt#=Uog?+5p0gF;r$pf{5RZy}cSdC}dj<S-S0Q<9OCr}tx<6ZAv
zpGr9awG_9@Sq&vu2Z4zNRR;mV4Zbw$W>eE=zHfY-iba7yvOE6rP;_r4v$DeKkT<Xf
z&~01)%|`B4dJ2|NLqM3}Za;<kt%2rif?(97>3usI72B|)nphX?40Opa=c*$Padeh5
z))iviQR=W3Mo>eb$1F?@=`DaI_2V$_zk4VqV}ULp&R9!?4zw7=c`k6r%?<2tjj3TR
zTTJ6B=xr|cV3S<Yd>b(|XkIkUY47LS%7OFaRmrum;&5^C`VDc`9)bnef>imyN=|*=
z)s6o8O}S<;kJ^Gg)h7_~<DNc?HY`$RlW7SmmR1|IlQ;KyJMJV>ZqzUr_6?*gybjRK
zj{kQ$`IAyFSY92-s!k-rQyP@0W4?8<^WFTpc75k5vZmC<&Z>IAzHgR!e{H7q?!XN7
zu*!^88tO)MtO(yFA?5G&@%5F)o)Ha}Woe+LeeAUcT8eT5i<e!8n$M21UI<yC8(5gA
z_4N!a0_)@Z53zJqNt&(o@quO5hrk+lp!W=#>DTIt1HCcGl|{Pa#4+pSDx14b$4cby
z>ZBDnpXXZZHq$r2#yJfj&)+QvtbX^3yRW(-b_-4-B2&+(ac8_pbumbCY)M1GUyNSw
zZ<w~hdZ}h+(6P`)kb4|UZ3K7ICKKs@U30oOu2@4cPgF9(N+!6*gvK~nN@Kw1Spi^b
zNhU%D^=1ewEhO-)mbbOSE+tvB94$B#4-l_l5gs7U!`#I1U`zOgi##o8QV?NHK#<D(
znt*em43A<CO+lQ3(aGNr@}i$_t7095LH6}c5m&8QF+MY6GmsXr>}G;4F%^T%ZGkV3
zTa=MNaH@*wn?o9hw*`)s_b9LBEUh`DQF~%leHP@24f0bl(2D<g)?qb&PuH$T7Ly5j
zFgG2xFzLYK*4<$RA}iM^ak?DY^SmHI2bSxF^=a#gSbT2Ow!w3i`@RLsgT1lbk0p3x
zxwZx1nJlaYXu~%Up#{y{fY<?6biUW?%K3wey9Ks{TzM_ARfBi0GiI;nUaDyY^JQ$r
zyyEiDnTfL%g(YrMv6NO|P-Rk$NS7)$)+Y>z71A1Fb!6$Sv6XQX5$e$FO-N~NKsjs1
zpf}x4*P@FJC<?5s4G8ZszqTOMZ<bSO^k#$r!R~YHir$TUt#m6aMb6Z!b~r#c)}tMW
z)m!97EocioA6RMLZ_iJ!UvN7U9}s8x03Eq>RDBPrfz@r8)LzgFNi3*6mYcEs6Lm||
zF>`wemA1S~mydx;VEJ~yYEuWRu1Y(A)|5tsVYC#qF&%-mWw{-p&EQVpAHT7CE5~Pl
z5>zK>C?=f<4`^;W)ZH1x<ylx~5L*CC+ZVjP@F_^?99f{R91UCX!xNj;f8`EC%z7oE
z-m>GqP{;=+_+eFwA2>8*1%Rm*lcJuzu6qor^yi&=8|rWu5L{vDT|i8_0&c(}x`NoU
zjR?J|_ur_)-GJ@F{JMdn5U@0JYkNOK2d*fu?hqpHZz7DL!gkc+?oh?KyITVO_qWw?
zll`Fyqd!&+D46r>z!vTa`9RYYOrcI`;tu@VO0o_TA-YchM8C|U1F)A`k5$XYk5IkZ
zrL>7GTn}bupoM7W)&oKsFp668XkpD2A&N9KX9x7&0|ZA{DF|3hPryzrw<m}RMpUIV
zVkh+83)q<~p%*B$y#a@@u->4MGUUsJUj~#7tTgQN*WYheaPJB1gT3?mfcPR4`hvI+
z#F^9~6FTmTGds0-^Jw!zCC``i1+AeUSZIciaNc`_A3CQW4xNFi*WEsv#g{i(`{Bf0
zNGE~dx`#ysLL4awt2`?=zx(96T5-A1AgnTC0+zby#+$M~eP%w^6@pfn&m8(=T}FSb
zyEkg)l7E^jxiWbGmg#q+4as@3V^ve$v8U~ZH3nc=D9auoOpx52rfu*D<5iUm#1i!$
z@T5U|bS!Hij&=L_=F8)5Dp4&B!m*+T0b4QT&fyjJZRGUJ?hitO4;+l`qmTH0*fv&a
zBw5B_Ff)Uh9d+BQW11m?ft3uw+WS$)utmyGfS5iQM5et&axA>#JM$@j$WiS>?hl5L
zTiCZ?oGpGRn71xy_+oB<?sVp%SQmqFT;(zG4u+me!7ReEybvtA&4giCmNE?RELH%R
z2Ja`rK$@^$mpmLIJlfm&%&VccbpIMxHgq_|&j(i8R^jE&203nu*0m$BgEk9K3TZJ(
z_EY)vE-DK(c?4*WogC~xy17zIm<6;fd?Xmxb`wuIFSZWVS>8x+uw)V8U+SHWd^8Hu
zyke1~Aekx@EDmliSdn#58KE*mD2Tl<yj%CS?E9C|ia}`10TnBfY3KjbA@*Z4u2~X>
z?Xtpve$%MZ=m*I>8%U#N>x>3E^^u=0Z!a<m(gC|aTCh(%NW>ar#s|D<?5K=;haQB<
z#z5fpe!BwBolr`7#uzZrj0J=03Cn*k+QfBj91GF%4-%W|S+vq2PgVj7vDSoxsk3~n
z<7lQIhjlsQa6DJ`Z5))Hb_kvFXnTkMn(<qM<&cWSj|byR>o%TvdqEjSF!Ok<3!MOT
zh2_H|v%`7IXPSWh!ZBi8o!qwj+_`Adi*{lXd)S_N89>{s(W~LLrf{{z7z9=FL|_{?
zj_#c6!|f3~5gdGvpe0O9J3aIYS7yo)^j@G9AC>;--8w=sl6DegNSg#~X4$QH-$9Bd
zEWlFLQIx{+AvR9F$|%8b6h@wmz3wi`dsU$^*LvP$Fz}rs5S#TQ*t{v|1dFgvdYbBU
z^S$zu0AfPbnTmDI11474Sx32aFvC==D*{^dIgl`Q$wH;=A=9vNmWha#?X??br&dq~
z+ZB)5v#e?0P`A-G+tH_adn!!_hp6d5$NB&KC(r`4*H+kjIy$SUWB3Wkfxb6tjO4?s
zW9Xv8L7F>qz~YXJIfsmJaL_~mt$S;^TliJE5Hn*0&?Pc@X-u;7(Hguo>1PNIH0XF+
z{H!PTxQ^w_fWe*Fw;6JP&cr!3F7SJhs1vCDAy@W#CWO$OK(pg!`s$Sajjr8`=lc`(
zEOZtqpEYeQyz;P?2WFau&Aet~GpB#U&vp2MJOy*J*x6uEg0b$&mrGrzROcqtpHwB!
z0qJ|qgc>Ur@EcO_9B{~&(W#Al7mcz}F5*l(7plxTNkre5gTsopSTh(^pMtgLLWJVH
zm0e!sy_4VKm<5z9+=$~GWtm3!Z#<^NITgnG)Sk>oG-fRGjl>SdkU(>G5O=<mNUT%M
z1Gmq|nmt_MU!AT!?#d?4gXE#7;U)+E>g?T6p{1tNur^2~_iD}!GW-w$@q1lZyZOjH
zS@VIukn~}Id;XtDUI5X(&Y&ZXnf0)DjUP<67z2;kGxjWM0d{NSDsAwX!`p9=vcQGl
zP~mgAclxqF$#<ckO3Wd4Q{BJayccJE0SwN8truarW7yGS6&ou4W?Y1w@^gsIo3*r3
zE@B%5LKgE_45Q{O2C<F!YRRgRO01}(KumJ+KKWs9`Hwz)q!^!z*p7k#<9j%CxljV_
z<Jp0|j>5@8qk(Q3wG#^Ba+#vRBK#~7^OlcR9bcvxCGRXeU<o!WS2xNz;e*ma#VkQ&
zFU9(_lKf*|`2zt9UW)a;=ZLs8@WqT-Rg}O?IS2cLR4l4+=D4wn;#b;bP)yn~Fc_6}
zWc}_xCD;NqRsBOG5_6!5$1<hFQo}!RfaN&)ahACpNB3QUbrWy6cRgUEcpghxfptay
z;Kx3VUORkUr;J3&dD#CiZ0uyY*n4URYq&GRU)Z<^SZRK*JMRZ4b7vtjV32j5h#BAa
zempwgf$d)on^wF4`^SL8&%%4ZRyMW14Kpbg9HL^u!FTkOJHFd^x-0~msxJ_!Qyrf>
z|9C4gOv5k0{wqP-&Q_C?bnuV;SAvCR6&SxiTCL#aHKl$VSAm210uj=w+eKWu@Lia}
zJXXubUJVv4{|%UZ_8n)Tjsvj?PXWHP6vXjyAlRLD{FTqPGCU7nhl%546R*J@=D>bq
z-+xye(zFK4O7e)fX;Nt5xCx4d^p{}awP0}RO~w{)4G-LywJ>o!uqPVb_%POkU-5$D
z!65h&5qi>uOFEV>6YQN<ucc#Eu1RfzY}o{$Tl9G7loQ7-WC5CLFB4%B4ZEyk;fXk0
zEXz!k%}F8TwMo5N40&Tm&)jllsZ@?pJTi1V(f59{1>BQOS5zzmq|yWXsz3KsQWTuL
z4!arGfr0xZbIH_2TDtb4Jc+7*)n62rYxnjWTh97EL}RboGkp>^&12C?*i@Yicq9u-
z#$E0jeonJ6%hj)i@?;l$4K`z7xof@7lse1Wy|4@>n=A#}HyL}>e@Jb9EMp3em4A&0
zxwPVS*bD?1p?IVU6L958NR_MYb=*;MSz7n0N}EY7*AZhkh~4dPKbDQ#Z4LfBJZ<>q
z6LHRi*e3%AD1+FPd_)4CF%q_St-MpGQLe=XJYy6U5V70Fd0xr)tR|)8COr3MJ3G(s
zj&JWevi*s&<K9A%!TZHbdJHcafw$40Ett^ym0773G~>34YVHtG)4pOYZLe~&&S>Nv
zWb`|jvDE+4pdf?0ul_EQ^j+LYo85d|G?b@#^*t4h$J2#*SDO8cJ-l-@0~uOKq=xBJ
zXSi#4yKlmKhSz;GzMp3ti9l1pyi)Nn5_{i1@qv7WYWDy)V!T;Q7`CU)*uK1n(>_$u
zw1;SNGOu0rea`c<1<3G62>S0GYHnE0XSsQgptb)IY2>U=&ON_#4W;}KYI{tiJ?T#Z
zLRa$h8XiM!K+gF1u$s$Oem3$1dV7LurLB0xVGu`3c%+Cb!kmmAD}v&R@tfW4T~90+
zs6-vjD2C#m5^2z}hH-_5xNyd&2&t!dGie!b*Ny))T>lJ;dq$*`V&{<mRpNO}{TzzJ
z<HYB2_JIv*TbnNz`uaJ1{RN_IR8i%(as0)?gcl31mw4TqdadudJT6<zOI6}4V$)<T
z^?Bt<^IsA1?1f66?n+{#T0BXlnK6X#=6-JKQRRmt7T^kB6QLe;c%!2kZ-|gUivbzm
zTHkQq;zIrot*1xLkoW$4s`U;@>^&~EH0V99(17Mqw-2}=e;`tR56_6XRk<cq@{_<v
zc~Y1A5&e4!fvYE!;1XME4e?UkPytP#-k&go`6NHw2%j-v!61L#j`{m;*LG7Jy5uv4
z=9uIkr|FpFr+vjwPBz!wGJY;Mu?6G$@PE<eZ|dZ8qaQE#dH=%hn9{$QxMReE>U>I^
z@*nJOL6NyOsoWl>gpdKF`yvZ!)SBs!OUCo}1cEVr7H0P)Ubg;=Px0I$mBH*~#OCe?
zdc4e&27bptGo+<Q(UX5WQjLcT&HS#SZa>;eWsd?@ba~3X%7{^Y$qyn0+)oO;<Nh7b
zH1F~9{nMW2{3KF%JM&u4n%qOw7|X|FR_{J-+`gZ+`FnvG$k5;TMb%<cV<%f~W7BU{
zk{7zwZ^x1*37*LU@=fvL(K9CnD6KjR7LbPWW%TaP;=JuqyeZe($Vt}*=$Zq+U39ir
z_GK0s9bO)(Y-91}m&gBelYaxuE|o`R@U;bT*qmxvPs=!QiY<s$n955F?@sPIJ(71j
zh6+Fz0WBWbRa)-NJEi^;J7BZyknNn<YmDt#l!%47aX(@b7xE6TP@d2SN>~^*D)Nfs
zW2H;Ukbu=x1o528+jf2!$op+$MW9P$bd~P4OR{Dt?!okxfX=A|9uNB7NbB6yYFDPN
z3~YR5V6&;)&!IX+B(sbStpaSWw@>Ewp9-x>9?*MLg`nryM2zB-t6`5F<*ytHTEJ6y
za5Yfm11%QMc5XPVuEI@g4{Vw}uvb~J>3TT@Ymu?xDzJF=>|@ullX>r*rvlp70qClC
zZFl4lj!tm^TIC2H<Hwf_-|}85^9Dy?i)5^O`%&K(2Rh1+C#;>5+-o|)^wmePH%@{l
zGgpVuZp^I)v}=+_>;tOi?Yde^$+t{ZQ_zc!hbv^i_Oo_7%qWl4OKO6y>(5=gPrLB8
zM30d=%W=kT-^9hkes$m)R0A8Y2JxZg4<~$1|8sAb(V;FNZX8fQVg7fnLJZnjiYtg6
zeSd#xDE}`jU+;psS4b_q92GZv)%-)O@=CyR<Ow>d4Z%ONh}sZb!YEwW%>3#AE|lS>
z%%LvejJkl&vSJxF)&o48W!D3&mxtME7A+66)oy@Kupl?UW*L6X-0A~1)d!469T|>s
zhp;!wU3A@Frp$JV-0>;60far0c`2=Pk@9;nmel}gZ9^<vz``10p#`wyuytaaa;=om
zV}Xr8;?)@FCOe<>s8xZ7MNDI~L0Vv6cQV(waD-!nwII$1T5Pat-|}8vmCdytz@~Ws
zd*J8H8<Wcv{aIvecoVSbxOGsEgy}p!@|pnc+Z5<hD%8$FM`8U%6-#XjPf#@jesMGQ
zb=f@L@EMwcya;H}xirTKvYLaWPs5S=$)_4Aj}H|+u`<dNXy<RGS!Y*rSqnX}GEfKf
zudPSp+6HmY$j||;L9#*eo07FGj61E-3+NIVeRE~K=be{u?dZLM&hf_4*8R%cIw)0b
z{p}EQX@M={TYy@XzdGc93zX+1W^MuM(3bG#oT_YnOL((aD=h7v9r3I01Y7G9Lu@O-
zKDjj({uQ~f_U|)%1{d5K3-e`k#1HrL<JWP1+BQI^wE=oTq-AV7{_h@Uk<sC8!MW<>
z)!n@<%Fk}trM5zVH1fgrWfyz#LwU&#gMlFatnlT5ug5Co{Uo^^utv<5F<{Kb#F^=R
z0DG}$AHY%a(D=cKi0>nBDwnas_Mi^z0PMr-YaSoy$NNHgl&t9p&WVNTvwKGItZD2B
zbP3Sn<aMLmgNv0I)nk0jaykK<YVt34wVRSu)SZEi$N1Rh?MHUGGn5tT3z7z{Mwj|j
z<kxVFl9`tuc1d}lI`?LdMt&P$v3^it7a%iAiW^q8@XQe01+@7<i|T?CvmYH)ZY|ob
zz@~KtvEym;M>{`GY?0C7-GJ`CqQ$)p7r4vhbpzVBJ9rF<^~l<2QUp!GESae=EEa09
z9{$i#5nyS?w)BIM)3~BZ07$X|u<+r#W<k=rO7bHBtEiV9QxD?GD~Ek;Kb&t~s0VRi
z4-oINUACddD<wZ>^Z-`V6U2LC45!w_;CH%#?F1JV*%M4kfES;ae>1MJpit|3fjXxb
zuq$1w*S>GZ^ILCV<9kD;uY%d--m*&jfT1wtm+RZcyp)>ciLqB-th^j@(Dlgwl$9}k
z5$^p!`)=Qv^?o1tLtAh^(B{kNO*7OUq1BX0DANW4ofZfdhdid7dA>$*6pM@v4+3^y
z_rsf;YZO8Af`Iky50Q#(*}VP`Ni_ic4(zznF!#?;#DJkN(+`A#kFe;0P_TLsNOs02
zv^h~uqdeD_XAcG;>wdj*d2<st?rgq;vCK3Wr0Yh<_s(}x8Vsfy0(8s}aPwukL%=OK
z7;r<DAP;S|7}^R;SlCd&7Qm9z>07SnfAVr17$WGUDy98e&&c5k)D!|{UKrU*!AH%4
zv+hU7#0BucVX%n-(^-5>9}ZSz1Sl$p=`zdh;fW(&p1w*W<sHUkxIeDLRTql!D=P#V
zb;Lm)x@O1&*j!dD!$x_idSh#Woe;r|m5%`|(}#g1m_>(yL_HdCGz%IH*et^ma~lKL
zGzRcSRw~0WV*xv`+_8x1q2q+M!Y7u10Vvas2VP`h;{jV_cr){!0Gdk^gtlU|)NawY
zH<heUm*v??1C;&H!*sP^E_a0z10*p_gmul~C!(ro6`SWw1eQ#K*oTg~KTK;5YvF(B
zEFP0eCQZf`S<G)Twkwq3Ma*Fe;EXANm#|_PHckb+oMlf1te*zB8;hO>SUnx^I~Ft@
zuvv!ZFt>2Prf|R!tW<_$A^`id+z7zIGXSq<3G&!aI}_q$RE~}D)N@CPnh9|%GTJfk
z_x`<^JlX^0Az$7spgkufO<lhU1xkLY!s%z@^gGRsJf`gCMXO{sNDXta$#9lF2b++&
zfY-8!xqu}j;9%y5Ass6OEbWO7`Ft&jFZGh=aT$>y$zsKkATeU#CR}IP^8o8HWy51Y
z^nAc-Owoiuh6W91mf>y8Z6RROLa=;$_*1F>JwBpPVLrxU7J=jq%UuMLU<}2OoD$>#
znHEzop)w1L0&J1ttIRtZa9%Xv`%G8@i>EFT+DbmX<Ak6v<+n_%1cNPRSPGI-mcA6^
zWEtR&EMgg8X*pmg<|hxK3T4=qIjjJju>x=aE0$p+W=r_BOZH!Y^)Zn6*{6W9si{0B
z(_+A09SiSCNKBmkFi^=2;jzG)fyJw}+e$1ntpwbUmCA6;DlmDnad*Ic{%;Cagh3Gt
zUJa5{EI}R*Y2yIvSy&ukiwq|+?=^t))&Q>0gtdTE)&joB3S`(24|p6)j|WT=z<&CJ
zQDOIS>1SSx@u%_ftSkYBuRP~L;R+|-Ercdw&%#8kyUiRZ)~VLv5N!-T&#wMf4q=c-
zF-0===B!O0(+o=GB1ynzB?0@r=;-CkeU(N@N(MG68Q8e8RnNZsQgUx$GG1?AFgFJF
zCWepV%h3gW@hBn>;~>?%6#S0h)9V32;}$Ag7NvkqPAU#?DRlHOcm7LJre2TiwQ0(R
z+FNV!sZ|s(;)1tJlj4JvN^AxK7W3YKN47<WSC*|2c>yzRz*@hSgWL2x$Db=S8?kor
zzO?aWFREK-Ni23F`ipO8J}r5AlD91-ppljl*9+%9;pckt_-*JWApk#3O5cPHe9x~Q
Tbzz-5f4SO>oo}#+&4TX#jWsSQ

delta 17152
zcmXwAcU)6R7xiIz4+Ilz1Z=??ECgK3*uet93RbX!6+2kL3f3s%2aGa7ETFE&4pyuS
zR&ZSfD_CLI5<7?}VEfMFjsN9$=ggUQ=iECpFG=UCC7rL9Qd_KiXxW%!4q~JrtfUFj
z6d{-j)_Q8PCX)AV_mLML*>|T&l7<#qtErnc5mWc&|LeHEobHeusS!3(od_3bXmx#@
z4Uyc`QFWdaS5<2G+Zcp4G}%T^Lu`q7{_MTeUaP)W)XTJ0(`>-SH{*xjJ7lH6b=B3>
zY)6Ebw7^bJld2Q3SIFC0k5?#7m7+Ai1`#?_N0pvRwnUgoJ#F<=qb5>h?Q7ASUN|Z=
zA!;?vMe!qQ4;l-KKYw}LrmtrerP#w>O+D<0^hetkm+08qiqT}JrrMfBib#1|Fmt+{
zVhpRPrs^6*d^00-;kAE?>5j%ubZQM1^{+*Q8#K0-o`#`6$7yN}J&mbNq?86PmwnNw
zyR+;bf+KxhTSW~jBJ8G-=&xH{B58`MZm)Yx=uX{sI?{D@RWwCK#6^FIRtG159J48*
z=fMs{XibwH^fW?E#10LQJO~d_<}4SbNg5)4O&vSq#N#g&HA*#V>T6G=k>TS)J{Zco
zF<&n<z0Y1na~+9bruI&Hnr2Ug*R;r9Pu2B^wD@D))h~)GD<cf9r>4f5MEFHBYU-(>
zJ`uLl$ohI(Sd)m&BHykJDEwT}jG>mAMl>MekwG_K4IH5~o!dZ7(`ylFb%VVvuKsMQ
z5Nc|xX<9=fozreNG_*J=Ms*`K)zv0qt?;5rH_X2(7$X2IY(%8+)%EvG>{&|z8nkL!
zTANgBef+6cxEtLrIZ@v_sOu~bCCFJ%1M3iB22H4gUyX_IlO{CQ)66=-)U64TT6%o{
z_U3%G?li@W*=?etrn*G9O>^o_k-`V&ZX30mkJ;Y=liZXDU1@StJ<WC?(uz+<9d}j1
zy2xIx!;B_1BVzQTe!8yhe<-uu3|_7w(y-i7ReFxGRe&)7<~AqNj2DkOOuwjBjBYK|
zRKm=^qMnYJZygb*wY~0@Y;DH|c?s|yor;Dy66xB=$D_I&MPKC>Gac2`;6j82G}1*+
zJ)DSmb!42ORlYJ&CMQgNOCmLFC(JmR!<)%%iJjskdtrgRz^#bnaH{BZrAnMp-C9k<
z>Vaph-nQo$g(n+JUD%pb>vqM`*1A*0+#1?oN7W-%ArGljeOIb;CDOdkG07h`R#!R}
z;i{%7^@(U_rD~YJM{z<4s~)H)(iBb8J`+#z_R{ofs%b!^21(s&diUjh3~8W_b0^~P
zZgbvdp0T1k>NwE=cNMiXkp0`ap`Mbq@Wxa5ALbq9?Zvc(GdCn+<%H<UKJ}Gun;WWW
z$R9)sTkZ46@na=EV}D?`HX`E3_cfnwIjF2r7@W-9j)+#K4zo>J6}Gtc@a{%Lcuq4K
z>1lp@BL0}rbAO1p!c01-slS#8)o831D$<b%*Qj4dJx$jV>E@ybp9?*>ENPt4EkdNx
zjb|0dHs?NVCTbevOr#~W|D}x~=vUxbY<XvI!GXHNDGNIhar2eDK~H~`C>yA=nr1d8
zqLlD`RF8GaRBD^RwYxwAQ)bP0*u5s7^Db&?YC?peG^Yu?yep|T>u2)tt#8@Q{z5%^
zx~nR#DG>t?9Ib0R;%f!7e^XTGMudAbryJZErI$PxOq~<`l?@sKk8^3JqS@Vv*nQ;+
z{j<2*v{8N7dZ;LAMub^3v>BAtg9sz3rw4vDCxScmYz`;%B+}iJU3#t>%(dU-iDiJZ
z*L?A_=Jag7UYX6|W<7~CK-+MxaDi`&?4FR<7DP&wsEf;8Yh_d>Y>Sj$M7*0fHN<_F
zvS3ngELe+9qTkohXQ7HC#p%@4(wj*Aoa}V%rt+pe`k)mZ5qxN>PEU<qvan}(VLf46
zN*%Ff(!GhWf|hyfX^IPxE*5Gt3cB#!EMcRR8i+8By8B>}TN2?Q^=k<^?n}fbLtBK*
z8B|Qiopqw?`oc4@%Y5pH4O_qAL-A+@rRY~7$Nluw7rQLu+>JMv8#*Y1GNV}Ann-o8
ze;Z-yz||!TTQ8|U5%U%<YhF43lOiAe;fJk>Akd7~dYU_c2vw>5Kt1(uL!{+HBRB3#
zQz?uo*pTW$MEZ1KLPHwG_fha5=q!+lBO9Jcyv8R~BX3P#BF?zu&^K*;v9i|IekvN{
zN`y)@%N2pokBBwG$OiXKKP!6SF&I;U(m3j_*Hi5fB5hd|z4W>@A8gnVcqle@VW=we
z`OpSRhqP|kBSVRFbyB6g7h`$bDMOJ5xM4qB4xN{LhEKE+$e3Y7de^JUzAaU_E?9=a
zH{FQvgXXwFsD~3_G8IPXX|OwyZY1d+Pp@I4w3F_xj`JsycE#OKgBD;W^D`W2fImDJ
zK-=;VmpvEx^y(lHNdZKx=c|h;_^zgnT%2fGfQlwTOGY-^(V?&-Pd!Qj%pFOj5o1O#
zK6R1LuiGf7GsNV&`+#F}zv+~=10g2r(L}nfo35#p$%hj>8rA<G!V7BO4uNqDk(%~d
z(!TtRq|`|o11E>r*i~7WxO!Dt#r&GuL8!+PskW~7rbIhFSGi+B-d+x{KJ6jY;|P+g
zqH#zZV5>}1VJi%TZq_+mDRC-KUkpJA2OWs`-@2I{Chq%5m(O>ij^n*iF=#wI93>`k
zSe4%EzE!j;b;PnwAVMG&CL(3%NThCy#(6%!&XqE^qdIO9re<gRg?;b+=ti?$F|m{2
z>yW#j)R{nqCllc;4V{eM5h5B|9_Z$AK^c&`6ZZTRB2~ZH_zcP6Zjw0#P7iS-y*x_(
zUZ;3g7=Y$rBHc2czg;_6aof15@cB+exKA@WVXsbw_CDNr?8iZ+2AKxG>P)1lt(`vf
zE9DzK1sWMKok&OK?F~uU{Cfb?;r&34$iMkG{SG&3Ad+b_Fs!|IJFnO9Y)w5A9@vEl
z{b^PgOzTW!CV%d*zS@%4G0cMdqd1njchytfY$BcXj92|z?yRh6#B9uCS0X&50%SBW
zgh&C6UZu}^%40xU2z<U9w(E!`T?fzMb7AZT_YNhJ-v-Bvt`E2<7KW<hx)bR?&7=;!
z8gno3?~ZJD4v~(vzEY<s6h`0nj?`tYiUxNl!VsF=9ojn&G5k#LyY4AGO%0rfoTCR3
zme9~15ajuC&%@`t(c~T-CGVvxzQj3jUo7nbeOy3<Z8UWO5^WE-cm9NvS7!g{7C#xe
zV3r5+%!Nd1eAVTYb3dM@Nnvnr=>7p}?+K*{gBVt;{yjXjHX9U(ppoF|Eu_){6loX1
zp<Z_L?KhowD{K)Qx+k$3<VpMXbfx}_i4a3$7b5{)LZm*cFL$anicgtk39<`Bhs(Fa
zhXg+586N3{X<kZ%F;rNFebtKyCK}lb%G_HHLVmsVam$H#r_=GM!vmD8-+wur0wKYE
z@%P=@ZKASRxd<I3f{33STUWVhtW0lpaiX4myv1FoX8ejh!4n6BjgUxURrfL7AL&Zd
z`VgTDE$XAE<`qOZLkm`5a9+qs7nCFx4^RSfm=}7yl89wje5-EVrDVQj71Ac)^4j@N
z=(k?M8N8A1tR_ML^;-=U_l6(ecr+*U_-_?QvF{op<rdqRt_<Z}Hm^ajH^BJlaosCN
zU<~}%k%q7J7WUDMwU|8=1wMN3)ziS|*<t{G9g$AxF1M(m<}w+v4#}4f5!YTIC-$c*
z!6nTHw)I3h?zy8lIP0sj=%?4KXr>PWN%#bZ?D@9cS;P#u!n!DLsow?Le_eZXzQQOt
za9>ibzvbYPtfv(@VPRjm>IN)j!D7F5FMg|Tv^uUIks7@lI;+@~E2MuvXz4~GJf)r+
zk$0eYPH5nS6>fYR=n(Tf{zt@)Bz<<OyOOGy{)c7jPlRY1+8+`aQ*m~Rf$t9>(&IaB
z#ScsPUJV?8=oU+)$x&TCPw?TLkm9hQK&~LgD<6k&V<wQ6I3fw>x8ABA%ay=`qV0i1
zh@|0&vc^qBFwl%mSb5k2X#s3u2(sJX_*u<A%{Ni@AbXmzxuf*`bWfkNDLi~>;^7ZK
z7G;l)Yg?Bii7#{{UX~em1`qZnlIliGcaKTD>q#hfGvP$KU|d9e1KuH{2@c~&B%RaX
zL((t4KSKPFT_g~}l_n=Zxe={Ll-*-nJgZUt5ht35Se~?nNav3nZ?~}}s>uFQwgu<9
zL?S$)_FIvV3?@?NO54^&wQHno3o|0TdK(cBgf?n>cd0Vx!P_8}gXO4SG#K68PDD#o
z#x(1iWo-Ej?DX&<-eOSu4_!mEZ0KL_ooK-jZz;NM`Ni}DT;mJ~_Ldz;j6zQlmcaGQ
zBMG8BlvvI9o0boCrP^d7J?YlUIP@G>@~~t$?=T{?q(Q^5L3UOo**oFoyNI~ypDh<3
z`YWBY?800EmrmV>BR|*;t*O#@=EBW&mGNl*gli8c;`np@O!bHo@6v{=<Mt4-V5IYl
zCQp?_(ti)8d;}5otxKfDs!HrKjzFHUmxu{3$Culz_(hiwM4qr0XTlLg>Xf3Hm0Fdr
zaUp=YW+K>A`+Z1Ekc6~%Ug&rs<9A}>k15?x#2e=q|8Hiwvi*biV~h9`agEKT<Ij#M
zYNHD<2%BhV0H*i=5$e*&190n+M5<x_qefINpO(Op(6WO>diZ+EUy*mY2j?DyTaP4S
zJGTxkZYC&$%mgs)5D~0t(III6C}MS_4_!3Ml@=Z*!c^*V1in0q2o_o}3X__GKKIY<
z89I=!jwJ;FVKfo0(A3eG)l?$bQQ;_pFp`|d1vT7jO!(1_MTA2TI*n1q9fP(#s2Sg6
zP2~y)2snmtF@}gQpU=yjrLm>sGM%XPSezG*V~umJvmP1Tr(=%8r^gauF!dXYuyaB_
zf$TehU;<k<bw-Y3K1qa6wBRH>bsUlOQ-=5Tug5E!$6;rkB2x3q`q~d$a3e`WY7q!Y
z4qKpW;%H4jmcc&*RaA4D2m`3!X>8>{nK2^}xyl(i`7b&H?+PM9JdF)P$Ulp%Ix6vM
z>wUjN{yDg55U~okqvb(3-<~JJ9U62VQ#PK6iNyi4BdOv+mho`33rMk_wP{uJ-^Pmf
zrCoq?jwjO2j>E3~XvK4W-w9C6zlc~eyUHwwF;;YTv6Em$2T$;lhHsuXw%eaP`%D8Y
zJDo@qZE8R5bAzvoE(3l#kx0|+UpY-qkhk<bX!1lAl`bON&}#R@SK+M$UPLQE=6`QJ
zD9nLJgu;nXwM&T9x5^gnJ}A=VqY$VsA%{SIcSG~t|L<RX%cf7l`d=o(SDJbm$~+0D
zPVt+U!%^<3lcB9wh*ZCFwd`#xcz>m<*yUG=@QgZN!_C`dgjSpKhLUqt_G>v*qHMB?
zYBPzDL<2J6*Hh#y)^iHxJ_|c`dWyOG7T(8{EbJx}&!YChQ>+dQr;CDJY0PyZE;z6s
zDyk%Zmh0G4Q;GEP`o^s-m-2lWjC?WkZz2q*!VT#2RC!TTr|RSWA=0)#TAuS9`n?-1
zEJO18kBS<m5g~_0PDAo~lSrof%NJXmxMalK#OS6$7awGwJU5?*DhWAc$Soq>H}rTn
zq3Q3#>n-^2bRrhsO=#rYUeTiv0L|G%T>5%|O}ckI`YQ-RJl$LT+$>%_mnpm7V+Lk7
z2Q4hS-72k^H=CV<kdK74S&2iJl1lte(F|nDZ5)ZbE}gOYJx=KkoE*97tKto!?RD<?
zVMtvqcjQdU`7XSCCK1-tjG0JK?#baH;2vgr7Lo2H+7|gV=G{+0I_rO*NGl)Cs&%Ni
zzT&be_u=rfh|rvt&4QOdAfoorfMtoxlnXn{10=|^iTM8RiGi-8mGsIYr@gsEI6;Lx
zJuRJ01aImdqK|t>M1QZkmCjxf6b}e^h=c-3@lY|xwZ{rBUD{BH>?1ja%X@?)btn<n
zwafePA(3AVqcr!ie9W<bqK}(H#Iyx1V@v*2`r<zaKJb)?10Cnoxi=Zk9E{7cr*P&u
zL>NSq=RilF!AE<i_i15WM;TnwGh`2Q<$O7GF5+cA9HY3u_D41kr@8s)%v>Uc<jmAx
za^+{|(zy`Q0wP_?+Yxg08c)U4|H2)RZa*0C({j$hjhRTd3;#uS@hCI$`L5r=??1$`
z=R`=PLC<k;pGSn*)P6pW2QP5yr#~**Z{W8<X)oY7^NF-Kpg3~dK_w52TcD16MZ|ZP
z#_bxukSDXRFzN-E#j*}JYX<UJ3|@e7S%~09LoE<#6u(Z)-Fw)9kBclcNHvE$^p6bS
zGLp0q-G2>n$oeriZvOA?zlJx55#c-a3v;9U-gHC^DtLow3PY!2ccvs|{^+(j1d^W@
zrlR?8iFo2hleYS6U+Aw{PPEfI74;1#)mGVexwmacMH*-h2j6=+Zu`B5+J+M$iWY_A
z*9Rhep+z6yrHhE5rWuQ%yB~2evSQix86|u-7z#0$i-_1hLbd($#G;CGs$nsvvWN)p
zX;2YvY!(x%ti`l^u`3PygpDa|Ser45-+-lkvZpRfI^t{+v;?mZ#YD;*c++Ks4Zo5o
zEQT!OtnqkOou~TRT<Lw6LT^9I0^XwLhEsf3=}MsLONsQ%(eqY(D%XNEAf+!vxJW&}
zz-O1?xY;`D#&~ZoV8&$-*{?+E?HqmdOFN$OnZ81fml0tO&B381zm!NGPnOnQGxB#v
zScXJyIS~%g<mEWYloR1I^(%++;wW>n{`YA?jTGh3ML;CJ;qrHpX3nc}-XHTfxGjz{
z{yTkF^{ytc*-o<FMyROqI}tw6jPKCfNFu)ecE3iIp9)W4BzE}^BGw$JU4DI=62UY-
zvDqSt^kHJJE8E9#&vILVsrrc%*wR~X%6D?9_x*(tu0Rs9WPkFyR=gLc73$4y0<j9p
z*gOr2qsAeqW}DI1todtA@Jclc76hm+OBMvk^GaL~wy9fkXvHsN5>#*$DzS1a!Aoe*
zJS(Hzu&UzOW0jtHR1qLtdG|c#{;OPXFjEz{P0A`r)BV@}&7Ug5E3H<uu&M%{TE@rN
z2luVe2$o$H$cWWM8b8%AEy<R5H5bs7YUoQX_PQF{vH;K~boH-Ar}&=tSfgeZ5zP)w
zHf~nURIJQH0$JJ`A~dE&YxGQO4ZuIIo8RB8QZhXjW(|OLEfF0xIq%zKDT!FvT6pqW
zB2=L+Mm_VlL9?@1tPPs=Hxg<7uQ|qd<L$e%LT$wqys3^USj60IQJ#+SFY~?)u$`$@
z<V&+o&D`uT$BwCNnjI!NW*w2NN0a8o(R`;{fC#RECahU<4N#P>BSHh}zFyCgROqc2
z>)2=ELM2?XQWbieiDTb`H=(m8KIL0S8>MEsYB20!_V!?Kiz3pYlBvC$)aNo`1VCLA
z^ITSWq*X1C3V&k3H3fAXj(n$bL(WVvV@2H(AQS-`RLoEdTs2r^EpP>IAi_YJyg|<*
zYNI!&{;c0DH9_$ymRlRWA<;zeqoL7ymR1MVMzEqfsFoB>#Lgt8*2~&T@Gp&4Gk*t^
zd$U*vl!t62LIK^kQO{yD=+}1Vw31rM6*)Y!Xuz7g5utWw^p8==eEr@2r)HUsAb8IN
zClHwbM}%**;D7q~dZ_R4a(Gbwj*3i&`PV~zbqtXb+JAL^ZSz}hW7Le)NBxH^v_9(R
z0}$BsuZ$Pb{P<2{)hwg|hS>7h+8*xB6op}#4M1kVnbdC2(7-|IJZnh;*4z+e)mcG9
zkZI!NHyOV;J<D%|-UK%(yZs=#l<JL6tdmwy(Fhz>Jr0~`*xbPHLvrKb&02VcUkrPr
z6<nFc87*)9c&PHn&Pt?b9*xnmFD25;;lXW7wR{+6YQT+85rr!^K}$PUk5`{rrHnhQ
z2`Xqe5$WljF1KnP<q{dT2@~HGUHyZ_HbqwpaV(xqT{dIlo1w|;tB<yHS*5A)Rc2`h
z2LH`O*i2&q$ZU=l>{`6GFWFSFU75B8%5^vdPoP2Z`gk3R&wM-d@zi2_rcV%@Sb$DY
zG2#N+uk}0MyX>xrD~oYKwU~G!hNe{>acQ5TW|nwNcS|trTA@1{`s@Rn-2x0*Eiqex
zj7aNxtv!|O%hx`QVY*vk4B@Px6~>Ush&VIA<G(aPWP>`v9V*fFCNE(=%`ssGTBH4^
z(*k`bO+oIMveA)sYJ+ZRTv1<Oey)N(E&;LjzCJiVhx7X<sF|-G)kX(i_*k-#d$(DS
zZf65qI^}sQpD^wwx-AAlq@i2%%n0QauCfd_^hio1QjbMHJD<M8GlRfHHA{B~C0VUI
zG-x9CCQVyVhTtTBl<rH^v(mO;c+1@X0E5R?B2A6a)UuA_4Vkt=INE{X(M{Kzh1EHO
zu^kx9TPvObx9VANdob)_$?d@qwv9-kwwvA8-R6hb>}_h64M4TBvhS-V9gqV&({(`o
zd|Va`+81$m*<Xs>k?q(U9l-RQg?0c_%61~vYyK`-G@>tBl_Ry@p<+n@Nap>$s_)fn
z6?Z9>xiq*W@Xorq=hH^6H6c6HOzH@-<;=4q$RYq(Id8(Kb`5xboC`omN1>D0=3C9T
z_Z10anH|C9n}mJVq|T5j{yb=zlOSv|*CB?-Y@{Jc@;SID2?2(nH(eG_Y5&Tiw98C#
zUSdqfjb|gx!fDNM`6WNcBSLK<kY{^VAQKcO6X6tf*{NshPN4N+KAm7q-$}$EpMg8F
zSIY{7Yxi9$7KU=MR-4;T^8*BSt1X<&iaPD`686%dU2rm#O5YA7sa_o9afEb6^QF6p
zG$`-JYR6|hUH9FsW`@pashmZ2MoWRX>&U8SXa92z-_L0PqyQj2ES_^RbOv8#sSC*5
z{v=}U7SSjA&QXG;@lQ3=bOF~6=GO&Wray`Fzb-z8KKuF17XlCgfcRt7!44A#s_BtL
zCzjU*J1Te&5mwRUJ$h!52?jIgt{}+XL!>L8hB>yl&odg`UhIRe=uF-3UF#;U{=E;n
zqBCT#d{G;^7b-6UTo!$D==+WPfw~(25-w8~P){?2sT%+dc0ThCT+f##Oa_Eh+_vlk
zzzBfg#WK2~4<7r7c&gflMV)LFS2XQYvqG65P-lJ8ei&B}Lw69E_u(aeB$>XXrV=>g
z_CwjagK7hd?GCE2{qWDkXO+AcG*m)wHUQ}WNTdGjb#}>6r54ll09QV+|IH7)w~ZF_
zZznn(P%&K(u<c|)J;0W7fJozdpWnUu_v}gs)htE^II=7mpgAaiOW=19+Za}<&ohUS
zPi!Eh_{alipN9wGbJY2eo&|cKv}~fvw`u)~Ox}^5_P~<(9>Od5*5|q#BH!=kLkMs(
z_UG9A>Th{eVp>o1R(qI87kskJu^PTF!VW_lJb{gx`Om;hnS7RvGS-NzqS-X#u%4M@
zz_E?zFSYr}SF%tB_#eUHH{nh1tPz#v$9ZVtCr`mkynEHgwMo~CyJhCz6S(vvxV+I%
z__D>9Ut?)fkf-#-1ejTJPfUOg7f^>E)J+a8;k}B$1ym`FkHd5B{I`-DeN!Pqs3p}H
z)BHt^mwXX)z0g8nDyFT2w(e6e?!alll3r-x9~RmREw~-UcLbJ0Zu>4ONrdsJnkAuJ
z(pCD@f8#1;3$ap}%XCye%;p@`GpRRrz!P2Fk?*~bPd0YKVvIcIB@Jvh&)WOO@9Vu|
zkRTb?=3#YRjg+7Ch#9e`H<l&)7?IXLNxIwDz<03jI3x&AVI{NggFYo4#|J&N?Vh@M
z;WjP1KQgAW<0|IS2feD=*EMvZ9Uq~o4|*k?Ad-8R(9vQLKUoHzKqLcJIKc{Jw%ij$
z)C8{@*~`^Iexk=>Sb0IM;+c;ZN<B^@K;Lilv`RFeOw&o^%U-DN%Ti^48h2^m@APZ7
zwUh&bPeJIsgpT66TI(WayC{hP@kUp|0DZH1Y4xpt^2yFV1!?jI*9{iw4K70(p2i|?
z<UCCLo#doJngEbI_ANeqx4yF?`jP=;DZoCSz3sZ^8BQjhhBg^Mc8U2JKo)VDNOinE
zFB(u%L)nYDrwwAS3*TJl@2pCHdCLQxV-UQgCOaDLnEX57=E~H*XOP_f5#qVUN|{J%
zK7+horVeJ#KA_f~l`l*J&gz-34>~t#+MY2>YV-8i>;ncP?gQUW-(feyipyI5Sv5-o
zR@lOdWCs6pL}*K6&q1pCf}u_H?5Bm3mBS+o>kEeTb5QA{jdJz|@ZM|AtC<m4p+3v#
z3x=5UIC9<S`K8(?zIiPG6v||&@2qS}dvP*DKaiDHTtB*Bz&WBH7?A(=!<j$pLPtqZ
zHTI27b5SNp`xnFt0O`VG?=?OD<;tn)4+gitkP8nv;Jo1s_emqLy8a+*%7XeMpTUiz
z*O*(Ihno~3p#JHQD!F_v%R)H~2H@|R|J<o#<aY__0F(kCb)GTl@Q?b+D4Fj7G)6Lr
z@R5dQK)42AgTyRPYf-C871=r2=>gavNhp6t^H83Na;ab1&;3&fAFp;G2tqCraoqVH
z|7}mPu6U-;x~O7q1LdiS7(aKKx6%V<l%cs7<)C7J30frsMwN(*{)|v&loiSV^CkHr
ztl*M9eh|v7hn8J)Q1KAyKM3XO%S6gK(X(IRUrH#V!Iz;?GIn78_LpbAa-U6?vH8HR
zq+539*Wvz6u0WY&?92r<QvNOHygFZC4Oip@EAon-5noK>K^E$ZY1H7RR7?G?;$Q}=
zczAzNr8n;?!WJu)YeifoVuRkkxhI<|0Xz39G9f?I_h6oWsPB6XuHE!hU7HYoWHn!d
z3;`e=iT-YkTdM3~mgxtsv};6ION*}QS+2~mgV_%TgAtdpPBbGE`Ojcf+iAON?}wq>
z_f3OQtuT{_t42muy|zZlvJF|#8yPy(tA1h19A!S@hX9$LMWiYwpC0d$xYKB^<BT{2
zZEaybL(rD)y8P`;&~-fvldYL7RkoI1ht939eRzX2AA|4TYL*XxSm54y-=9A!t|b^5
ziWUO@#&?ycM>hX#=4o~spoXE~+Q}k^g3Ij&k%D&>&vka?D`LC>#Q{M2yYk=1{gx=z
zm^2JzrW^8oW6ljd(+mT{U(9b97=m$4yuf+w+sb+TT$TP0QXl}tC{~bmv(h*EECVUf
zFj?6DA>zh_<HP$6Rc=mnHz6xB)o|uK98^g+iPg`s^x;ic<~tl+n0T+so^*UaC4Z{N
z%)`+I=@t?4spl=EKmZ8sSdm;W7gl#_pA9h?fof~Ij4NC2%ahu$5vb;ojdO*&myLBI
zPx(yQ5EB`jHP+_K><QfO@@1?V7tELH&)Mm5gvZ=qTrlV75YhI`%j1##RmwAcr`sx4
zC=)my>hpZnJih)0e-IdM6Ty~7-iFxt1F*1q=KdS?c!rwdFBrtiC#t5t_Ee5@ngG<$
z+`&c7)Y${Og>fklxdU+tK;>57_aC_6$WNmYGByI(mA@S9#vJF^Twr5>wUQ)uJpfzP
z_b$@81skol<|y~Q=DQFY0EBPMeI#Zp?JkjGo&>q?_TgTqzNcn^Be7styc)+Y{-(H3
z+DJ5Jya%ssrn)ns&M$nw(#4S$-1C;a`<|FRkNw2CF4B?u+*h$ox$cV|zdkopJ}_n4
zQK*}KpNRJh3brIhE6;+O2gsL3VNA7KzH0MfopN8vj51XBpu)``K!X4fuCSa@=x6Bz
zoFTUjcsuDF&lr4j)$yZ2;CIUZOpOxmnf{|e5SUA(wWq&ci2uabEG-ur1gtQOC65M|
zTOJWTau!w_xJY@4G3G&cP%ifEb^7uelQLx87*Lt=h)_&(@*q27P``kMjzRt4hw@Ey
z@<YfDtWw{T`}2$=c$QHrSId4#q=UP@wlGHUji!49;Ta2t8_aVo7|0_c{?R+Ya&eq;
zA03185R^;Dd+2sL{oo#$ITl<JZtibU&&SXmnV>ea9|wYv$MEdob3NPr&BvJeSj{}f
zVGM$B&FM(Fa&coC2Lg{L_>g1Mn%mDa6a_LpfdT<36`He>dgLo-!1zEQ%}<E5sO^vq
z?_MdJH|{9}C=iW)VLpLqH0-H-qDXxT0fJQuNS@lEQai<MShh@%{}gvTPfJGc^x)1!
z@KliU4EHae>CB%RrF|(M`XtxyxA&P(y{deyBnb62`SJ(Se))Q42tu=EEHVhqTJXXU
zp~~D@bw5uZJPM#n0Ekth4zKRlOBt&)9t6GxMA~FC?`kxsrDi}i<H4n2e&fNV{g()9
zXu!X?JcCtyuydGC?Ch%YcPlJ!JVeQe@=%(Aa*JFG8O{XM^8b$r`)TZd$Z#g0<Gow6
zl2wcNf}1Cx-Sq!(Dbe9WOy}OXgsk|)!|}O_r2#BFW<@eZ%yY!{_c=AIALREDmgj1w
zod`CUwqp&`&o@_eEo>s#O7YT>Lfv2BU<QCNlx0i=L*@%2OrpX|Ju8%}P1$)Wx}zT#
z1H&X#b9+gojt@rVh)kJNYJ7?F*d#EtX0emNV0uY}9yA9G>9X}SE0e9kuVicTD?QUq
z2JhEOSv!X%@cXBT$>7a?h3^hK_1Lud3q&SjAU>F~s921Q9sbXTkx!P?Q@U=Eu}KzU
z_5414XmMqwK#0Z~E<av7RHlP^%4vVO#Y;Nz_O*Hb7VfoyuOT*5z_c+n^yk1S+?Ud(
zfGHO*D+N>Qgge^uwA1Ykj$^<IW0??)etW#Z2e0kis#MD0!!-fm77VguKbl;byoq<q
z7z{G?TO=zphP~;1L9x={xArU{Sm-DiS&mE=_Lc~YroPq3PX)oOX&d^u^9-K(PZbPO
zZr-1(uJz-=Cw(d?4eyAwL(G3S_B9uzq<2sexpueWhaN6bJmTo40h<Es)zuGL4r{{4
zExpINY8uA!i-k@@^AULA=}u3-hoZnL9f*vz`SS|TK1yW<%X@rUGk;uT7pbX|oqBvQ
zh<{z!*Jsm_I`r32C%W&0ib>Nk<8{Y|ej9uHJ0170JmWP#dWqH6^z8Z3m*1m*gwV*a
zGdDLrJvvCa-_M+m7K|U|uh23+LT6AeJYn`T&@ul)`K2hf5c$mvSXZ%d*_vL6$E?IY
z?P~tV!;Yp1nj!=4u>u(oQ$(cJj!k}i{Qdc(1pxI-4DEcO)q}YSJf#etiH1voZMgLH
z)lYsr9Q%G!voK%<ElZsVvdm9%?k5!El1FA(a8G^d%>u3BbYvD7+=}HFnyCO7W&u#Y
zsGwQ(QXXTI0Eqic#0_ItPaOSFIkozKhJFAky62po|M*zNhv7_`4W{7FxMruxpOMte
zMhDEyZ#FtWN@P(8ErDpjDs^7d_CexRI9<NQk>$;nQ}7ZZ#U^+04DQMms<Z^TjLa~B
zIfsBD<O`lN9_;XbvRmmv<`>-Sgn+B^B-5}~?Rdgq4nY@k0S(Ju@bl;nd$v3rw_F0-
zAA*CK%kJc3;j_30szZS^f5lBBE%=H=Clpj=?^^po{J4(D05u-Ss!tiCezl(;c7sci
z=m0COUpK0x%V-<<11C7iv{El&E=?_kvdD$rRaPa|d8M3G4RgR_D8ofBjVwbBGY4b(
zkHyZxm{MSs=xbQhVYRZW!pi3$;fN^5CD~Y0-x2OgT9;dn>}4*h?Pfu9QO$y9xvA9o
z8?L)y6}<vZ{%`G@DzXo=*K;wKY2S!A>vPGkH*0L<XMYU;&0HM7>oWIwsIC2u{{%c3
zH{zf>-}GVMp&;`>bZO)<r;|^3x-t*FF8q#v=(xXmynU&Xau|L<KY+xV2=hVZ{{w$!
z7&XS>&`G{2Qvh(AkD0tUSK|^`gFllQ=Yvc4lL(7w&`;zf00{e8j?55)C%rSaZSFt2
zsmLX@{8Yy;Kwn1mIkCNsR+&Nn1*jkR3!fy+%skfUHBSiAejz0RRC25OzNtef-|Fcy
zHWS#$v2#~kZlgru%~}D%BGc;k{@pCYs;d003v*d0s5YC>mypdl!W8L6%~^>qK_Jh6
z<j4X9`PP3S3h%Jcg@T@C3#dKz#rEryZY!PAS%EVN2+27%w!_&<d^eRYgqc_Y93OD+
z#F{)S`EvlQK>0%4NBP{izP+V$W%+X#p)!lZE2FgOq{oL{6MttuGG|B_I2TTg>7QMT
zpJ6k@WOHSN(p;1YQOrIZJ<6?&-*1?G75w%H$L}x}F5Asj@cRiXknLvK9?uG7ySgfP
z4`(-fv2d`m#aJ*NC7F5=%<s<Mak}z@@1fvDQ0w=FgWAtYS27!xy$Ha3)E9HIrY6^S
zsMvvwRFkc!E)F|o5ghatxd|hSVKr1kyCYa69yOUpL<1cU_xS5o01r+fq6}FKNM{zg
z7?21V(zNQ!y-m}dmCctcLs9^dW(4Z@RXWIPN=sn&m0<34VYt`$Hp=G|%!~(7rda~B
zFvZ;DX#?(eAu>7*=xU#|;(3SV^yjR4@+Hj@EX9qVD=p8mv1x*kwk*M78?DiwEiA(t
z{jq>b$Yst;@w*UqanJUgH7Um`vE^&<p5tQ!xbIT5wsu!eH9`Icy5c;w6s@J(!2ITN
z*L5FT^EK5}mpcKpFp(9>gu3eZoyCHx<F|Gh$UQE-pHz6YgpRxC#KM<>I|c~p)+0}S
z<{>Ut7Ma8dFmCrVmZ4&xEh=91-0ywqY(@IZ(rke!1VZZAG-}$04E|JXSPpY0z|xAC
z)xVZ)<14SVgV}#M_>QvJ<$@bautOjhS&kjJ(`EZPR<>Nw$Jap3#+RQRP4CW!<6i?c
zbrC>Bv7iW`vt>x#O<T{ty~;BwoeGc`K%`IeZKM7Q{5^&UJXmy6p`H0GRE3(QfQZM%
zPRq*P*i`J2%B)-kom#>?)$$M{!Qj<0?MBW*o(QBxf;dDC^W>J1Ju*7;)z4JJoC&n(
z6nZwoR;T!(b_J{+_OL!F`rf~NXvM!0naLhjw-uo9J>BF{QX9T&jWXB_u&|L8;I)~V
z0D%YOtibQEnjopZJo8o67L_;8t_UZeR=|a}*l)kJdz2FY{a1n@A3*8H=s6KP|K>hH
zYQY@55?nJ_@=9=})WYu?>~$^t&W2r#?N|T#jv2~^(yanoQyT~s^Q#R6S%u#s3tffZ
z7TJD<IoHAOB-q7=?XEpqd#>WkZdNMS^sR&DZ+ZQ=>|0u;d)yL7wyzF|q}8Yw$UIl0
zp0+L!>TyGscU#UkR9Ib93<0FtnuWT!t>fh_!m?JQo)K6fhGo=6y<C~Yk=d`o??Rd5
z^4fTZQ+4>l8XT~&o@=nM^;x(KNp}Eb&gUn|q3gJ$Xz={a%xhq-WxLMkYEaUY__eU=
zG~iy$f;6b8UJJypYrl>h;-5XTU>Q;hh&Z!#d*PLfGEu&cu!hOtyOTH1+_H^pf3^$`
zbc8wkYsjUppLrlplhOGy+U9k0ml+2*niyerb3)u5>ddA&;l0{mL|1ZIq!C>)p+M-*
za_}tAQec<--rw9&=N(sMX&veY*8?PvCD#K)vkt$VnBO}5&W2sOv?S$S%kD~qWxD!+
zM*t$JR*WqEXEX0XuFR5DALgDTeJ!be99=4-Ei&OX=DZ$+QUi>CNm}biYrJZ+<+Q>B
zd#;BErd#)a74x^^+2-}Al?$X~Yv<6^?8!HyTSJ)B)`RQ-E0W1P8UpfS^M@f#viVzs
zNrq^nU~YNnY==}=-i@#*nAMHYbU!C4(Pe?6Gr^5uH3E!0H6sdqVL(VrKUI2XDCZK9
zEkg<c5&IqgROIzQEpHm;vjI+J(878y@YHGRX38#2k|VSK2GCt+u^T|AamMfU%+DFW
z(`9>YRwmmcU>Cnud$l5JY;nam2zk!n(?tVOjRi#m;oBG;+3#cD^J-yL<uewxuQ4z&
zz=&T=o86weC|5+5XtbFIv@nSkHAc-+ndLBZ-v}XG*93k%gJm><J#Zr!FZGQU{DPE^
zSy|dfd1y^w&MeG6UBdrUzzj`c&IDTM!G!;zW_nY!S*zM#XToe1kJaES1m^ZXR3yz_
z?%2_mZ$IPzVAeH5#Z@e*87i6p5oWR+nWR*<A7t*$p~ErY>)!SBcBd2gtjZ4484!b^
z1vUray<1Is9ko)DB9_)1guy@yZCG*)NZeZBcO^Ep1%7ACEMv&f;dUpL#ni<DZITfy
zS&ob#u|W70c~4A8s8R9x7SfcFI%x7YmaId0l3ac-Hg5VOUnL7Fl^L>i=*Hrp8TUMP
z{SE;xFiUYDzQR1?<ccnUbgrUJ-+b(Mt|LQ201*#<JJscBCnfF7jFT(2M8%WLvn49#
z0wK-bcEEcv{}h$EQ9yEK$Y^GdFDIA>#qa-EIF*050^IqF_xy|Rcsr(6fSYB=99AGh
z)UDCx+@v$FI`85x-5Ln>CR8-5$NKkaz$*rCf;kLe1f<l~s2BzaGM3a$_-$wdc!Rg*
z9qw8lX_MLjo-ebQKHRHwWH4tTn_*6o(a)OR`Y_Q&Nl2OG3bSD|2%EFW%^-|$1?1kW
zMt{__<NGgHhNJ)@UCbL7lxO~(0>#5@k<mqlN43(UvG8u29g)`9#3P*?F#lohnp#)|
zHzQtb*?v9N?gcB-%PquX+*|7Corm83#Xf4`LwWJ=A*~yzu1)LLcElSl)?sdFp-?vW
zQQQ4EXu}&exXTTL1aH&M421sffb^VWDV(`Xr=&nBGQ^jmovrh>eM|~geBaDq)wM;%
zG#1nr71MygCr?E(NsMfFWm&RaYeLQA<x&5A{;7CFm`N}Q16hU%g@J#d@Y)uATEaXf
z<fi>0cN0~t%+FcN1dwC`f;}y?1Kd9WaGN(n{3b0`JT)Z&a8o-V&aj+z$oH>CU;NTA
zim!)%dz7Z5j`SmN{HP}Q+JuF)K*)34B6v$fXC~I)S&t(lwjew1|90i(7{9N|r#P>H
z5!NvGM3CM%zP@~;$OB_qBA}Do5AV?T5>HjMTVb&|lr*{g1y8MwvL*AvrxpM5Kb){a
sSj2jroUUH_q|BfHHq1g*mb?x8S(i49ySk}~GTplEC|Jotw+s6J1Eeo1egFUf

diff --git a/tests/regression_tests/surface_source/surface_source_true.mcpl b/tests/regression_tests/surface_source/surface_source_true.mcpl
index 7c819ac9bd02179ed93a1cd94b6fd8237a7b0893..ca4b7c2c4257c88baff2f9bd1c2a756fdfde92bf 100644
GIT binary patch
delta 3894
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

delta 3830
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
UmJT&n$$LFrD(Rhu_Is`W0l@o@)c^nh

diff --git a/tests/regression_tests/surface_source_write/case-01/results_true.dat b/tests/regression_tests/surface_source_write/case-01/results_true.dat
index 8979eb554..d4d1d1e5a 100644
--- a/tests/regression_tests/surface_source_write/case-01/results_true.dat
+++ b/tests/regression_tests/surface_source_write/case-01/results_true.dat
@@ -1,2 +1,2 @@
 k-combined:
-5.169123E-02 9.144814E-03
+5.642735E-02 1.494035E-02
diff --git a/tests/regression_tests/surface_source_write/case-01/surface_source_true.h5 b/tests/regression_tests/surface_source_write/case-01/surface_source_true.h5
index 82dca4d032eec7395fe8697247c7dc4fb01f51e1..a43646158be4af47fc9ed18b9c2e2246ca57e35e 100644
GIT binary patch
delta 6332
zcmai&dt4L87ROz{Odvdhyg?*@yo5j$F<9jhrDVibKt&O+N-R>WTA@@3ND(bsN_`-M
zLbWPbYq7Upv9*d?O?+!b1u0(e307MlMG^5`YbU##-DTO&r}-zJ`R&a2oH^&r?9A$m
zP4vYkb@srlCE%BgADuxFVKQR{+8}l{dxL+dUJQvDh%k4fnlf`ph|yeQvjjK4K~2VH
zmpKI4=zYy!Un|iTu>&<E*#Z(xsK$aO=q;d0|6F7tp$+&;Ah8~0N$AIAxVad$N!<Dy
z%o8X}>x8713IZaPrBO>1t7#v}P9~_yS`FfYzk6JHb|A8m&~_D8ka&oe+EAlRP>qe6
zc!oNxC`0AekT`=9rN*Z$lk&RJ8gh}OAyYKeN=-4TPSrM$Leh^3Yc&UIiull0DI^f`
zw58`7Z3{*1&MVxNov6^tkwVtmLZTBrGIo&;fF>g*qm%)zqzSV=$o2sctj}u9Yd-G5
zP954oA_T3qqwUn$LC|sb+r_(GgV92BIy}zy5V);sxOcE13@x#u#Ud=moP0XH&_s#i
ztsO|4{W&&CLBx+Ytun!(+f2aecJJtjI9R$+oFH)$)i}{!>zyEI&i-TX!`uKgYXId7
z;0z+EVnJWTY@+C1y?qg*-oA+WSaU(FIS*^j))Z;RoQE~%V=V-+7Cfv44{O20TJW(F
zL9B#_mGH0<9#+D~S_)z<d00yx){=*{<Y1{h*Ly+YLqvGfd6s!Y;Go>xR{TK#yJ?ho
zLt+qWGWO}heS#-hJ4as}#a3|gU`Rxun!(0;84N-FqlgF4GL~Hl{yq@wSX41<aabHH
zmia)Fwa3t9A9@RVjyvUfOkHu|+EjGIhh7S)z7SmTy#2D?W;#3aG!{?B-hJYIK9luT
z;RnGnxF}+xbTiwt3X5qw5Bc1fvz_T#?hirLvTrh`w*16sC<BX6z89D3Pn=~(H)7GT
z!fSCwelshE2jDHqZ~Kz$7gyQg)mU_E-Sp86?RB=NcnAbGd21$Iym5=|nTf@dQ>MM}
zzi@|*VJjAOE>$ysNPo^Oc&k1cs||#}UfB}3b3SL2kp@AqcGmbqAWz0_Ale{E+(So#
z=$y3UW)%vM(@iLc;O@z-W4w;YSikDzkl2M@$f=#!25CZ_kRn(?G$T#0QR@g&Qyg-g
zNzpjDx-Tdp1cK|PpN-q18NsHpJ_HgCh)@`dO#z9GXs)qYf}7V+ld;*QfS^roS~zb;
zJh~yFwj3$>3d$U+0Pm^Ny*4^dLh(7qC%xUW6?Us^7<Q`}>=?PiAH9*&)%AQBBubGg
zly)mM)UYIW7@Ma<q3BwUIIrJJ6fCD-42t0pjJ;fxx+gyng%~ka!y&N{bquF4<zWzf
z;hS)$Gc^n?RM3_(!XWW2+8st)YQ#-4BV;7)_%74xZn>J16FY&N*rDE&w-+SYquwNY
z0g^qB<RD0L;E@~zNDe%bBcDX=KSiUUNStZX6SoWfEq5em>}a5sk5+)I^CL$jy$VFT
zLa7`(@{mq^BstuP=bWMKgsLMH!~@h6K}WtT0)lqs$Hj9l3}v&E90|d$ga3~#{V^7W
zXegUbJew|pHeGl&T?7K+!XvrzNmM`-DhO5|KzXAEcpFNKoRTX!g*ugjxPv-WbbXD1
zz~p>sZKrb#yW%sjcsvC~Z?H{ZUem5TyKa2DqzO0P4BW^W$YK;k97>F#mcAR0G*FN<
zkVhKWI~LR|rLho%KHgQmIi}mNQ<5&YqurC$K%@H1c{f(^k(E|G<FIP|{8$rK@tUR8
zrAcZqucJcp2&={daYweX>OR~-d@fyi5CV&`&wn_>!44uzZ=3>rf3WgsJBK_-knAB$
zmc_w74tpRWhdl(bGCr1^vJ43YLWYjaaYm|lLO{g3W9M^&AroYK3bH)~*`9(vdkS*B
z_*^o`<?#@lIX7!n8x><J@EKS<{P(6c_p!*FfE%$`l$Mhse!H73=kNpw>PD5n9Ee4H
z0;YynWAXLhF=2b~aOPekPK3bY+|>M=Ttk^yTqU|v`WTDMsk#-5F-K3okYFaR8;Th{
zu~#`#Vl5U2Tx^9uaScf)K@homde1p5V&}=s3?`Rn*(3$HYxR1sp=_8}OFQoV;#y7T
zQ!E<K@PqjQq|DV###O^Bejk2bsIEmxuutv#@TsJ0zWlV%s!%EU3Z~mvkn1PN^%Hhi
zpA5lBqAR`=2f?^h{RFZ8f>?iHY-$R=Nu__h{2>SHFNh5g#0K!OWNZQiqY%L7Qi*8%
z4+LA4mlO757noWMp8-Mb|GqhI*sqxSuEyfMn-ynnW09#2@k|J|zuC9fgsN}S{t#rF
zss<ap^UMmd${a4Vsd#<J8#dm=B6FN*PlcxL1Km-e#)a|+Y9O%wb4gIIp><f?<4~_`
z;SP144Mh`TSB{$&i-I-Odsoi4O!^ayG#{(M`U6AG?c<J5cn^xo6R)m&^tNF<Wxf7A
z2u_>)FnBiZ$V5Yy27w|e^VDT5GUxe{G$;#P;@6NE+a1}D{B=bc{;a4*Kk{ow7an<`
zA|u$6!jax6$fcG!M*&)+t>%4-pD@AH&w*e|rMBf37MX?ZpAG?<sNawq%ZX(f7T0-%
zlud}^h|jUu@<(K5`V5ZqsqaJZRCcT5%}Vk$MNRWG7Vq9k?l#@X>8Z$o0D7$Ws_{N2
z=~Y;~F7fm{@Z}R`|0<sg!HL#q!&<l{lYvFQJn_t{SY*DLG-6R#xAgo3?kvMUfFLaC
z=KgFfGU2So;)lya$L!)xT|5s@=;tK&@mOTCk%`5xPVDvjl46oE4JBXDUGo&+%`~40
ztz1U*e0=SHFtL3Z7MW74#bW<UujH$^VCe!}dHc>iJ&Z-BKD7&=sA=|u1u<liQPFG1
z9YeN7n;Fu?xCK9ip!BzHiy=5o%uZd0#h7Q)ZRcVUe{-OQJ1@j{NXxySD7nLnuz2=q
z!?y)kG@cNY<f}YW0rq_@KCmA@U}_>E6M{>7M@OvTBI>dD`_|zWJF&>jRF(z7>@P*7
zPq4^LssxKge-3-QKX!}BKvxzNU0>5`9?6+$@<$NJKTq3V!L_5u;--?ca0MRCl&*g^
ze$$j*>(p?OWmtUO^=k84EE;#sk*H0pCW?_~9(5vn3#szd_#0rN*4WO{szsG~<waA9
z(S#i1ZDkPzw|ow_Z=2$62sxSbQK%`$8SP#a0(w%qOQ(zsFx;`o5SQmb!UK)Vp-;*g
zxQRO&n~gaTRDPcNbD)YGL9#|8BF70O<SK}MXlX7zt~wWT9F1TdrSh1mg?;>N)zU+#
zF41|0&zr`nMdGVp->FISAz19bxyJgPAa>zs^C7Vm9m%IXX~%sgAKiBKv8{^TkKtkn
z(wB#OPuZ+yvsj14R#ojY-xF$Py&~rVNNAC!fTk4{Kv8{e_9pvd>~-)?0R%niFQ@JC
z@@MNL;S;>^O<C$Vd0B|zHbKp)9*YxwM<|!PHIh?ig%BKkI`bF%_)+YVD8XXs?Yj<F
zCPuT&E-c>P7haYlj$v*nDpZrpt%)&gsLAY%;RSAzVRIcrZ?wk0ts$o#X8-zHr|B*W
z*AMw4N|6Ez@0T6ZP1|*8)}xsZbZcMxL^=N6taEj;-OzY@N7T^WnvC>>DAi%tgy{9w
zgAHzz+_5yUKmFfmcBn&}CDJEYn68@r><GEZ<41b;`PnJKJ6GytuP-&2K0m5+-?T&e
z^R|aNZ=ay7?`uY>zIyhZ{gsspLrw*`p_-{Dw5vt>=zD9IFIe=cjxs0yS8jP+Ws=Kp
z!whvG$X$QvQLXmBB7K$mrwD2KahfarS8mCsPuEW!8OEIP#`2O9gVsu%l*REIDqBA|
z9<{w^i^Z?87o$v%c@-qx@6Z(|IIjA7{4Jf*bmpSJtUIFCto!Aiu~+O=w^k~H!xju<
zK7UY@_rv4!dq#BYs$Qjh;Zl1msx7H{b6VSPQCs(~9&~-q9i8|s(XWduPU&_&OqJ@_
z*{b%%G;FKCJ(@?k;57VF<T5jTVYBt)<ws8GTBAzy7v$X4wT$?PxP7oCs-t#xQ=w(M
fu4l-b@wH%QbdP&y^Sidm28z9*f@0_l8~^?R(%$c$

delta 6406
zcmZ{oeLzfEAIH1NoSCLFDZPrRl-{N;NqMQ6Y114pOGHb%R9?eoizKxa8}hPG>F}%-
zDeED-YZb9rOxYJNNz>X^vY4>Dtj&fEv3Snhd*|NUb+`Y{ch33ze&_dc&bieVSk@L;
zRyhKzaobYo9(Dowgyn@bXuH(S>Q$bF1v(~$gbgBO?(|S8gG2<HZypxnp%FEihaEBq
z%Fw)&e?ALGyQF>SB~z^-(Sa(g8A7c!w0xR{tmTXWKRG0FP==iOxfl-<&{es6Pm_59
zHDx&?g$+r#BCU;Cn<&*WK2nn`QInkx{H^-@@hA0tQ7<`Tm$Ze%8MLYwy~+|*^wJUM
zP@64nsKgEuThT;?`B#ofdu_0Td?aP42O4CnqnY%i@?MZeGCvb`Iv%tK5<*)PkRXw#
zJ+oJhJ(TQmS?dwrj#k<_(a1`BNbEol%~KS;q2<MRl-S#iGGX-w(%2gUO@?9l<?s4)
zTZayiutJ+17&}!C5d71yFSpt)7=0jP!sFry!TzF)e|+;{7|OF{#C$BO&Odo~rDZsp
zVAqGT*^_6J5+uTSGb$S#X3Peh8F!D4gokAc#TgPUsKS}?y4D#2`^?{u{<X{>CH1C#
z0lY;NRVwO>luHydtGh2!)ZG`U5GxbK$^=*$S5uT3nE)#jVy#87)&i`x0BbG4S_`pq
zQLJ2ml?$+P0ah-=+K6Ip1XvpZ79SSfy1<5qrSp8u3lbiP@MiL?^oBqdUUs!$fj@U>
z6naD4@=fMB9eB>kNp>!pA4hN%JaqshRH$Nrxn2f9aOz>?185V=b%LJ{1go;QB;|&U
z;lyGeXnEr-YV~1`pl5i}LghPa8?V2EZu&5-kn9UVwCk_WkM(+&TX_zPlePCcy)UJ6
zzLEnW==<LVk&_f<+{|rQTs!T6&&@e|*_kDN5FEECOns;M2&<t~ECvVNT3`EpJ-6C`
z#c40?a<}AM=EMkp2wvaXoVTRw7jAhu78T3ZFP@%#gPSQ0fS`0!!T29<-r;7ZV=?51
zx4Zlr?{YD0!Qxrl%`*<oea1Gt?Hd`Z420l+Lz@E+yw5vi6hROqB#k`<mMggfBs&Na
zYf)VglM^EzHXwf$GlVJ#JkIWp_Nr5IepRU;(TuuO^hw+crGz>oGMFU(L@B{$tu07L
zbErO3pwTMbo1nN52yCp@joy_qluP5W5J-H72+~|^BqV&$eDkmn4}(yXdDuZhFkjVU
z<-+L`&`mjg<S3{sD18tKc53E&l{&?vgPG=Ey1QjB?pE<&2x>2b{lnJ!q1P&=x}FV&
z1Vq|U#;xQ~NQ9vM=Ha<eC~;mUU2gFl1*@2gfgA$Ck=Fd=nw&rsV#aJ60*O7SZ3vAi
z34>srZ`|GX<S_IB$yiDagTw+<9mZHP;31U}Dv}ODml?HMrQ_wqK_n**sQcy}MM;jR
zJIPUm<R~EZ5he8zkot&_`Upr)LK1!c<d1-ok?EFyk2#25shp@CJDF%DBT3+q7BzIr
zi$HWRl+Lk}0O>45Qp=qM&Y8x}s63J+Zlk71Ch{GT5L^z=ESS?ch|A8@C<xN)u0(A(
z9E*yQXq(Ogo35fZT?IB>MFQd~Ah`)ibU;Wg1cno6`H0@$rqZIe<VJ0wN=p(aQJa>j
zuV{Q!HEgJCcZuOTJ{61klaOY+eH?pDy9w;N3++-S+yy&ur*@!>A&C?;F@|n^cLAxd
zD5<Z2)VF&q=v^veAqXotP+k`E$aGRtE_k5o$vQCW#{!pXtg=s5Bc3{ISLe4)Si~*M
zOkFia2htXo$RA?WTpu3DK34Yzwx2jQAL0YbbKRlyJZwLz@<x;3t8rV;7<uG=qU8QU
zGUZ!;)P}tfdfXq0dE8%=s}$ubMY&4kIokzk$Atj(4bA)fXedS5o}z3|QMRY3&z_=O
zFCmx8bIAk<>Ss*<_$nP_I`^qqtSu@nx{pQn1#H0L>dqyJ(ov7Na*l|D;LydQ=Y6q=
zU%>S8axA_siVmy6%h@84PK3a7#*~~}d_(D2Ec&En!(%M6uj&>o#>W59CC5x$I5bl;
zsarYHVkH(GXZ;M1@C_;A@e{xQw7(m$h@Gc0K7eY^;&>9=FMEE}R5$F^V#L#5EZWun
z1dHZ3`~YD9X>(PRah-F;Pmz6ud7-D~Pl0a~zmJeg0eppNVN|ga^%YIGuPAq*D0iT^
zyR}mx7*Wzbp&bXo+^Yjcv3{ahKXGhwA_TXeW~}*(hxHT1`io-yg;**!{-ROv7jo%D
z7~X?m&$%mc$FU1+Ek;a-;B)n7mrMs1Ti@ka{Budk`CqZfR)=&31eL`{j#|?7P1z3+
zT8cM)dk0!{|I@Vg-@2vsm3pUg+r64DqrQG*$MF$`MD3JOZO<P>8Ps3wt{)|lwChWr
z>wEgHZq}F9kLi8l%Q4!^ku@@=aYVUZ*01eCWUtk<HEHdR#OrmrS9;V&|GdBc(5vhE
zR>!p6!Onl^dpsEORp^;!^_tuX-yDkx)DD+NuXCYWSCo5Fn-BvVpE6uU?aC*vKe)8N
z(%;^ubRCL*(r?Jvy3F&>d-~4U`rxvZn`*B)jbHb32+$f^+@>aCuKAlY5M|8JfgLqj
zRx7c}KD}CSAXlG0UwR9R>|;xl1beJG;D$CPxiSr%grDatRs?lhsz`?5=-wmY&HSa=
z$xsq^W&P-BvFJZZ^s7WAZW*RPux+eg!`J-fRVh%i<<`}$4@a4n)5cw9LT~{c95544
zWJ@I<i-UhlJKKsy_G9PnOsG^Td@fFmeH2CKp@WK>EmH#2zk=dsLD1wgH`s>8QKdst
z=a69*30j-17k-3)VJl5J8-fbItmZpdWKX?9EN;DhYWuQSUMM@TXj2tbJbnyMoH_@B
zi0qN+bEos1uf?MG!M3*7o2WaS-lpGNd}QY)JnB)(n^}y-IaUQb4EK2*@eGT5cX)W7
z__UKd+>__wPoVjogPZvcbq<UE){+^&V3GTeQYr*>+Pq8S`P<xv#qi&59$$h*b39At
z<5!*2py-4At*2t~%G>cCW3k9)!+^!Igqne$(nu<%q15XoZUG61`(EQ)_>A%e5H#n-
z8CPSGtwiZU2*A89)yI5rIu;eM{>f=9vgO&b5K1mT9-9_J)fgQ;&HE4x3X8HbrHOT`
z5{sKMJFEk6n%HYhk%q6a!fE#Nv51?4UY?D`FLoYY5zb$3#A3s`3;RCAqWS$4PVFjr
z5ebeDk(@Y=e_@NFY7qo2y5W&Ue1^*h5ZnzNY<&QW>{j!!I6J^<Lnjv5UERgv>J{Xu
zp4cyQ22fl&lo*vi%c6K&J(iBYfZb*u-@><}%z$8*>&yreuV!nv5Q~oP*V<F~$PO&N
zUe#5$8H?sSWtgx<sSFNBqf>PJ9%a<(6x|z5TD$~;0N>NbJqg~X_){}Spg~JrkbPzd
z==<)Y4GF{iO<$vQypuCc|3ciK$$V6t!$S?SU&;*0rMMN=C!Y+|QcEb<NR*Q4jH;HB
zgaWlO6HBrnVL%m&=|^@Xs#~lhmZ0h^24l#A61SX^{DcDZRVIBFMWShV4!0(XTSHli
z!k@`H-XhxD^lV(-9%U7F<AS(0YRQI#GxA){7}G4rT~)W|m&f*6?(V9@;@bQO?}RcP
zms3R!1UE)jKK1=x$F*;E4kQXtT@FJt=0Hj9vL!nmzvVuiVJ-v~^PW$u@$%!UrV5Li
zgjG(HSBIFsyl8)2K7`<Ez|io#;lp@EhsC@XGcGtz7{PVOT`Ug2d#}&6Ng9qBw*q(K
zHxb2I(irw@PK$^ve&C`7fr}Odj=IaDyI;K)jU}n=8xOxwODhxiJM`?(pNxuJt|yG@
zWUt|tx{T9mw``AF-xfd6=g#rGCrfNnzt~vntn+@UnHTVTX<<jS$!&`J7Q;24>-)#Q
zr>X9Gp?+_p&B^lKf9ZoQ25zyvW>iaCk40S{drmF4%>VM`oCoTloLRH;&NQmy)`1Jr
z{!cZe`^d_n8E^e7cf;OIXYY@FrA}SE#&g{EJNhCpY}4iD-_$YMONNH&*VKbOL)Ldj
z{H{NBVpl<$x=p=+{5oX!%_o{m)$ubAER6kE?(m@nAqNIqXbN(-BuW11(lgu949oNR
yso-U+evwQTwQ}Db{k`Ok(YKTDsE1fQ+*i?Q(0tx8e$q#2lT0~vG~H#wIQ$<RsTYU<

diff --git a/tests/regression_tests/surface_source_write/case-02/results_true.dat b/tests/regression_tests/surface_source_write/case-02/results_true.dat
index 8979eb554..d4d1d1e5a 100644
--- a/tests/regression_tests/surface_source_write/case-02/results_true.dat
+++ b/tests/regression_tests/surface_source_write/case-02/results_true.dat
@@ -1,2 +1,2 @@
 k-combined:
-5.169123E-02 9.144814E-03
+5.642735E-02 1.494035E-02
diff --git a/tests/regression_tests/surface_source_write/case-02/surface_source_true.h5 b/tests/regression_tests/surface_source_write/case-02/surface_source_true.h5
index 872efa070701d0a052aa84f2f1980145fb59519b..5a73e7ab2ae7b7b582c93eeba57e8beadfef4515 100644
GIT binary patch
literal 13896
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
PQlfn_<M&zE=gR*Drvjzg

literal 12752
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

diff --git a/tests/regression_tests/surface_source_write/case-03/results_true.dat b/tests/regression_tests/surface_source_write/case-03/results_true.dat
index 8979eb554..d4d1d1e5a 100644
--- a/tests/regression_tests/surface_source_write/case-03/results_true.dat
+++ b/tests/regression_tests/surface_source_write/case-03/results_true.dat
@@ -1,2 +1,2 @@
 k-combined:
-5.169123E-02 9.144814E-03
+5.642735E-02 1.494035E-02
diff --git a/tests/regression_tests/surface_source_write/case-03/surface_source_true.h5 b/tests/regression_tests/surface_source_write/case-03/surface_source_true.h5
index 04a6ac9a387d5bd34e4d46fc533e90171d779238..4dd5f821af92dd98395a8df31af2a81fab8a8ba4 100644
GIT binary patch
delta 14582
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

delta 14854
zcmb_?c_38p7q_vEC2L}mvXwoC?8$R4$%teNQKHnhluDFVA*B?`v?)cD7Ohe$^o%Wp
zLZNIK+4m)ql6Tx0clyoy{l5M4_D9!q&NH9qbIx<ld6s)=5!|#0?#EI@-qn}4Zh1-~
zh7t(I)Odk;yuXifaZz6gPzcRbf*`A@AV?v&Qnv}t<D1qJsJbH7ggk2HjCzovE~e5&
zm}+je8tcwO9TK!=>Y3nb!W6<yYJe~c{H!pAKcP7P8uw1>bpdH+mvKfHUMf0^)x~=j
zh4`!d_Ms=T+SEjWIm|xA4B_3_vhJ+I2GpY>EFoEh!eoXG&CfA(oG69(>EvBsQE~a{
zpJ0869CQWPzrpkZ9C|?xy&#8Ph(j;Lp%>=R3v=javGq(l_e)X;bE&zKEMGKBQi$13
zq9mkhDccv6*%V?^QR-UK(pA){*(_f?o=xH2u0WlbEz1NVNl}P8Z&v+Kd*8|aWhg`F
zy1_Pwct8Pni73@)t~H^Wsyl}@ro$WxaTaf+O`?w>8~(){3ZZ~XkY@E!kfsn8QMb)B
zPcoWX)XJIWpfrWJZ81;C_Vuf&y9Ak@7iSD3L)|SyCeWxiWLPjX848i&pCcCItx4S_
z&9X#|L?J{{14yhsXBkb59X3I;IoW#8{Zl=Mp(au3b9D%2R0&yTh)T16f<ee&OdiXU
z316vnS>`Bl^C-j*MnMsq-|J2j!TbG>V=5S(vf-8bYcEWwUq~#r#&Q&*c6rpDKGJgB
zrLr6&&SSTkle2q1g}5nkG{18B@H7%O+<ZnS5_M?44sn)ZWO~UTng!H=`PTnefBAov
zD*UTd5i|L$JegSPwLbbY6Prn;S)M|q#a@l=VF>YTqbN{_;iG{b0#?K9Y<tWQDtfIs
z*z)JkNs1I=?4?gpBMc#)m!S+HBER-qITI5zZ{akBI3+T%=laC+W+ntn@o&~G`d2$t
z{#B~_uTnKmDbrr}g%sjFkn(QY^|-w>hOjp<uB460%Xzx+X>k4TKP90lQ60f4z?2Hm
z5<D7n57qL}ENbqSrvGk)byEJx+A`gcr(gf!lDukg{Lt#G7t1wKQ(=op64Q^Ey_!_@
zMb^ad*Ckh57*agy&n}`6pQk=Es{T_r&JbR<RV&Z@Q|PTiA?mgJ7u7L@jP%Dqb*Q=S
z($p_1y2QFlq3y>Q8azPBsubd8-iU;X9?W2@yDk<Fk5$RUT=eKW`#-wJsZoeV?O$F7
z{sFFs^$t}d6R*2wsK)=%n_9u>E>0;Od(9ByrWmVJh-ZQZg)~<D5fe!aVR_`++lT-B
zxqt?R=&QjSHTvhzcQb_HN61!ujGxcgXN*x8)F2ZR=WaA6Gc>q;h$e+7HLt$U=a23t
z)E^8V|6iUH*P;;RJcpxPP1Nzaw3JHMlA)f}A`{Z7xmv86)2u}y1X71InFVASRZ&oe
zO4B4WWz0BwyqH4F&Ar($B7w5wh@?#+o(MHocD-)RE}fwaA=f_>YcrJ8*gooH2u(Y?
z=F~eOc)>v#RIHg}U=e8XzX8Y<WHs9VrEC-!rd{ZGHJ6XZibTZZ=%SAilXY;XprCok
z?N-?3ecIxycPr568oGUBv;ujt^5ol#4?L&G!Eh~ExFW3Qz@{!9zm3CqWRH&XE%%fW
zLL`eb_C5Gg3-|WFAEw{#gNDoe*50P4!kmE!$&$KU<k|aWhciaJrt@B8I%9BLsyZ1E
zv(6Z48~E$tj$V#=F^Nnjc376(e9>k$tzr6dkW3*S5bFD|O2VBjbl0U2#;G@SXO;?G
z3Q=AeeJzmUibJmW--*GDvt}7J^UyR?Hql#`51DNNWNS<b-O6ncik)bZ3*gCy%E+dK
z<gp&`;L6M1WsXg-?+l+;!2}r{sHo5z`=o|PAcZkG(p0e}x&%`yx`ai_dkKZv#IkB7
z)n|$IA8lKXwjDF;^vR4(3tgYJ@EH7wV9)*q(=!zY6ygJ?2}RB0BKSh#!0v<%>&Ve|
zVz-$fyNwv`^)<GZ78J)pT-cp3x2>7+7wZ`y<(T$UrV5XV`vu*v$D-cB8y5F3BL~W%
zP<>yR;MQ(POgOh;X;?FeHkQ^>r@Ek~(m{P|4ol%np)1wV%$i_G9WrLQOx%P*ctIsB
zW2TlHTaDS`PL(jRX6l*TDW(+S$eV*v4~od_G<(btmM=eIcy-i=oo1w^jNJ2;|2?dk
z#TJG#gyVvtxz8qK*uu`G6v9=it{IDwgBgWM5M$uUX25FW24L-VY&|P@mr;lb$S-x@
z)cNco+|4PB9rg`#rj=eCR&HQpV3->?^xkYea|~~UQR94kg;Kl!Fryfu5Dro$P?i~F
zltR3-$+~HqmI9l{Wt2kLMWv%m9-BDE@x}5d)PhWSO?_g)!l|&J5U(E0kgIOjVSC)z
zl0wj-hFP-uBw133qC*#ECm1bZulfSZ8DVz&fVql?BU`weA>6pgukrFSXExd=hEUBi
z6zLjQ#fu;BbaEJV->;mvDDn#|OYaqxxjPD<7|8`YNwomo_(QjI+gbpySZf!(y9K6-
z@s7$BOdzAJeyc5m(dn?p!kCXEj6dH$?4fb36I64B0{?yjjj0x(IV%mCXCKW1Hck4n
zulyR|9>t~UXmBsQv~yhLEy)G7`Jo#LU9s~AHbeZ>u){J&vTdKF3XeCzva?;fx`jN5
z*01CKJvn_~-{a*-_lh^*XdpNJebq;hUTIfc_Q(*WTPg4M(omabhZRU7iyc2zkphUe
zhFb4gyAX`K00;NXTl2g=E}4Q!+ZV2GdGi)e#irQDu|_MK;R0)dYGGmr6pz_=E!wF8
zj8zHkh*YpZ6?7sE>=+9wV|VkfxWS;dDl-1pOhu%vHup%<Xyu{xgk1}Bv+n?#8ZVQV
zIW<A$kVx%ykG_DDlFP2W8PP*a`N)aA4BVNslmIqkytPx$4m)Q8bLR}v6W=GG=avoU
zbyp66kK#r4^c|T{WXCJfT=`<)8vaZ<MM4z~I%yKZ#oPm6>;yTiJ~xuKcgxKQumctu
zER*6#m}&vqbBmCTW;fn}xAQ*?CY|mAg=#8A*B;T~c=(}*A*XfGt;SHw_YbRuShxh%
zvs$fazH#Z#880GNlm>6@a}oS2?zW?O#61k$nVpEx^iInd@!$Kvdn#cZ=yfddIIqh^
z%X<+psFK+aE@Y2h_p+)4YwCrDgU>&O`56a0(oKFLcM2qLo%zFTVHT~KhY`u>DrK`U
z!fXp5fr(nVYd&((qOX*JFT}gx&V$DK;EVy#=`j$qUW*2bULJd1Q*$1<v+w}eXV0c5
zj7`d=!hXen1_Y77LksS2k^T*jc2OcfG<CqPy`E&<-UhIqw5!Kz^%t=9q)+jcHeW=1
z``(4YuGppun-orVJOhF%x*JMx=h@kg1w32Y3s$z<6_1h%p!CD1VZ~CNu<=-Bon>$<
zNHw;-`z>%GlA~Vjxo`|)_pi7iz0TTV+rQ6*BI1-x)Cox=AQ^4+=7gW0VbuNYN0%ni
z0qJwm!>%<QV0U*Gv1CCFc&&JCOw@FAdQ$!scfNdC`<CF}@RVZKF+%Yy+^c`X6?F-z
z2T5c2PKnbGIq?gP`WuFDzAB}!ZrgARAfl}yJLWvT0<)TD-|Al92jwzJd0t+hVbvLx
zH2=VO&?0yIV&Kuq|KywMddGBW;}G<Gnm;FFf{63|8}28GmydeFC#U(kOz*%r`Etwu
z-r^Pi6JCF*b0u_if<1qEdFy{#bwH2QhQ~WxlVQNY<Fu^)Hqc_IyIp@%IIzE;+B$iN
z2T*rQOJVg-czUHU?t1O7{qWQ%P)gJOfQ$$u7Uf<ZtL%GW$(}K&U0DyExd%2rxLXL@
zbM|V@(!UM#J^7-3I|?vh1pk0BN*GPiIkKi18rO1#mtT7cL<BCCB+7NefN{PjpZRV>
zDXsO13j$g|M8x_@T^V&WiE=e@1!H$VbCocQy4Kd3DEt1Xb`kRshsD6mZkCxrTwDuy
zhOL&(<wY(xgrw(P#S@>_qN32*UGx=rXNhrH>eoWT`2~j#JGKK<xO0wV3O|ZQ1;?5G
zQAjv(SCy8@26^%#TQxi6T%y>x(cjkZ<{wA~6pee)*KXB<;i5tV%JV)bJNw9NsKAY`
zrq0!~V&Y;h6`6LaQOWr+n#bxkkj0mKsiTLBwrG1;%wC;-Xs}!2ZKGZi46u&(l2WOL
z3cJ@V?2|xH6`I_eX%vPpFsnsp%w;|I3&<E%nb7eF?K?LiVzQrrIO`n0D!JneTz9C{
z&%wVF7%G{2`!&^pgv_q?lWGgmw7R?PgACl6GABm$S!GQ;>ksPX7@nUg`Qp@}l_bL(
zt@IpPKairnSfbSa8;txIc)QrK4?Np4W=wr@7YGPP?zag142~Pec)hN&M7_5?yZUG8
zli;9yrL{P>K7|`$iW$k&Sm4xbF%0q)FG+8fZUK&^zH#-g-QdiFESiPveef(`PK|q=
z8k&{%G~nYOlqIp!_xmDGveG*-L_J<tef_GDzoIBUNqs$sd7i|kg^7X=^cBY|{erZ4
zj)CW+`asV9JqctpIxxB`)_!)P96WIstwY+oV7Az>1(Hfd%Cqcp${pARbT)^L#{z%q
ze1qel@YIFdBBFTEAX^3^)-4%q0IIapFC7T0L6v&GXHHZvc+r;g#_i@3RPU=xFYk2d
zvyN_39Joedbv3IqCt$>L)1P7uU-1O5S3*4>5<kGC3o4YjWi_xP1zp9xw-=}_tMLol
zH-ae4e*DmZiHlh+jRoWO=(`s#+ZMp^CprA$1wzQG!Qh%qpH8?;?T(^oz)eu1?eXf&
zqgKXfd;Rk+T|hEFS(|>gWe1})2fH^HW!mE`glRQ5+n;}p&BcTAZ@9iDJ^VKri`tCU
zoVYHrn>tn>;G!{y6QJ!{74}<xFBh_wH}QB)eG7D=&Az4B+X)G2spUn7OTj&@DW5y<
z?9eksF)4YBh?xmz8O&;hXD4syk?5eA>+b4^cy6R|wrWOTM;~13v*<|Fl4`hjQ?d7(
zG#Y$T?Ae~_WrS8c&u*(^rXc1!5*BwyQm$Oybo&Q5Bcdb!ew<Nu4rCY5U(*5DLK+=O
z>IM=$HBVL&Hh_o+%hThkiKuu5_X6T=bNoOymm0Rlnz$=6wACV)aZkWXZ&?nHa?L8(
z|D%A0&$D>eN6Gk|9Uw(iKZTG*he~<vt4@b>gYXo0+Mwohm`RWCOUdO$tq1*Y*&5m6
z={*m#{9So$U4P66xU<2*b1=0OIzO1J>9wH)mMl>1++NTIUF;*vgl;|p+!vSHdT5HE
z0gvwlWIi&$3$ffZiec-(;nUGu=`eQeDZ1I`JA7eLay}`p7l;`L@mcL^06u(brnjG_
z1LTcCoK1WovZ|C6BEd!7DJYFqFgXqrd4x+$3pb46!SZ-MT};8T9&E^QzuvdH0>rjY
zT5hhQgOo)oeK%~o;Fh=a*Wh9)P)}NORP97DzQ%Im+SJHepAz_n<8n3UM|ROn;RUL3
z8DX*+Bwc!X&TwTV%qUKJCz{a(&xWT}n}s|9+#w>m@+wvTiM#3-pAS#OH;8niOV0Pk
z&rA*N`$8M#XI%cU2~k=4>tq8w$bGW(`psS#UKd+EFUJ@?_V})yR3~<-#r!az!w*qX
z=X~$G@zX?hgt_f{Ts6a+c6p%6vZ(hfe17)=b?|%@q-;L5>ITvQU1fXg*W9TBA-d@E
z7tdc!Z~w9IT!2mW#*M|*&R;%3Kysv$2L%6$@}batmLVw@pXvqFb8D@M7f;xlPMT@s
zVI)5t`c!cbG9jOedd$P@kms<&&R<$XGlrYS6bsOTTBRNd&g%mg=!@pTraIW06qUN-
zc_&;9+n<1lCNNiZDrR59H)M(R5LfnHFrBOzt^x<Ht*-y_B*V!WzaY2&k=_w~sTG=?
zIyTrZ(F)i2S|?N}Re<+?<QoI$J7DBNlTDU>gNWa@&{4ZFQ``nc%s&x()-1gDMi_Ce
zbsKik;iCNwCH_r+#K2<;o~Vi(>{>23ie#sX($2ZMZ&wKvMVM-Vzv3p-6AVHf9Pru0
z*ilLA$i%DPyp?pkH1H9XI7U2L6ozo!5Tk{bUf$Ld&d#6tOKRfmW2)fl$(9S&Hy(k*
z*SI$p#`XiPW2F_T7nRYFhcSE7+8IgBdhMZv`D4GJ^u_&$>tM~3<8NbxhJfv-T1_p{
z9!ODykHUv5Ag^t3S>}UAP$j+1jr_?P-C@fwh+1LSs@PFinZ=HW8n6x!+Nn?0F{5K4
z2kRxKIl*le9l&_eY8RhTwx5*S9PXS4+3@{s@8;t4a&XVecpXn)KMX?55*L41jCSrA
z9e$k0&K^$O6@=)$JZ)n$*@!&6-7I}bYZRoN8*F!6&;)h~MD8<O)Cn5T%e*SFY6Khk
z8buGcX`nHe3l(6x7M|^kIQYs~`pk39n1W6cdtV8ccH;P(u9^lu`q={Y@9Uanzet1G
zo6ngJKJ5aVp5N}J7`ve6n>Ev}r!T~pG!+iqQX5;BBYOO_@eA6*Z}PfkqMGJA`)d0U
zQYHM|AXV2~{uPv|bO>pubimhd28y0l*CF=HQXRL2Q}B3E#b)o^NdwOneXTHR{cdHx
zrvkJ`TQ(;i;G)CrPv57|bGku{_NC<q-{rzyfr#sSxt<}9_K)oV>8tQ;SEV{`A{mNr
zGaXa!2cJhaI$Jqc0y8lIb9?(P=>GG}-YbPIP$k=Y<pz&8F!$qGQPVSgsN9u@mzJ5D
z;sL70VWO7#v+d7zG7d+%!h02p24_q}Zi${v3duMF4?8rz<n8zj!(xb?dKP`a%(m{p
zMUmBL<-CZHqeSclAyx>~IdDV1HN4M^{R{_=A@}r}@xv3%>;0X{t&1TTv31uqzt;xB
z9~S6Vm~_C+c1Dx4%u&=?d*?Y_Wp)U0zVNww_fqSK&u5&ciQ<|@86|<g;#Rjw47=%&
z@ety~b=Y(0`Ad_ZFtffWUe*gQj0nHH)4?~gC9ui0bKsgxE4)`lbXS(`1ogtDcWcn)
z=(V77jU`58JcKkk{Lpt`N9>8$zi0T;E{!DZx|1vVSKOfGGD#af_3%Q=iTiuAro_6k
zkr`a%yR=`Msuwpxlb$>}k@pg|+`Ph_q22*%_jTwL*0zDGXH?$Kinl;%U;M%p3bDlk
zn>Q^EzW={)7jxh?yFBd@<9-HJb=J=-NEAbuY5`;{|9+=yU@y3}MnTTp@iQ<j*&4Ow
zP&sfUkB8kmD~Y<-3&=+48{_`v#68LNwaTD&2r4f4OzQ%pU<Oynu<+GBw?yEda8q0<
zq#d3r@2CmQX$SGicehv81tG6p`>Ki@58$}kEWZ4#=aYUuW93;~G)Lp~S6<B@XK-ou
z1ACV!pDBmRo#f<0M@yi@(2ugN1O4#B=t6Z@VRclFsN^5Tw**gp9W3=FMbYKTf}eqV
z!Q6;^4FWP-IaxQxqXE)3r_>&t3!%q8sW(A8dO>2qsf)8C_0e;F2YWs`>El^TX0e)i
z@Re`e5xiBHw$ps8he>SZ47<PL>dBl~71wS!Z8f$HA!EDbmAhWAG%({sxXwAblW1u$
zLu6LXwxxZH<;8wh1Mw56bkDBq6D|PvC(~u8e09;<db5$2IoRuV3`Ljv#K)TWU0+Gb
z?10v^<yd6t&5&h1yZ1L1noCZAx_Ff}2hH%MkQU;j?NyQ81@`D40RfrMq19=r?A7Hh
zP^)=~m*&?wsB2C0mTf&2xJQ>@oD*s%3O+v_hvomM%T#|5qlK(p>L2#L2h67%6lwOB
z!!9WG@_c(ec-<4Gs#7qGkVQ<lOm4QuclJxD5-UiCp~0!KFMom8kDM3ZSep;D=H-Wb
zZ~qFumKvCS?QRC|Xh&BxOtt{!1-sWtza2v4=v?)$50G&XeQa`*bXT-g94Q0KJ^GD=
z_`BiCu&M0qFP-p#j9huUa|;OGYV_jXoeB_0N=r`VwMR+2wN({~*l_}Lp8?hJh>X$p
z-x_jUKYjqcbJlzjN2Z|WmI+mxFFhc)f^=`|ry3CSyALW}sfNctsAXS&@DnMOnvfP;
zi(O-5?l$CbH|5nQGr}<u<Up%q*254kgsB#w)$RX$|LUQSz$122TQln|kb1Q=&nT`B
zT5Nb<P?Qsl@RJq%9pyLU?l#2SE!_UY-1GhmxNI_Oyd|*<TCA#FIK>DNvoML>OZPno
z{oX5rxcokY2Fi|K^4emk?Fv8Tv(X6dDWmBZb;ig|8(+1gntF(OygOLp-3)xj8_I>U
zx&hDg4cBhzJ%tuBaj|~>bf6&S`+;x~pa=N*eb2-w;V{P7jsN;X6XlC@djU1sLS;Ct
z8s1m5)j0B~7wDbXP*)p$3G(UfE=_W7U|f8DFe!;%fo}0AmC^TLyoqPMk1*kI)q?Km
zay6j|AQzgP^mukHo=wB@#ONiSB`~8c&+21-F}y%LWby#^gA)VlOG)n*qc`%0g#7JP
z@ET&ufh+AL;{K?ceZePqFgSAj&=fFJ+5zvVG{OZ<TV;28wt@>iuJLJoU%|~iwv`{0
zXvhxd1f`Bi8+@%=%7M$X(dBJI<xj|(Qsgyv)VA+FyohX?oxJD94rneGzUYTr6NtzX
zc$&2H3lJ#IY&sxhf!<51E+<139M_D6%gcIZ+V<z(TggM)cSLE{_ap3U@4w*|>yUiv
z_A@rYtg2$hm?ddrT8h1?_V3f8i2Ih>7g8F+f2DW4Lnlx+YcamxnTC-uDwn(Uk(AR5
z;+)FzfCCRg|J-y)_<KL-+xB$*C7wcP-gT3IOGGhv>FTB<<SmDezu2bX_mG_z%UH(E
z6n2)=Xc3-i^jEZT;BO&$`NWwDxb}HkzI$~)%nx0)t&q186l<Eswj<Z!qCJ8nZpupZ
zSnwn2LutmVG1eu3ISY5@@u=Lr=GNB%d{Pp0+`JCG>wv|c_5LXfB0+P=+(f~qe(+01
z-RERO1uQ?=U47$#61u&4Byj%*_Qr%2eKW9JZAX7yS~Y<$^t4S2pDn!jatQD~)TEdh
zRKX~-G_d4l4|Iqk#w%FW0e_Y4KT}TYpmUn@>o@OYZy*pBA`k1i+H2@(rPna%U0ZNy
zyoDW1=t{dJp_(=zb)q^tIJFMapPHE!n0y5)xAo)Et)9p(%b<v|xhL_UM{%aiKdcqp
z12)mepaysE9Ny@O8Gq2$CEt0k#+L<)b}0vicDBJ2zN0%8q&nd7#jjO@m!s&qH;yR>
z6tRt;)AX%5=XVwr(aH<#?=`{x6#IkME!Z~(A{plB!85(^!9Ekamfu;B*ZAcwLy-pH
z{-KsfJJ}i?N3QArB2jlrGcPtQIou%k#5%p}1QGc$9O2@+tcB%$0mP<4zk9K56<9NC
z(*c6zR}f64Pg*r}0PeR{cjJ{cP}1@1viGi8;xWG*E0ZVnx4*MBX$NkRK?Y4r1^<dd
z7Vznf8MDMI({c`H-e13<3U1{_m|_8%Z8ERUyQ4g`&Q_b&k+iFTaBXg{)Vo&bV7f2U
z-L4Zltu-(ob6bk8T<?5HL*EMDJz8<#^0*$B%{|ABe7ShK<V>9~Z3h2uxP<Ui`uoLK
z;ERJ5HFqJ&@a}bE)uu{#tmv}iJsl#_{D9}V<mE<i$}?upXj3Ne2;{c5H|hoFBR+qY
zlCVOp<}cuWeu!=K3J!AeSLlmTe*vWXiFZ=_;>wu_`YUdKuQ+}EC2UHt6_FFSG|=04
z>ecYf6w|D$s*6O@^TGW94_%F^*RWWS-l&;70FM+nXy_h^2bI;epfq49s$x)VI=k2s
zcjnB;EHjyu8m>&(99@Cq`i9$9wWB=9vwupr{K$vUc-Cwl3EBYkjj0TP8mGYNg-sK-
zuY}O=_0qLY={D22*gk-Qg^=VEm)>s=I$@Yl(5PPT5Aa6zkxHsu2PpJ8`nq!+g!VSt
zyR3`bK;5zXb+O`>sMPmJ-O(!+cnH~Wcyr0bx}={<<1_4#_^8cWSLTmH%{dp=);ul)
zMba_p{^z^ERQ+}Byc#<2v#B7oZ&5%a7oD`$dWU_>ig|M-2kruuhL1YyxoAwW0Mc^y
zn2ONN4q%zPZ=LndY$&cz`u#+!1;l=}MQcdiU}d6t+$VY-Vl1`7(m4+M5(~517TZI4
zTNXddJtBx?&Dv!q;W!93WsGdyY&!tU)vY_FZxjRR%%<-Kg&8ovr(x$6BNQoFp%}C@
z>=<5+Z8_Mrbh#yOpx}Xx=$?JheqCn}%wBHeUtXI7>J$z{B>1;OF7D2)*CN`%uJ8?^
zjO82Ir^w$7UY(m>BL84VHKA|aN8&>yjf>6hpW;G}D#exlPHqNMzf#o;tm)u;mFkF&
zb{pV|i&l7$Jqb>z7Twl)^W;C-txQfn?^eT$`);k0E)NazAYNhD^W!|)0j(?gO12mS
zx7PVqZ&VXVkUd{0?ll4CwkI8o?a9O!a89dzv;R>kGM$9~oNE%VgzPu0f5W{cvi-tN
zW5&HA>xBj<uERXRlm~rmzIMeYci!40h^+Eyk50F4fh3C>xozLN;3(N;_GS_d5OOb!
zOIa5Ka|JHRccIn)$=Br7W=~mPKHLvp3!SvgH3g7kLSl(KvpxZhBWb0?3*BJFKRo=4
zQ$NEyYI%OvW-owmktUhvLH&Q?-f_4v{EsOgZJ*bI>>FzZ5N2@v9arEs5;LgV@SlDN
z$y6lJwb+*={O2kIBg%=$o)dlGhf6C|_<FOqMz<MkGf%7hdA9{T^xzS$$~8g-WC1<)
z6#M?lj!6jr-__3VTjP~M__ib<vz%f74Bx-u4r=(UI|#LKzMQxYGFg0=8e8EEUhDO;
zgWXOY&{ug*h^J~L6!|!{+^n(}%!}~kztdR_-Ad=hzpYq-e*7tvws2S(&w^Fdxx1_h
zr>Q=>n4c^$zKCOd7L+^`p3>o;3zzMkDAtMo0-o}#O?H1B0H11z#Nd>4c&zMuiv9eX
zP&{X^VALWqdTs2&w_<VZ^n_KE)wuo4Ke98Asd>tO#o4-?y0my8`Xea4b&*Rr?<1Tu
zu539f(hu$=aZ8kZ$_A>sC!g8-s-u3L%|S{n>UcCbaNzbA>i>2tD#mdq@+7N_$$Ydm
zrxR!KUHS|(&KqP>QY%4Dg_K0jcn<`U-e-QC6hz<ft6487F~M;iIdIR*58h2HPlEG8
zKIzZ-iqG0#ar4}74vIvW;Rj_--1~EQL=w~Z5$13Lh>4L?qj};m2wol6?`YNysvEw2
z7moi71ly<Lf{p7y+bRB#u_QA3X#7KGRROk>#A+AglS9TV6%_P4i=+x5PTx0u@E;lZ
zD~j&Ui43O=y7-aH39HYyuX$K5P8|imXcI-nIU_J_*~Jw%ZTesbb#u62ZZ@dOUKw*S
z{}cQmZ;=1}h5@?wiA33|W=3SPcFWEjzC#iuyxa~4;B)f&B#)JB$XCGsQnK65w-2tk
zNRXS=^$ARAlY;ENJOM%aR)z{OXAo`;hn<dk>+v~p;lNEjw(4NL3;SCT^1*0}xjX|P
zc-YcCMxz~$zrENW6Z!>~2j2U>r>PnAqHm)5Pxv8OCE!K(hd?~yT`;R-UP_+09WVs0
zIEkKW4W0yCbCT`uH#I}M6DDcATs=^(>CJMNcQ4_a8sqMw+I7hLORHBF9zKg(&B^YY
zO8U~y33mMuRyn^egl`BUN9_HZDz-xV=%RnBl?T9=vQ%3#<9klsxZwuxwSuV9z2Xnw
zcOW>sHPmw?#sTY{&-^|0q;Zh<{Okq6x<UBvG*@)l=^i-xsJBGYs|0*o?z6acsuAvr
zHGL-iO#$7%I-ieMMGvRv%Hh21YQOCk;^V*|d11TiQv4`GTjB9*Lk>>?j2+;jCrnj<
z4IkfS=mqq{9R~2&mddk8s?1nN&!9UV&~6;KH`|R)M(xQ3j?a{?8_mYI?zDs>af?;j
zI$%fkMC#l{^{{bExxM-3W^nkUc-5X!31okr*Vc_EuKp*kL2}QUord`GK^wZkcU4Gw
z6n0!SSh;6eGYpC}A*8uA!SMOl+GY4VfaZ>=ufdtk;QWq^B6q?&d_%{{cW)MfmL9=F
zW17LZGWkMkK9Jb~-A=wwZk^Qv(oTdd;(pu?l16&hc1hQR!{L=yv(U?6a{OW@^lqER
z#XkJu#O)2T5&j+j3C!R+n{f&9Msm>#uAdm03>$zOUwRb!WaL6EKO?7Z=PbCzO<ePz
z^9kTqY)0FSa$Z0U6_NT^U{lllW6&vcCYxxAUyffgKfy&?ZPO8|C{hC>7TQ<tc-{dt
z){B?#WPHQp8)_?3x%VtE41In$V-Ej+1FMQPZn}3KPbb=S-_#4rT|Bh>0p(LiQd$B3
zhKptMf;!;`xukP<c*9`Kr>MkjZ=ylmhni<E^@RQ#IA@vhW|N^|obgcqW7oZDJhaD(
zj}NAP=!N<t&EKE7eFA;r4{Iw+-vYC3KK53F4}o*wE``9`{}13it{%;bboQ~6*K4Ja
zixv+}L@&r<_~d)YtE1N)pWhGj<bKK3ZG+(DO9@LIn;W2a9qHz}abb)xRz2OOD}ZsO
z2+a6G5TeaKm3zW)CxNDuW%IJ&Xfu4e&*_?BO9fbA_Hmo8bT<gyluewsEfbu-z-^gg
zA%=Zig)MTNG4O6GFuqc<7*G=xyOLwrF?PJ!O3PtWBRrV%E@Xas2YfvAWuyAmFL18)
zh9{~T2Iv`^?66gj6!BbeXXO|->#6;Iw6ls(fIC#s)6nMikPz)}xDh<JYHDvT!gGNW
zcYAm3bM<x2c+B3nEu)Ju98qR0FT9Cy*A#f@ICW@NGn_R1<Qtsa2=9a&Y&3W>j?`R!
zB=jTH6vti5;yLp;yrAy0!~9O@mxkKS4;P>@<pQ+zX<IKRDkQ*>`#odm$qtZg;Fg?s
zuMLtVoLn42pCi|8s_X~7op3*J;x2b7ipeE+;(kbfBqv`U{CC`}6q=oyrSpIC{q6Pp
zW~ovgOxRY~XPk+@AEF)H)a}u2M+YAW69=@OC4v_z`#rw4GmbmPIp1jIkB}t9Ks;*M
O#%aD%)7KiDeE$z<mjV+2

diff --git a/tests/regression_tests/surface_source_write/case-04/results_true.dat b/tests/regression_tests/surface_source_write/case-04/results_true.dat
index 8979eb554..d4d1d1e5a 100644
--- a/tests/regression_tests/surface_source_write/case-04/results_true.dat
+++ b/tests/regression_tests/surface_source_write/case-04/results_true.dat
@@ -1,2 +1,2 @@
 k-combined:
-5.169123E-02 9.144814E-03
+5.642735E-02 1.494035E-02
diff --git a/tests/regression_tests/surface_source_write/case-04/surface_source_true.h5 b/tests/regression_tests/surface_source_write/case-04/surface_source_true.h5
index 75c309eb4f43740be530493ea10863478d06a525..ee00af3895c349d60d786af1aedef39e05e24d20 100644
GIT binary patch
delta 16296
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%0DysK%M}RP$^fP_Fv*B3rcp@|b_;s9<k|KUZH1
z4j~w!W48Reu5VrXVuV1%$&;7!YsK5i=Q+($M`W%>41nLVFtYa30F3*<h$3IAL7=^M
z407@zEL_jQ&L4uHr(#xznmkd(mJ=3~9pR>M-SQuXqmZvsufSb^5#je$G>xn7g%4vr
z>jxVe;FhML8s-slI*h$`mB|xJ)EhZ5BO#)Kp;%H-3c4aYeOXJu%EPPkl{A=0e8-*+
zCpz^&ywDfD_Z8nkZeZ5tb*<zN8ij*)-|W*sOX7}cpLWy3P&QLOz_?-JI`r+xIN%Lo
ze*SD-4`3~OJuhfI1QHbHn8cLwz`+x78!hEi;UlY;&nIuoq5a!#vSg4b$#hBxSW&p7
zMydDda^(WaG6n;qgnnqMV5Wgf9e}T1DjLT5R6>_aN*rP!8!EXnJHO2!pj$qXh${AK
z3tT7*8CvR`HlU2nz3g^no}&dQ(mcDpa-%Z?5?{x=Li8&6v!0yuuBQm(k1bhvs?X27
z1Ng*#<p`OTXti?n$+=h)%vI@A=QA@E4f7kv;nYMTILDbv!zUFL+NdCbpJD&sJ4Z}W
z66m!aWcvJM2qyiJSTQomgZjznw{3m430q`ur3-<A>4!!xdodR!83uKu+bqW6f!EIX
x1p6+yC(B;<bz=vViw-}-sU8Jw%+=W|yT=hjHTi=Ai0;Aw$iMJK27U7V{{TZCYLNf{

delta 16328
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

diff --git a/tests/regression_tests/surface_source_write/case-05/results_true.dat b/tests/regression_tests/surface_source_write/case-05/results_true.dat
index 8979eb554..d4d1d1e5a 100644
--- a/tests/regression_tests/surface_source_write/case-05/results_true.dat
+++ b/tests/regression_tests/surface_source_write/case-05/results_true.dat
@@ -1,2 +1,2 @@
 k-combined:
-5.169123E-02 9.144814E-03
+5.642735E-02 1.494035E-02
diff --git a/tests/regression_tests/surface_source_write/case-05/surface_source_true.h5 b/tests/regression_tests/surface_source_write/case-05/surface_source_true.h5
index 1a2f54d765811bd10a2758e20a11b7ea1f242ae5..ee00af3895c349d60d786af1aedef39e05e24d20 100644
GIT binary patch
delta 16296
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%0DysK%M}RP$^fP_Fv*B3rcp@|b_;s9<k|KUZH1
z4j~w!W48Reu5VrXVuV1%$&;7!YsK5i=Q+($M`W%>41nLVFtYa30F3*<h$3IAL7=^M
z407@zEL_jQ&L4uHr(#xznmkd(mJ=3~9pR>M-SQuXqmZvsufSb^5#je$G>xn7g%4vr
z>jxVe;FhML8s-slI*h$`mB|xJ)EhZ5BO#)Kp;%H-3c4aYeOXJu%EPPkl{A=0e8-*+
zCpz^&ywDfD_Z8nkZeZ5tb*<zN8ij*)-|W*sOX7}cpLWy3P&QLOz_?-JI`r+xIN%Lo
ze*SD-4`3~OJuhfI1QHbHn8cLwz`+x78!hEi;UlY;&nIuoq5a!#vSg4b$#hBxSW&p7
zMydDda^(WaG6n;qgnnqMV5Wgf9e}T1DjLT5R6>_aN*rP!8!EXnJHO2!pj$qXh${AK
z3tT7*8CvR`HlU2nz3g^no}&dQ(mcDpa-%Z?5?{x=Li8&6v!0yuuBQm(k1bhvs?X27
z1Ng*#<p`OTXti?n$+=h)%vI@A=QA@E4f7kv;nYMTILDbv!zUFL+NdCbpJD&sJ4Z}W
z66m!aWcvJM2qyiJSTQomgZjznw{3m430q`ur3-<A>4!!xdodR!83uKu+bqW6f!EIX
x1p6+yC(B;<bz=vViw-}-sU8Jw%+=W|yT=hjHTi=Ai0;Aw$iMJK27U7V{{TZCYLNf{

delta 16328
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

diff --git a/tests/regression_tests/surface_source_write/case-06/results_true.dat b/tests/regression_tests/surface_source_write/case-06/results_true.dat
index 8979eb554..d4d1d1e5a 100644
--- a/tests/regression_tests/surface_source_write/case-06/results_true.dat
+++ b/tests/regression_tests/surface_source_write/case-06/results_true.dat
@@ -1,2 +1,2 @@
 k-combined:
-5.169123E-02 9.144814E-03
+5.642735E-02 1.494035E-02
diff --git a/tests/regression_tests/surface_source_write/case-06/surface_source_true.h5 b/tests/regression_tests/surface_source_write/case-06/surface_source_true.h5
index bef135e5ace081b17fa1400cddb095fda62df652..6946938adb27e24a74078b6546c045551d24713b 100644
GIT binary patch
delta 9536
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
BgaH5m

delta 9646
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
ZGW~B#GSJ)n@9qo(Vl%43UYmve{vZ9g!(IRY

diff --git a/tests/regression_tests/surface_source_write/case-07/results_true.dat b/tests/regression_tests/surface_source_write/case-07/results_true.dat
index 8979eb554..d4d1d1e5a 100644
--- a/tests/regression_tests/surface_source_write/case-07/results_true.dat
+++ b/tests/regression_tests/surface_source_write/case-07/results_true.dat
@@ -1,2 +1,2 @@
 k-combined:
-5.169123E-02 9.144814E-03
+5.642735E-02 1.494035E-02
diff --git a/tests/regression_tests/surface_source_write/case-07/surface_source_true.h5 b/tests/regression_tests/surface_source_write/case-07/surface_source_true.h5
index f84a5c4c5b6d8cb4ad3f720e40580f6309998d57..60527c99bc259a790c1f71ca36c7a00bef7fdf3f 100644
GIT binary patch
delta 16301
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

delta 16328
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

diff --git a/tests/regression_tests/surface_source_write/case-08/results_true.dat b/tests/regression_tests/surface_source_write/case-08/results_true.dat
index 8979eb554..d4d1d1e5a 100644
--- a/tests/regression_tests/surface_source_write/case-08/results_true.dat
+++ b/tests/regression_tests/surface_source_write/case-08/results_true.dat
@@ -1,2 +1,2 @@
 k-combined:
-5.169123E-02 9.144814E-03
+5.642735E-02 1.494035E-02
diff --git a/tests/regression_tests/surface_source_write/case-08/surface_source_true.h5 b/tests/regression_tests/surface_source_write/case-08/surface_source_true.h5
index 1fd302a7cd429beaee0a203ec8e5f1da09cb09d9..3088597c08e1b4af24b1004f8d62e66bd18d6631 100644
GIT binary patch
delta 16492
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

delta 16528
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
P!D9IFE&iy17We-E%q{pF

diff --git a/tests/regression_tests/surface_source_write/case-09/results_true.dat b/tests/regression_tests/surface_source_write/case-09/results_true.dat
index 8979eb554..d4d1d1e5a 100644
--- a/tests/regression_tests/surface_source_write/case-09/results_true.dat
+++ b/tests/regression_tests/surface_source_write/case-09/results_true.dat
@@ -1,2 +1,2 @@
 k-combined:
-5.169123E-02 9.144814E-03
+5.642735E-02 1.494035E-02
diff --git a/tests/regression_tests/surface_source_write/case-09/surface_source_true.h5 b/tests/regression_tests/surface_source_write/case-09/surface_source_true.h5
index af832f060cbfbfd6f25fd6cd2049a5bfef55e307..81cdbfb0fe8919edb309daee668fd689fc71507b 100644
GIT binary patch
delta 15744
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

delta 15900
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
W1*vX9zslCfo#W)^TRQJB!v24-pZmf9

diff --git a/tests/regression_tests/surface_source_write/case-10/results_true.dat b/tests/regression_tests/surface_source_write/case-10/results_true.dat
index 8979eb554..d4d1d1e5a 100644
--- a/tests/regression_tests/surface_source_write/case-10/results_true.dat
+++ b/tests/regression_tests/surface_source_write/case-10/results_true.dat
@@ -1,2 +1,2 @@
 k-combined:
-5.169123E-02 9.144814E-03
+5.642735E-02 1.494035E-02
diff --git a/tests/regression_tests/surface_source_write/case-10/surface_source_true.h5 b/tests/regression_tests/surface_source_write/case-10/surface_source_true.h5
index 1512d869298f2a8a0c86d1218646be2abe1ac77b..b7843003817fac9a2a987e0d30127163a69eea43 100644
GIT binary patch
delta 16746
zcmZu&c|26#`!~dpeJ7DUTiJIx_lgWrb|MrlN=b`KeH5jXHcT6Bv{1>Gk|<{ql8`<7
zzVBp9=r?A}<u|YI{BvLT+<V{W{k+ffob5S73S}gPGNuaPSJf*P`J{{BgK;=kVl=B5
z^FQ(rM?A_SOe|wn!<{AK*u+*XmJub{2)GeqIUDsAMxqp(IrX0Uc$AI6(kgOUTz81*
z$0kHAb6HKmsS@K>Q$Jy*|3rbEfGZ##Wv4#IFF&S`V5Pffqq|>CchA0jPp$nvCjlox
zY~!TzkK!UQMt&t)a;>30_2DAm3!HZRQTW+Qe8MV7Ei5A!MtW}jj1QC~9$^!t@Zcia
z3Yz0mh#}ldLd0?t@XbtN7EgBT5VvzJeaXs0z&#+^@+`gMPrj`qe&nH=#zSo56DE%G
zsNtH4QoKvAAiM<JHR4rX>MMN2F=rv-c5ZcQO_ZAXmusfn3oPGL>9+C_SXliTCoEHl
z9(+QScZBHQN#!TtTXj!_?)|Awyv0j3NtphnU;zTY7sfO^%G4)%@=;$}L;sSEAYlc$
zwZt(YbNp_unXl!h<BK0rDM<<u@T()PzWq)uq;Qh>->;66UtRG%<yFc5{VGYAfd5|N
zd82Lxsx(DZL_`h0uEhCF`$`fKA_TngO}B{>av`~GDaf+)$dppK|5+;kKTFsD&r${Y
zQi={yVg&rl<QJuj+Rzv%5zEEQ@xdF4AGDi|FSZ3$F}<|}{5!!+-RhNvvE;(LSxO}z
zRu-~~6Yy$|{@?1!g_z^{lM8DRPTz~<LaY^P$%TY<mmii5P^za^gh&wZFg2uf8}&_!
z{TdVzNfK)Khxr-nqgP_^tRvvLK9o%5kP9)gr^$uk9pkH&wu~<Z2o<=MT=-+EIN`sQ
zpA#erc&})d@X3{*r;-aFUD>0jM*f`UXZqC6Mp}*B0pVnpf+JXpfS+(34|md6Btjl)
z3mOt_rG=x&@7*J+OE0}=BTb-wMzLno|ALZ~A>bWypEv&IMVABp3b}A%-|UWe(hAGQ
zjgkw)yZQth><}zeP;#Z_)GF*3yFn9%|Nqn6?VNx5CJPDakGym^;3A|xWhIFpI_|nL
z={l60uPJ7l$%W#NUh#Z-J_2RrRF1xhGen~-?>UNgXkgB<dC@o`BBzGyBp#JpvMxf7
z%u;-)(wf(0Q3a~nGjasnJ0dE-^v*7M0{(_Fn#20c2~%pz|JQ+{jX4pgV2(2-wymdj
zIE3YU3T~7FVZ~F+<)@Udx6<8PQT)b6Q4Lo_3{hO7605ipV%zd3RO0?h1bm#`td#O4
zPOR~5mS3XOV@r2$w|q|p;ZY&rgZJo}3$gKFAP&nfQ9v9Q$>|cu-_AzycLPSFgmhS4
z0Wu#CS08vj2rTdSrH9C5f~)OpTWdQT!0_DGia#F-sIdpPLrRAThU!F2+hC3}AVzLj
zGB0%lVdbsJMgqPv|4ew&H??KI3MLm$u?2s5KP$W#q7*u=%RrQSx8-}PO_{0$Ts9G>
zwp5R#8Ue4GmEp}EC5;V29?RcQFg%y<sTeNm1pMr-J*(sUDHT%-N#w%tUEp^*PGp&)
zf(8M1o_JJ)>IUBQKr`gWcZsMb&Al`Uc*e0i{10_Cmjk|#TzKL|ps~EG?Q)@-76I>S
z5{&fCtY3^CO0=x{|G~n52>kW*n!zEGv1t`C?tf^}f(#lRyv)3}5wtna6(&9FhParm
zx9`NXfv|Fm$0H29sBO9_LFuv@7M09ITMH2#@qcFL(iuq(NnB;#5~~o?dfm(BiUYvI
zM@HsI=uS9CdRp!>&<a*ROO8Cy6NQ}Car&+Jz;m&IDdbq_$XQ!&x&2@3EI1J-Il-wg
zgOMw{B4TT{D-_f}42)EJ*#YZcOU0&wKJe9DLZZ#w9_3lvQNHS-3}!Tb372W<8e%6q
zn<S4z&I>g2)iezQYB4Jk{!RFlIcF)DO@#(Tq#sCRRZM`CR?w%N9V}LEitc>ANBfu}
zMNH1cu7{PzmsqC_@D?vN{#-e_uu+_T#{2wmXy_jh5_MdBkL+Jqub|pWxYq+Bp6kEg
zrP2j1IS3pq3Hbt2q6%$2q}HP)QDK(i)NY&NSF4HY0U|n1CwuSQp9Al{G?7e9=iu$@
zdCyO9HUrabzc<%N4}wd#N-gCtyo1fwPwx62lR*<FI#d*>AQWNQX+)Q<<u_agV&?m4
zhLiSocncayGLkOb5sB|J{Rkzylt;|MhTz)<o`c4}enEZCltPAfO;mcQz|Dq?OPh&t
zP)t0^^d{!&zy#1e=|GtKHxIQP$G60F^#Nm*C&aU9?SMDVtfuNo3TPLK{rRqh167?3
zbUnO+9VZ>Tw_40<4JC|7+{J%P>$D~?mSY$5&z;L@1LNvEER4NvfRmjtGV;CyZYo+I
zm%Pgm-5<Z;)3#!G=OXgzo8v`{FKqm_qLh2FE7m<+ARNgtibMEO*TJ0DDIjoZSj=~<
z2fkzxxunQY1IEgHwqI6g2Qn_VF4c;nsJZRc2cBfkw4slO7%3;B<9Pg{LU<==eqkH;
zp_K{QrK=$QUcVile;z?v-BkwXc?4ODdwW5!#=pmRcu{oc5AT*!R1iwD@Gcon3rdS?
zoA1E(dH5f%vYTXlA<f@O={9$A^DH`HRNSGLtv7q1)Je0r;BBQa<(=F9I{xE`@?9ZU
zyv_2whL4zLV2;1ph&HUH&I%}=#7}7~*H%$K;fpiC-O)YksNEzuWdK~Khy%dIc_))!
zT?^>>7L?d7@eztmzMZzJ)J1zZXE()A8;gP>KtTyh(0qHbodL=1KP+ISRR*%F-dH%^
z>;qpA-^=^=et~8>#SK-t?Qo5wXYsv!dGwm^;KP{}O)f~+<lzCAW!x4Pz)^`^->d`&
zX-$sQI=)$`xn2g#V?*1Ra+^R+if@>`$N(s4DN7%aT7&AXI_SniwvjfE7NW4*^1RNO
zq}K=evMar^4>KalH!dH}`rQq}TiKsW`?SIPmtEgVw={tBFFpy)bZ$fk<;tyUSFjVN
zW4G2ws#aq|1Fb!fk;^1QOM@nGU;mOyL2o;Jyb$ogB(nkBKV?xB_N@zEsT~&E#j1sN
zpZMqai;PPfcSI=c{GIkOAM73nVR=8InHHKMH`8^eWH12cnzSFx3f2MOwo&V<MGZV4
z)>Pu(9Elv)EO{!pZFzboN=6aU>CIB&KgmKmRm~CCC(T59V%dJax}_Va@7~kJ>h}xw
zN<ZnJ<>`Rmo1LRmJ=dasIwO)r<`fW$>#d<PabYbVvraY(LM>)R5cBsLx-Z|tC)_S<
zA+;^QMqb+4yPzNVS)7qPw50_8d$^;C>B1JY_H0AXqLYzLq~MAz;W92=3wCa}EL6lu
zI>k8ov-`>z*08Z0Y@#0A1MsOj&&2ArX<$>^iw^VgR`A)*{z>SNIlB1|&Oezf9j#&4
zQld67eeOd>8xGkh)Azf_yA$*TTE%+$55X&|SoTG+{sJ!R{dWYke}xsM*R>Nx%u$<H
z>tjEWQOHqCVJE)Cigqbt<S-KbZwfT5=iQnW`WtIt5-5yk^Xh=*y>eHS_&>sc_bo$l
zrhUN7R{5BheJ`>Qd*#I|8-THspiJ-ljn!~`#5iLyN?q${l`LHuJz~@o{>)=_Fff)?
ze;0~_Ej&VAmo2lvm7P~bvsrrp@H`U4JktfM&)>gk6|RBG>qTqZMQdSBBuP<XX6_qT
zt>iq+a8mecGWrijetw<9WY-QmZJfSb%PE6RN3tzWH1$IF6AZ3j2<^z%X<aq;hZdL;
zQgrNgi{JD?yznI1(W*^ue;7#A$E>87Ui(1T(O!UXdY4+i`w6$K`60*U+YXf`a{jT~
z7a-w-|6D60?H4CA6szfRxo-HJ;!7HXF9nDH?KdjHtnVsxv)aj#4S$N%{4;pk2{sN{
z%KGW|0t363R~K}qk-&Sa8Ip{>FomTlR&Nk6zFspr3svqW?DJM*K*kV%|K{FiI2g}Z
z-ICA=jhu39I7Zq*s7yvc=$sa+b|2?+r`Zs*T4u>=+|rd;J>2NQMglZzx54>ygP+G?
zRo-ro+dIF3%On04d-o1QmE!Yt!Nz5fL$c(Ad$uw9Ti@Zq<p4Eo9F!$~M;52@yePHp
z<(BYi7tbUW?eyX{xZrU|i}^LCE~4?YSpCKRHt=e<X9TN%9q_8^yk{BT1GH|izuo7`
zhaS3-Qny2g;%5|f<!OLR*Pj;o`+jT~#8iDgFIOw4GzGtr2)i2}=YRmUxfg+A!=Ms=
z*Gsafg2W2~nqCbj5Mwt3g13MZ7Paf?a4!}IU3GCAgTK#>SZ0V#V)}gMiFbX>R0D4u
z3ZFH?mqVF&9*@SdL0DMW-zacL8JVBi_pedl;i5NCCP)fPxI9EQ6M)|`u}fOjLus)!
zC{Gn>wG!*dPcNBPyNxy}Vt%ef=`0z9FQ`I)W+cqI-(E{-6zCeVRh}vx0m{`1<Gf;@
z0Ox~`42SI9fF<iEd#UX_sQIRE9Q`4>*qT9^;y1?*RhwELtb@68PukS~{sk&8dz#Em
z``|jCZJS2(+hJ+U>l?3Fzd@}uPwmQHJM`us!{2TP*JFO8vc!}&P&=&E(o6m{2NG{z
z<TtSBqv?Z;2Bgi`n6`lPe=LmlrzOIpZ%aqUng)Od&f$28lnyGYNUZjeR9W<DN_%dg
zDX?_?&2A+VRy7P;I<${$pY6li)#dy43=iTf7#Vs2)wo{@Wg1>dF|&?<!qxXALOHgh
zW$QXW4F6EVaMkGezH)s2#v-l)<Czz7_?`3j8IY$@&p$z)?U*+>e+zit3mBT<V?&KL
za68gC&$dzs6&}s_SZJe<`H4CmZcG|W;V!OG8c))rogUZnTZiCp8Sw7&U;+@R+vy)(
z*9Y&LY)*|TX@}uY(Q}_>QPj%4OGb-LeKCG0I%v@8a3!K*JiKrWTs-M^YtkNvP#?1*
z99HA3X}8*dB^x6MPyPjRr4^3m&GmqD_n4eUZ<wHWece?aW>Quq6kJU@zOHcnPLS{i
zu$H_@n>hJ}rUyxGSH=e6x?kY6wVGb0bq#!c^jZIdO9L>Zi>F#V)C2JoahZ0`i(2$+
z$|OjOxch{Nj@gC37Q05lnlXmc5e-uyH@J{(Q+6+OoYN0wdtC}*n~j{yOWJ{YRK(}8
zP4eiw%(&|t)@xu+rA=qFB(Xo7>1_ul<_4rS!GBE;2rlY4$(!2=w5)uKFAbJMC9f1e
z?ibzg_Nu7ji4aA!h>@WCP|pApQ-==s1OEffRNMs2+g<CbLCnOAzSPBNry4;5z8503
zKHjc?oFCke%Q+9jvdTN#WA)U~%wRQjyZq%15nW;k!5sfZOIq3}Pz94hj}l;JeZga|
z?l2*S=YHvgZ0&+FQG{TJ>pgJbOyftV7hS+3B>dj))lVQ-!m48u??lni>*-IXGITL5
z^yxTX&rh*>^qrC9(-T#(g&%VOl6L&2N+0tUfT)H8f^QAH2gOouMfSmif28*P;uAzO
zKW8PL9W}$)QMR&l4+njj4hortW>Poo{#(U_JdgC2s{GpnFBF%3O3LhjhF_eATgOVl
z#-e}ip5H{!ju!5{=!n@OJ4$mKP`aY@El-o(Pxb<rYp$tQq6IK)BB^O>=rA}Xz@lCL
zyd3h>RR-^D%Ynyg?KoWyYoI{vM}F*_7}gaTQj{7V>(FS<AA_rT|FN{an1p-O1{e|!
z4M5=npU3Kqbuc!+@Zin!)o|umRZz}GTU6Gbz0&4@EXKu%n08iJH>8n~;T7iqFx^*j
z%i}-~L=8KXN)v~{rvMe5M8|SiTyc72M|}otjbcAkJjsO4mPx&mw2;A8+MDR~-e~5{
z!}EO_)F?`<nKNTTsE=8Z^bccQ`uonpL5b?~L#4g2mYH8iQl}HV%r3t=6f21CzkBVD
z^r7W_Y-5U2CYr$u-8UM*$@f~lRXaw&VWZM>0c7RA@mRhLiuew+_?TL@Kk5Km{ojsV
za~45mXYY;L)vI7ifyJ$NJ!D^4(b<@kDPZ!Lg<E<WPny1~sd6l<4wy&c7(s6*NPcF!
zRV}O&=Hx`TrbWu2QK144wo7cnj9jvUfwt@?9hfL~`7;A{A=%77WyWZMhSWbE?!2ke
z4fYh3m>EykLA&oCkB9Mf0Fk$k?>VX7K>Fc2o6TIuu-+A=6VG3VsmdUIffiVZ9I7Is
zqRUJ=%T%Djc0Lyfe+bFC*WCju!&-Xh^T^9M=KkoP36kjV+}TfJNqX3bXF?HgokjO)
z)k+p*DA~U3s1p++61~Sk=0iJJ_p|lwS%uG#xj|wFLwX-je1iz>ex8Tih}E>XacV0j
z-ewAlv1VA{j&IX2I{07BA%=2r^`dCb;ml5eml_f~-qZ$lTmI`)j&6l-%tfxHoSQ~I
zot%u+Eg@hirqm|zE{^${BHa&@oC2J;3e15Z+=mfvzjpAaX+gX^pbM@8X)S&OO`vCY
zP%Sq^&}h3@+1_K4SQD7hNyT<mOUk&P0onAX;x^A*8z$MXwTkpUyHc>%CtK@p`xiK^
zp1YARZx}qyc9|bLf}$@1C(iv7lEkKiTPQ|8X1!GYS^Wq2vuiVZYib49)}*KO*?$CV
zX-pY)7|(}U26Zw~ci)1~K(<NE-4xwM;Afq$(ZGx}CmSiOx5LO}jpF+z!1%%Sz=^A^
zK<_^#@8I=AQ2Uu*|8?zh81}=OJ>_2|kT-I?&9AA1HZ#GtqpubKk;EfF8D$7`MtW-}
zBljkTF#kIE^waGelYVf>(O%$)_%mQ5apBSKbA#ag)uhwU@l9Z?w+ghZ*@#-<uLvX=
zZ(Q^ThsEtB3p!l?=3h2(&1p2zNX$;`_BPMwVYj9FK7+tc=t&woU)oCE4++uEQkZIl
zg11o1x8f40&D<Iv+0lML^k<_Iwxk2z-<E63Cxl1Z`EmQX`Ma<Rd^^<96r-0gy;@Y~
zhFcf>nh`p|QP=}_YX7%o*XiGgOXr)DXFls=z3o;?tN3R<%sz7AII#Jzb&pX7jx-}=
z@Fj3)065#<EZqO*2YlW8>c9@BMyPN`Mmqe&7W4yQ(2(<l8s;-rbnMnMH#YU%U%=!%
zmin#1yQLni=`lNT`BWG5F{!drvF`zA)W6&*4Eh3$4EsC+3(U|xfpT>dg7Vnp#hMQH
zkk~0%sSo|oH*GRGwg`_<AG0ErGbi)4gML8!Q=Z2U|JMet1jz(>_w<2372<E*9E?#%
z2EnF-bIMqEu#FCP>Ox=R;hz;4-+R)M%s0tPax;O3BTTRZ%CFHvcE|Msd?LR7!0$Y0
zB6B?>z{?c%es&-SuPcjn2iu7j4(2!`Vx$9gQDH+@PqMTLLH)-hXzf4X@aWogTB{)e
zg^60W=IsFY)h<as{w2&c={g^%*AJQl*j!F-RYLEqpU?HVzXgjWTjEi1Vck~Gn~}AT
zCcuze@v8j6aS)F5yR7>&00JF`1xzj%fqk`xtW#o*K&0I24EH!2dQJN&>!p4KizPeC
z=$3hn<M{fKAt+_+m_N3C3><uPFikz9AAZShVz}p&2`zaYC8gZjz;6|cJxL$U(WHxo
z>8_)4*gU|V&PIoe{;XA>|I)N1`A^xznjOypbsA!S_q$}mr&rCnpU(Hfx{|Zb-J}li
zrsSaDF48#C9_O>aG;cFDCvu>})yY!cuX%O~is*gy4G0>h;UiAkzORD6^}<gT!m^X3
zMtJ|Au!wkQBM?itY4GNYH!^T>hmb?VEv)Sw>2NP{2Ru98-$=tF@jTCaog6d`@Ruuc
zpj<bcT33Ezolpm4-FtVYkEtHGpM4V4{Y@3kMD1`cP0AQwCpz57-$fh0Z<&O1YgQj|
zyjy_bkEW$=y+&SEf0b-z@LMwgy}N|Qoj*21*HJ=8%xpbEO5GOdr9_zzQMxMUC0yD9
zczFN9rCo`2U{`xjsE0QZ!@W`S)hep21Kv`_ojh4k4kV8&dglc9z{*LTzu^@#h;OyS
z<>@QSb3+%Rx|=zEt#6T$WhU=pe?X~i2b~qY9AW!Pc!ywYtMymM<>d|OLDHRd4_|e{
zo55G62c4SXNvQ|;n)MxUo0ajm>?4{e=*0=_jgiLs8CN21r#W6hZ0Mpt2W62)nWecA
z59~B2CsNXOE@eu5b}r^su-meo1bmV9yKi&ql=Kkg8;?b=CEB>F;fTZ#_oeS*-O0IH
zk>1VO_A8P!tR4hhF45Lw=^cL$0={zq4}8wA!_4)fGgm`=>QsPC1<3NzR3v|gP#?3B
zdawT(+qU}?>}TQ=?0eM>+^RqQytTa>jx>fFgp}){2Hmmw0eJC6Tx!+`@g(4#-}|~g
zI;V-n+a5|^dv6Xh_Ychi`Ac>25mM9e_WKsucce<te5lmp$B{Ph$RloB{&+8(4n3Jy
zx>q0lZ}YA24tvT7NNFLOAJCZ3p7@Yh&e{*+7Yqz8sWXz6C?lVKv~jKa(+xWlk51L4
z<U@Hk4L#2XT_E<z$Y}NH3b3dBq7`H7CoC>#+kZ4%R=t8EEtBQVulK#zYCkn(0f+Kb
zKfS_gIA~usQYbVGkOktal53}7foj`p_JB3$!v0LRTPt=@nJB%?aml{w>T^?2cqXNR
zrMeZ`$^U)jDA)^cZ)NiQ$KC}EyNWlsZHNV9nSQC?=BJUJ2E-H&^5!RP8<4h)r?K-}
zw>j(Or%^z&R)dp2(cbYVXrFY<c*R!<?AQLp1*#2#%WB)DK7{>(TdXfNxoab+?n~>R
zM^~_8rp(QY(zHJ*Zf%24Pt5OBY^#L24^H!OruG7dZkI5Ea1D$+X7|Z!O&d_v#sB$I
zBZ)rV6rnJvJb{gWEHqk6*KWVL!L^_2vDhrt`Y%!{xF5dj*mNaEtO!Q_ym;&N)m}I$
zvgh~bzz(Q?CRil<f;Re_Gs9y}X=1TYq4+xaIFF^UZtl+JJ3;%INCY|2hJC-<z|N;f
zO7C-z06u{;Yn+_FLs<{QNhI(KP;W}95`D4}?Nl@?a$ms?%Xuxa^Ahf~?qjLM*bQ-w
zq~C1$42C)n2>*3Xhg{M8+Gp;Mz&;M9+1RQtaG#-;Lj$`u`aQ;b%^;N>WwOJzgh%rn
z>9?9W$isYEn~-WdXDmG>`vLn+VzKwWdQf^cUtw@?0N!O+Gz<P%2KvjZuJI97QT*Sv
z14hv%2sYVSO(&;GN$Gwbj^#azDJ78khoKn|4bSq+MKr>Qd&4A!eFN}B)7C9g31y%U
zPCm<F(?k1RRemfHrpU=oaYd5X`x*Tk9|6I^uO@ug04#m**6f8rAAH^OPx8&>HZb+I
zqrH#3XfIk982_0|5*4{5CJ{}Rlje#XbnKpfH5PAw{SOAed{x1<nVCd=%!-^T6?&;G
z)<WJvG3Z?_mIsNe-X&#U7yvg5FY+nKs-lrx$;VU3xU`)mPC8s!<`x~<6W=j8O*V`s
zmu4`MI6f+o62?0qzg)0ShFT5mIUMQeakv{cI)D97!dnfMI4d7_myAnuA}%8CfQZi8
zS*>{MLJ+;{S@_O)2ISJN$$SH`PH0^}(re#V57a*@w(Xhd1nW(|GT!i!M13+|s}`&<
znwyRs!xaNuuj4M5_xTQ*A2Lq!C8Vv!-t)}E@1Pmx$*wmk1Ls;j<r>U~fuAtP$3x!6
z=;k7?FmbBU)Q-}hM@0Ajdtt>YQ4%1^PUg0vQ=m-jM+xEM093xX*C*7p39PDWF)&a4
z4!f=8+btjB(bJrXU*c4jTZERBqjA)|8sK_g6`OvNUi=)JeGxDUJEHDZ-M`!d-A}X0
z)chELhNqv1h$4v~@5A_m<T75g^=Y?_GgUcCSIb8OT)L)SsrB(tZ>1Sa5_BMjF~l>F
z&TYDqc27PPcH|j)ePV8fyfrhYx5bi&c7rpbvq@s;U+#<jzAJF~>2T|x3#^i5n8I-D
z()@5UU%vx|M@0O6oeH>NR$|js>@alpc;4#~m<Xp280=ISS%oItMlJWQz!jjw{qNj|
zZ_(GQFx<RHj}K?LW`kf!1?6MWcR*H~Ah*=~2+S$?afE+&1mF{E;lbMw(A<~%Q>&?g
zPSJrr^~d<0{pa3}PmsA_%{b#FW`tTTD@pSDYAp}Lc;LylCCk#NA0(dP-Z5(04mpKX
zE*&_4qH`vO*?Y)*X_F25q@Ac=!@y<%Y%7EGGEQCU$ZtlZzIdPGOj!pg3%Ol)va1W0
z`qr$w@uC*o|HZlX=f4KTJ-OU&?M8~nQ}~L|>Ckxns@K|uazNwx&M;HaB=9eIAaA?D
zF0BF#rKPJKNo|KX|Ba!RM&xP!r3N*zaye9UEKyN?g}$P6xGKfBTLe|xFnvWVaam%`
zc#=>~=mg)!B-nCm3YO~B!b3B0{x2hj;9hsZv@`s+=qt<MUWOI8^qIXKXi}w|U^j-F
z^NXRdaq}SL7X=eZn+jk|&O+(gJ^e5s@)t9r*9H|<Sqwj9UX3bzT}U~y0+*KAqtX8P
z_*;kU;Z;a{+vAt@BFjVjo9#hqYI|D2T^ARA#Y4xS>t6ivyJrW0o9}o;R-p<iwDrG-
zNn~7FPqlUlka_899_;hz=B8HQcXziz##wA?PLglQFdpEG0WVp<;_n_N!RNb=8Ag2^
zfzHCdWgy84J;={cC`ryl()@uw*LUTyv5M!z?=&3{Bi?v+(u-kuHoi{dhhjT0U>rcU
zj5Puqm!_cKOx-Z=usDlucq|f@Od5G(v7F(Qpb4;aJ+@#}`S|)b4A<Dgd&{$?I@sGS
zdTHCn3LvugL!5rZ5IC`C&8gD|%Rt~7^JkSs8mKGkw88MZCbm3XM~8bUjpfKYlNJoO
zAj!+*%(36V_;oDdt7twDOz`%}AT@)Nzoq;1A_l<j3w9o<p(q;ZcXfY|c?5<lNr#*L
zwA^6!>L84$l@c_SY^ULqVi`F~pKou6F}zBaCN-UK*Qs_f_udw`aI!plj~yo}b5Nx;
z^<V_1uM{2by8>l#Qg$Z|4|x|Tru5PnPcl}^HnbqOC$VX6Oy%kTkhI!yuWvFQT#r%-
z4U3UOQN@JUfhH8blyOy>XzMSc<9YMM7xO=$FvOMDRA&V22sBy!$g>SrJTe&|SbhY1
zaSpPdQ~E)r?86N_BkJh%otThowh`DasSIUs_K;8dG`w#HklKHpmUbea%TS5`q;<R>
zrgjxS`a4w#t-U4#)BiSsD-W-2n~(mD{7HAnA9kUjP(ojp&cs(L4?=@er(hXt_K*9z
zEC}^6E9tTHHHD1{zu+gL#_&RSANVDhB>P*l3GOp1A2_sC5xpuHc3O1vvUK$6!GgKG
zLlT#;!JbrhlJQt}*CfoyUlaMks|MaJFOn~PI|S?HBa+UzkwCq2h0qpFEmX$Bk>{Rk
z1h#6VPY-5AGiFNUWBWOXAx~>T44%B-?U`&+Gui=S11DPC>pDQuJbq^Izh;mEJUIl-
zO;9;6a83hRb|L!oVE^V*mGWH7q@cQk1BaZJbuf5+J9O=lZs;zvX_UeB2govhR<Sw1
z3kI{?jXIFYfkqcMI#h-(>p)8n(qzs|_qcP`BnNmLz81+S!a&m(dGqy(aDV@2c<=l*
z=77l`K&6E{HGyFSxVU6KtIsY+yoVnK$LmBbb}1AWQY5BHis-zl@wF-$gJq2`{>AUD
z1TQ2$R5=w6fW}P|2Ry&mLgX^Hu1kF-_`HER%=WAW`tR5S?UU9K*fd;;#%k#ra8z8|
z82v%>Z<1)I;9RqD9lXoAr*h7|2Bv>3<~<IFU^sh=*Awp?xO;N@hZ^ewWa72$?WoyE
zYz9TmYw~KsSFYZ_;NB4DU&cq~;FlEn=(M>3(0zD@$y>Dw7Dw2RABy}1^G@g0=Czxl
zEmQS;J65n$reo*m5~nYv+61V@tR#|obnMC8ahS)Ln7?qe4kUQD9{clW5WaqJO<3kn
zF7)lLX5yW&MGf|ji7zmWVC+;V%gVdCWlwb04Z<pZPW^3r=AmEJ8{th|{eV=aH6&ot
z0!-w&^+)lgFtUEMuyjri&14)k6J#90w4={!8v6<E!OhRWle>JruUB4nnD3SuO$X0a
z0kMts3qo9d;8F0u#8#d*=yYVr(CV--I#^Wh<-#<A^*I~qtX7OW;`D9(0DJ|9Oyo9A
zV{M~gb0CS$sT_P!nL80V*bcLkr0S)&^+LkYTkpQ#XF^dCNH8SxrHvJ;bh!HYYsA&J
zw_s}W8CVPiyN*HEhr36Ap6vzs)jOJt3bNrT4}@>$_D-mD*MjSmBp+HG#k*if{tpH%
zuSv_p(%^R<)G~Nh!$O*R@dT++_=oWo@HVjwF(x1E@~iu|PWu~-2lxX`I$f~)TE>NY
ze-+S4`yssxEBMm#ur%D;Hha0xU7v!F=Sp7tE6riJW$Zm}Y!dD8_g@BH&l44J_+WC#
z*!x~6omH6Zi{FH%#-?o8LFP-=ff6_xiyPv)onx8j4&NICK5NJP&YRzdk$;GaCC1$_
zj$26T9KIX;$N9eIKu{6jdC9GQR7D9b*YeqYoy?AwF4Ls=klt2%g_rt?!04lr@Fj=O
zpw^l+C5;;b(?LSFBxkEYPsGE(Fs^d2rbw^sbCxXnNBecL#|j_Pq8Ybz%@tB;u=JgT
z4}FL62Su^PI*DI1NvI>g5^^#0p`X&bK;&+26?>;H$PxN-P4F!<bZ?u;4|l4Klun&K
z?OJ_}g;lV5dAqi~1#~grng=|ODr99E3qT=SeI>c42gG}@_QRk~5D@z1z}7$O(c_=$
zG>pl<Njv#OpLWGHd7VDIwH(Iz{o?Gm!WK0oCer(?fh+m&UCi_atA}Nv8kP8N?Kcc}
zO`O^<a9}O!TS-(ZSix71PKOa*jj&e+jS&5lIDIb;o981rtIY4^mgd60SvjQZ^)*2B
z$oT4Kp+i8-{M1RUAWhW0`0j=(GA?c2MW1rzTG+8Jy<|CtA|8nz{I+WfdYLCGPujM^
z@6Xa12Lt+H`=h(uY!2kuXVCNfa9kff6jZ5bMaHH1ya65G?GYKeeFNCwh7{Qd_?pJB
zkRoCx2R0h^LwIX`<Xu1;IK{rrv)HNtuy~1EW_`YfDCRtyauiwCmmZh5Y*6ji?NR6}
z6;LE8&qShD%ZfNc9@BZ<asV#=*O3xa1+OYi9TVdi0-f!p;;+Xik$4}zAKlE$Iv6hT
zrER<LTsh(YO=J${CC`*@{Mv)XQta7IsV81-P-*?uYPP3&VB&_JeYAT&bTXLo&e^d8
z{UClUf7Ob1GosTWr{Glly@2J@teNLzw*BOp0ft;7+PlM=!GEi+<Khk4;LY(Ni$a5L
zP^|E_tI!BV6P~9CU0k6red_itpKnfB@)+!0cQ!=cc@pE>t3Fk^YD+czZ&KofHB5(t
zLU_yV0>kjst=d-q7iQ@7w?Q}MSMW8a=li;Hv%GT&IKBVPKC!Xobzf{w*j5pr0{Fdf
z{rxoMJ{Z62&`9@qJ4`+se(+$C1^Rw6WyhTrxPT7#U6qiI8qx(tw!bkp5yj5jk@oIx
z6wMW_fKk`>j^g9K!rm?`fm2q)FzV+Br`4z+YCU;UQGZ1rh|u9aFCjWcR^(##=anY4
z8kLaO=?Qu2Cb)J`!N-F$F>HY;uQQ|1xpsl;g0YGbl1~t!=%gb<g3JDkF5%L$#!7;d
z_44(rNUy(0HEuRs_OrEBCkn0ID`Ar5rRSnx2-r2>ideP19H_q1Rt`SSi>N-zmh1Ez
z#o~<~SI5>pNV}wRNgh_xY;ipwr}`Aktou29W4ajLBF6Q-QyPLu@Qc@X=c?gav!i)m
zdi2oTcJ^CxRDYoK+0?AD|JM4KhYluz>pn@3=ZmvJx~5!JFuAvVIBXT_!dVS&40`FA
zPm}>6-qkNZ-*G{Iv|7k(kWpwy?>Ez_nVKcuVJXuOH++pwo2oCzR4uJDJ*8p&9UeF?
z*xf(<3m`vce`(JTLi1u~VTSt6Xz{Iz_v$NJ-;@s5E=Q3=d0jsZ53$VGJ$!N1G_a3t
zko9o?2y8NIS$k8+2Yk~KEkB)Tfj7EJtD=f!(3?jDht$l~u-?{;4%dGz@BW>sc@THt
zK%+fa{vSiY)}s4W^;KY#1Z=N<&<`t`?!>{OMj+_IwR&5zExJ?5<NTh>l)oHNMu#nQ
ztslU!nz6|lM_Pyssk#!sd?L%|ZZx~AVFj$edeUalu@44`l0K(dwt;}x^=kXO$S3fx
zOS3#l(!i#q=9Dq<w`KL|Evml&!{&tz9CD>loh$XR)_(&)rRL|eJhdXoYyOq9ioF^B
zSbH@zj9`pT*bD3o-@be>f<Rf;?0+LC(MjIfXpKE8bLHL;sFj7$_3wvZVmc#=eE0=|
zopj=nQ!%i311Gyc7=oUTUmIciNDUjGEhs3Pqx34j8;wK$YW*TFK}JNtPsuFtS3it-
zwWo2osR?dt8L3+}Mo#^(*K?RYvP2IeCui4*s$wXX6qKT#=x#sOGO+r{+CpVbCKCVg
z$D=8(eGo7FLH}*lS5Od~yLEj#`GlQFi2L;cO|&fWxXzhf`WVVq>N$gJrk*38k4^%<
zuvJf=tnUM?6$uMM)*~QUah^#``5QQNGI5ioLKb{r_5A7dO?h<C_BwM8iIOv>1c4QW
zOjfMMfF5@NkgQ-ZG)^9bW{O)haalv~#d9U2MBi%YaZ#C54CFy&&sA=(a|r0R_avgK
zllmeVO5@Wq#I(?#n19~uxoVykqDbqUUG*k61|+G0k7dmj^7)ngbDpOO<l}$LyuZ%P
zz5)1@L6v(ltI=O7zfR4+GR2&gK0`b^Th+9%X%fy%rGOx=EE+zkq}WCk3C@6ne{UT%
zLrI|DdYCEW(Fjcay^dvUniut#G3eO-WHUBx-A)$-MSo(9J@#TwN-_%RMQtr6;eiA<
ze6mvy+@0&Bm(bh=<>R8xa%sdu8*>fz>fTAjNL}HOAfksY0&FO1YVB9v;d7%KjLU!c
zvi)x*Tzz(W&hJ<ceB-o+>Di$U&|?s4QI}c?@}3?J-0mielE;b7U*2xO)U>5zmsS-1
z9Pd2^Zaho!-4u@<Dn$_Ho(<33^Wme;R;$mun&APt_79g527tr)O1GKXX2dj9<NU?L
zmRLt>M~6FkOE}s6OfxXP%c%NNJB`-0kb=J)?Uc^{0o>$rqWK+)q3F(#xABLDA<I>h
zBd?FBqVI(d^SI|}VQSLnaxd7o1Xnxvf`gyUm|7lA&~Opeu*{zVa}8kUtG#3O>TR$;
zIYEQO-vb^QT1O3~SfkCy%{wpt+=zv~6D9O7p4o`Xo*w}3?y@pOYqbCaMHk5}eIsCW
zf7+#?T@PT{gQoWQ!Zh&w&~K4n&9<m&o6V2Q+5C$gG{wW6DJac>q27nBMnNvetvwEC
z9T1<fOL;>++OdcK)a!0CmulHE7qiE&fI)yYi|XtcBKNoW?H@6NMHIWmBPA|$+Ub7S
zU8$hXh;T5j7SOK3HcOGNmv^i5-#&*;2fU6v6uS-A)JksoI6VTom~vj`EApTkx5v}A
z4ij(k3Q+=wKGBN=on9!|Rsi;!*DG%f?Z6y-`a{VJ6=EMWG&DP-ulNDThnhW2VCsN-
z$}VZybIt(%RiA1Y5)&4igpw3;rK2lhaO$VE)GAWOoT=RWeMW@(n3Z%a#_eJ7L-P4j
zmY2=blN}HVN@qOrz7@t+&tDz6p8+oJ-%)T>mjMuCSp_I+x>D41QQ?`YHmC&~xf3?&
zb<Myj%b@zJdwReft2^c1D*514D85!iwF~~faZ<Kb!VEQFNqZmeEQJl4Zglh%#<uQ$
z#)`*i?OL0onbKDU8rKM`e=h6>kGJRi&@Lk%R~H{pm2ztZ`f)F83a?0@T*+leP(xiT
z{&rH>?Vc&sFP*|6WeJ;qAAZ;m96kwFnpXA#O|uOXho;*=dw>no&|z}!RiQT5t4tQn
zU^IG^8HQr)+?UwVdNa!%2VdJ7GGgqaVvdDo7EXaX9X0L2EEOQOieL`c^}yl`i{oaR
zouF$2;}<6jUX<_5m2dlnm(Q1aEaB2FHOUgQHe(BLir7{!oUpuW6aIGNJ66GT7#x+{
zzYX^jOvR}Fy*4onm^-+3^gotE$4#E^Fh90@7}}EtxOA0Z6Ex13U0&dP6}M<_&YlEk
z4$lon`VB&kch{`UrJKNokGT^vPm{pfh^<m$ddCosW^oT?#cPYbufU?u)8qah75yj*

delta 16798
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
Uq2BhUB_p9~^Oh3&ubP(s0|V?-tpET3

diff --git a/tests/regression_tests/surface_source_write/case-11/results_true.dat b/tests/regression_tests/surface_source_write/case-11/results_true.dat
index 8979eb554..d4d1d1e5a 100644
--- a/tests/regression_tests/surface_source_write/case-11/results_true.dat
+++ b/tests/regression_tests/surface_source_write/case-11/results_true.dat
@@ -1,2 +1,2 @@
 k-combined:
-5.169123E-02 9.144814E-03
+5.642735E-02 1.494035E-02
diff --git a/tests/regression_tests/surface_source_write/case-11/surface_source_true.h5 b/tests/regression_tests/surface_source_write/case-11/surface_source_true.h5
index 0edb06c88e9a4ba368a72bb0a16b698553dee244..b5b6036201bede37dac2749563dcd68620584009 100644
GIT binary patch
delta 1887
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

delta 2822
zcmZvec|4SB8^>piWrk$QdXg;(bq-1yr2Cn?UP3BDC0nPom*td5l4Pl*Je4JBDoxrL
zSqt4$O%madElXw?g9+Is$=l3$eBR@8o`0^-eLv6r{rs-qbzS#NhF;97D|#YC)ocS_
z0!beyeDrgY2|fgo3|aJtxQghGr2W1*DiYy%JPS=Gsu9lMaA+aXR-)Kxp$bxKf!-!6
z3HCHewjzf#(SxMLf@KWJ7SBX$NWueyzg8<zGf6ekU&m!pV`*j7PtpkAiQbVEe!!5l
z73sD@C8dO?^`va^H&K5nHK$+S@0`_zg@XHwJ?mD_K<Xi#%^juXK)6q2e2%Bbo7%CU
zx($B$+uPkx_VS5aaZasZyjJpXwB`nireX9N2kT+JVm_9L@n$38D@oVb>pg};9PG#a
z^DO#+9oM03Ooa)RGIP$BDfGa$b2ZIYK^#CM+dmu))Im!0>)mz6htXps0aj`rmgbsa
zZqYUb-E-b3=6;tzgs+LnLQdFWMS2P>VlBGQ^XP|a1uCySJwL(POS+Gb1SW$fx#wA5
zBBoIw`L9@Y!mzcaswk4w8usk<%_&SZqeEA-hxe`%co)gwtV|jq{+jx!(5+lRk?K*D
zzb8(iTnI`q7n;DYg*5s~QrVRAHS}WKem0CB&!Oz~nSg~G-e038^Z^<2Ut-qBT7i$4
zp812EX8<W(ldv)QEwZUXB}@)yjmk&~w5iQYd1J$GHnGG}h^2~Sy@~E+n8WKR`2&8M
z1*nNRSJ&Frz}zxw)xz9fcqQU-{kpJhAQC2Rtf5=WcapD7O`r`mWA8tqB8JG5%ho-K
z#UW?36Doe*Wr3L=G<~KG8%)$LA2Ix+3*ZvsG@lkvgQ(^29vGHpW7_QJX``Ln6w<P7
zXil3^NZbZh!dDP9Y_<Ke0T+HNzcFw*yd72sKAH&l%mRIs(hCDo2a%%pppf@55UcXG
zdDwKWY0QOyS72+NcADv;xzrh{rxSkH?dpcz#ouYF%UWQYZ>8h<y(|z~CtDjZCWoAC
z_T0Za>L%8cZu79mi|~wRkpzZto5*NxS78MgbVIk8>bsl;9pG_P*fJ417f?s~cJwN>
zfY68<>jjh~F#YXD0rc)d+ohD8e>piHYi|DL9CRwcOkilWpHEyLg=1{q*d4AV-2fwX
z9BU5ecLM_t*~+8-9biwmy>!j-D`0JSerT?uI6zraivPwfu_W&`8ycSD4h_&<k3S|b
z=vwp;+Q&X<GQyh3b87<qvYCxF73E;v0Ut-}!A#&BcuX_!fuw-TAI<rCe|r8*uh4FW
zsR!QnlM6)V><Iajx0C0<1|RX?gIDI=28H)d?(F39fE~GHlu?<5P?0sV7c6)4-Q_pb
z4*tbs+Fl|ru`$0KNWa>>`Bc^vc$@QkUe9J0JSwM9^YH@*Xx5)%ijq3OeN)Q}rdK-B
zWUl|FyK@VAMq1G9q}dXQ&PJ>>mSwMg+o#6{KI?UEc#9H{N*g1*Ye6Sikyv!|TQC<q
zkG^Ytsk#A<@_q&lirhyyO4rtfafkVRD!df=gLrC?TA&o%1FUU6kFuwxz@GhCmtH1R
zgNVcinoRyHz#QJ68k0Q$jW2pOq<EVkZXOG6n11^|2tUCpk3nxy3mnq-X&HGnX#(=D
zef?8nZ3lceCfZiLsuZ|Ypej*?y)fxTMpNmX6eO-~a>Wd9n4chDiJV~UaJr+BBl1Hq
zz3!3=Gf4ztxm|XU8L9-X@jVYKiu<6-^k85|V<T|S7~k|cN|)ln)(<da&nZz5K>V3%
zhj3f^ft;Gi64&+?c;ad7pwgwk!I_{9{Y?{RVP=*~ie~Qs{8H;K=I0iU<T`8k+IP=E
z)CG`BL2;cDMnmv6NA_x$gaqS(yXw$ODi2)LW}2`J>Y&w6!;34{w1EKSrS87eF<`h)
z%YS9^2;W$KkE;KpPB>hLrR~%Wtx7Q1o^^l54bQ;pciLYmh8i^h6Il)sD;D1Y@iLR`
zT?!w;YJH1H56whyH2qw~DiR)`RH7o^CUrqG6^gE-SN66*-71m%)7iDaWZ=N$@-P<U
zaV%pCqFEq)n-Sib-37E&6CRavk02h(+htFU`e9!GA%HYBKN<PZS`S^0<{S*A&46)-
z+tKFjUC@v1a<9au8{RoR?ZS=A1XP`l`nq%?CErl2lWw^ZgP02-@-tpXZk?Qj`<{EX
zJD2<bRntr4mu~+8k<_cB$axm@+^Jnx=K2&WNqh9HZH`5Z==*R)!hik=xh0<#oo9?^
z<b$%i9ZGHRAc;WOHTe~~#5aC^6p;>IC)Fs_+4+G?Bi|8b=xOBTi>4}5spEVIe{L;i
zy~bvvw{0S|W1GaB$Hb<;9%qkpA@|}1V>cBZ7%>absV`#z_4L>(b?0h$<*XygV6g%c
zLZ)rr`XiEmeetpDXR%oD%x&oNvEl&Xn#ibjB2P9Z^S}!2Hp!g^JWyU1lwD`{4$Rm;
z6|o3m!w9eEBTJhYNYbuO)2l&SFsvQMn~for7Ic~h0hz@j$F3{$l9O;q+R>E1Gy0xE
zYL%y@+QetrN?rXVyZa05Ka_Z#6IzXosH*yxY+_<R4f8Lro<lF0zJp^h+okwvHWX)I
z_)G>>XNzJ7yi(boS+2|hS(U3vL`^m<46rIG{_k5rE2XdWqcvlH0KA3gaG1AIuLpCl
z>u~_tY&yxrbIuHed>*O)5?cbEH|CvRlH3EXx{%ISX>p)z3X{s%x*L(Sdh#GOsg{rB
zx3Pwxd8Dt|w1yQ+FcK*Xrz+7-DDK5N{-~q{dPU-nrd1Vzdm8IbrcwKVld{H=pZZCN
zZ29y<i(n>Jce7b-Sjcsne9epzN2b(j0&OO7h;W~X%oH7=n;3Ni^Yl3Q0?&pgs-SM-
zqE@K-uFs63q(zY;eM<93O0kqTVZ7OBl<26-P@jUcIL5niUt?P51l;3l5MM~<LR_@G
p>Z7hMU{7A2cO~=#6t8e}-PK}BIf>GPO~uCebzk%=W$$^|{{aQqMX&$>

diff --git a/tests/regression_tests/surface_source_write/case-12/results_true.dat b/tests/regression_tests/surface_source_write/case-12/results_true.dat
index d793a7e42..ad927bdf3 100644
--- a/tests/regression_tests/surface_source_write/case-12/results_true.dat
+++ b/tests/regression_tests/surface_source_write/case-12/results_true.dat
@@ -1,2 +1,2 @@
 k-combined:
-4.752377E-02 6.773395E-03
+4.929000E-02 8.212396E-03
diff --git a/tests/regression_tests/surface_source_write/case-12/surface_source_true.h5 b/tests/regression_tests/surface_source_write/case-12/surface_source_true.h5
index ea81a8250956ba2f3da07bde3332e13963cd26d7..ca5eda8e2f347a1fc88b05db6690ad5b6d3a2a51 100644
GIT binary patch
literal 33344
zcmeI52{={X|L;xd6d{F5W*MT)l4<QNQ&NUzDMO`ErBpO&GDJx<si>sPktBq5%rehp
z$UJk*5~a(RecJo{zJB+ApQrEldG2%X>FKPs_t|H?&gZi}YuxX1+|t+9U9@n;Lb~Y(
ziA2Xl$MIJdd-^r|K(5c6!H%)lEoU?Iv#Hx`8q6@0p{HY{n|^KC?0Jsa@&y@ZP8iRg
z-)5?#LpOCLRz8-_zD&1l{!EU9o%sLh|5F~&*FpaZm0hz|WAT(d8)uj^&YV1ZdjCNS
zYpWB-{yK%lC4yb>f0!<wjaS;ZW~GyzEq?(WY3iTNk>dyL9Zwy^ieEC7VV?Sr@n=5Q
z^zppE&OM%ufBM;$K~Fz(rS$9@u#}NbmT~$N_f+5?o=Q(o{r{glxTngW_L0N?<l?Do
z77KzYE2bX^ogxdJ;;*UqJN|V%)h*1Xb0vTG-V3uA6MK{YEaC6odv^9Rtd9TlT{CC?
zZ?<u&v-|5Y6GgKJf0O*3f9#Lg{uO5`e{((l)Ze}L{2}|lE<x}Y{!RYx-h1HSaVy7z
z2P_VqK6&=k)O+;*=6(2698-bA^w$YNx-(}_+gKbqKxc@*;BWHy_nfjiZGU9{acY|~
z{+sLZr||EcHx;$h?S_GY;jb1&nr&x{^p>;X+<=AmUqx`vM)~x`wURl9w{9`grk^SS
zi~Uox?G?}a|M~yD2PpGT3VibX1_bY(sk6zMfHUtPkz-S~-_ki*3R)kDP`DSif_c25
z2?HE$@N53$osJ?Ilw@aoP)AN&bLRSfFr8v`F+Df<t5RoP{Ofspi_T_wj-kJ<o4S%5
ztmDx6X*(17^p}bTHP&iyxbe!R?R{UM%lcQ_MCH4nkKPgGfm0~jmspm_B_KrLO!wQ<
zk7*9g@Iv=bacIMfp~f-H)S{kh&$*Q{#e$&><X=Ura(60M!>wn(x{YjYfWIQaY9WOV
zxZ6{-)K7OU+OW)pZ(Z-)_RO@$8T+Q6EsbOS_|nFxoQ#|FSpj<V<o&B;H;iU<f?Ji(
zoHswHhB@1pc6+ebz(!|Lihq&{Ds$5MrR}G=IrDxa{>uGRe#7bt!*R+4HingrQtfee
z9BcWJ@eSUKE>aAiXa&5Yi#SToHNyDIZ5Q-De1*+9T8ze(YG|fg$N@GEfjQ$~cKV57
z{;@c~VjKhgQ+`{30cO*GiZipY_znA~I4r*rf93uu4l50(Ya)CSo@oJPmp6XyDI13~
zFO$eCZ1=aX+g=2>w2$1j?xFy9-b4GCD_+4ie%%7``CKS}yWf^-KPf`IVRb*<?<}I>
zv~#93xqKU@#&!C2^{2kC=*Uc2kLVL5+CUa^>b&8qMp)0$YPhxgD^z%QM8vyI4ZUZv
zDQUi=Ac2FmnQ0Ci4d<Wo8~eY+p`CB)CsZ-W8VpkXw&K#K@X4Eu<kE{Wx)O1vK$Y1+
z=CxV}-0DoPtZUl@6{VQ+(=Mo^?bWBw=zgBtZ;NT{Iee+d%W2(DDyQ)c$1-nICh{WN
z;ea6jCeUdSpV6|S5<2g%kX&fm4yBDO??_LLKc=KRdXvY5=d2&jSq|2p{!{fcy<WjT
z{wdB<JcODjA;R*Z%<Il|L4W2W+fUD9L`GL!JSDhus@(+G#J}}PhSyJS($%Rh0seOd
z=IwW0henp%<kgQ5Blr#T(R5sMQOm|>ra1QA9E(f4;kv91=v4|mQlt_e+_I?;$QQUC
z?fmi?%2)_q@bL`=R=F-wm&cV*(kX^vgUGo#-1y?D`9E(D54CK3=FfAM<BO-}Nl1UT
zR+7jT2J*ySUCRr7ePCZewd$pcM&K%ONtJh7DU^Tpu|gGgK)UwM6rtTekPi5y#xHLD
zob|JUS~foO=k4Le7f;RqdCp2|+4#(#=kVc+r{+nB!rjk;EA1)3b~56=Z9F3qoio{d
zmA4V>j#^SFBi{uQl%yxv>T<y3^0o{MI%PC@t&1n?A>#OhZ$JFhvhkTeZ;t@JcxwL7
za|Een<1>GrBZM!WnkOM|ifq)*2lYW~iHA8q57Hwm6vc|ZcJ~1GTHh58q18~Q+w0W?
zb37!U3S^WKkVl0aQMN{D;`#?)Kf=_q@fi}bxL}`f;cyAm{PC>p)h>F3`^E#G_vRE3
zay?mqN4EsH8j6`1=%s)`(M)>JtLxBp;XlJ+_}u-Q$ZYY%b;F<cn<(B4YW~l2R#D5w
zXZ}1#3|~Ao|K~a4)UxrJKhKfC7eAHvir2W=@VFgbuXyasx$PTu-t*)=o$R`KB|zBu
z<0pzhItX9W9BOJnfzNm^c*;4bq07gXsC7J&A&d+7d9Nf5XXcQE3`Sls3X}T=<cloB
zT;iA!9rY}~Yg^lZ3ZLANArBecZegGczSjn-E{*qDl&hd8@&nlzd!z{*eEV7b_Z%{7
zl=q=e!()KiwsX7Ir5^ZIcWu_7dk5q>G3I@4UjtApcTY{st%Ca!$aKBWlu;>1{p$VM
zs|g&etxV5Dq~_q92#BgZY2F3yS*zyV_wRs4mpXUHF*m|)_`+D~O*^dG$j6XrR}BN=
z7C5yVilI+VdTw6mJU2&r4vueqs!wY{KUip{{uXI%g*Q6A)(S1|gXI3jWMOt+U|zwn
z4Y(A*%m&5QB|8C1y46&e$09kWJ!}3Y&RQDIO*wv(yLU(6%xMy08MJ{<BEA*sotD!a
z3uuS0n10?<ZEgbJRDN;PRg^)&tGAR33<1iXwle1SqE!TYu(kYj{m9I6i0elZvPfmm
zeZ|36u=*%s&2zpIG#wBTqA%<KOUpm|TP8Nauni5by0#U-t~EJ#H>=hlErk&eg|yWO
z9DKZC`@GmW%#Pb#!U@uk8^KqDBFbLUC~Sz@de%w36L44VU47pu1FEKSUC!)pf~gOK
z?Pa*uq5Pud<wE^)_t$c>_F(J#(@2ooN;xJ3<MC;~8{Fde3*Ox2Qs8Y`0?Y%K?~hNY
z1VG)Q{)tWxeAsoUGB8a7WmqG^$`eD3H@x5EXE|8nS7+jIbZ0xYein<1zu)Cu1w0m|
z?^~0e24wC_8F83WfDY>V#=ff<Tv%0+YBQ{g>W41Vv{9LxqksVjDTyp~r@&}5d=U7w
zX)k}5*b1HMYUK6oy5QZlLmH|aji97Loij&13ua}$L;HEwp&}BJ{>%2v9oI^P^05OF
z`A@eWWvuAg^l)0zk)O*Mke43Su-x_c{$-ubYLbUV8@L?)(@SbR9LShAyFV&ugE!O7
zK14hgLRH(EPrfc)M~F9kKe}$Vd~B^hb4VgHe30`RbR7jpSg!{hTmBBRgtbK*hW5eT
z%xtnu&13-NNRnGxBH*sp6=L4o0oqUYS@|Sgg22J|Z`eHuTF#&L+j<(mVfOrKj_Mqo
z%hfJRdA1LL14)aE?%H%g<z;^PQYsWUxXA0&5%VB$Fgs=2SXCM1l)U4YwF98TW`piK
z*3TVpYO@@g{(yY>6kDu7Uk~tZl3i?M-wh9C8}H{hPl2(_?9ZKsU&6O?2a>njm%?nh
z<uCH4IFD{wCQ6}mbJYKygJ^I5<TWx;1fv6TMOTRZfMe0ZS)U90K-q@p9xICz0NHGD
z5J~SD*eoFRegy17wJB*)VX~}*IKV#pbU&)`_kR21oY@aRLnHlh&g_KdKRCzv(K>eh
zY&afS6PJCDfn0whzOV5C1(>~9ZscB+0`5B$N4ohG!G$r&NeLRe&=2K4$IAwO`)#`I
z;QfZo60rVy=8%M3*-ddfm)#1-FEm~)Q6GnI0?E=Lp?zRfP9@K-G7+j&7HbU-#DdN7
zpX$#n+J&0S<w}X~`OTRw2hTxgImCOaf8K9evm9db=Q$gQfY~DwV$9L6p^%ykonG%$
z`@Hu%{8UP>Q^Z#WI(Ae%*f-n^Y{i-j;@jJRO*yDycV3G+-?`*|BAsK-xYnM7^QYU7
z&K#UTzeTr?p6v&PF<0jc_t25`c|S-CWHbRwuY8~Q&UO&LL||ack5VYH8PRdK;zU;`
z_V=q;5a&DiIMAJg^QZ06`<FQS{}N~8zr->4mpGgLCC=a9?<XN_j#V$$)qVkf&raN@
zbpC?ds_9?Uu=N0ywVRdre%1l5M^OE|-zT_FcmAaSwOwdL(8gCDx@>c{)6KK?5brnr
z`F>~1zvMTgIXGTRnD&6%32;xgo7ZM^7;av)B0qMp2Xt1y*scF52gIusa0zBrg2@fd
z%daimg}yW$7m{*bG^gKaH5IN#iJH5`D8T>qTh(C7JY?o$kjVW7IafBw<^mJPLcZ+o
zc5rpxfbTPr7C4e&x9jQ(Lsa#3WlxOwG6DxbA2p$|=Q+1ZAVr9QJX=1J8B2O3@`Hi=
zvOkb<Ur`a%eIFn7LAVEmn;bjVdg2TC`g15Izr7Y=)IGks=9V^rgI|}J(s2GMd$!VW
z;!Khj^gM~h_CXL9_4T|NiOl2+Hi<!p&>Fbg#UT4xS|<=uY_8gMtQx*l6H80qya|=R
zD(Tl+vV2Z^w$X6@DSNilaApokh|gg3xc8Daz@Q%V9+sDYIDbm{k-#2c@VN8+HIX=Q
zt7*Zes+Jl+`LU_wd%QlXxsQEYWHT`i@Z--88qPmu&(42|vx|namRs-Wikb=V`2Jbm
ziIWppJditA=4gwJHv`KB866?(tAK1#&mz&Ut#DMzqhQDNY@{^ff_p@kEFli??PoU)
z=k3L>j0>Jq?*}9AZ@(=&>Gcb~sPqm|60Qb2Mi2HU^7Mk^19s4BECz~_Eo_#b--M1X
zxSH}|oQJ@{w;wYa&OcQ@d;TSkISt2+#G}yX982A&Fuqq(@BEN~yk5mXOEaVswtQt?
z91`^vWUX0s_f|m#Xod4!76$91pO7Dt2j1|_>9@T!9KY?u4X&Gi?~76#`YAg#MquDM
z^7>5IBJk+NGBl)(0z0m@Eb**+1}X!>Zk_$8i^?R#?q~6y`+o2~8qPmeKNkNI$C8G_
z6()N0Y9|G2H%RqUzMcwhCUW7RuVuuld@%2=(W0Q8Js_PY%+$B#3*=<y*=@1R5FNKX
zu<%XS+;MF+%fa?3jy;sSxm~jzJY-cY<UyH`nU_gqwKYouhhoa$vfZW&!UC#6=K1lv
zJLS3|S)p52{2PM0TY{nY^u+!R-%hP*>^bEgA6S$)qhFiSr6Gd5BxO_!naNg;;-pmt
zW#AaI*JIul6i`^aq-~@o4nF4RjxM>m33U<(d%=8X?r~v14d<VVg99|2SwA5q&uaLd
z&SOBrfQXxycQLRXDDtW=Xaq;ChZL@>bODodlhOr`Qh>g)nY^Tq7^*}rwO!e#L})+w
zae-FPmwz$%`P;?!us9&ITAm$0zWgIRTw-mqd`}HnHQ{)z;$08yKDJnXxor~YNN~^_
z=vjf*lT?!FxAPM?Se;MrQ_$-9k~9NFMl>0a7cLWnW-^1+e!=a%?Ln_AwSe)7PVJ5h
znLs>5Sh!?a4-j0qIBWbIFY3*H<EN|yasLfl!%uT)^?aD$o}bB(vsyI(&YJWxEhrm-
z<yQ3)6(?JP`5oIc1~F}bH7Mz^*<>#KnV|bQt#2Os)w(!e3q=X`;QcnepYWd#64Di3
z%)8399_B^&u<?Y9z<29bo;O|E1mt`#2Bow%0id<p@Xo0w_=cTnWM%p|;?{iBXv6ur
zIT#aT1$y$Rx5)k8uatQcBx#QP0Iyv*C!CmHfUOA^3dSuu;C=V?jh8;O04Ju^mKnM1
z=*1MZn#`>_1bguHgXM{Kk&qRwRZBCRzrsAPPC2;@Mnw9Dvu$@$FE|&ajdbZ|0;e+!
zjfEv;AiCHvJ1<fh_0|zNwQn_X-x9N7x_+=R595&;PKNfD41yD@&wSgL!9<?1lSFP<
z&=hMKTnia=cuv0DR|b07nl-tSx?ro7{1LlbL&!!+^SID2dIWp${Q;K8;$dOq-F6}M
zA@E!#pip3GKQ-QBF7cDxpVh%0jqcUw>xyCBb_NrM-Yy{F^0pvDR{`bxaX4>Z5^>)j
zA8%M5tDi^%)?$rUL%^;2*naLVs=gDk4VN=D8}5SX@f_b)3B^IXbzH9{CK`a)w=45*
zNT(vE%SHln?2QTbU}aDHjkvy=(vRNuU}`aH#_S-wuc)jw=NN|P6pRGqK0krJyk9hA
zLMc<}^^_0mN`PQn4#URnC|c(cy*qYf4S|Ez#WV-IAA`lgS#2}7JflIN8WEfG#dLtm
zOY`0OLA~odaF+aDd)1@~y78$+XQ_9==+G-s`P@qAi3Jl2OFfA97qB{+=3sh0tp9mB
zK=G>!oYJxU^&pX}FYQv?G0_XQeHM@Lu=)y@F0kV$XzhmbYudHUhmt|4luk?fJY#fQ
zGuzgt^&)fHL#yXg{kc6T#Hj_$auBBv8}_SY_kv_JO#E_a7EG^cJ>77i4>Y^oF52TB
z0ju<%X>4dVNAnL~aTI^Kl)%AadD<RYJ)e=Pl>Eaq3OJq-&#U0UgkZeNwsgHMOH$yu
z_^_kR*$u$U&e8HpM;EZqWAd#1C68`f`FKlj#@z8ntLJ;Gz5biBSq)TT997nDU?5|h
zLIY1aY5$jCX8`Z>E19j(&T?2z;dnc6`RdBle{(*1y|YJNWsMfW9(=sf>iH(Wd*52$
zG)%1@c5}0zi^T^)9QtW8F6}dPHK|V)bLoX|-Yq$JhOHcMR;D_xKC=mpjL0M(cO%9D
zKHe}r9~N)&gY!q(J*o3|B)C}PNPB5N-12svGqSb;_!}qK?)7U0%=s}|_0o+nMp^&W
z@OcR|=6P@UURUCNJidM~J>QIfuxAo-q9%MZv-A+y$}3y3O>Z17RoIX_bh{Je^`vPi
zT#SWf{l4Sc?9K4BhpNn^hX9IZ6|0Le$`kyC@84+ke9On31gnnFA?Lo-#~dvz!u*GL
zP#U^2R#gFd{WDx6jjeE%iudiG6V2fLu`LD<o-ap1u;yJqTNMHaUq5r``N&z9pIpCp
zeE>)$z3$o*GLO6}`#PJ($xe7I-h00Ba10;``Yj-9G{d|&hb$kBZK%n8%bRapiTjpV
zT};O{rsu=X@y(ZVLGw#NkIzSss-6a{9g#1+d`rqt_y{XkDhkC+kfE`Md%zE$J{Tw#
zH2J|?AI&X)dgr>bD8U|le=wJxZ)k)Ie7p7?)^1sHcCdsQ;XzK^6}N2!o|S!vHJ>*@
z2|I1Uw5`pc;=$#cUT-W=wl;Bcvn_ERkFOtEJ>L$_TTk=Nn2=+oal&zGRNX%k5ZXXF
z^`H)X*Im6i)IAN}y3cBmH`EOhHjvm4RH>nY#zyCURTAS3Uq8hC{@?L-d)scwdGzH#
zC41civc@1>^Y)BB>BU#@^jhD7QnxP9P}AmCc&P*q#`Um0csURC7GgWmxt3Tzczc#(
zMH5mI;%Y_Cl`!uFN)kL`OlKN_V5GD%XFUZx^4;N>$(8^c8pZkAISWC<+OB~GwxVd4
zjn<d-62x|j=gg%W+%52l_2img;BH*M!6QKmDCSwYV!*u-M7Cv%ofPbXA)Ja1?Fw1Y
zkH1Y+s5Avhd9+0)muyIg13ZUTH`t)+yn-ysgiMyVUkNR##M%#e%kBFnvC3s&rRjCm
zD?h8?T7K*EBVpYz=h@hq^aLfeRK&~LtD88^;p1&3!C%+`2{DyjJ_$yd$o4xLS1x`^
z0hcO@zgrZRfY_^LWDTBPsK0N3&8xKp^e0^O@pBSI%U8$U6iJ?Yem#e7kSrT~>>{bM
z1s;$x=vrn+k2q+y#8&U6K#0V&v|oA-t%iE8PI8w)tsA2)99<6)i8|ki#(VYzzhP~1
zx}EZ4Cd{S{zmA^TQ1%@@+Z&+DqLz;N4OtykSC!LW42^^Gw}_jRLp_#t#^VJ&VBf$V
zPC(v{?tWs>ao3%wf5XSM04=A*vvK3ePgp;I)Y*PA4!-;a9O3-#W7bv<elooCzbn}b
z#ujI|v>4`tYh%04bk!@N0e4N)mVPI;AAEl;NW+;qB$1zrY$$oMq!C12xS$(l-vMnR
zPRKY<>6~=f1y#P?&4LXjCJL1PBDm>TZa_nm3i{M)cYx+gVqD|>CPc$2e_p|A)jSSZ
z)Sruf&!T>>0C9b`Z|U%xB6!wmd)LYA_fX6EKD%Qc1zcO3UH9Hv2vrduY;fq2Bh(Mx
zZ^AU3I)B&w!Xd*j+$1%WQudizKb2|HlEItaft}utp8E_c;b5|;rhGy#I4v^j@Wql5
z4O6un=V&4B!{Rw2G@MhPT~f-!x?sYnf}LC`GcxlsiF|DRkuAotX)t%Rck`jGF98Re
z581`H55^p3m#cash%Sq8Iv**cNU#Urene?FRS(zmN>1G$9RMud!`^+r?WxwO>jT-4
z-twi5Yg`p9)!9G5+uQ@LI@G?jaWh60-=5pDCX1+t#oM!LmV?!qtoXv1f})>T`D9kH
z>`fg`-$49jk+>kHM&M3nu<B&)hPs+hD{n+a!iG~?PaV3}pz%?3U!K+w_xbSi5HT8i
z$kAJ6N7;rU@`UBuMn6Vm=4BFjIC4a(oTCZKbd`)z%0u9dz)jkd=3UU5=bFwYAc<ah
zXSl$3lsG@Y`%RpNLnp}>)_-w6d0F-y^_t#Es$F}3<*hlnvl6D3KREoFzYR8QG8jHL
z+6=!kHLrcbjiNX2{1jt&MT|E*M`D(Pt$*Sq)~+k=rq16H*4oo;$A*8vA60isj6)-U
zBppm>desa#tFQR4l<$N$&AB^RJq^*Y<V7JZdx+~fd^?q-u_s{Fee(^qC72z^XxIQL
zZf`MY(<&@}v$G7;FQ}e(tGE{wWQn{zel!zo7r3XyMcIUo@eJ7=_)MJl;yJ5nIFSYS
zwY!EXP^xQ{Nqs#vu92(9&Z<>@)`nb{jW&8}Gyt1-1LXVO-CzTM)VzpFEp%t0VYZ^g
zT0&go<4uZ&Gjm8Hcf2h3<uB@n6Ljg~CifVTfy222Ug`}n``mf0*1O$6;hs~kV9gWw
z>|K=Y;ZzdhZyD$prTmV-!D4v2zoyj<D)Q`Ry^+X3p5-AO#{$@(Y$n+A^BO}+Svg$(
zs)mDdryH1GWsw#au7Wbr@el8xkwpVv@tm=s`92fgZ*%De2OpGictbiwwsL?@x4H|w
zE6nfXdOM{TeW1KZL81^Uo;<v}?{g}gOw)<=J<p1^4?13SVkPcV;O)V5gIJpiur+Uc
zc69&<Cb)9&bc_SckKE|i<-$km!I-&9a9h!5AQ}7JHb9^odawQ1v8!eSs=I%qEaNp|
ze}Io`OwTt{-qiQ(Sx(gCe5LjWNR-(l&o%B7Ks@2}DIL2S=rbZ~AN!#d=pZ4BDcsFK
z$@oV1m9`D&w)qb(C9Nio3wXa_dOnO3=y6$CL?95e1K}5z*wx!y3-+5GZ(7aw83wz!
z6nLq0gT-4l<we%j!;hyl;fSd+x^y1AlqECwI7h4J!~A5Z%~3C}#f0373uL?5S_wLC
zEI+%=ryE|kzxnMRsR3AL`HV8z#(<Mw<m~v)YNHD|{SUJm5$(a(&m4L_<n$TKnBX!7
z@@mgR>y3{wBV%F5ZQi?l1;KT{2Ctb{!cUoW2l5_tf}8D29tQgkBE}!O&4y9|A+GWB
zH$}{0vnf(F2m{4CKyA2Ys;<MY-~B?c<9k8HMzAk&{pS#^GN^9i_>-TZ6V&u=PKBD1
zsO*T@swYc{x=wsM#dL$%{z1Zo-$AKejEMR$r+Sp`2P((-`=GcOYX?{-@ce?RO%B|r
zIC{Q#Q47%0w0`}vUmwkW)RD&LOzf}m99rEVRzKrxKM!wW?*?O52Tw<7Re>z26C1sJ
zyP<xGaxnX<2Ds|Q*Hy_1fgpNgAFJcuwdngS9-W7-#JI-S52hO=x^HT{Y3MmRB;E^r
z%9gZdf2K!dCYR)^zD|a#c-BmC(Un5khHJV*#uT8pSY{JjAt&lFpm&XJBXNHe&%tzq
z7^mUwBL&lApCSKGuWk3|jbial_V7{Y?{S*?-q+dXW2MjDLH(6_ub4b3(1GW(g+z!d
zdS<XWC#;b;p5ognrW?e@9~P4ozl@hf)bhF6EMK??HA7vA+J%Cv%7C$bFc-(pZn&3g
zYp?maYOrW&`3i4}9GX;gH~69!ah${YnCX6W4&5L!`B~k?Z!;s3W6f*&*@GVO)n0fi
z+P@tzah6fEJ~RR*`s+iQ@2da_Jd;l}T8BPcP?5aNh-eQ!t})#p<~J-3LLab%G+iBo
z^KF)BwJ0~h;k8@u*!Z+V-;9`k?encbv0ts&IQ0WqZC-k0)0LwLS)P9}JJ(S{`@z=_
zrW>T;Ajpuv*yyt^kd%7y=|wsUSjo?t<G-s9bgt`uA)7pPKltrg8)=_Rz%o)-v{`!t
z$`!v=S$ZGQZ+LrXb%W%XU~-8|AV~Y!w&QSFE7pF<>qk$&%Q0?+@7o4CKI)`EwI)Fi
z8OJHT@&2Tgp$QfA#p7+`{*J_bF?<}%8cH;0>VAyusM`<84gH|%tDov3W_of5N#!J~
zP8(1dv$<o`(+qlhFY+_BSAf)fp4Q2;I;b7p*>9O=h#b5<vw=nBc!*^4cLz0rfgApg
z#~j+I_UzD?DD0fNe-&=Fc+iz43ySVu@7NpF1LqCd?bwm1h(`5q6s)Y{B-9Vy9)wE3
zXGlm<Xc>9gWePCOd}TJafSLUCM@XD~LOV#-xBPPNYa<9;X3`gwUkSCu-8OceH$a0-
zyxHWUxCk7)JzDtUr}CO(DcOrz2EZ8mtvAAUzvrXJH#*rG$J~Q^#)tLaJ?;g??;Bp5
z8CAh2?H3LNE<;cky`n%3SK{~U@%C(>;kbNTTSEz^-j5;MEI51lZhH}Yy2v_R`#?3c
z^Xe9RBGe0ABd*k4DS8RD)~5P42J)aM&df_ba!eALDQ@Pz8@`=t&vLMHU81h`*A#le
z<nugVxAHV<{gfrgxV%3e2ice!f1UR#21+VgBM<y3@XpJ_KZGQ8(c^vwkBok>5d4O>
zM~B9qnL`pn-nCx$!_n`+cIUMt3v7OZwS5NBE}7kc;cKX$s{U7Sq_BQt=%zI260nka
zTec5UebfE$lGft{4!(YLX*g9Uax#+F(IK-uvWD&1*Pa5y@Ww#e)lawDfWPe_roN~)
zX#DzXLX!APFtmP4QKdd7YHs+*pp%I>&S5^9?%(uiIG$BpBHP$Izy^b}-G0dLxb|-}
z>M$Zd0EzpDoo?zkL8T4{`%$C|o(f|WFXAMjCrsHh)llO2gZG>MEC=haXYD}JFGLJ=
z?@od#aQtznD>Ip^NlC+`xf_(d;xAtECLP4TVr9Jfst!hNAK;Orh@oQ(dG6LV3(e`b
zjWqTc1_~V%8IFNTPwT6gPF2q~V-h)HBEP{hv<zyBE!m=1)dW2<PfDNu&<@|XhJHA=
zdH|7n*vYHluT0?J?J=O?h`QdXad7;-o=*$7(7w8y0eLTHu{@ut9lnucZTu<N1`Z`y
zMJhBzLCqSmYgJ!{5biBk#=kQV=R5d$;wBo7*MOt_cxndJ6q0Ou6PZhm>kh?XM?KAU
zDD|d4M0sf{Sl?q_Y3b4mz1+o4zTB>d+V6Ycx^&axIqjj<^X;~0AvG8L0%z`rD8^6C
zb7$*|{NsG=>O=iaz}!q>qhhfyus>*E)t}V~8{^{dyUB^5nGM@2Y$|x?<Y0O}qFE%w
z%N@R#k7ppqo_k}qWZxu=8GY#3^0p0pt1o`Qdb<s}*)*KIUGM@9FI8wGe=$MtM>ve`
zTrhWkO{?b<^~<PLa~}gYG~6T*|KImFCx)Jv*fRUV)a37vw+?oL+&*#xi%31>EWB@J
z9IuDQ_#~D19U*e?aX_o*6Ld;hYkO$~(Df+uTyBe@`mH&ecOaKJ3oxFHE3+{#1>c5C
z`OAiSVKSXS<Yyxkwb_07Dg7a$4ie9y)$`rA8W3IC+Xv2=$BXp3Q|~vCdl-V>elE|4
zaju48r;9!UuS`a-((e?Q-o7JA;E@)3wrt_muF1LW!SsAsJ1rWzaqYPG@A2S3$^^$c
zG81wo)oB@h$ys38-;>|b(FBuh;x0QEbwc@$2m0n)R-?yX2Yotvia6iF_dB$DK2m)N
zQ%N8*G8<<|@W-q{6Nhdn;o((;`qY5vkrcDbRo&pR`Y6X`-vS_yE=m>PwM5VJxso)h
zh~pf-{m|<9u<~6U4^>>^tb^B5eY~|dwLmYf9=b!9`+(M_B+BrLSeST^KRcx@4Omu|
zCYYE?p|M|9_4qgv$2oj|O{?e2-Ke@!)`Af!^vk3V2%xSX$=_~SbcH`}0*}5Sg%CEw
zbfy@#?tuoV+9p)Bq-i~BC1SR9zxawd+Yhat?^IZmh`ehXFpqvgACvUEzrOcD;>G2A
zG4MK%C>{IWLa@_u(fDu|1uC*mT$cYJfF>lUzDpdLTkk@v=fnIKHRfKBb$0@0etdOD
z;^hR~`s<9%h)5?;U|#EdBC{D@N`mK3S^L9iBPP2CEyAdNc)!yFA>w{7-fy&ezHJ8<
z2@FS9L3z6)(ziNCvG#)mct4jGu`7qU^9#J^zsrWwJFE_I+~@_Dn(UJdBlS?;Q?{SQ
zAn`s1ew~Hs`LMW-6Z(9cPVzgnZXGv^FQ1Ra9a;4JvqHv&*;C(}394Ql-wlFJz1qa<
zUk8PdT=&rc5%kog$V=oLaXp7`r?h%L%x|~H-^zzPo=1*d&J~-^+5jUqbdrUqbSELB
zY322$r7*WPX}_*{C9rR7m9Vr}jvSTP_GGEwV?rF@{YI<j!#I1#*oU_0jKT1$dm93V
zCt(G7>n-Lz9YDfgzS!YqGx!#~E+~352bdV=WSwx)LR@d?AJ%ldHYbNx&$rj(#l;i1
zM}UFuj@PVxjbN5bu1H+_X~O+2yt-7?;pUze5P7?o#n-O`o;dI&;uo7Py7E|#x<TCB
z;}5N#Zw05P_M$uVWP8#3b|=q6EDp#K`9dmgn<%i=;eLsnLk!?fk7Bm?Rtoo?TCDe+
zq=;UBa~5j<AjTWMerWZ4)k7oqmAr<5gy>yEi;jG%J)Bi`CwSPaplivOYu^vG0%dCn
zPhRI1`0{#*K;o3n!9tWl={Eh`{ph|K$Iv{J$PhXAs>g^9dD5eG|JMy>vef&fEKKg*
zuq9&gkD#DD;BFo5k)c}$ZKW9A7QQ)xXiV@#DgC%gs2}`#&Vq)(VqQ}1EY}P>)~NP;
zx6GjW&3jqxqb{BXNVhaC>Vt1HWUFyY%DB-CH!iuTV`Z`seQP=v>nTNC&*A-MNyC{r
zB$01QuH?Am#(?-|$+g<$4nVLr?P(qh1wIn@G<41_1v&GKz3Mlmfgc*L(<I$@p(B$~
z5j%2L&S{U;9Gp{S-+*j*H7LoqeCBg+61rGwU0rsz4j$b%oN@kP2S~e`&&_nM7N(g1
z{oC=ih=0MMu=>@+`xtn?S<`Uj`9{y56)6D;hZQ9E@iHNpeI2*I4{WhYgk6lBT%93p
zU{85s;a#IP*jMYWdaYPx>ie26GS1E?>PPW@+fT!pEf=}W<MAR=g%Jt+WpqW#cM@K-
zUm_GbQU)F_i6JNHr$Nc5*Y%XX^g_9V*>L`eW@P7wV`hF=6bOF9_Xh`PINiHrqK6WG
zud@;(!<eGp(ver8RR>pfcEHQO+@r0}G(+x`v1{3^>2U1<`$H{53TXJp`H?wii5&d6
zjqQhFxJ`a^d}Q4ID?^q<>-@kzaC@IUpJC{ysr}ajf#ZdJkm>Oi;d=gK&@gB`xmQFH
zZGR9e@1RN4AK*C*7+^MK^xD13@mvYDeU`AiUmeRi5AiUgw{R880DjuBW<74b5G~3(
zW`|S&t<b75xu*vaH(S5?`T92qe#3LH@c@erWuMB>XeT;EyK~fJe%E(u`?;AGROBny
z0m4^2Q}<PQ0Oe20sIm05z+6q+kLm)l=%$-54;udDM`k|m%=#1`2Uz)-SrxnQFZ((&
z1|rCMVa%_o_f5#dj+dS*NHu}r#I$=qwwHp(<9&lYS3BU2foI>C^<>ck3IG4f!D0gA
z%%miwV)C=r)@O}SPSCRHvBem;H^S{);N1y?W%HjtZK;Gy`jk)QiG2lC&HQ4+CcLQB
zuaaw=X2f+PR`&F|5%VF&*`!;=9CYCKJaM^r@M{Y@3RqFIjNBMq2+!SnwSJ{81r|w{
zafBu1KzWI>R8PLOD5<#g<yob<=ZV-{j;K!~As@Z-6?ht%$u?EHJ`LUd0bIP7=xYd0
z?OPA!=`y)=LrWiNNjEeGZsh5y-w?hIeK9Z~&s{A|hy%PmSY2WEV16?QxUh<qrxf-_
z+&tPT8Uru&cjkQ+Zv;;JhDus5`ht~$zl2rjx*?~(l+4q`i&3qFoy?IE#JI+DusI19
z55qq;&D(4~4vazFpnl#k7H>$jHD$CpECw8RThrmTwH`*~8SQM$?gj@>@QQ2=TaL!c
zgjg#bC+ZKdvZw2Z=r1}t{##YL8`>EWvlGhBym9no%)Up*os2v~y1>{`gZY%V6;QNt
zyRX6O8ZgupXTUvwDQefSe>B?|A@~i?VIewf_K1XZoVon*2tx{pRK0I=cpE+Ppf!FO
zZ)`L8xN2bXi$W)Gd6!uA$ow8~ZU5vgCZd2=Z(bN%?>Kk;V0u0bcdGG1YL*@oGILBK
zpMG$i+tA@BNO9dRb5W=iI4v;!c1MQ-g-!2!7;=!|j<?Timo8p|UJmO|S;IVcywU3U
zKCO*((fv-<t&<x+N1S`mJdaG#;kMuPxdpH+ouo6bYKL3)ki?lx(;(yUZqy;U9q~JA
zEF;=L)W2bEX1ac8^?b8-AZH!S4kWveLq*q{Ph{naL04qxh42SWpgqaZzVS^J<TXE_
z#WmChMQu;*PtVjtKVMtwR69<*e~OPcT0I}e@z-K><x8G`CHLF}&y80ByRpu&z4KcD
zV{c#e!O%t+veVgW>_sCSKL1#EqpdFLsK~gLv3YI|t)36#G}y;g@NhCu{r<|rmbR;v
z;K}=r>RXd}AX-dB$CV=;swf68WJ{yKhOZVMHugM4GB4$DAHQ~l5N~*UFg@Q)`PefF
z*?*_eEwF0>K6p9KqL|nX_>w0XHTU!Y_bZ<+ud*nHuTs3bm=;#S_HLgA^{d5Ex@*Pg
zipjZkHFN3t!nZFgZMZc8z1ef*9lJ(>Gyf8&%7iK1mW^dlheip^BtI`&tx^rhyhm^6
z$e5rTUkk+XT_?6vygjsfKFn|YoaVviizu+i2Tpv-?F4H{T9hKwJ`m0j?$FFfhKDE0
z<=(wa2Yu(S)N9_7MNee9iEO=2oWJ2YbLjbyYlGjf*>m^<>ti00%QM?SMQnwANJ$rn
zSVJif+Y<!Wu2|icvcC}&U6?d|;md|5oLCv-cu8^2`oZ*kSj~(+BiYt({yn}W+<E5g
zz&Z-w-dozRh%XmbdoEHQozf*Oth%?TvOOQ%7Or`rn#GUa*dcPMb&SZtw;x)a-7}%d
zUS{X{$gKa!`r~)r9#i-VE{(p?(2i=GTE_`@XIIuk>k~5cc@y>E(3d@$xs!&d;^iyy
zdUuI_!*k}+*<A_SmRILC0I#Oi-e?}9zzd0XmrM`}Xgygfv@1LV3i5C|q2<NkfZFM}
zWOEaA$NuL=#l}Qk0KR@OogFqVU~zCRRsP}%p+5LCP>AcJKtHs<YHlbSN&yIEdugqI
zBIHOr!LCzL1d=yAd|fofF^K%SH(hOR4z14aiTL`bp>5Q08#!@&Z`r;F%;a3uU+Z8_
zGuSV{{j_#@2Z#=R%Jd>S4^FPXwJV-c3k_=eu+!}wah`~c)zkeOt<Fv{_r{aVD(dfO
zB0231x~no9K*5dv?HhKL!f$&{2QKmG1&SF;L#F!*VEv(enL+#MQ29*lJDav>5aJEb
zq1D;lQ9I&co63yb*RN3fB2VR!<=+awu(GNI3l;?_nt0ZM4N?<riglfkLT|p5D^(QT
zU8*+LUNHB%elDF|T*cxZnfakGMsr|q>b5F4Y5eW9@SZlvWO4ZQyZH^^jb{iW!|n!f
zP`~5n$TK<QQmxsp;UMCA8>{nazX@OshmcPFZjpGVL8N~RoWEyFdA)5bT&=VsfS<b$
z^n;Pp;dLKi>)551=xup0UGFaC+-@zj%pvkxyfkr~!^fK-p?vIsgbXO><eD!20rU-;
zQf??PAUv$A+2BMEXt$cb?$uxl$a?>N#ZlicV6TK}^2+tY$YFV@%=wG95b6id5yFZl
zq*LGDeo}VwXk`O%-MPDF;g!!&n|q^_4O<_Gj;dxUl*$98EyHn%YvW<Dq2yh%Gac%p
zus{0xapHOo&k-h+Pe*tAXm8|0-4e+C%vbnC`tR>a><qCtxVM=Me%%Q;qj0qmtYpwh
zy>g)owAcmn{!-t9DkB~FKEcHM82I^)$iKu9rQz&T_0s)lF@UXqkmB2wJL57sVaLQn
z)bULjSRx3~%_<bYw551F(I5)ix4#Vfenb^LTD6bWNS-)u<J-?F8cv1@PhzBhHkDJ6
z_$Jq2@(1|gcKq;Tk5nMq$LBNgy#?IlGQ8&Uu^s3<yrz6ad^4J8E4VYbdv1M|*uTUP
zr{NS04qlfzPEVdWO+q4d_LL=Y{e&*jdEwiSG{gO0*RMw$+JI$3enV<aCG56HN!sPV
z8QmDZvyo3^ZhIvDC5|Kw=iG)zK?{w3f~~q7!4EE%Vf94jGOm06@^TZ9kZKou_v<n6
zS$UnYZ$%f(ssB}8AUd@#w#bJ4Oc`+=f~|R``yE>S+f|!o#_DgnVZ_6IWY)Z?eWSk~
zBxFaL@R1`iwb1SOZu82n$DoV#qc88H9w5FXGfTul5uI-o*+Y&c{th6%{m|;)?qrfS
zj_&#iU%Kmle2`jA<<JLK=Dge20VCtBFXorl0Sn#IzR;3da68artZ?l*bU+~?;HNxs
z+{SZg^>4E44?y;)dC0p9cIo*{^T?Pz3!kaWKYZB^+|m&Lhc;h8L%ElTqg^8~Xbf1f
zS2_hz(^<o_F=7Xyf5UU;(7z$40;I0?MD~Ft0h^7N$+ttrjyEvKryFdNHxd?>X@I0a
z&v0?&Kv0xh8}+8(9kS{1w}J&1%?KQP|Ay(`W<EC^-6<C(P}$cDoUiZLY<QQdt3jTL
zPrg|;*#Zw94Ot@aunG1w*~;y&`U(o9^H!Wiz9Ef$Y0|rZ0fB?JM+O5BQW6s3Ei%lJ
zItk3L$cHe^8v@!pqLU(~e)lb2*nf|?<J9kMHyX0?^~Ql~H||ST1x+Fv*PoRZT}BBU
zygjr!JFGtRZ&<DCxYz+M_w`dE41a<gF*d7T8r?vnUFY@qnFhe8#{%gS5?~nD<zZhJ
zb@Y(f$Bb4D;yeV;q1D-4J4P1!%oGmU6E`i~dX0fR%O(4tY+35Py%>&_FCS=^?FM=m
z``N)zEes4MwQV>Ng*;X+sa}~tT$kY652mxj_LC$ozBemOq0V~|weGa_3N1gtrgF+x
z#jIwacV`iIY-~FS$~`9Rlv4!q<Dyrxz*fXt{oR3uImGWB;`?h_o!vP%`{<N3M$8VR
z%34I5E3X!Q%I0}B@ID<5#YqaZ*R}u{)1?0_rX5(GUHW*r%~EvoIAca+IMHu-4z12^
zTP(fZ?%*GgE{pL9%Mz+xWcZRvOxnEw?l1Vk%oRt5_n#l!EtpGz&kH0|#n&sKGLCl!
zmNXIDDc)~NGZjGdJoP*K!J8ejDD|+Q(((ZEy$-T|McphbI-s>ai@DIAa>zMs{puBe
zBXB0eiyxK?qdDj56JNLx?ZMBhXmxhdPA8VC_kD%x-=E)Iy5aZz;Ln*uGM#!5Ztp28
zmyCG>#EkEyTuJDI>pS2NegREXY-@qdO)28M3U3dlv%}b1&zW#bpJSrd4<$a>G@Nm&
z|6wV5z0a-*J_Wuf51uUtuba0kuldpr^A_5+ej3z7_ZYO^+@(sKkK*fxR%fR$5~QT;
zOh@IY@F&HIUrhmJGJS0M+Rf0SFRtZ*b|WC$=*DT5HBIRv{gXQ8twzO`Dl#eS%+0}c
zc31`3DmAL>YEs~l-fPyp^pn{5gK!M3sidqag357{O7dxGK<a3=!VWJASW;h-`1~}2
zl61@b69b5GfbVx`b#}Qr^8LQ#so(h$Z)1+!)J)}QZut-~qEi9mzStQr^30slsjjhN
zJl{L@yRH?-`o}jRdRFOUuUcFQ{SKZ(tFzlUzHEIt=OmZ_!ip~)v#8@wUXy-&ra>2o
zKFsYNqwoPX`-P};vo-;j136BhdIQRtP;b&HI=4NvI=dH%Y_89_7?8t$o2|>Q{r;Zb
zN~s$gkGD4f{zqq6Zzxqx>HAI!+urK{3ao2>`SWR_lZRG)?5HQkHQt_CL$T_aO-ba}
zhhB^_I!}TglcspVM}6?My~2W+jeT&~>X~AfbUX+}LJq6PWkK>`E)XOL&<o4fvpp>)
z#x)kh)ANJb3ZQZd)pI5m=1;(?Rh}2WZ2PUhZpvSL!OE%>+CB|2dfMs)g6{h%t#qP5
znVK}O+*_I`Q-G(;^(vy@@a+eo5@s^tC52^4znIB0M<jCnwr;xa{w{dtXu!vvPwSvH
zXW|tKR}ajz6-XOmCc{`=eRq@0t*HIbQT2E0i1T>-x*nY=aQ5$5(b2h-D{Y&w?xDun
z!u;Jk`F@VWRX&UzYF-`ScJ@e~u-X?;ZS&eWOsWB%VUGGRQ6P(sl7vUEa1!S`_;#u_
z%fXTz)$hE1w*8*x#Hy+BJT@4Fc{{tMR&9&}!yMmwJPdn4)<E?NR<sU2*s!b3J9Pv4
zZO5be9M_2VHSwGc7+^M4FL^cevUsY${_8<Pm=c!@1-za5-HU+p;!#asq3>cAq3u(8
z@?)<(dh0&q0116*pLM3%XxTmH#P)=_IodRwoSTwd42KxV80X5e8m9D1Ol0v0Kco9f
zrI4h$aLdQ0R$#9;$)>B<3eBu*rB<)WMD%;(jOBv25!xx<9-UbZ7J~`~dmpWyy8nuC
z7=xdjbI2HjhU`ms25pW34;+K#8a`4$M5z9gV)<gIo?Lro@kVh}_V6+5d%47T!*ldz
zIau;far7|&AtjNMDqGxb%D%xfhixBKFYbq*b<1PMd7EKQlgcvA*PT#M)1Hpb;w8{2
zxV>hyRUdVze`;KlK<uwEA5FK@jfC>C0}|QNKWSJwH4?Z{oSwbE7Y$A3trW5w?tm*Q
zdKk^58=&m#-P@&JRRX>*L3Sl8B+)0?S!(vniTXD@hgSbqxbEGK)oQ=vK;4-9Vd<q<
za7gS-oryv&jMyF~wwJXVWLSGVEwQWz=cT1h8DqIor}TXR#~07NzeB5kt6g9^5$!|m
zZ;%AtCzOC2Vena1$u+Uk8eoyOM+)TkfGZKl?{b~=2YILsqp-IUx+a0{KlG#cIH1+P
z6?wLned(h9&JV(rfArEL#R{nZ;2pz?no4k$&Mczcr5Eg7+TY7B77w$xA1ix(PYJzg
z``<a3{*8EllSH2E=B-w#oliDC%^sDKlnJ(VIma!{?SQQ;?B5`L3w&VkLp7W^4ty|t
zV(B6%hc3EH{~z|?>xWkVHWLXXa)Qko@#CojAl<s?@;&_?IRC?gmJ=miaD2t?TcXkp
zVDci{V>68$c>9|(NqC7KdhPqSBwF1qo<pmD!#I>rl>6&L+hKU7g1t>jF}%J1YnFdq
zA2f`hxQ#J<gvT=iN~)jTgOcg($KPJiMZa$v{jVHa{o5=D8DGE|c1-C9Eb$XmH6CV0
zbPe4E`KP`Ikj|I9z+R^no@1r3vm9*$g%7j6O+TRMyjSD@!NIQ=F#Q|WaxjjkgU@%3
z?-S5cbmc=z>NoIXAU#CIs}=lEmW(`S-40nL!aUw}e*#xdS~EAEK+!u|WB-*ytAEok
z_~=dw&Ii&D_Uk4u{{6cfL%Qn@eBTxW&J?IgxGzWp9pww8;@taSv+26w3*$m)=I3Oy
zTn|}f=5zk%edn!2LuQYr^zlX`N&HWeK^D6U-^=!9_`PXc^kO3l_>p_x!1I1G3^bPD
zA}=b1=fx`Cep#Z1wyyd~uxC1c@qWYfZ&+*;jL5|2k?4>aAPKPxx}Nohvl*&$gdFr^
zr~$g#*JXp=bc2a^FDmlx6hp>kpUYO%tDyyfzX+V^_v72?_L%~y<2DEPV?LCx3*Po!
z+^)vOOrCj}M4neFcz52y8rV5R-yGlA0vUXlq|*zvK(0q$HjeHzK}TiG{d+a$)~V9!
z-%juMQ2ui98_<q(Ge~^>1Dhw1Me24$X2BfrNKP}O|3)V`NOHN$&EEta!VS0zF3F)I
z63Cj(Tj%~=0$TmsIq!u}>?f)H8(Bsm$Skq296BpJ<<5?6f^>KJl~X3#q0ixM4}EG%
z!R9M5$5LW>P%*hiBlH+?{)V6LVEVUN_tA}|E4X`dFd?)4LXP;eJt*m_03}8#z3&`a
zfI*o(<;K+C0TSa9u=+x2fZBHctACsqL{luwYTUi%-cQ8zZ&)1oCz?j3eJG}m+tnYo
zoZqps1ANHj9=zvY4EL~(4}2Nz1jny5qGL`CAkj|ov?m9OQdazWHj+%#^Wo!wR{uu6
zzS}iKhYl$X*rRG^LEYaW3%?ZD@XDzS!q4n<CK|<X*ACXq<s7~6*DbkWJr5?-vt~K7
z&HlOf#c1_!n7=OMtJnkQL2!NarnFvS3XJ}>zN^cs1*FL^PR0axzzFes57~A+1i_PW
zJ2zTtB34Fk!dP>OIxc+sq1C^g?$xFn%WegZXXiU@awww4TUE-fIQ83A@KWpOj_cnG
zprLtB%L?Zn$dXjALZ>Z?t{$NiTYjDRJ6ZVoHLd;)v!^J_Fz904Ah6$Y^6d~~H#D9v
zt*Lvs3p_b>DN2W_1Qe$`zB1TR4_fz&uDr^mi(Ywg(m7m)sC&ZOvu~zgnr9MnDOV5C
z-1!wg^`9E-ZdSniac^pWl~x0bYibpdDpS9|Qzq{jytxdBAX>{-{hCC2)=LEh>&$(h
z)`EsGw#Ak^^Gpxu*1tMpnNQVIkiXdSwaC|(K<B~gK3+5wWGtkFIJ!~bu9V{8HQ)Hq
zM5Y7c2A#zFjd;IV(r}`6+fR=x(;*UhRuy|ffA<Hcc}G=Tw->^#zI#@m<>>&gUp)8t
ze!CgUaxRwXO%_8Bn~zA9u+QBeSkZ9eT2(HczRZlwoF*aRJ3Rt!ax#)%Nve;((r5wq
zem*kfoNNWUpU~!IwH2WH#-}GcyO~k@RK2_248(OKzWrF!a47oXgMqIqfXeER5>n);
ze&(+SiL5}sWii+FW_U3&XouTiEEHST<gq}p6HeamEcLshftDRQJhA@?QGbp1+kP4j
zo!7UMrlwn9R7|+AfqNO1v)}(wg*$%-?BHe4+Horh#2rc0Ulh{<!*#C9+3eIni{7m`
zDBVE(9Y8$i04-<s^ZTdNxFJDBut`yTy`Rz#P_kP?@2NlsWO?foC(}{{e4ie@$%{4v
z8;3=o=uMWO={~aBpCoh$>k_Olo1S0O({N7joSYv})JbihD^W|Y{!^pS*oIu4EPfPr
z9(1ig+%WZbS(c@|V?P}Wy^LyoCw^(6qrbWse#sEmCHVfDI6s{F`{4f&hmpn}ZqIiK
zaTMx)GC5RtsO<t>0Z5N0&tG<<6`ayxx$hIz4l_&pDf~Y6AS*^Z_0uOFR9^ayDf<Uv
zJH^|B`4GdcmoKp1E#673|DS&RHVPe6`-<!*#UDOyfS=PHoTT@5L8ZMlTT8X_AyXdz
zk*ZTHsGWP))1TeMePuic>w_@POiDr&tHqfTiYwqPu?$oC&VJ}zc0hxFUKfa6S<3hE
z#aH<8V|%)WQaO-T+AiDwB@og5puJ0c&u&5-U}aCo0mh`|cz|j<5!(Tn&c-BCoi`6T
z)~w`v>S`UByqD<p;_}qKPbL$ahjcf17#hXEv4;npRBhWy`Y*Z-tj*GJ$je{siFrsj
z_4jcy&DOtv^bNS%?k!Hf(Fbqqg>b}HK@i*VYFW!@GE8tYJMzU7pzj|2<Xa$5><_Ry
MnYIUOOW3*p1=$pDP5=M^

literal 33344
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
S)+dnMzTq}Zl@F~h?f(H)kZg?r

diff --git a/tests/regression_tests/surface_source_write/case-13/results_true.dat b/tests/regression_tests/surface_source_write/case-13/results_true.dat
index d793a7e42..ad927bdf3 100644
--- a/tests/regression_tests/surface_source_write/case-13/results_true.dat
+++ b/tests/regression_tests/surface_source_write/case-13/results_true.dat
@@ -1,2 +1,2 @@
 k-combined:
-4.752377E-02 6.773395E-03
+4.929000E-02 8.212396E-03
diff --git a/tests/regression_tests/surface_source_write/case-13/surface_source_true.h5 b/tests/regression_tests/surface_source_write/case-13/surface_source_true.h5
index 08bd809852152200e5449745616feef691f46778..ca5eda8e2f347a1fc88b05db6690ad5b6d3a2a51 100644
GIT binary patch
literal 33344
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
MnYIUOOW3*p1=$pDP5=M^

literal 33344
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
Q0?F+gZo^dh(CX6uAE<_K5&!@I

diff --git a/tests/regression_tests/surface_source_write/case-14/results_true.dat b/tests/regression_tests/surface_source_write/case-14/results_true.dat
index d793a7e42..ad927bdf3 100644
--- a/tests/regression_tests/surface_source_write/case-14/results_true.dat
+++ b/tests/regression_tests/surface_source_write/case-14/results_true.dat
@@ -1,2 +1,2 @@
 k-combined:
-4.752377E-02 6.773395E-03
+4.929000E-02 8.212396E-03
diff --git a/tests/regression_tests/surface_source_write/case-14/surface_source_true.h5 b/tests/regression_tests/surface_source_write/case-14/surface_source_true.h5
index 50cddcc70cd27df73f37a288d86a906d7e7694fe..c9900bd9c0469d3b171f863f0518d6c94e966027 100644
GIT binary patch
literal 33344
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
LX?w7?gq{0eR8MbD

literal 33344
zcmeIb2{cu0{P%52CzT8(W0?x6h(f}(HyH~Js8ogs4N9d*lO#onR8morBuR>d=-QRJ
z$UM*UJWnBBZuV*K^S{0C^R89*TF-i(bFb`c@3YVKIltfayXNmcx4YJ6jfE_{EOb*Z
z3Wbh|j_sc${%2z5g}6*#!O!vc&1MqxGso*Q$54jp1U(%i-PC*BGuPQ>@)u;BzOZfP
zy1@>0b-Kwr@%-`Q%-eL_bEi`j{KEe|{vYK5Ep_ytP}x0WH6BlCGjWDH<J9rfCoK+|
z9xy+4<ey7;Tq5`l|38oHGx16r*9+*RXY!v%N16Q3>d?`H_Gj%5;@NXfCYUGx;r!|E
zHFZAcpKE?I@lQWfGwA83?_53e0sP2FC(Sr@iEA?OZ6=Q=C;$DgytpRwpYoC8|H{pi
z_pl3sNh_va2;KVmbn7Q3KY#Y0^T}pm<~ZBo-#+U!b2GU$`JXxb+h<SD+=iF&|NPYS
zmH(Y>oNVm=c}+*r%*nqT{>?x3hiw0eGlhS-pLprtKI>p@|IaN5@y35i|J!FR4<0o?
zd(hI<`sDG`c9Wmc`j^iUFR@Jq4%0su1nEwlK51oo$dYa=@rHj%6F*~Te$xJs#ZhXV
z+V(H^6E6`zJ7+R#r|Jy@1H(TxiZWBr80pPs!nqm`?|-u3n2GYKn@#*|taj?@Z>FEj
z0grvVnfglP{onNew+A}s9$)_P)({Z%I#pqnF$$+YLBV1^8@j6>&jStjMLM}y8o(UB
zu=pOfMp&6S?%A9zg({rbc2Iqtn9B71-C*j7m&N#{-|g!3`*d`M_3FAZY<>USH+d%(
zs_xkG(U1u{SyEWNX+bHlskwOGu&V^RZG2`RD$@$@XdaU5u|v@>3Hb?2mJ5+MQ|<QD
zYl=hDz5F!}ZFn)1oqe^#w2Era8Gfl8!7v7FB74QRU2>&x=jqDp13RnX#2c_mNVXa7
zxh0wxps^MW=5`a1@0i`5>H0Wr-_&2TZ7~4?Ux%rjWLNssAWeGAVuiHYU~&s^FY>>t
zd#@B`7%pzRv8W8zTovtnoTz{@9Y65Y_T%iFIlmGAr2ba<;AMs5IHZDWUgZx`?YVk(
zxPB~o2;P2|y*_-j0q}_~WXnBM1LH0<I%&SIgmoFJjN6Jfp~cr<TC%b&pEV9<hMzd*
zuf+i#<2dMV`E4E!m^uC}&h*6MH|%e5=Kn_gllohn1vH%2(eQD2svhKD&`xj9AA!?v
zQ!rjziza!)Y^c{XaPvTGC-C62HeoJ&1{;@YWQomPg7P#4=#>UYlHv_7`>A$kAq}UA
z<8!UsP(L-UlU$S@J$OckF{R$8j~8zQsfeA!))h6dimhSm&bCS@`}UBCPva)k$aG8M
z+_Qot4qj)bIIJ|BzvZ_@{}G3Fyr~sm%pk4POZ6M?`H$h_u8dgTIVlbC*gT-f>?rko
zQ#0Iom0nK6wid3JWXk;Nq=d$o+MUu!pWSclH1^n>Z}+|=|BK4031Q>**};S@wCxXi
z@wgVWn8qd7^A^FY7KIWlJDT8XeKXJ1ll{*gil^rI5#d?Ohhv6=x2J!re5U3r#Mj^A
zEG9yzX$m4N6UHomrWHPBK4f@u4kI$id(KX9*JQm3vWkni^9i~f-=d*jnhPF#EuUj?
zRUR$Kb>-7~y^`cN+(%P!y@Z-KF)_)p_hDntYlHHsYN&H3J(8^u7h1oi3&><$JKR!|
z4y8;5o$fpc1Loh{A}@?=K$Ywm`gPvS&fy|vPfh=MdzMo3CMNzohliLwHBCXf(^L~h
z^cb+w{TgOYU0uK=s8sQMVGXz@eqNE!AP>qs`%tI|n;~6O%V(iIV@LvgSQZewan|zT
zrRGgc{CRu$h}l!qf1bln&6}9`^Be(U_S7^5k@ZR!<hSnxw&Snw+Qu;=?=r^gocU_N
zo=DCjDVbIfzhU(#Yefba=V?qfrISP7t#!M#z?$6u5bMt}YTm@epSNc@F?(wI&vOK+
zc@q<Vo+Cueo|>j0A=y@&9A0$61LD3JzYfwPyz5tHSGKi-Mdc589m7hYdYkvNQRX;^
z*#$F7Etf%0o<&(}R+HyH#PSiQ=1ojc5cVt+;UE3EP-V<N|JiPOgzL(^J5l>O!AqA<
z%a>~8f@@n>Zr9QL40=UV=x;g8qv7Gd!eRLA?VHF<_T+iPpZA+6(F|((&vRB#^Cl+#
zJZB{_dusa6bHu256BB=)BTmeIGVL9w>{{*D1YHXK9&i{8QO7+Gqv)jN=i~z6s~<jg
zE>8mCYwE&w=yXDVKBrsj95<m{!<?I%?@N*T1>(3@f`&7FN<n(xIO)GyHw0v|&0e|1
zG9&6rsR5UFHUb5Kb$wfxV&G;y16}CtMo@fyq|3BG0ll9Y%*xoln#3X2pH=_P!4^dN
zSbyvv2F$iChN|b=VWq~})LxHfxb)bt&l!_yu&Kb~OTxEeXcCXnb@<Dn56)_pTBNNa
zaqzk_H4c%Sg>x(@vi$hIR&e`(;`h6co1y;smOZh|HLwi^Zj%gYg2mbb3@Il{VNmS6
zOHEr>qATof>9Sm%owIrt&V#BicN(&~0gJIx1k%s|ue5lt6=Ls#ST{Q+yyyYgSIA%h
z+_GRw_4)?RT>w4hUi;(we2H1@S@R!p*3xiX*Dc%b<uw4OFH;b+7it3HaSc%O<T{n%
zpeFc?>DO(=x>_)#Fu_()m=6V=-Q}{j0(9|L{^*+vSCH(%=kinKBQ?Vz&mSqsLWR9|
z*Y`GnRfmxSOC5?pt)++%{f}m_xFG$pSwby*rB?l{)gTMDuF3GyRV+g;=e_n7+PsOx
zA;ufN&Wm5e?YP-09KYJH22|=~ckZVQ!s^JKr!OhB0Is6_tM2M2L&YykE~IqV!Y{s|
z_EJmaQDf190-^5N+v{~R_TcmTlgNur{OgzyoF}mPZLeOy1a#f)mgTb}7wik>v51Q=
z0zk>M>Y;i&^lh~+3jQjNVyi_KER80|8_{nvGaUR7P_f<d@UA9m`LK(LMeX(}1~(Qa
znXF0r3Z(8z>a*?W1nTIu5c}2~;IyLfi&eiOY9Gd}Vx=%UM-~T=jucGNGfRIkycgVQ
z+|2Vfp#fg1D3j4V(F(oR_9-i})qvbWC5{Z4RG6Cb7VTatkKPfNc+9<b_PE|a${#<W
zV1K&)$l+Pf9BsZP9{R<@fIPiX3Jb3NUcaocT1B~G+6XR$|MHd`2?tX9>OAgeHA2@U
z<M*%qgwU-`b;qCQ$&=!Z*pAB2<d4twr%x#u!~1pKz1If8p#?5MM|j@C`L7z^Z4K*!
zdze|Jnd&eA)=?z%>R-d%4ZJIT3;{ZZ-Qj<jBu?TG+c$g<f|m2A{kD<DZ@4{wnxi-i
z=R&F5;-!W?z%r3N+smpI%5eu|N-A{1-i6+FhxWYy2h%<q3>W7^4hheIR3m`$@9p(4
z+Bkc>ZJOcGv<KJ)JJy)xUG2c9R+?Skz71NZZL?r==!7xMi=JHSe+nbkS$;CK&x2{}
zcmlsqa^AU{B}k&PbCmv_gKXCQ=shr+4c`TQ6Xjhw28Z7Xr>6ht0{LoBZt&;C1I(EH
z1x3>z=q{Ix8UVXd#m=vhucQ}{;sF2dQ|+kozx(Zvb7sB(4UO{0Ie>;ReL6V~5$A1P
z{iF!W%eRiHCilTPeyfznygGr3O5OWUUZFtVRwdc(LoSf9UE};qc{jT1lGxSr1Hb(?
zRd<MfLuNR5dyR80?&-XKCanREIMq1kDviL9U~Kivur4sTPT~8Bq6DZ=l%v|)69aVP
zK31JtxEnQF_f1l4?{CgjK12>W!y)gf{&~Nt&Tz<wKhIGk17^-B$TqfaW!W#E;HBrg
zHl^?X2|wo1t7i-3gJz?`dnWyLz;<O_R$Nmfuqpt>i>|IkJw4BR97|%GHLf?$!uiwn
zM|~DfaKOTwhfjBdAJNWph1=;cExz}wmnYW(Gw;khaV<?Cj&pgB-dG+K*G1Gl%sJ4Z
z`0j26Q}TF+7zY}&aQ?JCn*R|;>p$XX|3@61|A@2YKjQrRem@0aJzM-#zPtnk_#eC5
z*)jnQO6dd3SlfZZTHOr-zbe3z`%uXt;3G8An0r2G({42Eh4!->8mzO{Q{5SR$ooxy
zzTMILkNl=T3&)$2X)m}L5BH{B_tr)Gq3%N7%$VMG&{7(>N9$t-h*QW~BA8kP#?|V0
zF0<@LU+)+ZlDxWbR=?3|Dz51#sO(wU2_8R>Pz>#ygG_%73f7&KaZyeB8`ysKhd^3e
z6L6l>^T1!E9u6d**zL@_6_tBl)E+IyP2v#8quXihdBUX-+$qF>&E$`y#8B>wj4@zO
zyMq}`va_K^R9xhH;dT(d{m7AqV<n*SS6_5yQ#s<TbaYjj`(_e{I4{{j!}(kG?4;qu
zZcm)o{xD`{*g!$%D{bUUPGH8ItP);Wqh)Z9n@*bl*A^hMzOH!pky7|{)5@<&x?9lo
z&JqC)xjeJlV?e|CTlN^zaHdZw$erGIBR-ssfI;a+6fDREv5z|o4h6RZ9lw^S%ObJB
zy>{M~;`%bsIkqMDXPg$QVY0~JO&vK7i2aWd4d-v!v+F<N?55$Y<<dONTQ&;(?w;lw
zJwA%Z1J=Tyv3cc49Wa}h-28H5F_6w~UnpAH00$*+WEr`nA$=)M9<NiSNpV1|KYM66
z5$7ry=RKkB2P088Bl3@XPr$$;pO+hiOM%hg!R~~m9pGrs3Fti>4Mj0iD;|d}=<qz}
z&+kW;k~qZrV@$*OTjjI&KjQ48;asOImF>D31E()fju&s|R$cXFz&0xAsH(hdf%TQl
z>@OoLLF$?nUhY|ipaITtV+qwl{gE*V%MgKC{kETm6JXe1eNFfGx@f0kcjqqU0T_G+
z+n91K8{7}%Mqf5|!e-}s&RZ4!peX2-`{@rFs6u><#eARH_k&GnIDe~rO#dT}84YL2
zE78NwEuDD1K}sJ9v=?$QVLy5wn7v++3FbuTFMP499V9J%wc|m33FKI`bdM?bR&=qs
zB}+)_>~U>A!@<`nj`*%~HB@N=z6;j>Sc)<s({EF-O=~!V`=aw9_nsZ|UImqc6o(P7
zUF+H)Cfg=0HiV!~W}q*Mp4`3>>*)a+d+a>og0mB*^=p&5G(>Q>gp}eBX3YGo7-dCP
zJ~+bc?Z?O434Y{oHV%}<Lce8P?{ZzYpvRZL3S{=2y<f1P;ry*Qu%zM4_zB7NFB5n)
zhXHv7M6P@L<N({AZ11Y98gTePpR9{QE7*Q!e0A3S&p=DgSVls9C3*nn+46U7Ak`mY
zzc8h{{GTrh7I@NAbO}=cNaGM!-NQQ!jJ&soADn1{8gKU(`|DH!%ACHMMRzN}V)w7%
z`#ELN1NROyhGwrJai-?nQ?IFY3R*qi^g9&n?iVqelmmm%udL-rk5&V`s8<pgMd^aA
zXhC16Y%*9jDwNIKoB~$ueZ*evA%gCEZIz-OO>VD=99li!3<nu`&U<=(UKcdG+2^p`
zCIV(}tB-m(S^g~Xn;+>a=L41PU9YYhK~O`%mUMgZp&S<NL8rE^BiTdr8_t~0pN{T!
z=KNp6u}sM0Bkt!-zyDrO479rReI=z9UQU0Q@}au{Xv`b4xp=VxO0Ut^vN0$_l2Sy1
zqLs8s9AaGKOq}yU*wUpsdldNi#`MIqv{KtsB(D7DA^F#!<Y0)_^RHi^|Nep!x`$oh
z<JH<*ak;{%xSBK4GECmr#MeHi$_KBXI0yHeM!T8mxE>>hjdN?K?kxs|wj(xii)(>l
zSi#$O#x;;mco*ZRhB_#vdg$As2m#b?!k=eZ_j-~&xD8VrywAfq9X)%MA4lfE*CAO~
z*iESW4A^L2<~hpw8n|J=@Y8*|I^eSKz`A{nwa|H=?BRue06pNt7FwS_`+gSgL%f{K
zCin&)%nbmzT}fgW-dyw=2g|Mm@0s_Z60*IJVy_-<1J!MEhLA4`(D%td-Nj9hh6FiI
z$okDb?!|qG$DMXvcB7>iBZ6~mLtE{&J}@FLA}h6)N;UyW=@MjgX$eqRl3K(gQ485_
zD;#?MOcZ@xS9ba`B1iHY?yD)kk>^*F=QUnULP~w$iB!;!<%_!^&Wk?3jN;*60o#?^
zRykDUzzRc#?F=2QK-?`ND_KJpRUNbWZjwme$G~lv;*j@argNQYKmC=BzXeF=gZ1;2
zP1_0>5Xvf}72(SDAnhQX#Ieoc(EY)yLzS`3;G*>Mq@&M*kX2WYANcuAmt+qy4ruj!
z@>XxwNE){QN8z<|>5tdp_F%k%akseAzd`}`P)TL96kfYtu2%M?9k%Lx?i1$TfQo8)
zx4Ir9ufyVHKV=WCo^QranBeU_>eq5dVZGN=c<<2!bib0OEO@^GM(iu$f48q1o_@c-
z?KY(b2DX=H59~EZFZ#x~ppVG9TRgU=IJA1cewh!MhH7*O&RaOaaWM7gIAAFB<S|%M
z3v7}vAp&-d@MUu%_A$2%JgvgQ0&Dcqb?edx!x+fxNO;|x;^2Bdoc-c{Kn0saHJITb
zXM+yDR7vaw=kiV0d2T6!E^glEQ!3lQT%h82TCe~t>0R@1XS_Lj_0(w8Q21g}`4Hoc
zR?nxeC@JInwG$joj^mTPLG8DZqQ)dmJ<iYYOx&x(b!pYW`@~tZi_NXT{yWpH@(CF<
zf!|NBBYF0Cqt)}_b_};J{NTK@7hdlz8;Nl$1--HTa#l?3;O?<Ehv?7}X#9AMTSrk2
zXe+Kybu^Ji^W+tE=tgGm=WsnA-rvde&K+EIi#kt0LUWW4HRW|fy$JcM$l7Y~cw4;f
z{(uI+oEfcJwYmmI%V|C9cMwN;pLB%pzebKXqTguseC<-ARpTXd5Q)Id5td}C->{YA
z%Mt}A_3?{GKCQXWQVPUF`X5_Mw!&kt$1{1yIZz{5Ty^-fBB^|caZRh|+rB8{`D)e)
zY8<fN)tz(Nt`;bXb3EnlY6IRke^PE#<^l1CFXqZEDTZT~-zNgBH=)iKda_Ozi;_4*
zdua81PhVD9Y!|2md&Rm7<DAE+JORo*w*}I#pb)>2`p4bhz_pt%LYU>dfLFTQy#B`v
z&}4&mM`Rw!k~qY6hgQ!QqVw_8{jNEf%Fg*uuW*#%9IV47>cyh5M(CI9c|F=T5o%XE
ztuY&Dfbp!JV=*cQ=otyy2vrYq{UQ2|R?inUZ{8WEH62io_uC_PpB5^|%l+O)BP14B
z&sW|0DZCbjo3D~=%xZxNj@29!bJWrIv3}R?>5=<WB8R-*KONOm?P%Y?5-@c6CoI?F
zJl&hij4VZtd5PK9fLldfHY!hQq4<f-f?s#mfx>$iT)jg~QT|3Ttj?A^FCn(0w7Nkf
z4);fy#!SeOyjbDbP1NTYkf5;YPP=;*;HSna-7t@@(EaWLo$q~ZAYP5K$g+47x?r3B
znTaBDTocP@Hr?Q!<sTOuUo!!`V!L(j3wDB>rTn}-9yQ=iW7^8&g01i+$9l&m*;E*?
ztWi`b?=y1CRZr?0wv`kIM0;p;gL00R*~07TkhXPRF75=q3vV5ho@-hP*iNUD!j_!@
za=rNTk0f=%2<Dyhm#x`?CVIYQxtmXJcZlV~j~5B)NI`Z;^NfQ*Cd}TbhM)aWCpcf2
z^V9T4E{Ji?$CQ_LKrNFVR_}&f&>es7PQWEmbp5JWSCLP%w>z`w1~KW-Bj+eZ_0UpM
zr<MBzJ>sZRA5*%&6G9}qzUllEXx`WEJkFI5Rj&-zv$gsncZwdouDNYb@*Ca<O!W)P
zNOsWC9Tk|X$WEa?_k-~7RQF~$)B*&g#cn5Bl)*^3_QU#?tsvXxaj<o05$Hc0BfrT_
z2ff=`W_REv*>A-5U^xvZ%QR5K<6Q?x<{shA?xyzJh=4Ko8MDMBSUa?7rPR9&ApM!A
zN~od}EUaQ<Y-UkMExva2oiQPg--z)hIK#omRpu-P+^w2)*c=4`_iKW`+wG2BKe@!t
z<wJij4g2n`>A=-OR>3Bu1KhBG{`A0nb<{QV9%gcCHOX&8ju4GK)29?{_uIKPYUh%{
zcjXVCv7cq2xXy3miGX$}oX!%bYgP<TWNm)Lz?%hBU+M9UR#H%>$anoLkIA|KV)+Qu
zaF~Z%2ldw1!WkZ7H`ZplBzpq(1e*PHSX2bg7Vg|$9n%5MMs^$tON)X224C(?%;QAQ
zd>HkqEg-j}#PSiL;Y=9nEo3(u0wLR6wlwxopOZj*O+q)UecA!Ag^A&6OEDN0^^C>i
zTOp7Mk@uNnt%i1r>ND%Fn!S8PXE?ZxxE(=jZU$N9w!#T%l?By4-5|8sM{jOiJGh#;
zlh1X1IdqcA?mo5F4PMY&5&2~o3o43sKFQ)GkFSaC!3r9CW;mF)kAjJ&eirl->E*gL
zJ^`<8&TKB)+yGh5?}~YFrxdO?daHv}*TH=@d-EcAQ1pAA&aoH4<T${;`&9i|NyD+6
zuN)9~VF0%0-Ys0<$B4~v5&h~6?R|Ul;fpW(w=q7L949K8dEP$Q0=jb3gj{c{p+5z*
z2Ig%dmk%-C#ArBb`raoqC4N%lK-hWR3RBa$NFtiON7nBXG;JHb%9UIN0(1{^zrE51
z>@fO?Q`i>t`I(!&>nF%MVqzSK({Kde3g}cz#K3y<stcn@^ayUxqy8c9e%?l~BVz5!
zjO-{VZy;u&NZ$lRONI0`btKR-HN(R%c97@6M0+G?I2HC{->PbuFg*Xf7h_9*gjazC
zuIm0q`9?Umi~HbwzD6*|T?N^Zmk#R9pWH~vS3*yp&)>jmH@iKwy1~_q=M#f&(IMq?
z^B*SV)&QK>t+~yy6xM?zzFd|aj2~g0`LEJVg3aKSkAm}iZgo^M^gF%m6Y@F*(H>ge
zpkd8kx<md0kcBI->)V%MyqvI-n%rX<d>O#n!zRb|SSef^RI4s)-41y#N!0FCP(bII
z$DX}XM2-Vu|AXrW@fZxU-Ph>v+yeyTudyv{9>MLwxX_(E!iTEB@IHmm#_V(;5%beF
zXn7m-S^J@RcbOWhWuYz2c$w@sB8OHtXk3KpVU0P|{AIE}Ck{ViM6zO3KUp~B0#Vr{
z|7zDJ=)B_a7{jwVpcL|Jt*ydl^!mG_+V?YLNbM+bUV`feakia@!!OP1-{mqv=cigc
z%#5Tzlw6u~r3NOPmbGUd&H@IbD>iI=)&jzp96!6HKpri0LOZ2ClkFkKHLmBw`vsS-
z^z4T#fA9Z{M+gRdie*54==+^@QK|#X_qZ}1$~FPFHRV@XT?)YX(o@WPJ*83G5dO6h
zLgeuqk%Q~`$l*=FjGwVLXLC2eP@d9r+r)>#_?`1Rg4sKu%j#P!mt)^S8P;Rs4!cXi
zdH0VUUp2*1X`=&)+F?p0zu{#*)$ZVWKJxk)1rzt{r4)>H15Nklcd>`t!MC7L#;tap
zP%Xe29qNq(LHj9l-iPD@mzdgRCR}3Z;}Hwnwe!jGM&!(*=R@v4jF5hbP5|jOt*ZLj
z?VynE;PyucYQd|f3k9u@OTe?+JkCnRjlfWiF(_ZQ7AcQn_7=-TNcIrh>-A)Z&74s%
z=bne2%PX3J;2`(X%~%Fpf64Al_VF&*vr|%*V`(z<fA`pW$+Z|Dc8xB9JqJOLUvsWk
z{XDz=Z8qJYWI+5!f3G1BJ;EcHvz;C(l9p&Y=HCuo)J0D+xA=l8UTK|zz;a;68kgYJ
zCW2}W9&;PNO^$1#-)MD%X3N||_x+--?;*wQyx#o=y|9taNze9l3wXhDc-}@zEjT-@
zCdYN|JA8CLe1l&sGwSq_M^$mFD#>rec*AvrWcN`J+gHMIr-$-DzDt(iwI5@kZRkyY
z_o5c?P|I6<$od=T(f-xP8c_>`hga&43aX&?h7ZnMGa$zSv3wL}0Jx34BlH*46er;H
zWeT!y^`Zn}{RHsTGjw$~UEAc7MNIY|x~jpiCGv0f`^3QaR_mC$ECCvJT1NNFm$kFn
zgX;!yj)~%V473fv%vBX{FRWz1aGqb;Xu-?oKyZ1#A>DJ$61YDu^67|K2XNxq>crP0
zfM!Ruus^#*ex8ZgUeoFZ9pAMavwclZ&3}EWM%a^_5n$NBAS!fuavU;T6seqF0#YnG
z)wE#-;QslYr9ff?RI3|J+?f|Rt39}GaQb`We<@g|_!ZWlL)B1m^i|UJ(*xj5)0T(}
z?M?8y^cRERyOnVH=sOYNs}(>xEs*D9nI_6Yr_uT833;A{`)H~?z;%Q8wcU#y+3qZe
zhaY#|i)30*iI)?$y+%%8Ahi?zERfvu@O%om-}7au+>Z>XS+jcH4mk$&jy!vWogjJM
zh_}sC99rGrK112D_$9sI?z}^N%3{?0P0Sg3*syq<2B^a)ZkJuH!2Ho2bBbgw{CUA~
zzuQ&>J!?f_7`nkl@*9ye^9Js)nIi=;KKUr@=%l{NF}UDN>JkRb&(5{$jBpc>sr=yM
zc&;8aUyR^e{yZB*eCqPa%|Ot8%#_hrlDyAEjB7wcP#ON5#y-CX3@>sI5k5g(kHwB^
zU$Wg6eH-o_>DPMe*8y^(s-GL{7sH25PL{#k2zpR6J6QP|`FV7rJqQiQB7g5LLz6P#
zPR~#kev>*rKptkKR2TYVll#Kv+qPd%g3qkh?Tyjz0v4O(8_h9x^hYrILX?5rFA(Dz
zrQy&$&@JA);5*#UX?*?14(dD$JL$bwZy>b^#>=nn+ujoepI7Db2~3WIuf&UMRI_TL
zx*GJm=A37rwR}`*IPJUX3qrfcV1G`}Sa!)AZ2D~q7E+4_*w7V%uC==-9?xrn`ro!J
z+PI|-%F9UJcfDqYWcvCxzPs!-D@TonGm|gU{cNKA$j>e)mhxcz*y>t{`9~_RWoiZd
zE}Vk=$1>p&CbrL_%W44sKypgn4pnrJGM~M5&+KuqnTDe^sw<uLVh|YY)On!#tA$#B
z7@QZdZGDjnDn5D@uN}#S3v`&fV@ErncxK2U*3cEG`i<P<`SWJqZ&at@Xs(TJ9Pld#
z&AQ!8fumGCKBlgM&EFB(1eFzc#k~~4042)FB~xf}{Gk3U5gc8L>U}CdQ*@oYzfFuc
z4H}N)LW!>f-Au@_%*4mF6a7?s4vxrUHk0F=%A=hcv5h4#NjCJRctH(xR85Fo!zzp-
zl7XiLkBZD%KAJNed|b81em<oxYXY3Q`*MBUi83l@%pqo#b$2b;XDq9|KIZ|jKd58g
zo!SCxV&m>!Unhc|sxc_ED&(7$qeWxS^eF}L_JC0`aST|@nGj=6lW`b5=zF$4q7e*L
z<=k6vvk_jmsy==*D-iZCmTkmJwxjN^9S3*KBd=c*+XL-cIDTd;*wTH!z>}>ymHG>Q
z!F^oI%}@TQ1?{2QnM3y{pJV!V%n;Qmf$@RveKJYa$XMvEANs7?BzuUQ*>r<8Hw&^J
zseFOU)QflS51oTqZ<I$CIk$tljGu#TFH?c0r{d8F-%{|v!pP-0dJR#Cx)t*B#{OA3
zw7NmTOP|-;o*w{o?Q%;mG)7a)r!I}J=Noe>U_2h1Z?!KE4E5(N%kS%epXipqN!LeF
zmOU39(OZ-Ce8hO8)eYux#&ph4ras4yNWB(Ge{02n1;*Dt8j-yX^mQ(}?ThFF>&t5|
z1~q(!t#w**3K44PcZX{V9}39rC~>@l>jufiL_wNg?6`H)wE(nmSeP%ETt9HRbWicZ
z`Wny|<J4%RnF$uxXm&{qw}A6psyv5JDxvHbR5l44ko!4e`OKml#5}GZS9lwo222<@
zA0Lisg*Q*P3GH9p3Hz_gtAMe5cyGyG>65Es;X}oVsG%}dl+`#_cHD%#PLB7{Q~fEe
zZje%y%aj|;jNtJd`XRM<yJH&^zu}#Y-YEm`20j~KC~gCON`q_{9%KO-bm5ofd}inw
zfol}y;w7XwAo`6~H~39kkzd-B5&032LLU_Liy8+*?xwBbPin#aA>;>ybufu3nzgNG
za-7mARLohs5#<pv-f1DmOX3jYfL1rS#<7*(evmpYKuqE`MYq}I!~R3Qt1~y$!7%u&
zs+6S(h}24HWvCZ|a~C@sB8>YH;ZxU(FPD<{gNgRg>IP^0g~i@ja7wJJ0}81aCim#~
zfWrZY->#c1r_UcN=<XZELLGKPL7}~qaj{z4@^zdh8h<4%%D9`n?oTWqTHT<*6+23P
zB6WQfvm4wNsDA1bD3ReCwcZ^IgWNS21^sG<C7I`THDYxjJoE4pGprZc5n^MVm83@U
z8*v_NKn`fSlgzFDyKXRJxLq}SQx?++{sJ$;(+}P?>w@`0YdY&se}w%Up++t9lYuek
zTA|n3-0001AF*xX<ozEahgLUey!`v|mm1Xa!SouV)(<Uig1haUijCS+p@?2cR^D(Y
z{E#f4vEf=W5O)_8l#?1k><7m@VA|{)THPRS$9dmqEbJIP5|hj4xqo8~w2RFiqCeFP
zl`^%l{%w=L=V749cxquD+<w~orlEW_63D1(6&9mK@*A;yXmx{kUvYCP)6*k<_dIoD
zwHv5$y_(bT^o4y@fD66;)%;pAq*L*st1@YW5`)2}b_><edtiU4#Gcv5JG6Q}ojSLn
z6)nGYLYDM9?mJd6VEKlk+^6Oyz(<ke;tW<@z-2V%nc1!+Xw5XTGxeS_suXggGCYOc
z?hxaeR?l~&s5JnwEP&6%>>m%r7gOzdb$ZLQr{Cj&w|b$gIa@oNmlqU?Fjm5m>n5_%
z$`eSoWr)hyV)A^BSWjv7eEUBJjC$_R2D;4c8+pur|GrdA3y<cCret{O_4x7ZBiW!j
z-7fp}<a)v@E>UCYR(VvNyIJky&e_L1w0gd7Uk~<ERUObY0)!&BI;r+7l`!>q6ki2>
zcRXNO?9~L%?$GkJI9CB5dY|#=0i5WTe7{=mo8<X6(H>eoAGTapGetFQa-HD4$y0ag
zyc=6EdhL0LaXHL8;pABOsT4kl8`5+zZ-E)gh=gx~9ID?E_RyAtpA>IIj>&W&Q~$Ep
zY`^H1Le&i-q9$+cU)$z`7p7Yl=ZD3^BP^nd?U^-TjrL)81@l%A(|JEs_bmmD%>Vh>
zZSL&44O1$Cn4n;;68vnQ*BOw<sp}d}eCvT=?bk=&=Xb*UVz;(l{gwwZ=4|t>+VT~Q
zDL?-z;jtU-7>|5yltH$KSbxlj*-xhbRvehqaHdZwm|gx5kPa^extV7EcW#eEH#1dd
z?$Z_Uut|TigKsnV>YT~Nbfz4B-43*F#+4(Y->hF%ts<}c6YV)b!;ujfbT}=N3*v2L
zB~1935S-h5^JkBqc>-)@<XF=3vJvbpNciEU-w3<PJrpnJD4>3gfyt-m&OW}jpyABq
zi(FWGBk+v^Bl2oO|DxoBad^(2Qz&d8ANX=cV~JW{p~NE>%?%|TaNWT)IQLi`Vi<G8
zIN&0=o)X6)mNXohi)$rd#$4o3V4}I^gWvPU5&I>wPaJE&`(e4;$JxI?u52?Uaobi<
zDqdTuo-2l?1=KpceL~)EB+eV@X*jq&MbFFSw<#4tCV_C%d+UclBFnXHXhaJT4d9Ma
z^2i7LvS!y;aaRL}H*Pt{T(+YD&o;eUH9~$qm}n1qy%L8~kU!1A=OZ`)x2Ml`Zj!>Q
zW~f+KlYBL%6XYfw%+{*t0E-W+s&Alt0adqIM{cbs0N)!9+tp@Equ&Ls&W(4F_p^xh
z;IW5uxKC?+ZmlkYFFSa1#Eww+8!@Lx^1$J4Ej%%hqF-v53)K&u^A)vdhRi*O`-?3(
z&@_?FTi0un*ZGL;4$j2ODJZGv0l#(|n6V3E=0Eg+$Dj_bFy&j3wzm)_NUEQq>}iLa
zzYjKgyXV15&1j{CNsH0u%GXI2XUK6t93S9m+@8VAN{8JCsQm%LY~prDVaFU~^JqHr
z*zq9P`XFS^2jMP|JD~JTP&yNoSsyucv>c!(qmL=xyF=Dn68kyaHk{*f_xV}(BTaze
z8NF<Kb0pp`Agi{F=-t~;3fr~3rJvhH1G%(ZgZjlCz}rvi_M<ET^wF1J4g)IWaUwCU
z@ieYaV;CwK39I<sA8cii+sn~701A&?os)>9z`d^`8;<^*d`@^&WW;h(e;|-|h5qg}
z1YPA=3YZp?_ZM(qO^xGeb#{M?gWG}oZKnK@xDLMFcI{&5kafw*?#noM*_8b{!l?@!
zTV>z;@bMRT>VvRV%|tvf`fM_sr8pNgvEn>yet&j71+KHhZNxdjO!KAJ>o8!cj^jr&
zkIX@`4ldu;Z`2Oxq#}Rr>?#E>=4(vM7fA<eOgbJ(3iKgcs&?8PNhPnt;;}sCH(H(D
zi2#MT$6a%f#&X^sPd_>Y=Q^)GQ?PNc8qE2Xe7?rG0qCqfHves6HIU%Uuv2}lfZntU
z-8VKujyJsQr#Q4ayTBD62Q(g2>nGwhVSXsLW)8O4i)CK*xoWWUeu#XeXAM|fzw7n}
z&IaheajWNry)x)!maqkRmgI3SF|Ki)-SqdSqjS}L5N)uX0h_S{`?*8FFXCc7khRFa
zc;`whbgjPZf@Rl0ZUJYDFLn{&<wUhygf1KUEt6SN0g^d*SxnhOtFtRbqdu_&|6ZrE
zQds$d*|P`8FJ#poy^#Z3>a7D`zHWhDhf%BSfoj+<nQ6fDF%9wS*tghOX!dytt<KI!
z(%EJFT?)YMQOLiwbmQtC$aSYoJ$+{hNWbgqDaF<bPxfNp+{DV@b&v9lr@OgPCPtO6
z^UKNWmPC7SogKM7rC>InLj^wnY5<#9yk1o;?1jZb_o9DH>X+Z8ySm7Y7K7bO3^&?)
zmchQWU7r3%s%Wf})!Og3X5X);)!9)7Y)+I6x4<BSUA)`(_rV#vkR^cupPbCgVS?JC
zXZNB$Lcfjk7*ieF!Og;J+d>slboEX_4yg{Z-h~)%i>EW9{tdUAuxzG`;rU~aO0LA;
z7wCh>Pql6fFKB|%Yvyx5d|3@|g;kjFMVA7Je*YMEwO>fy%8BYS6_hj{CHjq4XUALf
z&`_eF7)E`#=g7O0suRKd-W{oo5vqVA((B@H50?U;bo&#>d0L?0F&B>U#6W}vaQN`K
zpCWPaHhL=FXmxgUb=>1T1%A{x5I?d);8`q$`xLa7#l#jtzF>!}0NqAt{iGwbHn<KJ
zt~@@E`GqJ-f5)=R;ei5)L$rrhXIIhMwUy&+Em)uGe8R~p4fh}7?{(oEm+&NK;yU~^
zQ4ah9+!uIpwt~w$!H%K|S@fV|dhmIN+4TpsI=jEcq1D;p@pb+2JvVKZaY$#q^i!a*
z7g*XAIWM=T0n`WOt#lPEf_V`;J~+$Q!<=D-{h9MOqe{LHHhnlmp8pWr(OGnM*yTQd
zy>u-GOiDrTaa3P1eC2(1PUYrKcq63%)bOW(bDgo?`|sqy#364RxuF3Bd3>rxU|5Az
zK6ss+iUV4m-Hbih^S+0t1P=~@bAn+={+mu{xjIvoZG98`es`ttjmdqpBddS?sxPg9
z9XqW#TeUW!?V6?gd{54<d%|^gcnl&P>?vDr{R9avepTPtsd`If^VRg7tijcwT&C8x
z<5>=<?`JTqtZV@*E>q-C4q0^k*FytEYqH;n^^{g;ry6sx^O{>Z5PadV-L2&k9^c5s
z+zoO3>1~ilrABXqL^j;x6ZstMECW|m983Hc)*{{FMea`<$Z<{NETgsr!~_M|6Ju1l
zq@xdhR}GCl`MDNEh33%hv1kG|l67n7q9KS3xx7i&sR4>AJN`W9%YX{$q%I3hBDV*`
zI1nUePfb&h+!vTecEC7XVzTnJVKozG=)T5j&$@Pih@1F3Hk89Iw~}MboRjO$D>ky{
zakL_119Vyjx#pxeAaaDLc@q;9?9|u=y22+tAXy#Nh)67%)B|1O91LlM%RlOT34h%H
zik0F{V7}>K!F7=@uVYrCx0ZtoyH1n)ZDPC$6SJqLDOls4YG_g!1B#=aeGh!^0hL}B
zt`A+BpqcNB<5znFK~J=nRzXAq;E|Ow_4>R4^}&h@lrNC=J4B8MHSg)f;piYUe)xNz
zB$>bVT%p(isC9367@nR2#?N?NKQXEQ6|TEKoD@+67{c$n^K))TbMCX;+kJvOUm&(`
zqBNW)pRow7^tsr_pP$2HIe)Li8r)uVRC;d#yl8$sH+D@Lta(=Gl<(OA$8QO%b65(Y
zmdEpUF#jZv5AeD&RZmyYaLx>e3EeC$g(n4-)#Y{H;_WC_EL4<ukU0tpSnrb4QHq6M
zg~y(rO6r2=y7yS`SgC?qU2Rm--%Z}HCvsN)M;tL4&h#k-IVCB0EZ&m|$zS}QJ*#~J
z+UeF>HLhs_TaTbeQ#fjX(#AENpL)umf}w)2ruAm@anXs-<}BoXff(1~{}D&x-#J**
z{>SFo6eeW;w+;vGy(56>atg!x(pGp$+S$f!pc)+DPCR632w_ggf`IZ{>ru|i{{EI?
zavTuj8rQ$!^TrsK*XJHz$id4W(eW1D#QS;}Ea{s_JyR48@2&A4dg9jwSSRLOF6#LL
zuc~cylbldNvqzn|);uHEQ{uQ+lExlK`snS7-xx4vfg-o%6O-$$|GX&3H}L`%L-ksy
zp?K6TM<5;+NPjKXWp4%fl4~uJ&*`8IiY>!wCFFWaY)5hZ8;+|n7<qf?3O&X;K2&_(
zdyvX;+7lm~cq<*AYAHU_zqAc*^$^_7ak~oiu1<UrEx!u2jfW~Qn7r;n<k0HhJk68j
zLKZP%(hTKCBStHzoaCe!mDj4Z@aoDgm6fR}u>VwXl<kWaP<qAxzU8E@=I4ejNF)zA
z-iRDr|AyOR75Ke(+u|C4`|DZFo!&!5%-EQ2oXp1`MX+ISL}T-ULa>DMdwlraHrN}G
z{!M~!IohOidA=yu?CXhAIAG?urgiQG-O>)Q;aO;3&zC}+hv_c7$Lyb34=!xI&l(aE
z2@-W~+ZAnWhLyc9GE>!`BH!qSZIGwr{)gBe;5s`TXZ9qzp~Afz_ZN2P5<Qj~H43cf
zh;6A-o_vN%IMdXEwG$={4d*W}F92SlV;b{>gi(svNBIpkv(Fc1(b*wuL%;e;E@}ix
zbTQ{-&oX0G4*Z9+&QIzmYCi5sFnSA|JhCno@+N}?_a`iE7QR5R{8K+hERW6F&*3^d
zyiU!O3+ALAecU)C6_zZrPhc!##>$pEWEe45LKdkxv6*w8!GjwZ?usk5!-p|>bPL|A
zpyw2rvlEY!$02y0Q|&dbv%|0XZbFnelw05<zE7H_Tf3;`GqMQCE(<AubfJ5Z&L0}^
zh-*qemp~^xx<t*9hr?j<IiqLx&~WzsdRm>`-{R2f><*j6Ro3Rc2QdyBN?z8#*UQVT
zbsRQ(mIB>x{!w>Lvw@D#8uht7ZNTc?mgb;yQfO<ZsL2T(@_de1e{h{0?zg<#+UtcJ
zsOwdjO{npfNcTZ-uWzA#%DfyPaU|i8Yhnkqw-Y(QFuC8c|J>XUT@0Jiiwc*MHk;1A
zzJu%RaL!B|ARg|l(mjnSz~T9i?VFvxgN}%pJG_b=K$JehXu>re+OOuu=EW64$$~vu
zTJ``f+r*+idV{>*NbG-bogH3(nlFFQF_;hG(gwGpx`n^}*0bvLro?SU@cxaxbASBG
zgHAiD!g)B`L0DtLBJ-o&$euUnrG5Wj#-q5-4(HsmivQZ^+5wMpA6%j)@>_>;{V8@%
z^i>{|+*;}?5Ks$Ko{ldM;%SDj25mcyE`LW-pGv7r=#a;W#P)zz|JJD%*8BZrBaqe^
z;#z!p@;TstUKB(=N>SFc{|!hzAzRgBo(6_HZY9O<=>q234;QQL=tGbjgVt}_j7asA
z7zeoi4Yvo+mvx|n!hf<GwiK7NhQ$oRb;h#uEBz+*mZf?u5k*DtERVjrJ%1$(juYD4
zx(!9s!W>46x0A<j#PXT>0#pp^-g^Qc&UV7PG6@=w`X<-G{&`U_y8SD*Y*MHO?J6SI
z-@E+)_v0EK86Iziw%a|*WKea~vAJRBjRLtnAo^`4BPyrc@Y8Y8iZN)9na6uvVZ?CG
znpJg=9`$9zYr0ZfHS{WA(NV{vgJNy4r1e?K_RGp>*#e_Dz)kMwh#Z7Um`*s{^7KFG
zO<i}xvbL7Jmv}!0M8qTj+sQbPx7S_f)j$rcp=Vg*eX|qXdFfxYP_q#j*R;LQlln|5
zAL6(do#Ei?@{;KxmVsX;=fD5FC`i7~2gS_WKj9X7Y@YS<7r^-9uXB|p9U$b>)4dAS
zg>Yk>{iX-y8&Kt%0@sQaWP6C?5Y-tD`9Q(A&X`0!K1qkL*%qY6Kj?*<?eg7Fl_r?4
zr`<i5tpVs&_bufxN{3s%b`GCS)J9i7o$wYiB#(FSx<A!ktC0b8Bd4#`2X=j@mVY^&
zZuig6lfT2`bbjxdgBhUxivNPLPwg=DYiL4BelZZPAJCWQkV9Kp>%N7Jlg9@{zip=B
zXy-iLrQ+HL51+5|*R}k;fBMCFUh5!V0UTBswYNX_8Z1*jdUUl|Cw!dj<A?}sKs7wX
z#G^iu*U5=-pgzN4m^t>dUN2Ms7E3K3*5C^-&p6b9goZ5>Pj9qA)=%FSiA5Ix@#qGd
zw#jv8Ea~yhZR=K`8D0hf)edC85z9w|#-8}9OZStFhhWGEms9}X@AazE&zeuaUaN%n
zJ{;MSBUJ$vgWMwCu{6UZH}-0=dM)&;t>zvfda~b$_Gry;@G_e|rC_3QCCOngs-UPl
zD^h7P7fY5j;^U)hfPp@rcnuzuz>$a67gn9EhcBHB(Mty;P&&TTJ5E&3KEBqbvFB5i
zrVm%>T<rU>zK{8d3~D@-<~TQB<4=T~H@+P0KhOax{K~w-)QVx<qM_)MRzHyfcjnRl
zG(f69M0;k@i(%SBog)Wi`l0=I?mb3UbV!NCf+jktW_Wb@79QrJ4EUVOBSX8i4t%o6
z^*Z6T91YyzeWOF2Jg&lhG!@rdXzaoLRvJ@+wwm<=dbcQdCAn&-nQ)lm(bEFQ8Y3+w
zSEqw{RVM@(o==Wj8(w@e_|}A^O_(2PG9v5Wh#XumhR;h9k6jr}JHm)Ky<72&Uag7h
zx21aPh5eHnK~Ud!!4+2T0LGH=R?egm>M6cy4F0eUeYfeyBS&L$zfJTTt{21G@ELoM
zE2ed|yEb$Jts{%e_}G~+@12sp?w?u#U8Ho0TAMr+2of7#=TifB&6BrvezF}c);<_u
zc8kox^PKYAEP65Ir5KPa{qPHvd8Jg2R3<?r^VZHai@HF>4v}^AZ?k{`R@!>|$UV5=
zOr^ot8g2Cb&4@tLwAneddNJl8o)wF&sQ(`uWPNVP%D4p?;OT*&-lP@HAdtTy@>Xg+
z*dAT83=@q7pR88C;>guPUGMDKS;I%(rzO@?TD=&b*s$@Z{f!X!-@`z&D+xBE;74%E
zA+|*o;A4HO)JygTVDHoS=+>mJ>t>wkwar`o5$saTjR$;|q_`$>X!T-83O!=vHV?w8
z_xJCO9U8;q09mQ=IPD5r4<9OR-KdkF2pZ&GAWtqdgT&?x^BUo6$Qg&%k@YSXBo1+W
zK&uyHV)UiVWn{qAcDakXb21>fT>~)oqUPl9hTL<l;-kBA1&o=pAD#nS0H@f?x#Kl`
zh;NY1{UJMYJtcB>PG>}i_jB%90o~jvJ(f~(Gr%;B8Jpo?hZ?vn0#lly$lf(>s%vZE
zyQAk-T#9qx%POs>%1=@Bw&q!{1<z(5$J6S#)&{x<@8KDS$GegkxlaEcAEah)6BA`?
zfXvID>@SBkaBj<u@?`C5Xc<+`&wCa@+i!O*Y%3Nd`HfhAXmwm#!v<F_m*s<wH4<a1
zl7H`K9FSjp?zv3~d}o%p`z%)@Jh%2e^OL=GaN?AY^=fZbbX8wPO#Cjg?v}`*)p2DG
zjomwZs1Y#w_GX5RQuk#rE$xMeQYF5?=-XZ!-`Knb0S`=$_CDx>kH2^g{*v2(Ze^dp
zpY1qV=S}47o+%&lfr32IioAZ@tp%(KJO2X)WJ1BBm)0KNT7lA8Ap_et72tiD;Nrcm
zxqxf<W9V4B7<$iq@~Lqi36kH4?E$S`Y^L0i)`p@;l%ogqsY^ItjU0j8U5ehxiS2;D
zELfZIauDz|wDlNfDF^z-tZS<-(oae)wtIz|=+DZb)r--I1?*W7ZVtR#2SwBKZs7G5
z)7n(JaI~ocT+jb-+0dsDTz5<#wwP?cU8Tf-2%Pgp%Gpm?b&rubM8DDM#XjWN@aAlz
zj(3oGy*)zjy2d~PqrG^Waz0GckE*&Q-wxsejFV$53xQ{G5JyFd7<w?$MVj@}?CTV?
zdNJH@EG<5jKi~WW=Rg0lS?fCleI3<f7pT?)&GZ!^7c82A!xA(8vfZD-*p8t0D_hp1
zX`N^@=o6aNZ?t-`la{?bk=;YU{?%rN;K6dL-+Faa_qU%-0$n>xWR|tuh7)1~yEfhH
zf~P-s3;7Kxp>|B}Y#J*$NF1WyOvr&o_vk*R*`6^07>=cBid-(Ca(=`t%PlP{1)mJO
zhB`Lp0*-@<Z5t=ocZyN@2%i)E$a*X0iPwwC&m9surZgPfZ^y3~z3ra!3$*vvY|6Mf
z0JEMPQE_jr0&I5!#I5JI0X@;zBcFoOz%|vNw}m6ZXtRMTvl=_Oe28&vM#JG+o?vjX
zrVxB$xFIm;+=JVL=x@5Ly1A$TTCUXGEVwfY9@5^Pw`;Tmq_b3Vni`9sg}vY6yK=}n
z6k<DSPQwXO%N-wGLY<c&xhHqsby(I5c~$dd5VIQCptbM$3Aa{|UN{(}F8djL>Q3@W
zeAtJq(*C9Iw17N*BlbTBXgGf>4lHOmb;+Vz4&LkqtlD-K9p*z+zYXq?o3nlE4|v({
zk^=YMB=~E?(%Z?CzbEl#-SMLyvLdM7Nxwz@9<%$+l7?fDEfMs&p&U3T8XlD^hyv4Z
zQxGG!`gxDyCZEqZcWG^PR}SDhJpY;Lp*HZU{Gnb`%qH}#f8(}erR4c3v3&4x8yQDI
zhMo;B9@#MfUAivBg)FIomuoIxxn$P?qW2yuI6(gj4tjo<IayW=8CTvf&5l`%raZdm
zIrlAjzCesOd_F?M!5kS@U5u(?#&p+rZRJ1O15XabWY`q8!<NGb>cVmgpu@pR{%WBd
zSa+|-rYjJjBF#u9w=&sp#PKNJU*nt%b)R0>yT8CbVgGY3BlO7hbqc1vXr0Es6~&-M
z{{f4`#XMMcZg;@du{LO@QeaS#VUM(H2WhW!JUnZAfHQFp%DZ)4`sDXF%9B<WIa@_7
zpDU%Zi+{K!!Hp+-zqTAH0E1r!Mr$X3*I|J`n@QWe&1eJb^6dk+$@5@h`QSdp+lZO(
zk34RUOgR$Gh_u|YK@Sc#0`-DM-Tt>7AWLT3H(~1nu-Dn5R%236US?rFaY`~Ak-Od&
z?O9<=vIoz5YTS#@RdIWc+b{XPM4Sn6^of)xzD(UeL)a^wE-QGK0Jc>c`%5->!8>lN
zkMbCH0GoYR7Va9`hL#N0b<z)z_nC<H;B^+~;P&{uG<wV*z<`za?|f7%LWh_$9KN=v
zzXd2sl_tf0nEbu0Vw>usSX;1cNy3IJ$(D%pEzk4!FP@v#9^7B#_@-d#h7RrXd<Q_9
zSoinmll$6oo(hMHVw&MkhPf)M78XLqg-h-fa@K%o$uBoU@}y9Q>YrO%3TEF&$8E!X
zx$$UBPp}Fz5*`e6jP-xVTc)2G|0&S|aEJXv!kwj)x+mGj=EILCe}{IC)r6|@8nlse
TdaX|&xqZWJm?|GyUE2QxR|Ib8

diff --git a/tests/regression_tests/surface_source_write/case-15/results_true.dat b/tests/regression_tests/surface_source_write/case-15/results_true.dat
index d793a7e42..ad927bdf3 100644
--- a/tests/regression_tests/surface_source_write/case-15/results_true.dat
+++ b/tests/regression_tests/surface_source_write/case-15/results_true.dat
@@ -1,2 +1,2 @@
 k-combined:
-4.752377E-02 6.773395E-03
+4.929000E-02 8.212396E-03
diff --git a/tests/regression_tests/surface_source_write/case-15/surface_source_true.h5 b/tests/regression_tests/surface_source_write/case-15/surface_source_true.h5
index 3e15017a16626a9a66d903daf1721a97dc3c4058..5bdb39b2a703fa7cdb17a153a688cb0ea7664f1c 100644
GIT binary patch
delta 17
YcmaDL@IYXL2s_I?%~KhhCD=U}0X^3S1ONa4

delta 17
YcmaDL@IYXL2s=ysjEuC+66_v~06HE8kN^Mx

diff --git a/tests/regression_tests/surface_source_write/case-16/results_true.dat b/tests/regression_tests/surface_source_write/case-16/results_true.dat
index a97be70ca..cd0619c1f 100644
--- a/tests/regression_tests/surface_source_write/case-16/results_true.dat
+++ b/tests/regression_tests/surface_source_write/case-16/results_true.dat
@@ -1,2 +1,2 @@
 k-combined:
-1.496403E+00 3.891283E-02
+1.403371E+00 1.456192E-02
diff --git a/tests/regression_tests/surface_source_write/case-16/surface_source_true.h5 b/tests/regression_tests/surface_source_write/case-16/surface_source_true.h5
index 49f67e8205608e848f0130ed65b472ff98eee046..79ac8e1a65e38b5b4c38de45c29da9f3579a35aa 100644
GIT binary patch
literal 33344
zcmeIbcUTim8}?0aQpJJ_2qFSX69EhAYy?CB6-5vg6hs81hzg2=6$QaUQHo+i1nEtB
zo23Xy@4fe4rMEBMBr(Zz%g6oad%SNvOqOMLemSo>=bG8w*~RgQ!eJJsjZ753UknTs
zG!*RrEaKl5aWCZY(i;5F_}}Z|7ASF_&v2gsR7(q#6x0;If5(Me&yFjfk9ui^8gBjR
zQ;Lcd*e&tp<3Dk~rr@GqT4KPj_<x`OS4H56BIX~fXyH`j{gi|A89o>{uUXyDH@J97
z&)npnRd`<__znK!CkM{2<i2L6ki?bGNWp;pcg5J$!19iT0ls)n>;fJ3Kc2tzy?*~p
z`_DQroc}3tErXJBX-iSu4){-M3Q6kUtJYzSZ-o84f&IUd*E($Zzhh**l8v$3aPR@F
zir+7ULV6X2^dffuJOBKQO$)fszkU4MzISmOlV+3uE#cqxwZd(NujBvSYiZ5@$r`cA
z?w{9^i*P^u%g4XP$I{sBAD`{{m+gsH{oB5`4K4rK1R>t=UzY!E-^&K3dUp&iUo^aN
z&B_A1&yj!Gk9ZY3);Ki(tl*=#X?5euMdQm9s>B=o%QEpk7J4@<jrC0lZA$H5wkKXi
zye}=*wZGd96&2M#Es6ox&ZsGMadvLT+xwp)R^wd$d*eotTqE`4Cln~LCE&epforeC
zy#Ken(g-l1b8*g(lR2r7^~bXc#_R@wRo4r5YD^bwx>{xY-Kz{R7H=_62yFwm&TdSt
z^W?`=e)?e}xQiVu5r+TyT=EjdKVyV{DwPP&{qaNBWa}7QTE&1+FkCsh_b@er<AA?$
zXxt51kCAb3Lydps{2CB<DpwkZQYp-4cOX52=lOj$yjeKb3~hI`Zb*HW33&Teue|l|
z1<vct;?3SnAzc^W1Y9QLFyg-d@39WKp5gBa`U@iy1U)as4Kk@C>5#v0Af97T*r;Vn
z##v4e;-OdP7duDb1el!43QM9v)((oa*$NFogNo<+8>9-r;$FjhoW%~{Wu-Cf^Q%C<
zTRgwy_#ZfPwr&REyJ%2+yk5U$Rd0MwiFhB?a9z#a4xMu4+#R*DfZCe%zNwgQ`0aj!
zj*)2+g2pLqpZO1*H<8+VL)>WzoO~`0N7K_3$VuVDs<q}laH`;gQ;2aJ_$3#R_%YNK
z+%TGG&!BKd%GnKQB&13Gwp`qFj=FmmkJ6*DiE&027-|HsD^>lv+WFEvczmPo^U0`Y
zsC4$H=yii$Ku6CicXRd%Lj5=-PIC__XE`6>%0*AUv$4(Lr$*dv$ns4T&?A50Ks;wt
zh<nX-GR|`CCtX=vYNojvI_1qIeqBvN&{HYCGu-2&98eh1{J3vT3)u7dSy=#EA6VGG
ze{W|}0Jxk}w<ADl%|Gpvf?}ziu0+p_oSr!UFa?76mL!XpQ6Pu+1$4bH8iMA9=)Fme
zC~)-Ds`Wli(NNE>1n@a{19M~Lbu)4sNI1*s!N+Z}gM~|>f*#r9|7%!g>mtxUFm=Z2
zP$N{K4XmH+>I16N^~XoHqp;b|&}tR`EAT^WpZuePn^w$GWj&i*-c66<c*q6!k-GBr
z1P=HcC$VqqGtMKVoaOu`b<kfg`v4t*(<Ay}XV&yQcu_!ceBbRppuYd|<N7DH;Na9e
zGjg#EzH&C2Eu#Gd^rugwT3=Sq!RbKfPYF_9o1j3(M0Sp>|3!_c?t1Gcdanmwj`d}^
zo!SZya^BQX63qZIfg!hU@%jTAcOK);d)PtbKd=A)e63`^aL%KS0+k18#|qYA2c7@C
z7?8tnd3;6WIzW@zx>tpdzraZ3=>3hoT|na4LTcuHU(hJqda-ODKM7|!znzs)Sr}ub
zKqa@F{wDaElECR%nCU(7tQrhAA{VY69{{_+Py1N^R4}VB`)l7lZSZQc)bK;h$~moj
z2VWeEoPsh@7q_@c|7kyQ7a})~aO8q`g>`@pTQ47mjT80q27ofn<F>AX7vQEiC*yki
ztt-~^N|ZVK#KB33+9+hqQ!L>2V?ZuvE0yw?=fe=1sfw`o-7wUHFNj~P4GgalnrYtc
z1#B2ini&HGSIi09tM6sRGYh-e+T=aA_Cb98#8k7m8osK5hO^q+nYBYf(&J-IWl95p
zwRihbPZ~d97a(@2mRWqooLkRwA0B--2ivDbPg(T#5IAP^2PAGqb;9$dl@ZpMD$sV&
zG)4Dx8@Np6l%3=k3KE~4<zL0Sa?X#V$L@}o&ch@Smn{1A568+#{MhWqHlQ*i8)BnW
z1Me#_{A@eZ30xk_nA}qd20_mb-XAw!IY*;i@t73*7*0O}8lY(1lcYg|-l(Z;mSe63
zMlJVkHHK=S{a)YGTcvv8Yb9gZ5ep1vD7id&?PmUiOL1OmKfjM3f4_c@56BL4DP+eE
zein|I09%X84V)zC(BIo(kJM009Ovp12RtL=Oop#s`^8j%go7XB{u>8ZF0x6TqKCSU
z7R|O4st!Bd26=}Ew_R*$1>Xk07Y?3nhOTc8hjCE0gT^BV9xDZI#nhO;<S;IhBH_?3
z7549Xnts0AXitmac&H7J2BTI;3EaHIfdM#<8yV+@URLD8Txk-{a&c=&J_-bP58!=<
zc9|(kE2p=^+)Fxgp`I~t)?Z>?>GTk^d2m~?D=`~>m=Bb$e<Y15`x*b)ZIOk<*Tfw1
z!-I-7Lr6vQpYfZ})0a1zUd_Qg9A|Ec18m7SUJA_X*HN&NaESW_a*oFt|82bYDbVh<
z{5=LcS_r<|Z&fq?W1tjPNtVa+HFm=y8SWGPSuHRk#rBYblq81viuC%kWE^52kaG^E
zX^IN^(4t$|KE-l~PZQ#oRalpHOtu1E^Wp#EVbuV`ds6MA&h^6QvMG1(=<{JPGJJdU
z{sRYJ{{<)ZU1;652uJS7l{xfKqQ83YUg+(ug34OX1{<gwpbu-k$&QX5u#O^>D%-Cb
z8MJcyyoHi9Zp7mQay|J!AF#zF&4C@JG_FpoDhY9`;Z>--rrrSB{4a2wIbH~=a_Ib3
zuJ*z7pl@O!egX*JYd|SpOv+g<Zuabyc^Zd%@$o{EectY~IhO%3KR=&j=WK?4Ma`c!
zO>}}Ck55O5wKT%3G8%E?@qWPmKr{FKqom`i<$Tbe?m4j6dX~U(%BiHK3@ZoS^P8P@
zU_U(dC_bg_a3KieQhlxvQ3cYyKaAQx4gkgH6+JQ@uEptJ$~(((x*d#uY<8qTarK0V
z?@+dTU)ussXH$i}+t&mJLMME5%p1U|59*4EDP3SR^!odB`_I6x|4G|5hIK3Ee91m`
znD%%Jq<doL0`({nJnzZHRuMhPHee~X+SJmt8F*W2)OGn``?-3>=izrffjfhjY|NXD
zBpl-L0l5#5%RApHP8C39`#b68On=59$N9}K>=SMWEbbc&`?hz$7l%)7*@eyDTh}w$
z7;KIOwnmRHc5WvfS1rdmv$pbLdQKmx6!N?;fBui2@BF*+46gUU&Bk{UOzrAHu(R)?
zfMzXtDZ?T?HS-=MJ=&x)Y0tA_J@`1?>XT{S^@S2qw5_%6XQD+^n?5C?QbS-By^<WI
zOd{xM{&YcE=_h!m#Kv=iE&=>77KkiqCmp{L=WFt~jo!JnzejK$%nfgsQo|l!;kkB}
zRTUljUGRsz`1A>la+uAgbvQ-64Qy%OwZ=s+8SLMB$EHj1@8c?R4z65u>bu5?pQFAo
zdh_8jO`S5x?V->h^kM+EQ5FTzyH&%CtU1m8nd`7}aq|Y>ONn4hhLBdmdI6HSEte0<
zeV_W5I<`Rid4EnFiBX8xv;W2`F_+!#u*u#;?!qn<+DEth{IKo@Dn^FE>q-?c^8B2~
z4#bk?17aWGnM>v2-x*Mkp2@KuE*ix4603;G_##}dFWzh+k_A&cCWo@8dO-ee8Fv5L
z7MM|GCi>`vJZ3(%nm2}wgD?Aczl~qU6V87#)Nb7V=eXqP1GR#ufmA5h5(hvWr+|!u
zR-dv@CF2n119HxbTkBSpJ*GwVFQpydx1Znxat<WtgxKxgUqZ$q&ZFd<n};7fw_o$8
z-`W3=N!%8x1rOIY*Jn;u0sE%s*F=YVVO>&4_~)i-P;Hp2{Bj0^3A}MnLMo25eu(>R
zat^-U=jIXvja`P}U7N34jrC}d$`dR@)&>2beD_JUt@8PRdG$Wi3ry7@Ax^_`+rl19
zbB2|_HyMYx{g88{?9RqneOmzL?yK*~eC#Ip4ab3h<9s-IgzY;SXF0#I_Q<IS(asRc
zFTZw8?rRJ+5@Z{$lX<ZL?#^|*9<9?4S{g$37QYJvS6uFm%Zcz~D#8;!XvUMqZ8;y@
zO>|1sTAYQC?LNp!og?@TEh^C8DpJx3FjOi-SK`Xxl_;;iCqmfq*65%?#=;bGrN`qW
zV<IVMIUj6oIdH9FaSE>obvfsoLl;W-Hx9saREO6k@Q`s<-~&`MTtt>`t_XVdnfSy%
zr9_=a@-%o0dSNBEiS1R+6qxw^`xc>%EkF_&jhF7RLUQMB7CB^*>cQ9jzqQlK!3!Fy
zLESJoB6)Lg_9Q`<u+&3-Grb~U;TiOyzpWA8z3Fx-r>htK+8Mjc|BD5p_~?0QO*1KH
zxwvgSW*g)4x(@i8W=@9`Q=>SaqkH#!uN_|33wDXb+>h?5gY8vUr&M*TAwq>x4sORF
zg=;Dp4^6L}b5B^7V-IH=&_6Pw0)1!*oPeQg$!`-XKv;0hv(O_|FipGVYHL~_JbBi^
z+d-@X>=yW1ox{KemcG~0IAl3J0o6n15<LC5?HSOo;HzPm^8zf1YWMQHl?P<>oL2?y
zu7qLA&&IQ42SDZU5stz$<)D<Cbp}&K%300_J$mA40;A&uj=-8r$E|XDpiH!E7o&X*
z@D&qpQk$-Yw`LrK2H1K*dV#p)tlk?iS4<uJa)O;i&vG1GeIUuv7TzILi%?P~FrH80
z8xYWR+Y=w&17s!VA7z|w0Zt162P(&lK<zZk2@ai?;9j7Z;`?=^<HY6ij!2lU@#Xm$
z@cm6YbE?`DUKf&8R5Nz;LOT$8d&OkkL@RcDpnq`2s|g5G_NA?_7RRve_BndQoRLHi
zao)i*mvrFY84z!4?e?tIv`9t3**IQ$TI86^o~#`L1E6Dbyi5pZE%<UGx|_8p60CkD
zHgR2T3x@OEWTy=o2VeH@_Jd!>6O<=u7L<GcoPRBNJ-OS$oCcwKYMOXW!T}lw>%7p5
z?*{u-F(m>g+o9hP#^VZ=ok)tRtlk$g4sm`X=iuu{==$t9T^|KfG%nx8EHMY>`T0(P
zSN#Co*@Zr0_6LHEr|y43>w$^N&*zFQet<I0&DLF+)Cc&o|4k2`6K~4(J=Tc^y%44Q
zm1F%VJQ~Hh*r;3w@;wz!T?y!dzU<eiSVEg&U+A&7PB)}6TnZ5!*U9t{bMW57$L-<U
zOVsBm=@1+brLpL}#4|a8=fJ;l_)p9F+#}=Q%l@qgzl`VL%a8i;gu|1977fu=yYE{$
z49w~;`i0MTL;G8o40Mmwz|l<xmdq24K--l1NK+0oW-@eIyYw2V--z=lIfswVWu!Qq
z7FC<)GNV1v3~^lK{0BXn!)XaXRac_?{lg*f{)!(@qIo*VZ@cj$<#IR@VqbDn?j|XR
z*w^Ho?{3OFbDHSU{*B^W1qyQs?MGp6!0ZE=R(O&xms?M}6Kozr3)EBVfQ@&P$@5wt
zM5UT`f2ZZjIrzAZJm-lJQ7Qnmo%9)&UG&IbI1tadzbfnPFEY+@ar;s#HRyD59ImOY
z_Pi<bmY_#bsn6knTq_LPTlf5<Py$?Mt=hGfyBDls7IB;UfC7<(vgS@_roZL`^0?vk
zc+Am;uQo`7FXyNF;xEksn)=IuDz$xZ=h~A~Ch@iKjRB_O_V;4QsN#3LO4J9)R2~X_
zszrL<WjQ@hW7uDu%I_lR(9PJX{#kDZ>=q6K70R)Is^R&KLW>?yx~+5On@k&^*Waa^
zMSlQ8pE13;n5m8AJQ8s}z%MW9prClt+fY5mF$gj$9&(vqAe`?*$T*OkQ+%uK$&FQ{
z9AdwbbK31wr(4kxf}R9DpTn=mrok1{^u7D(BcT=}$H&07Awa`T!CLYt5b%wrKjm_g
z#<VTmPf=qb<>1Ty-A?h#cs;oKK~6_UDsaA<0^K(3CY25q;Aqw^zcR}%@b!lM1Ma~F
zIF%e^Ir6><-V+P#g;s1B4^gqtm)S@;#Chj$oO@Te`wnIg1OK;XDKYO#fpy6p{l|;_
zV2GZL_x{6LxOV&D8yX`qpu)=XkjC3eL}J~KrgQB7nS<taJQb0;L5DCL*1jY7qXljh
z@Z7C&uMeIVSCz8f-wav;M|p?NM}i-@Z+LI}S|cGQ4_qh@lX8gtMy}_K@&V?|^>ipc
zes3PzasT9RfzhRd79QPYpule5bBjxZ;L6>BLD`b8z}VJGAyUy4X({KKOI9W2;LHBE
z`q}<1;o6Rulmt#-{!wdh;Zp4RmNT}qDXridcWz%nZx5gzMW0Y0pTRRw_H6zV3!?Ff
zQnjac<(y5H%*pn(GzeZ#;FGLmcFr--+BzL^*Si*6Q#Z+P?Cb-9CpS60cv%d(?ZYDP
z`NxC688$9e8cLFUu$&%z`S}SP>Y-OCk#yIVwF>hSpbf{dSmMASGS1wsFgbovDiY30
z{3aM2^hW(W6_V-a_%!a+I51;2Z~tc41}e_`T50fifmpYnXQX8+px?EHgQ+P#Am#4#
zIa&wm|IE?8LL+@%feyJPz+z=&o&l8dH}RZf?Ewm=>e_;;b>LKqH1oi8Jv=+{^V;Y+
z8$gYz4?gga`9E_$<sYNj@s<vm3vEz#(o6%qN1n^1-|Gf`hB?Mr+gpLLv73*#VHq6T
z6)V%t`vC~2@*2lyuADRPWml~?_GesmP~4Msk~<TYeJwJugK@BUGV{loeRUxH{j9==
z!hSfr^CrLP;61QgtlYzRKk4{-B|h+cq+^y~JP!<g&cEOuPXX&&SW;{R8o~L`&NpLS
zilEQdPTTJr`#=r4d(b>M8z`i-F#3e9UUA&Cif;(}A8P;)g{^i>t*OK9$ABDkivARw
z*$YLtJ8)^RmBM<{+MsB*MsQ)O=4uaj3g}(9S$(OHbbP&BzQ+67oW1&Z&7Dy|lj{`j
z=|zQb44j)$*X{!L8D3GUoDI;~?HIGGW;1Zf*3wZE<-j-=HEgwICT*w0zQ!L5EtO9}
zv6r)uVOo&_5kh?_o8k!P{qY?5H;(%a1}00get}pIIR~c)-R<_yxR7ZGIL*>NG7Fu6
zbKV~O%{tZaS9;C^m-8*4{#(pg!9*7na`eTx2TdX34-R-ba+2yH&ZFd<%{Jw_Jbsj@
za`aKf$cAZr{h$?h%|a7oDgb@>-s@ZTw8N^J)1mbyop24u)4KBM7Nkb|%O>4*q#S(N
zzw;=586UUHnX=|)^i*g}$a*vGydeTdZifK+_C^Qvu9V^Gcu@$CT~wS1w(W%BI=VOP
z%iIu&7LEP=8&=NAngwP`Z)YIlgZV0x?2YFjmm{gtyl2`Vg~e^T0;y`qWZ2mIv8e-0
zU3*hGap5?IN@rC~2u&EtIE1)<@XL5T`1;XR=8GO=>490Y%oHiEQ{XQgi05#2+ZyYv
zBIOX*4>^bLkvCt<#W{iw^+Njaj?7_z3dy!{Uj7amwmZs&tic{<hbVTa$k&3();0TG
zZqs0Djw@ele@x0D&IjZioF3$%pLukz{20*x@rY&B)F_B(=ak=easXfq6u!NPj{`&E
z9X8_Q)gaEsbhlgEStPVkHFHiRk|b`#?dNZt&P4%Q@gI~(;0fC(twK8F^4N|hUk(U*
zRBPUUF6e|`0~&nab9aKXwxV0R2VQ{H4iff$)BP*vNan#gwOo3nPWMC6q$A<{D4qlV
z#_6R~K0%u_M8d&q`0Z=_GMNvMwT9_54*hdLn$Go+nm8R2V9hi$96Shs=Ii0dh9%&B
z`(_<R?6``e{7t^zA$M?DzWXQ093|nbByMK?Jr=G<r$9)1Oz(@banLA!Mnv~(70?vl
z*3l6=0JeK`cb?Gt0%o{<?*H893QU3(GI#dO{%6kl!IuLu<8wgN@wHVfW&jMu+z&q}
z(GQLv>lu#q`3deu*qko8RR?K<#4QtjzF@DfT>aIx_V43^zr`(~VXefgrwc&&0K>la
z1A*{yf#z*x<{x0!5qi}j=N|a#0mf7JNh{P4Zm2mMj)J=ZUk`Vkp~1C>rSnxQiQBvV
z``a6zkAa<%%&||f*S8A66A@F9M$pl-W_OxQ7hHc`V6d6B85*6u)8Zr;26Q!0j_sFd
zSIkM3*WdIoe+C?0^?>cjuRqr{m1wpPht~B%=b^P)=e{-rhG%@bL5i7>m#e2u@9;;U
z&WC81*8lxHA9>u|H_JscQOyB0)p4f4*eZNpKr>k~&jfasz{eg;VV`z%0nwfpUz0`K
zVX3*;s=I-H;M5lL#8s4}=R@#0`rmvV7W=B`)Y(ZO_|xIOyg@gCLnZm^vT0N~yq<x)
z)#3gL2DT4E{Z9kXl|}TH%#SpXru^KOOMm4Yrv$$FV?v|guHCAKvGx-L&g`+tOJ@R6
z;Hp5kZR%S)Xim9#Q+RDR?7jC`-K6O=_+-3MY&S|e4p~l*{2ku6S|2BXj{&;yi-~aD
zh`yvW+WOif1Mp4Dj$Xbs0LKt(S(=$jsMw?--H`VV@E5Wf9zH-i4q1+a?-w#znvD+a
zm<Mk^%{yjUP$S~{K2lEGhF})|)Y^%`d@zAdH(fXQ0vxhk&q2V1`KUgUxvRs2q@5D?
z3rjZ&k!GFW^G?M4AC#8UF96$z%ttAVX%Nk=?{8~;sDs}IU9&EF=D^$C!e0WV`@w8>
zo?OIW8xm-4Li2{zbHyBnsYcY3oeo|2`FT%T+dRI0kOP)yGMTalz)OaZ2aAy?IA}EP
zuH07v_C?EmeA1nTgfp*+EZjxP!F&0)-^lf>|NP_jC0i6<K6>Jrv%>VYQ4qU#@bwvk
z7N~%15II}Y3FXh;;%C&X2dCy{PKf!h!3e5r?V0|ROQHvV4&*my6<Nr%Jf&yte~rRl
z@8x&hP(&fFzL32?W3psl*Fc39E}F>;t)OU;al)dp6Vw<UO)0CT!C0}0yL=BN<q+#3
z=iq&CBU&*oUJ6_PbEyuOF%v*S%unRemGAIbG^Nw|hYf%)H@#g-r60UWPnfym>5Ck?
zw<B1xo0LQBgTHYq?61Fwo~1!X);oGzan6H4uHBW4*z<gIUF9#@@0Wq^m^dx(n=Qbz
zEj;=oqa$KmSF<i|YULaoo`WLJ`or+X9>botlYfp+invW5QSHMXALL(PuZXIGa{c>6
ze$-WgPLEpxQ6<+A4r#4ZhM)3C>SrZ!`z)SP;XFGGtRL!ErQM`NEO@6{kJfd;Lg^IC
z2~8jP^_USRSG5C#>axbD%PV4bdLb08Tbf8X#BpOL^8v4~V0W_`C7N&}czvYeQa^%i
zPsqjBr@H5`^ZCrp-mfd6jfc-6=00E@0wod&YZPh(Fuq40$lMVi<q+#3=M2h@4%r-<
zfD6=KGU)w3oQNRW9+usmAp3;Nk3OMjaI5d~V0U{bNH5u8HGO3>#*QviYTdS#bMQXy
zuBJ{eI~oWzFZiRM=vrZY!VZ=L9lapxL2S(ltp+F({VGxHZYi97%QHUi!;QHCF3Jas
zl5&XqQ*u3cj?!5VPjR*%u(>Ys{2jeEXqr&l`LebLcpmjKJiX8YYcBNrD7a)n<$|t>
zc+G0$llNnlwPGvhWOjwbB&6pO+NUb*tz$OQROqaiAO~Y>Dh!q8c+P)z2xQv?)m(Xz
z2{qN$57KXWh71gZ<i@&_a)`&hf78Rs+GbIdF%M;op5LytnFMz6h8`V-10bqNRahqU
zCw%@maFN-h4Aeb7yXn*}dQ9|<=IU2-e;*&PkogT4H`Mze-NuPAYIGq+b0cHv0PHH;
zyq4CX61sdhpjeQ>9`~G7GgsznhpGK1f+W3?5aat2=^H5NaCvdbKg7N!=X9~;It`iA
zqIlj}1G9&*Ipgs4-gmKq8jaxFg}@rm%nrEqe9SaxZ-EbVETUpqlMuyc8(hc9IK+9B
zoMXZ%vB7LRHF|1my6ILE!u=npnDndEpU=tw54(h@O;QUu@FSl_Ij0*k4RRfdd?JCU
zayh((J4p2q_ow8XOR2(9pPu(aH&*P~YUymeAJAVEXdjhK4>0KA4;s7T0d9HtR-gUe
z23>b+@UA-23`)g?4$TVDlf-Q~j-p_f@*1j6-1gY}W^Cwo`FH07dFlJI+g}Dlv^gCU
ze6$O42`H}F-qHasNyzaugu8=0B_`&;gQVk-<>I#H=>sG|pO6Po-HMaPKR+D>J>N`D
z?D6&koS9DG^qmga=FZg-AKnENSXQyRolO85@e&o?UpYziEXO%-dVAYD%p5SFuL(MT
zC<3nwsqW93kUsbYGB77gm72Rkr=O1d-cJvK*u&a$t(0n*<P*cYE|B?}IKQ#}yRQ-6
z7qrUbX64{>nOZ7_q8&!tD1YKkuLXle&wTBkG=SEtx|_DF>Vd~IZFbBj<{{fD7YwK7
z|K5JcIiJtJ_^{1$9^!nB&}_)y^5W}-9nXinuDW!?#YCa`Es9y-^MD)Qs+2ac<0|7p
z#RqzbrSE2oFg8-Z5$6MP&UDp2fv-Vhu=B;#r*{K%2%h)habD`~)yZ&D>Ct}8uVru|
z;_}vHWDq>+JFQHk{1tF{CG8!aBR&7NT-=Nn*YFKzPeAMABWIao2=mg=$Z`vP*8QH~
ze01fRS7~W55%Y64C=7dl#vu;<xkEFEl2L+ysz2%ZQDR@Sk<|~!=4&!1ZuJx57Stwo
zsLy%<t}>Z=AX?E12JGbT=}7hfCuO&rMenl#)9#9o)*HhRp9<5YzHg));<%A>UOhkM
zYg3*?;M|R<DHV(P1?}`H4`hZlfdgK5!@9P10I5wD)(otzAj*8PG(OJ`p&QCo$PQXL
z2VWnpHJCexn8%>NVCLCJXA8lus`8-BygtBry!q?Ps5)?C)LLJ-r4UwyYKI<CQ9~{j
zri&b^BjphHbL4vPoB$we*0L!J4&SZm)x^$&x|gQC?pkOoI3>aC-0ac~jNdy984VW0
z^LsjdD)YYs^*C+gsUFh2vm9qDCN6S}b(GLPZ|`0Rf4O=HJ~k<R^4YKf4jDS-8-{g)
z<9nG`Q}DL{xgeJFTz7+j#TlKs`v?bazomS#T>aqn#Mc&B^9oKvH}x%II~gm1U;+oH
zCtn}<Ft`7-#PJNcDfOfGfMPRL=`@#kT+M^w8~(61({hGnTt%#hoy>3Tm}ieRtNz0K
z0NvP_xZ65o93C2A9hmdOj;l5s&fP9)foo_(Vw=2rpmX~N9r@!W$lER27SC>za)|RA
zIVZ{_J-n~75OS@3bDV#W62<95#dkb0GP>FT-pq8HeZBM(yhlCz6TbJsipX~<_9|D9
zc-x>~VUI~U#O;Tiqnn{9dpgRFP(J}$ES53Y>wi2qX=e>eD}j((ggRaP0FcngyO&Cv
z2;^F*qROQO5&i2|1t_`aNa99ZKja)`xsOSQpLF8mhFG?09>01f8pdWnWP8269b#va
z`b#8t1753)u{bmeGCeD_Pl=;LBE>gy9;TUJF$eF1M<<{5=D+QR$c58ebTM;~>Z2tU
zwNyKhaEx@IdQ%II-}BqHb+R4q-5=>SE9MI}R6OX73jTY(Cf8#~*>mkoF7|k|K$mKe
z{?9y~@kb0)a~cgGBZg&S5K{>bU6~HqA=(RX417V2w#I-v+AYoNpO9X6Uao%ddJ>bu
zUbdZ`2J-SUyJjY6(D0%4n-;?dfyJfUZC2hTAmqZw`lh>)u<K~Se38y)z^80QEg;H{
ztJkIWvz)Ib)R??W_Rt{et`s){PW?GgaW5nazBk9l>0M5ez@Zv=HR!h5x2+ve({h8K
zaHT((lDJcPrht^QoSwp>><Yoy5oi+fhLQG5J;8V7$VJwt@6*BD$%(hr8!7;|g6YTN
zngMXD+najk#a_&&0|nT7U_X=ifVltRSPB&3UE5T#DWhPLP`&`$Th%z_Mfjxi=1}m@
zGI)pPau5Y}9=W>KXQq6nHW;_+RYm>!)tHYPo~?dxl9WU2YjV!mx{DFbnxo*3hCzlG
zEfuo#1sKp12iILTWc&sWV$9?Hj+X)V+LTAWcLw3L!ZU^m+nNwZ9+p+XCZrtVxRG;k
z<s#Kb*V4r23<IOhSsO$(qp{<T{nz5JR)MnQ{-{R%0$6fL;*e5(KPahw75Ked3-Lj0
z?#rh8lEjVJ2Y=)EO|7Gz<sJn_`i9Tr7bp;WKL5s;h9MBW{ljMN*+}@tvxd8VBoxZi
zjkbgsDPc~_@wi)WC)GpDS-m8H?41EUv^S5DH@p+19C;|ja&8VdEOB5Aj^j?oVS?wv
zS^+7C_;`VwBf85r>8lPMTKeKnyb?1lf{P<MG9Z6N?_3t#WYWTTPPi51Onu^EMth(&
zwU1sI7)ACBs$BXRNy;IvA9Bw0yC>}X4io05A{w_tgq5)KAxCi>ZXD<55(nTp0cu0C
z&L}B|*l*+<{P#b+&+72TbM%PohK|>gwp8fLK=HkX4GnPe{>y+%RaKB$(OgG2xCdl@
zACabG9Y)Nv^}U>akaCub+wRJ>3P<k}=2;>?$IoGIs!*V+J5?hBDf)rnfg@4O`qd!c
zr(3?3s|-lyoe(xVU5vO09uT%@Amyw?Pxtn_UUxoIA{PhRGPf90Bkop>v`O71aQHxg
zTt{;|*mx>Y-O#ZU6f(B?Yr5tFhKM_RK5HhE_<A`#__%HO&H>*EQX)gmCq1`ZqemKZ
z3x$H*E1?J!<s9!EfNb@?+mGE30N>Zt`LXXw1(MXZf#)@gSIjwd>a$B#13lVWd9eqz
zTO{Nk>hyGlo1NM4l|YoqOU7>4AtE<ZaHt*B`<Z(u9}fZCiX{PgZ%Rox#QE)SJ_vm<
zwyxh|0c2jq91?v&kNkxL@tg>w^NQb-%1AgXiJO_8kC7R6e$dNZqgTwX(;+l@QV}~`
z>*2*%d+X}XJ}B*m-hYw)6D)2NdX*9W1#Ak@E574by<$%5_1B;Gs`Wv9J!w=2Z&V5E
zf+g?2OGjXO;cZ9XxCfY4=ouYzd=7j4r&LBgFRAqa#&DXJ=cVRR5)SdW>i6?<{`bXz
z-Zv5a!n=72$_gE6Jrjn#j)3D>FL8hu8HZIkCNS`zDhY=;ZseRtFC8bxjTZ=dM6(7o
z)=O5vsh>@*4X?AHuh~w&x^qKNKU6#UCUrc}sjRrg!o3F*qRHONUZh6CS&1HH%#pJ`
z*!%VNO-HD)@pXZ=)1fxja^3KwR+gloUON<I7j$KGOotTTEl#dJAA!9;Bx^8w_azd}
za(dP)3p%_SBHZ7Kdd-#W(rKnZikr_Y?2GOOocYEVt2}C;Yt!wV*Pog|@I`lV-kpb#
zDO=m~JPGb3oaOX9cfBK^8kPaqR;skk9sHAj&Wu-Bzqy|RE)3UhwcAk!Zrxq`GVJ&u
zXej&8u`5>+F%W)e>nP|$!Xa)y<n{AHmX-qrg!>~<!-(nZ_@r5I`{P*O+WsOia)h66
zyI3!LZyK)1<<Sf!?~2tYro;dT<()6j=#idRUQW-F_ZW~k3$?u#pQ%yh{E|yWVtw$#
zx`Wl1H3xu4+pVH`vl_@ApL)y2{wq9ml1oMi9>VZ%ixS(qXEQE;{O|Z}4VkGsj-*Ao
zmCWMv4SIRfvCe0tAJ2h*<LK<1*dRg1A=X3Ap+6ZlHM6!A&q1z>J-yt%ni_S<lj*9r
z41;^ZCzXqGu;*hHFNuyDwm_Q?{w{T_2QWQ-zfPvw{rz}uEtwvfFeTNm^-TbbXgeF5
z5Uy{dt~k!#B@X;f#?kQCx6dKt5ck{U9G$Fnv-Ai4#7%$Bu<(K8FZh}_@@=15H+W`0
z_B3~GCG@J8f4at}1#+_KMl+f3#cX@Yn9THqR1b07$T@f)TxiI-q?<*7S{r>dGLoBu
z49}{wR7ZP2(Zh#%5f;rrD#7&;I#L4k=`#Dqg?3=X10CFW$vDL0s=shhE7}eBjf|-f
zho2p02dpTNTW(PGopURkA3L|u!P)}+MhAuZW7@!p$)Z4ZfgPB4Kl;31l5vRh0XZj~
z?bE89AJnM((LT0=we$#H-`Kf%pNWbZa8{UWs~Bwyp!$)@B39Z3)?Cgw$zLym*|$Nz
z<|7%0xSf)71TsF=ZVseI@#Q<&UaS<#qeuS2fq2gQHM>rJBI6K`L&!Nt29I`Kw5x>l
z{ufl^(FTIQPj4tqelSu4ytXm=bl)$7ahY`-=$k&EE8Q_``_&$KU^?GD_>9yC%js!Q
z`jLK+IRT_?%R9g865%=%%Iox<k2^IMs(77P``o7+G_LP6PubTF6JMR%7{^43v2Ca7
zXj;bC>y`pUcrW+1%4(bcM9^_$_U%J`8JfRw0G>l9>sK;G#vzUyIR{rSsJgU$j!8ci
zBB)t-k%^BIy+~Co|EsYJ^3J>KnfsJMO*XmhfxWFD%~;fWKvNOnFdr(Ue@PlQV!!>3
zBkI7y$eX?hTn)6}_<B(zDm=BGM$*mD(z~Z>HnSJJWPWjxH!BzDeD-(2^t=NBXw1Fi
z4@l1|FUP@Xo9*E?p+T>zuQ}!Nf>1xm-N?|J78%XJP`z)YgufZs>Rz%9o$3I;vSgd9
zo_m1d3~FB^chc+V#6BR`bK?HH&8K*1QC+w8n|?&k^?1B-&4Guit)TXk*`r5me}K~P
zJ)^JVdVqKix4h6A4?v$Oe%$TiI$XUj^$W{!o=iJldvT3$UmKD;f1uE1bQS~&+V63(
zDTNV!y5IZNtAQ-zc+_FuewgVKtBpAu3@XEnw!}g%63%iypia3x)_;od+z>Q^;?vJh
zU-|%B8F$2`=Pf{3J||^Zr3cQeW*o4-T>|26ei<K3+lHy&dULM4ET5#`CeEYl365S`
z;G3bno)C*-=YvYe#52*MOKTYri>(wd-5m<y`L412@`PTf(RbTse_Rs?$jjW?_(2;9
z9u=rMCtOIvA&wh42XWx^wkyvE9+4$IBH4d9*+!a+$`^XUb7V9p@Kpx1C`FY_ty%z+
z$H$~zP8MYJwEAHykCk&Qj%(b?_QGD*-jjtK2&N?HIpDEvZ`|1~Ab*4+-tAL5pp~c#
z<JZIbjheG0pQ9b{w%L>l%2%#fkKStiPz@JqB&NlFhgt!4p5Q+(281&^!}qLCI}AOt
zPn_4i6PPw>?$aJD11|84jXw5BxZSE*D$kkpdgF3&Q?R*~q#j&DD8KZZJaW1w9lqZY
zqLXkWAJqJ6%kUj;1r;2h*U%MqgCF8(5_-%YsD#}ycDlOiuYM!1ADVsCU$0#3fUGAf
zAbm99x)w5N`b6?5Qv-ClR5)lRQUP7hU8kPC+Y5~HQmJ#&crd~?>v={7NRQ`;^^iXs
zQsYt2jO!#NYQfeiFo{XVeLn_-x2Nijx>`K==$g1EMY|G=Z~M4&bNK)$`^215dWH*A
zE5GWs``F4kxcWdXXTxCF>k<&wT`~XQKn`%LI$Fq7)&)aut#g<a?SLk$o&+6y9}7-8
ztbMV~Vhv`BzPbL~G%1HTzme;~a}ZI!qxF^<Fa-HzROvJi-kq0<6!OS}RnBSd+|_L$
zJf(D(rT}(cl;SEH&ky{_pulBbnurP#zpaD=WZbMjJ}v<U=cs8i3#pJI`DfyK5+zVQ
zo4<VX!)7qT$_mdj_JTW{e9;t>YZ1(krzb3|NqxN%4m$kMib(|fe29-N?W+uEkQ_T|
zDY4J>Fpfst`UqnWXbDoObWE-TMPIn0;|j6khcw-5FS`CaC->rKGi{45pmdoga^VsU
zQkBrq>d4myzwIA8qmRvVkM5n)42x@phh;h(W2tBmjMNRiLw;2&j@!}Ja7{7UKkaid
z+4;>=BMKzjt*BoWQvfV)_0?3fcY}k%@3>Fow1K&y$32tZYeAW9=EC^f77`9|z9#oU
ztW-bKevU;r%*ntr-0^38rG{>?)HSF9*CZWoc%CbTi=584X|T^TtG;tnK#~0m=u45m
zD;`Wb4|2KoW0_LSvbJ&>hCP;WD{-JgasESU8y|5<xwQg*E0*BTkJ^C!hnzPhN-bb`
zH1M3Sm@7~m9sI0zigX_2a-4U5VZOW^RH#<Au+Y#s3Ib<s)Af(u9Bn{y4e$G5!BW6)
zxM#41sT+8i^{Q+ujRHQeXCxgDlU_evj<bLMl!a?0CHn5HOMnOKpYwgRGOhBCEZFC*
z(AikLSk(^AwT?LUoTvg<Ulf(swmX5aP^KNSHKg+(m*af?wrOZOpP&Q%^5oIN$D8!X
zUpNrY`B-bW#@U+mIxTU3O6~)EK6rU{XT7Y_EbLA<bd6wI1UbTb5zO_25RuyUa#d#z
zJacnSO>jI5hE!*5$lc`*xB`MgvS>-?1uWN2%TH+JZamTe5&yFauLU{?{X<FO!keQG
zgW#FAJXgl6FF+yC&wKx>GGNg3cK5Wb4|tu#U)DCho}^z`E^e$}Z!TsXtA<TYn+F2;
z|8Q;`|2R>?-UEwUy5b@<qM#$I$uH;hHjs5UGQjkuBajW*U|uRiI^J21)03OUwGMQ`
zsg3ONgQb5sb9C1v&&77Yhcu3|tuiryYM%GO#q(W2xGY8`P5LXa_?U6dvv}nk)1=b$
ztXe|*M8SPAKS}=);Ksri>pkNKW4qZTp0E$W`9u4!815?sW8>u;nk6E^a}|%$Sv_8o
zxUIwo^_@L&h7V~_lNuV8exCtA-K`a+t<eT0E;va9RaJxHW9`Wc3Y}1vGWewlQ#dGZ
zZl85HLHc}`<$Qqm+ete&e~aDo@NqDEK$~_r+!H&>sjWQ(BV^)v`W#YWt_!;r^TkY9
zuxU!{{EI-)!G3dxG}RUoJ<D-KgJ{>gk4^#YjjT5vVhQt=k#qFJ#nn;Rc@)3y4)NaY
z08IPk;~W{fKm@aMrnS#*Op09bDq6Q;k~~W6gAGdp2=C4+CcY!s`?7Gl5DU>yC%12H
zfs2D0=Rzs5`R4ID*fQDz5*#i$T<pcp6KXzt_bSzH%;*5`hg32SalR(!;LEoXOu2e)
zst#;FNgKPDqZ)q8Sg%%irxdLJvUM1WwLpt#CU(^eJ&<n=2X*+`K7`%n)7_xgq<Uy^
z-~RXf(Z6vHg$sLjOJnD$@A0a+d!YlSR$4Y%U+n<<^}kF_ySBlJZhk>Ysye94I=67k
zy#^82(GBN#vvQ6vXT0v0ytiOP^5C9u3c~e9<ajn0<{EP!cw%BJA^6D#B=|<bIj$D4
zU-og%7QVL#h2Y+OGM`8}%hgYqr|4XE8sT{k2vuCpW?N}$q$KNti#S^?IBa#Xwjs9<
zP_9pt99UNht-tO2A=7P*=sg_gq>m!yELT4pOnodwvDbl_T$|S4ai&7>^;PZ1+WgKi
z4}=?5G2U@+gx_<08P>@6fkz-;Bje&3<maT{!owe=oaOX*)PAkK)-(YUBud%%g$VO%
zkSo+Wr_CqYfph7i{C4RIct7%&YjR=-xSxD5IaEOjp|l*Ad0V)04*vUZQM-|7wQ&&W
zGSa?F#EgME97zaxGYF)ux&o4db3hMQ$_t)n`B0L&(Df3x5OUnGF)KXj@ArM+{YJS2
zpx9bAi#~1d0?pC#sp>U<&hx!Jyjb7Rik)94pGSRYARO+#v_|Bk754ck-ySfSitfVf
zwoaZf#>kVjQ{wY{8*$~6elVbXd;FDlRLz4_iLqf}t7(Y&#;s)crW7i1-=FuK?t-P5
z#Iq=K8=#UqxSy7(A8~Y^omI6wNx~t{JAdP-?6@5?6EF$d)DjWb%0+mxo$7?qjt*Ea
zEa6}Bu?|}D+359sYJ>6PuXZSIdW6X8mQyI?8vJKY%jYc0q3TxnFyr9(o$FQ5(!J5<
zHd8xfy%Mm$*&z*TeeioB?A#3-Q}0tMs^x+s0!8-IJ4oj_5bN1Q8Zg{X3@D;;W4qeU
zF_<s+!oClCea<7$o*}cY6<Tue>>b(M14B%>7439#z^;BI(bPi{Gl}}2y>*pzJ`yp9
zo1C-fUX^@63NF7hAo;~%#oZdzh_Pgr&N<3v5aldc+!l=;hj#3^)SB%C_hx?-)*BVV
zi0}m}Z#E(25VzC+;rzp8KpdU&6l7Z$A(g2jn@tiGIR}z+22L|<Oe5nE=TUM_JNwl{
zbuGgABh(9%Ev^2Zz=1eD|HCm#;)X3`9O8bPoTL2Vo9@-*Nw^eF?DNSRTm;my{dV}1
zJeJc=E%0ZRl9gvgH&8u&KiF}+3_f&-dtvlJ5MxV4r5<PcpW}w+#GDq&RPF;)*^YU-
zA`#>qNX}_XD`a3aBjqgTgM9SbU`b^OUJsge#*t=y#w5h)0XRMX!&&p{PJlNVXSulH
z;)R}Ye5%MUJO-|Atv1tEZwIf=V$igbX4pS7<HqmW0<!9ae^TeSgPD2TeS@C_kp~T@
zdvo1at_RQY&h$U~{6HHJ5gpVhR_TB@#4fyh#)_S9d+?N(P-F)z*{NCiJu)3`xFkw{
zSS}sdiJr@fI{f!`O6~(u5$Q=C+ZlZOLDzlUaHV*%3sMDdAI>|}1r}xL*0%e1KwXup
ztI6!C;CTA!&7*}H7&-H(G2zSOBzcE8Zahl@$le(cm&x;{XQpSN{cX9Mn`v6eIe?sF
zyXvXS2{I0G`}rHEKuD|eCtnB9695cf&FN5=V|z~9C-j2xW1?#}%~Sx6vEy65KB$B7
z@922eZ4|}Cy7XqouSy`%L(JhNQ}Qk(>U7f>_Bm`@S{UmEdI|Bvap2!LCKKbWQY@q#
z;{J!6lY8K}xBJ*UkZE7zF*QMlE`1FK#9;02*d5VbfX35^a`ssxFm;`5wo_;X++G(R
z?KX@9x^WwG4&81b(L+2wAm`xAy(6o?>7EEB8gf;8;fpF2B8GW!_cl{MxU<+=?PF38
z9EVF1*#@$~g<UGV!tbMiI{0}fL#LC3vs~O3%T(fPzfvJM9_lN+j>7ce4ES*Sx%LC=
zCU7f4xYE$O4|+$J2e(P3LgT=%0}=8`KuWiz@y2J;aR{;B{-&oqFXpiV2Mwz7W|R1r
z3*%tujL4g{*m;SEIb^ei@-v~<^$U&nPglUK%;%|`;lW@oy46G`du+ve@NqlNFMM9;
zFa>&je|cbpRx^BYNf(A24T2g~CC(<1V#sEtm3;JMHqhF*gGW$c8)mLuk!9Vk>A!OL
zmI@}kSAXG~$mPb~C;QKf0d;Zn8sVJ`g3~=*dwVbT!JO8&oPn;`>&?4VHeao?178IT
zY?S8&F-aYwy9&rS#Bt*z5SA7q%01p^@`n;Qx|D~aM=twAhJE#A65Ji|^&WLQ!3`}?
z*_HK`RZlZ`!#p$gbkkOhOXl0%MgM`bL}NfR%l$pewOXN{L*5nZE!4<`x#HMYZ~EYb
zG={JEsRz)KlB`yiZ3flCIueBm0vP=k-Jl+6(zp@#3*>qfpH5v7xv>a8nE44fK5T(F
zE}jGa#;Ij!Xx$}4${}t)<ebYzv)wvjf9?nUwK}O)vT`2y8P}=ob*KUY>k@jDlLp|I
z)(20&Sbv4%o_CcDxwc^VXM8I!$dYoFtDlR{G!nG1=Uwsf%NO6Q#Xr^p<~a%td(ZoW
zZ=rk&QC)p-wFBE_?p;mb&ebOzx?0sp#FK;NJaQ}N;Nui<{B&mDvq^X)$W@+e;}Bqp
zY+Bz>*$cj3Q?c93)(UuOs7nj6^Fuze>6t`IL?fa}3T8}zltY{k$m53R>~VY&rkXVh
zsJ=^@%zD+pfN*_keYO_xJZ+?V=h0>mNaNpd_j3o#dG=t?yF38lp{ABQs{G$Moxxj`
z4Y$q$u*q-sm<la=L2&eD9b-G#6qFR*wIKr@upcREv+ahloHb167MPGN-)-qM?N-it
zU+y%w?kPRu&GNC~ZPlNC^;G9$F{$@ipjFah=D=nfu%Sqdp5nm}yd$tMFgxD|%5M3w
zTc?q7i2H@V#Z7HG<v{X>Sx~or(R*Vi9U7{m6@1mW6X@w#(D>4JfS7(aoAV7NK*Ocx
z8LLJy(8*&L&7URZELT5QXew@VKBPqu+9IB!Fv9Z|P!C1D`5@&UxVwW5k-Yy5dPUSo
zXS{8LZWC{AB%e(N9&Xo}M9cp^pPXEe8S}NSRT8vFTqjI<RPcx6*I(KE_EjO2D!4T{
z_@Wdr=Df3g954VSDmP6nl*R(iYkTX=7go-}`3*fx$1Fa3=oc(35w>~txflxV_)dNH
zPABZ(cP#BJZG+aA1HOe{uLQrgKMX9Nk-#uU2tL_!nF81Dmad-?=N<l~f(h@db~c2T
zVCU!HdCt-*lRxD;f!XNwxK7nxAZPzGM_;NH##v-WH_H3K$dIf4Lj~J0XC;I;z9i!i
z=L2$%c%Z*vWA8Y0>k&EUTlVLEmXkU2(pkN&@D;W%qx;Yet!lZio#!Y5+7d5EIsHeG
zv%!?BzFZ;IL!95pIrk&?Q0HLB1?s<Ej89kmnUC*3%jMq4(+Xto8Qx19?g6<cMkeO?
zvG<Litmr%}Esj(u81?acubdNfu#%lpy&YaCP8P7QiO0te(OUE9^QE9Za4ZuQ@hz@}
zUp@^>dZw3v)1Q7#dN51^Bd2twbCWCQsPRo7ymqXakVhRX4((`)>jUelG7taAYk`!e
z+ipF_{{4j++4gYdD_!touag}$PZrRxX3fv{ARWgqS3ki|Qw3Mk`V%;!Keq6=D>;Me
z;dK9W&<2jpZ(RFBtrHf{xoh7Xu7=L0XPk6Seg?GhC87Jbkj{@^j&ry;akZjo8G*BA
z@oVZ%>^wep$%-5Ahbv%2)$<ZVpHld|cJ;BmH~lc|y|Rzx>JQ-A3HwWzRY=drFUQHH
z+Rg)csZmSl?L&pVK8E*qO=r6g^ZIb$<WNw5aJT}<?>1$5y*L0<bDgRjUx{JV4tew-
zWWFZOZ(9g0XK7(gc~o+##3b~;*CsN%nhwEphRZ_iO2<)%-eQz&0fT^lVvlPTXBkvU
zXXiZhco;cV+d47+A2>RdY21v7e~yEzA~@bYyG)Oc;5cbG&Xy$(z;m_=ZC7D6AoUyZ
z`2%u28rr-Q@^Ldzwyfg1?mc>f9@*|t4)0g}uqa>ig_M6T^i%FTHTkgy&I+dPOWpq!
znbiuOwIt&#7dL#IR8L3K_B^0NuIO8e%8E|IgQj=jMd>=|C35?GH)kcFW{r)%ncWLy
za<)BMFg8QDW$p*3nUd-u&Tr&;oD^<1#ciWQaXiHPtn;PF_7OY>{Eahjdz(|rf|Rpd
z-0*q=Z3@f^chVy#&u#HK{H7bWho_o2#}2_!me<+>-ytZTHR1^f3xv&9@nSwFjSy~|
zR~lnhq@3mSd|_^NaWbPI=s7R8I@+wN8`7P8xhB722;3{>zeYcn06s4|_6wz-0RaLE
zgJbeW2w&tk=Qp;boR#QlHVQ8a?^*!7I(JK3l)K=m=t}zy#%<8f>#19cbUO&qdgO1_
z+X&KCsqGs@B@ulu_JxjoQqFRE@Nt_LW3)|bq(WBfd_Ajc)dElL$k><A*$xe^McgvM
zUXLjc*(a~dT?U?|7#h|e{RSSMg8Y#iNarIh#}R9M+JE&V-JiHU-gs@IDh+<u<f0XM
zkO03jy}EQ^U=Vn-%}quq7lOS`Hg`u^BLKBPN0``-wYdDT)SoUFx9WB8wjQfofKPtb
z`MpXc+!u&i)kLyIEO-KO!|aUBze-?>>96bY(SvZYgThjYI}SLEjJJDel3oW~LHj}c
zsploFhv<-q3U{sKdTMlM^uU&y&`uDtC-3pJawiBly)XFl{baa$yqGe#RS|QN_KM4i
zG}7}S#N#S~r3xXu3!WFf1$*g`r4<aw@#%0&B?cN)YKa3wahyOh&Za1CaSbvKaoor`
zZ-gk?S~5#vvsMd2{VfsVc;p;N&RH$ZFHud#A&wh4hwEy6(TF}I^al*qwPL|_Q_z@d
zqprl=7NDkfS=Noc6RPKI7S+Ap2t=>mzGRTR8?#Uxc=uX5Y21kWA99WZeT+gL&kX$b
z_+p!sB_WR@!@+^C3R1oRlx4b@O&|LlMNj&1d-EPpwf()X3(X$P*JmA(FWfef_>FkH
zvz1UYOAGtPuX%Pd|9MXR`bTk--bd(>5gaEC$EjT6Ks@LCgOZ|`WE|r9A?M)h<8({~
zd;h&fm^AzJ*39)j2vh0q8eeFIx@p0)zvf$D$|a8P@0r^mliKmxN2M;vhS+O66WvMm
z5VuouPKRfNjKdlV)XJ+lQ{*vWo(Sqxu*rNf@h7xhJEB`KQVF7&=-XF`4nVzZF}?4y
zlE}Lnp9_w0q#R-&kaM1kd*^#OQlhu*x6t=0H4yx^mG4mA*UPcsOnwVj;LBpDGXLa!
zQqCZ3FAIfvrh#Bk;kaPe8*Y;NS&oB`+ZUI*WY@bRP}860l!@y!w6Ei*5Zg2a7fZg}
zEz=5w*PGP2!*vR<<AqxWyK=3;c>UF<sUmzNoaN$%=Qx``=h-+l0yhPIXO1tLhT7lV
zrP;9a@x3v3CAh>JVWvZ;)VeE$&`kX8?I*Tx0NB&!`Au%+9GV+9FV|oe;Js7>Z=r{a
zgt%Qa@E@Y=YXOr@olQ4V>L54GYXLj2PRQrkqZq{+0%o@C-)qUpPoihJxNY4T9PP=R
zhufY3J+*f2p@mL*l#8)?bE%s@IPb^)yq2*Eei1Czq8aOhjtvsQVT$44#<o=sJ*xyr
zIK=Ig+y^7+JzH}5@<4?F+Zi70-=)OIk&FY#IbDus<wsaZIm_v}Fq;&T7=q&UAV14L
z37Bw=!Jin}jH&8wxSzJQ{kcdxD5?E9uwC&nsC07v+CQ`%Lv>mqpiqi5Zp7_WaOn#Z
z-d{h|Oc9u*LA_U38M5(@;d$tbhy8EYt!sn@<z>&_z3T-TJGWu%CQG55TTEOcHxF{~
zpxr<}Ldqf5L(aj+>D=A}+RvWMgUzGt^at7K&^O}shp#qwLW#EZVLQ{Sz+>;RL!#K{
z;)l6S%LbXRL84F&CGI1n9AaOSb56xxuGhuh|A*rt&P@i)e%|ybU8Z%mwOS8Qqq+`k
zLRvt(oXNJ_@?yB)Uhr7_)d1)WDpDIUA>}L=H~W`Lb&rlyqVE}`7Y>LK@-;aJl5=jW
z_UigskaCubn{C0<prCv05U(d_c5M_@5;gkCUoGeEt~^k#s?2Uy+Xg(oeA#C%+zlOH
zKizJ+J{U;r)P68dBb^_zoSucv>t=S3cMv$~+RkjO*uP_Qe@37${#70vOKK4Rtkns`
z_CBMMuI>O?UcGB$JidXg2hV)@wU5--%W+;RACJsZC)_uMl*(Pu;{HO5R@+gZyZ59G
zvRIx<u@q<kAZ*7zn>6g-FR7Bf{KO^=JkJ@Q?GzKl`SX9rRpdT!2vhYpWvL?QY4A3>
zOi@LRituY)IAPumUO5Qc?MSNz?GNZAR=sS-{@n_hXYJCT!D=V|WQmU}=j@L;eNaj$
z709=~KK77?8o|{Q>Txdko3CmU=nDMd{E)5#Zu4n>6LP*4w)b526%+~we4^D!&Xn6o
J^epFt{|~;VRf_-s

literal 33344
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
NWw4>&FGk7_{y#M<VzmGO

diff --git a/tests/regression_tests/surface_source_write/case-17/results_true.dat b/tests/regression_tests/surface_source_write/case-17/results_true.dat
index a97be70ca..cd0619c1f 100644
--- a/tests/regression_tests/surface_source_write/case-17/results_true.dat
+++ b/tests/regression_tests/surface_source_write/case-17/results_true.dat
@@ -1,2 +1,2 @@
 k-combined:
-1.496403E+00 3.891283E-02
+1.403371E+00 1.456192E-02
diff --git a/tests/regression_tests/surface_source_write/case-17/surface_source_true.h5 b/tests/regression_tests/surface_source_write/case-17/surface_source_true.h5
index 35878eecae7d7fcf08cbd53e5db8b2d63e3177d3..aadcc3fa407a973be80196cab5f3cc4051c1a724 100644
GIT binary patch
delta 17
YcmaDL@IYXL2s_Jt%~KhhCD=U}0X^Ub1poj5

delta 17
YcmaDL@IYXL2s=yCjEuC+66_v~06IAZlK=n!

diff --git a/tests/regression_tests/surface_source_write/case-18/results_true.dat b/tests/regression_tests/surface_source_write/case-18/results_true.dat
index a97be70ca..cd0619c1f 100644
--- a/tests/regression_tests/surface_source_write/case-18/results_true.dat
+++ b/tests/regression_tests/surface_source_write/case-18/results_true.dat
@@ -1,2 +1,2 @@
 k-combined:
-1.496403E+00 3.891283E-02
+1.403371E+00 1.456192E-02
diff --git a/tests/regression_tests/surface_source_write/case-18/surface_source_true.h5 b/tests/regression_tests/surface_source_write/case-18/surface_source_true.h5
index 36da9e7a7f7307e5af5221f380b58750742fcc41..e5a7619c552c4321cdcaa3710363e430fa57516b 100644
GIT binary patch
delta 17
YcmaDL@IYXL2s_II%~KhhCD=U}0X^vk1^@s6

delta 17
YcmaDL@IYXL2s=y4jEuC+66_v~06I$rl>h($

diff --git a/tests/regression_tests/surface_source_write/case-19/results_true.dat b/tests/regression_tests/surface_source_write/case-19/results_true.dat
index a97be70ca..cd0619c1f 100644
--- a/tests/regression_tests/surface_source_write/case-19/results_true.dat
+++ b/tests/regression_tests/surface_source_write/case-19/results_true.dat
@@ -1,2 +1,2 @@
 k-combined:
-1.496403E+00 3.891283E-02
+1.403371E+00 1.456192E-02
diff --git a/tests/regression_tests/surface_source_write/case-19/surface_source_true.h5 b/tests/regression_tests/surface_source_write/case-19/surface_source_true.h5
index f4261451dd4832b3ebf2e4f014543c850f8f35de..db8a49dceeb20ebdc3e0c1b8db765cafed5a4052 100644
GIT binary patch
delta 17
YcmaDL@IYXL2s_I|%~KhhCD=U}0X^~t2LJ#7

delta 17
YcmaDL@IYXL2s=yKjEuC+66_v~06JX-mjD0&

diff --git a/tests/regression_tests/surface_source_write/case-20/results_true.dat b/tests/regression_tests/surface_source_write/case-20/results_true.dat
index 7ccce7cc3..44293cf09 100644
--- a/tests/regression_tests/surface_source_write/case-20/results_true.dat
+++ b/tests/regression_tests/surface_source_write/case-20/results_true.dat
@@ -1,2 +1,2 @@
 k-combined:
-1.149925E+00 2.542255E-01
+1.266853E+00 4.552028E-02
diff --git a/tests/regression_tests/surface_source_write/case-20/surface_source_true.h5 b/tests/regression_tests/surface_source_write/case-20/surface_source_true.h5
index fa8a4e628728deb4c4d75b03cd31f0aefe6d132c..01d2abf61cf8a41876d664d1aa505a967e7559cb 100644
GIT binary patch
literal 33344
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
Q>SyP0uS<iS8vzSG08pXchyVZp

literal 33344
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
I=Y?4Z0NP<`Z~y=R

diff --git a/tests/regression_tests/surface_source_write/case-21/results_true.dat b/tests/regression_tests/surface_source_write/case-21/results_true.dat
index 7ccce7cc3..44293cf09 100644
--- a/tests/regression_tests/surface_source_write/case-21/results_true.dat
+++ b/tests/regression_tests/surface_source_write/case-21/results_true.dat
@@ -1,2 +1,2 @@
 k-combined:
-1.149925E+00 2.542255E-01
+1.266853E+00 4.552028E-02
diff --git a/tests/regression_tests/surface_source_write/case-21/surface_source_true.h5 b/tests/regression_tests/surface_source_write/case-21/surface_source_true.h5
index ed87ce849f788a346f99843aa263565fd326040c..4e5dcb446c26e85f1f763b75e4a33e490c1ba01d 100644
GIT binary patch
delta 17
YcmaDL@IYXL2s_Io%~KhhCD=U}0X_Q$2mk;8

delta 17
YcmaDL@IYXL2s=yWjEuC+66_v~06KUDng9R*

diff --git a/tests/regression_tests/surface_source_write/case-a01/results_true.dat b/tests/regression_tests/surface_source_write/case-a01/results_true.dat
index 8979eb554..d4d1d1e5a 100644
--- a/tests/regression_tests/surface_source_write/case-a01/results_true.dat
+++ b/tests/regression_tests/surface_source_write/case-a01/results_true.dat
@@ -1,2 +1,2 @@
 k-combined:
-5.169123E-02 9.144814E-03
+5.642735E-02 1.494035E-02
diff --git a/tests/regression_tests/surface_source_write/case-a01/surface_source_true.h5 b/tests/regression_tests/surface_source_write/case-a01/surface_source_true.h5
index 4a86235679085a07458904653a5b63f162059dea..8dc148ee07eb33d6374387e557b35914f5fa2003 100644
GIT binary patch
delta 3450
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
S3!@oVZf5V?%PoXBH~tSAEx4rs

delta 3364
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

diff --git a/tests/regression_tests/surface_source_write/case-d01/results_true.dat b/tests/regression_tests/surface_source_write/case-d01/results_true.dat
index 7fb415cb1..26b9e30a3 100644
--- a/tests/regression_tests/surface_source_write/case-d01/results_true.dat
+++ b/tests/regression_tests/surface_source_write/case-d01/results_true.dat
@@ -1,2 +1,2 @@
 k-combined:
-9.263843E-01 3.193920E-02
+9.288719E-01 6.877101E-03
diff --git a/tests/regression_tests/surface_source_write/case-d01/surface_source_true.h5 b/tests/regression_tests/surface_source_write/case-d01/surface_source_true.h5
index 8f8cd604dc7d685af08c32e69922749b6ad01654..9a66315ffe508938cf4b2499f980718982314636 100644
GIT binary patch
delta 9388
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

delta 9466
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
N_l~KYf43N~`yX0AieCT#

diff --git a/tests/regression_tests/surface_source_write/case-d02/results_true.dat b/tests/regression_tests/surface_source_write/case-d02/results_true.dat
index 7fb415cb1..26b9e30a3 100644
--- a/tests/regression_tests/surface_source_write/case-d02/results_true.dat
+++ b/tests/regression_tests/surface_source_write/case-d02/results_true.dat
@@ -1,2 +1,2 @@
 k-combined:
-9.263843E-01 3.193920E-02
+9.288719E-01 6.877101E-03
diff --git a/tests/regression_tests/surface_source_write/case-d02/surface_source_true.h5 b/tests/regression_tests/surface_source_write/case-d02/surface_source_true.h5
index 3abc471e043152b09e736a5f09012f5f0a95191b..2910629425bdbf3581e92ae9ab216482a3170a0e 100644
GIT binary patch
delta 20326
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
Hqv8I4L9t>9

delta 18778
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
aQMJeStOfD{|Cz_a|9q$Cvjm9y`~LvP#Sf?e

diff --git a/tests/regression_tests/surface_source_write/case-d03/results_true.dat b/tests/regression_tests/surface_source_write/case-d03/results_true.dat
index 7fb415cb1..26b9e30a3 100644
--- a/tests/regression_tests/surface_source_write/case-d03/results_true.dat
+++ b/tests/regression_tests/surface_source_write/case-d03/results_true.dat
@@ -1,2 +1,2 @@
 k-combined:
-9.263843E-01 3.193920E-02
+9.288719E-01 6.877101E-03
diff --git a/tests/regression_tests/surface_source_write/case-d03/surface_source_true.h5 b/tests/regression_tests/surface_source_write/case-d03/surface_source_true.h5
index 8435e8f17f4284ea1916ca71e048265aea650f19..0af7160d4bb91e4efc535bbfa8bb2aa24851db7e 100644
GIT binary patch
delta 15119
zcmai*c|26@`^Swi_I)4AjD0Qpk~rr`8T%5VMM#loQA8<A5-DNYMUw3G5Q$RfC|j#t
zgzWp8N>cQjPBW(8JkR%~f6lARb>8>qT=#YF_aM=XNHk-iAeL!R`IT?6C^iCvIYqk8
zievgk{zocfC1P*vQ$2s73L@QN75Zbuvk|coDG}`+VeT|zEE|z!R-t*{2X;~#tMDJk
zSvDdjpJd2Rfw{61F`=Z})c+#vM66NMm-glRo+N;s!dBuSVp|6l6d(I-p|KOmMyUd=
zcje8_G|vSNBF3KtaZ=zOoJ6cksM1ZlA>H3TTYk&OGW_|6p*%N^o;%ls!GRNkKJmgA
zmw=k?AI)Qn+Mv18&WG3D_5$4Vk2ZbP9t9F|oJi0@JMeDu<(H#2W>DSPlc)BdSNtsq
z<+4(E)W_nN_pfy%abVZ2&VVkpW#ErpXH_nfaYn1sGey$DtwLPC^{#M9jhp}mL*nDY
zq2;kr3!*%Mk<LVkeL_gid+($Dvl2*ctD~$-8Xl2VKh$2v-VfJLe!KKme;h_sa^Rxe
z$G~y#r}ZZVOraZ`=Z+ZmZ1^1?w7eBA=`c5dVI&oC<CuTzU?(+ln`0fN4qeil)LQXo
zr>Y=@@&Z^@HSY*b@y)bKYUd?l(-t`HUA3^FRT9WY#4=SsD~O*rpn2wyjqT^HGHtU_
zDSvW>m!F6oE4`Ac-%F&u9zr&{hE%N`@v)*Ad&$Pq$aB}X^5JMqq5u)|kd!1q$%aA!
zA~qXNR;=>Sq`fFANW}1yJOwE}5rRbQkB?=_m#)jwIHP3a%gNa7xyzeqMtdP5)^T%Q
zkY(6kpH?PB#Ke#=!W0@_n8@;ohbh3ymX`mq!bGfy$bRTuygp6EEZMlpDaO4>>aP-9
zMTl7BtA#g{7)0|#$i`moGD!Z722G2SC=ttS3u6CKu%{Ul$ws_#?RRzwC)(=^WMjgZ
zXZ^)Z5j3NR7@4V(=kGoqPBYe#jp^I2&L3s@%Tq&~hz+k+a9(@yFXJ_`5zu{Rqe9%d
zQhG9uh)u2T=uW#!vyptsMqzwJBEtg@S~(45V=VL3y&S$hG^2q85!)G5r_HtNFJn5{
zxH#@ISDoTR^JJAIVxE&6Bq<R;BuS=u-z?RBZ%XrNCmYMEx8+wl%C86{fl@^5Em1|T
zPmF3b&m1WtCY$t0ibCU+CSpruRWHoHIZE>hAsZu1)3~ueH_~XmWMkr%0Hz|MHO-TV
zCt{BeW(rM=+tZANWaGr08q>x2t+dxg3FOqgjYNeC{MCC#kd2wqdo1rI{1t>z0ughG
zq$xvDXfH#=f-h6Hei^i(6;Vbuo|I+U&)8v0GvZ~5Si8@ixQH<eTDh^ZL<~e~l%>#S
z$v!x@uao%4mb4dL<%s0o|F#^(2azLUy-6{M8}nazuO$Dwr5%>1_$0~`u_m1bZM;Qj
z|M;gdFOZETIA&P2!Ivh$LxG4@h{8uXkh|@b{=SZEWO>N+;Y_10%~L~>Y^+I?>|_LK
zp4SwKm@-nI;-7Mpm5A8DrtYiz6m@7WzDh(4FR4h0BCUb!lO~eu?2TyB*apf(j5H}y
znc|bKOvGN|IL|HcVjazgRfUM@A~~o~d=9A)u^It2@7py0YO(EP<45D9L9wX6;s>e{
zvHo)zJbYia(^TcC5-~W^CshiKSB;2${Iu0$OE%iI{s~x!8WGb%s#K%+^pbtj!{ug~
z_WhOGM0FyjfRv<8@hMa%H<3-(%2<Oo)5;QEOT-9~Jl9fuBGwYIllV&<bxp=JpHZ^U
zPm<<3ijVy|BKFZ@|E^z^X0!;Dts`QxNEi)@4_<>@mbA@+)U*xFCzfnXc)r%1pX&h4
zI7>DP5HKQa@kTVGt0ocCM7pg>p&^>&^z<_N%Cgg(=A)!V#7L12Yf*d>wTRfTZ166(
z&0l%3K=xTfg0v|<9@<3gi6<W7UI+hb>vh^h%r6q34#h`9hlnMync2qrnbOL-rbEOe
zlKLn<$+|@B`P$4$8Q(XwAo=PNG3!Z1x)e+U+2@K}cBjd!zZ$K99ucEQiqxa{r0bD`
z<j)Z3KmFHyhE<=4J%BtMiUkhQ;D^Y@<>NKUcBhFnQSD?Sx2G1v9+kgZGH5`=O8@H0
zF|V_udFGIf<NKr^*j)N+2;em&Vh`SU$6*xgKr1N3kcg=#RT@$h_8MBSeDBEJYw}mI
z#P#GZ?&p(pT2hX*_X^3z1Rmb}EVdoAVnvOJ7(B_-hysf+B4VGUI2S%S_*cUpCHusY
zG&fLu>^BgxN6P)yXiB-!IAvrb2F$a#FXKfs;*H78NjQb=46>UhBi5LRIYw$UrqE`|
zK1@~LEe^~m(_VBnA!67`w@oNMhzSwf&Eo4jtn^nutOO7-??{IMiccay9ynl+Nv=M0
zY(l3zYe+9ab8MVxd~8W1I*h6Qo(M5fr#zJB^pDY$5^r9Rvo(Yxk_C?(nTzij@zx^E
zfCTK|k%05HuI|6pqmwrJca_#4YW3HrVE_2d-^D9&;JpeNl7|Q%Xp^%0gI8-Gy!IL6
z4Ilq;!0lf5UVW=l;JYoHn`^laGJl;BFVKR<59P8@v`{Ct3YJ-syJRp(&!kMxjS~bg
zeX3Va;KS<N(y{G56A@@X^`G2bBAv^x_F$0&QQM*+W&(Kf;Cd%BtN=K^>67xZ^m%|a
zHQjEydImn$@%YI)!)E}GnN8n|9wo?m;qK<-ww)_+px67LMR`+I^%{if*|B_EEpae%
zr`My`Tw<VFKD%S*(>FlbjhY{y<_2L*)umJHVk3YW&$Wlg8<ikNQK`r7JRZMm{y+8V
zj{ydLyf`quTs|zZ^e0dtc1U2yPA!mGBwqjV<9^`dLROAn?|b0&D6gpp+XzsqICNZY
zUJTl^uF`OJ+3#OmMoOG7mrsVzYT&^tCb!cgGR)u~v(BpAfGpo+1vmfSll%Xtm&$Fl
zT>C8QI}TZ5Phfw+(G2VPhuJ<IR70A&H*C+%8-bHcNbeJ627zo1)?UJucfdKOq*v|E
zL?~UNT}Rvloe`p3>LQ0CmtpqAkB;>t1jPLvJG)Zj6rh!8GJdaE4arhn0Chf3!jk+g
zCmvU}1HQ}QFO<4#VErML+yPr6Wc=tuhT3^_H2qI*v0PD!5;<@6FteLTSEk^gm)4i(
zAVn}S&R3<$b^^F7MQ~q8=!FYXS?0<$3V~iy=bk60HKCA?!`YW?(d8q`r7m))`CF-=
ze!Vr80IEk6ojhU2fP69y-Q#?Ab#7*Y8_vwnY$ea=xgl4-Yn;bo5J0C*I=ny}#D{Rb
z?*+dD4>A~w0`@%y?ms&`S^9JUczYjPjeHx0<1EwG97=G7E?$cCTff_6B_CE6Nt6I5
z2<1H#tQdq{zT7y&@`V7_h==T0c*}rvZ`|gxll23zv)AJ5m&`7pX;`Q3$B8kxR57bd
zHQp8avAnbEAQw8Gqj8|;9^bm(tuF(M*qChLzQI61e59JB+;UhD7nAVfot9Iu67LDW
zVcutOvBX7Y)$DeFC-tyknW8o%K5)@0AO@W%p^G}&GR?spz&s!&ng3Zta!?b5`W#LY
zf70F!NQgJ$d1i4)$V{59@>4Ekydk;Mm2m)g?~2<fBrya_S>%3u8QcwXvdNzOXHo|;
z+*2D~cmbUcqu)X0QtLCBSHaKW3<H?Rd+|Ek83Mxne4@s=SzuM}h8<i+%6RjY`lRRX
zQJS&3QzC|7F^n^o+ALts%?^>1%WO!?L4D(@eT{HJsmxh{_F+J9uKV!B-9dPLvd5jL
zHx!{8v9TYY*U{>elluLX=hfPM9_D)_5rZqLnJRUH;MrWgb*EvWRk;<M+!t?qZd%bx
z&%IZx@kAp|9B~=*eTnJ8AO?Mn-5h4jh;s>;_V#f#5Vie!QlZudKyXi2(u02{;q*<m
zrVkmkpq+2O*52ttXQOC*xhXoS@f}^TP1c$fMZ&?4@(#glNM^umQ_+{ah*C|EeqLG?
zaACbpVc+2qnEMd#9YN(GxL}y^@T8k0<X=<TJD-Ox!~Y+b+8<?OHi3IoMUf{j%;9^R
zIFUtoP5Q|oK18LaLH@z6Hb8PrrrS8U4e(|Zurhfw0d$(T^x2F`K<uhwkCsw4{BAF3
z{!#TZl3rQ?SSENP>*q1O-+x8NSss$IwK?V`>9F;mtmL7qjk1IpgIt|XK&xro`uQ9V
zbQ$(*kWSD<_<53b1S>xP4~pI5BleF0kJm34hU#>|eD|D=@odFIv2rhKTX~&VS}iXf
zw>7-bKB{^Nc&WzGdhjLz<lE*en(MBOh(^!a;`J&4{U`07y^g&=e*>Sh>$(Yey|xI#
z_fi@v`WDpPnBull%k<o^B*n(-pg59;&n4^)U4xjLiU0|>aR~ds&1z5HaoE{0`%Unj
zn*bMAqK|rfKWww(Zi=*-E(F%!pJpF+T+z!%r?)0f2aa<mAnMHg+`5B|$cy0onCq?h
zRk>Fs&WJFkqPqZSZLDxfhPD8f^Zco#{7`figVu%s>AI~sW{K2i`=>Sp=v0K5zfu_f
zB@8Ngja=F=%L78!Hwmg8kVk$l?2y^V)(MOzv*4fm4+92J?Tq}Me%R?&<@<`}wa{f&
zryoMn=<F2DH9-oOn#1v1FM!VjaNxM8O&z0y2sq6xGM{!>X;p59=9bH~^5{hMKe<fv
zuj(t?#X!|%W3@FrV#xBO-#f$5hj6!3`DE6_6kybL)5<`q4gk`Rt$S<O49GZ3y6ehY
zKnTY7GU0s0N-Yb~#UY~AA%&BGLoPkcp8Z<-1L$Q9@FR9;AXYDawMN<W!_2j(jK*Zg
zftzd9y|_e*f$0mOW`raFDtnT5?VAfabw~9I({Wj!T<`W?l13PQR{ml+%?mc&T>f}k
zUlWmbHBZgqYl1I#IVbFip9C5moinYkw!uylUq%Yg0#H`|seCI9bfS;e@(P!fYY$-a
z%U?XZ5U}m{*Pyj5LSl0;$Kumi-FPmbb6Zr4D4mv9w>R4NcnE?9E@Pt)wFSU^`DQVe
zi;7^Js!+LCZxP&s@%g-2ry4fio&O{D_zYmVtKnB|wH%}@xND93de4<irgEuuEt*um
zE9xJ9@Yt_b`JEpG!Jh;FSZcIsg4?~WFVB@v1Nv7pr(DMy0MV(}TqXENaC>j<_q&@!
zpvMB2x6bx>|BFlQuS#dO-FbdU42(MJe?28c3~cTVo=*+X1l5ZUUKo)c1=7FjD?h0p
z075>ou9cR51DiH-5yn9g=%X-jTugWGN?lX+uA#)kB_zEh5SoMIqdyBtq~pLzG3cqQ
zK09c+O=h6MYXCMsdOGJ}ay?x9MoHzE&M16i{nxV$8m3TnRl*oU=iU{)Vs!D%#0>kK
z2;fCHxzz+S3xq-6HD{yZ!uw$IN~`&Be?KgzZ(TxqUJt*C(~UR3JPOy0m7iZ;X9{^m
ze4ZAOME6n9x~6h5B(W_3_WJvvyu_K%-(Q3NRh(KX$-xOA@8u*p{n^sRksMsiu|1h%
zpNl@Dd#Pv+NKm~g&z-+g7Z&WLkXMNcSv-CMpul~BqoX#$U`D~Ld4bCiykW-%f$u5(
zaLDnd+f7Z~u%yv<Yv1jgpvf9(_FOrWm6%G=amB24mxPXqBZ_DIp(GzsP;A7%%-|sx
zScDhXwCt+`a*i1O;`Ez>r87q4?I&7+sRMS|>1BK%*R>XB&x)-7$=wU!9?YB&N7Np~
zJK1}Qf)%F5-8($Ez{es_KYrw^h6@?MBSTVefO*N1;my_4u*)7FcC|fxV6z0Hu5(oO
zZ!X$Gq)3&n=2&M)eo3GP{R-47O;UC<$2=n)cKg#i;_1Fh^k8UdPc<j#*XB}uoLLmC
zeF$=<-<1XV_G{}!WsU>YDXdr1f3^UPFM=NqBz3{+2Y1MV%32T%-YOwpLbvA7TA=4n
zrPQ%(TQ35B&sEL%6oCW7<$RE~&Ezp_6)xvzhV}b*pqqpL$*t-NGt<5&3|d><IQ;f2
z4ovm;Xh}<z139Fk&wBF@0VjmZI`4Hf0~qK+CirOxzI9#ri*En~T@lv2;&Bk&>_l^n
zK#c=w-!=d%TR8GFM-`plqibdv>R%~Oop#@ayR6dS_$?RbdJ}#ywA!qdOIw3<b{he^
z8^+yE!qMhX^zVLoi*K9%g#*FO8wZP=&%(@c?I+y$2uNS8_hYM!X`uWV8y0`830U%c
zGh57_3|!va<zuQT1}zEPPgUAswbB-4DO#v~2OQ5)tT#^pFK%p>3w_!Tw9H9&++W78
z%1z#m&D*sW-B~~*OwVnX=khK8M;z&5aeD3bnE_N0YuRF;$A|n<4*AttJ_s*s?pur$
zEdXlQlCC&9i~<L}9nx->;vmuTpjv@;^u!D0%2D)E`%q~mZ_5aO0y6f<pS7Eh5$wYH
zsNeEsK-^`;(p$C;!UxWNGkR~;1kWGsS{(T_44>>A%xXS}gN|1mag{&5b*25#bC33$
zh8&0?Ak`s7p{D~Fz_bXxnF8Dzq!rf{?@#Ii+DiK_-`&{{*Bv;Tl=N)~4sHz6X>t{V
zj5NC^j&r#FPwty5jXVCC7eQn)_OXAR=R|l7a2&3u1dz(8lY2Kdbpg}Cae5j%8{nOp
zzHC2tO#oy1JO-N~VQ93Y8a8}L8%yZ*#`Ikf3rZG7^!*xOuOwc??NqjSz926$e#m0D
zM_~-Mn>onZHQ5DgkAExJ_3Hx=rrLXrkj@VEKCpVK7rSjGALQxsAx;1BtAY>-<aqpm
z<~&vykqz=*EG=e5c=ye->{TT9`K8T}F1bZ;-RAOPj`{$^1-`^Zrm{nA1Ku7lL3Gat
zZ5b<EQm8wCb&Rt{^i|QVbF@|!D5X*#jM-S8HJh1{aY3^PQ!N5`X}#Xf-9t>s$Q)6$
z^5h4YC(tnIMOiznFwdWH)ngpcE-FmSu4989s_*bNT8r)y{wFv6#`;^&kJJLPG5(3s
zOE^$V4ll@!S%&#H*f+Ibp8)z|e~uOPcEiwyFC?p<b-?nDTS?n5vOxmc`U7n<PAgHO
z*Bf|o{ShR84v?>#Hpx%HflcC;|Hyu2Kw^AvXnB_o!dv678s~f-0F;yCPQB&rg4gp!
z8efrRgV+-LEjjLP|DW8Pe<I&oWKYBI6Ml8R9U_2pTl^~yg>tUS9Y5{Sb>ud>hxeax
zIIW*qqHXgNE<4*MERjV3Efo0=OLK4`%Uu?jD;W(yY1TbM(Vi)IhRNuSOL{%f-+#RD
z2>TNFR^<kpzz46D?52-HBFDyX!NSk*wv<ahb|m7!^E+^S?4Maz<vy(yu<l;F=YPhb
z=9H>{mXkDcsWiNQ>IolMvlSoJaY-IoKHj}Sd=P;@1gW3TZ5#($^^F-f%=W@<jpiX@
zFV{d>=gvNSx(_{KMB|`HO)$#SVh3L?+$#)59|O&DUgN-Si`fe$x=P5>`Y{XFgH3>}
zyyHuL#m9id_bwT1$TV#G-nr|Q=sL(D%OmE-1zK;XM8{1qb`2noii6xOQ=fQ#ECX77
zok@PFcn}F5%Z;rX0X$N6Y1CY31=Q9u_I!-)2edLG0F?*!(5cb=Y9czcwU06#H$`1l
z%YI1$99q89W#TG?d^enM6MZcQRvixT4#GTvjkrIn+9%Aw8hx6vwY~^&JO8w+GLH)M
z_TJt6y{WXd8a)><N>xlM6a`sdC~NX)izAziZ+zNy3J-!|#0W++a_{N9PfKO%AaGLa
zy*c-nVYtK=4n8S60WL)^Hpn>9@`0YKp6C~t&LW6dZT%toB1r(Lb#qe@V$}qLPn;jy
z&NK<*J;d_-2(Mvw#Oh7S%TAy<{yBpUvng~$`ky-J)UK6$P@#*%u@l=|&OVhup4XNu
zzP~4g^u!$AkSC$FD!2Mbmyo>&tzFP__e0trn<f~*D&JdMW(vhY%Z~fg=PlJi%wyt<
zk(M?<qMqPger^gd#I&1SvU?6kUo)sUtR)47l?NDwB+zE$s&snKU01d7eZT@D`pOAx
zLIm)|rRw*NrE05k&-f?22`xYmKGFQ8=Q?rm-(fvG1B5I$A=q*pI2@dJy8EIMxc%~m
zj0A@dFd=)Z5u54=u;3ANzN4%UXz$(_x+7Z-`Z1BkrzRP&5??inUh1gY;P|{~I;IZ(
z(Qu7#W|;u;3|3i&m8-7GwQSjbz$o~@O8-F5wJ-f5FPR{YY-u7aMO0$INBg(9b%k?-
z68E>CF&LVGGfa0~^-T{1{L9~kJ7<-^ufuxTPap~qKA_1?&^2&HuR299b!F1U6W|<h
zh=3Sa9I>Bk!GO!H2hElgxK`zY;|YY#4S_3q>A6)m)-*kHB_OUBqi?nttN}kS1xl#P
z3V>_Q3VHQ8jRJ*wc3f-v-T+#TU(7vD4gd}u%$Xio0qD)wFHSwaNB$@GYRb7<FMct^
zaJruB!Za)RIr7nvY`gfX+$>&Yr+}!V|1%Ek&V;X>`?<m4!lNH~qC~(N_kxMan|#P_
z?FgN2pH}#M(o5*-*f?NR_w&4@ekZI3zO-7j;fFjw>GZ$mIr%Rx6D7`!B}mk<R%S3|
zDe?$|A^}voRN-#UFS084T+5C$R_#;&iUXC)FTJ!|{sIHYz3HUMrDy^uC6Xz&w^kgf
zP(H|=JP--I2rVdUeBA;+>{z&j-#87s&EENC^|}@O*<fM%*#f<%fwl{3y-~TB42~((
zs)`{DMNjno&axu9?QGpc-V&g#!l=TW`UKn=e%z5X@BvnC0k@tAY=OVz2JMS(<%437
zh>eN7`&Qzxj;>uCW-0tYG{z$zMec5J<mN#-j=DlkcyaK4NgZB6Xbi?Z*G@dcQx7!P
z6&;MR><4b`wy}|#<AvA*2R{|1`K`o(%B9Y_4KFa*&$8o?!OCclEY>CXkm=-+g)BU%
z+BWj@GOh!TwVtdEBky$cE6)d$j32?rMuc*&jVVA5VIN-K@%35Jt3lCAeQ@ubGJbwo
z8d0<WwTWl>5DpAO{Z+Zuxe7imo5J&aSM<_zCG*qO;!4T0S6&M<4t7y+vEo92YpfQ?
zu56KFd87|8bv)R!i)9ROcw@hR*sd8UY--F?Chy>GTz6n88K<+NSBol?@=VzBD|Oou
z9>jvkxS>)-1WeNz_H-Z80IzJl3Xiil!Lyt1$<!r`1CI<1qm}DF!V1qkrm?(I5aF!E
zJykc_$&WT2ml?3uP}{|ixOnpNp8F~VT0}gJGL2ma8W+S=MMPA>tyQuanc-7Fr^dlO
zjC$|ks-9-GtK3qM{+l%a+KTnR<AAPvwMj{P&9U6|9G{|%(UVrxs!RI5*BtYj1o`|~
z4eQdCjuo(#-rg*X<S{D~BK3Je(JxAo-FItXe2CfG$3O(UBgLBaN$~^_>yY7W!qf}z
zy^B45I?xz8G|+If@F#i{jApqW9anc<#eH0g2of#ZyNhov4m98sHF~T64Q_D$_@KF_
z3)cF@PAI=V4kTA)xc?e&0W35Yu3xrZ2X)mMRlglaPm}+Xo5*x2@kfCGxMPcl@W_M!
zV(<!h4PW2_&#&<^^)wy?h8NPmM0zyBC)S=md0TG;aQ6?d&B_;tSk3yu_9EJOmH|aC
zbyT@B#GK?Ff&<0(EnPltCW3JH4Bqp9B(f^ERN<fEscH1`8>*L{%Xx+LEZtQER8}|i
z3?1i29>R;yExgttdlKc%cWj#kc8GBW_XRwMZNrTFBXqg|$II<jVaCc(TfF=_qx-aM
zG^FUIwn}?5)fj~)X;6ak&0F#oI@0eQ6j`xZeO2y(jVY=X9q0`{R4+ZZWRJzz**P(!
zTIv#fmxCEOQjHJb6x2W#*5~lt51)qP_O^2DQfvm6JS4Z(Z^#CYCSd{?3^<|En+DrI
z_R!Yu>*@00YJ6~4<W&OFp1Lr&@8mK(bVxk<&CI%0xqUTR@@G2GJyTRKJy+%#(d`F2
z6Cx5l>(*&OK%%~xe0nIXjd+h5mDL>^0KzgMw<DvYu*0ift2J#e;Q9M+_A-`lgT_D3
z+*d3`&#llk;09_wkaGP1tb?d}dil29D}8}6-Pep3OS{7Nn7|43h~w_e;>gB|6VelB
zWDp&sJ!<=>0bq+)*r$_PBXC~(tzX5pO@K8as8Obl14;v<<sy=3eIk`htySCoTQXZM
zgu$bllWiL|NgxN_dk2rG5|AQ^Fp=D-86cr;UT=)G7=U$ua&1tn0=()jq~QxWpgFUr
zm%LrkJ{<j;6)vgBAHaTx)Hm+ZIQ08#&_2P0#1~+Wz2u@e+n0sjZ$Tq#Lidf=6!*S>
z=Ei{0q8;T=>v4$dwZL2_J{j=yix5nh%qSo~0es%vIS5OD*W%6vl)%w;+26(H)u4I>
zY?Q%0^u`g&g{YCGJXsB^>qy;<Am2Wp>Lv17Nm|aF%F!(Z@Xnyh&dm~ifOk`5UB%28
zOmr!JV0hyl+?zl9;_I9mbciv%@N)%iT|?zkW2Z1<vw8UZ8t|t-iNDK{fIN~btMbqx
zfWK;WZf1#nfa{w%Fq=M30^07ZcgC>Kfe!<R^fclWpoOPfNgwaiGK`*EVKTo>;PH3h
zy<PTATM&ofCraFP>Q?7wK3Psth@<Te(Q`#!3+hO}!XegPKT=cok<YH2E&U2|HNh_o
z@x|XA`(W3IpteJzjqtTIOJxmFV?f}BK&jyYdB|n=Ii@0hTF*=6Qs<lFvWDS><lVNp
zn7yR^8y4X|Vb@ues~mXNtix~j%FPFQZdzojrEeS$=y~<p-NS3~;MUuk97mP#NOaz~
z?k|C9VE@#%$I&sZfI?=9P5rxj0A}I)%!fv6Xz{E)PjB(TmGRn?F3-w&T*B2mmf)@<
z*550CiX)ZD5+%ECX@O}|*vG?(1#s*=&!oK9GqBek*&E{$<?x0mp)nCtNyzOSBQ(E6
zTaRv}%QN1e5nCOWe*!9H=d05>$Y*;E0&EhWxDd+(%geUU+5p$&#u#SDDOf5<Y;qyD
z7MOM_K9~M=Gt_(enTysqdaDl2Uo$$ru|H%Rvh(=Br3@KO-f|(Nm#1sH_A6P$YH$0u
zJyX^2{h3VX<Ljn@^>?N|C2BRn$~PbEG{oZ|aG*@T-Ga7HL*-&9{BOcn1i#%9KqSj>
zg}Q5{kY*dis3=Dhd3Rw$OlDU%?3?PY=2?FSuCHWf&D%T)vyUq5(j<Y<Fjx_zEKJMa
z&2)M#I`6IZ2@^$n8e{!Cc8epD^~B4&e6$gZpVr5Z=C#5>`H%Wr*e3wJpdWiB!ae}!
zOpQw&gRu~HTmAkL+bt{gM$fIaPG}Coh$DNOa(_G@6h$h&HNkhpwGqyO=d$g0y5T9^
z^YX$h<FLK^jmgpTZE)H3z0>cMu#m0bO}6V}=vgNkUn-Xxhh3a`PYxuCfOGt>PC4u2
zkXP2heCupfKn9V4I$!P%;6{kj{(-n=cs!S{N3wPTK7aT}440=G)N^a>beiVd6}{$k
zaq!x7@XStAQP9mN?zr}Kal~M2i_P~p3SeWJz>!GcIs7uGX>xDRdteBosS@Eb1!LCC
z?bXs3hRSee$*sEoo7?c^Sm_%K4`?kT#W-Lug6Je34!jzR2OWCeX7<lb!?lm?c1B0n
zz%#6I%WF^8!lC7b87BO~P*Wr^$kX)g${0hhH*?szL$iVzv276#<9#QFL_~+NUYsO=
zCc+aQhAKmFpns@I!nYAv$zhS)e`LZ}g4+T^=Y^mGwMN@ir+;&)@x3i5A3N^Fi=0#F
z_&HC$4Hu1VH(RV+oy(>Y*SBWdzvDpVws$!>9%m6ndIvl0yz0e~8q0)RLc_9Pz>~%`
zK5XUigH5k&>?&t~JL=qaOIF432b)Q7Gtm>Yu{y)S&-m_N^+x4ZKZrSv-7EsWnwU7n
zeGG?qes+5`7N-LC7;Q7L3w;FKXw;Q>J~0M!GTgAc8QTx1oOz#WYw;3H<_1i4wP|{Z
zbop?>jTCGr$q%wba6}R%q!C+@V0A7HMX;OM+AgxP3jTuq`Va~l0j7zD8+B!e;Ex5a
z<y$6wLD7d7O|qY$+&{N~J&qEwJqxeeF!ktG^&ev$+4w^<l4u`<-l_Xz)CeM9H_veu
z<TpUKWBwSgk&T~vV9m#-=w1qHOb#Yu&tPM)t?lT|xj&A+WTPiRr4%2G4uXG-4P@iZ
z?MWw8+y44dhrux-wsw8O3pJy^E~TcEjegw;=UO+r{EqdX*I7e|SoUW9?UEaI(Ts=4
zMr@*9C0^c}W^5-Lujju~-olPf8UDNuh7z&nC6BZpZl~RJw57zEIv&kkQ`^cnCV-eL
zS0u_TOM=gWfQ_y<<Pe{=J|=$QgYdjv@IL~NT7aA%)9M*S^8VdbvHhcgEYL^qokK&4
zs4TRfpmLchd>QxMZ(Fl@5a#hUdgUs3uu1tqsei>fFa)#zK+m>LxMA*y+T+3r;Bo9o
z`z+D`OT=x5s=8GnLO%1aoP6{~7dlsRpymaM5C&jteuPEs&q42Hp`~u2{+04PmnNCt
zwIB$dDu$*_FYqI0Z0>g%ut*?+HT&-dKbi)vhkU<x&ZHi0zFfrCn^g(yxfLr(isgZ%
z*Kw}5aHgG+IMH$EF4lgk4wM9Mj#M;rKNLiQGHRTUzY|}Td+b#D&^IP@y@bx~oJbBQ
z&9UPe=4aD;XmbP?y3%%%;<^Q!mtfBh#~igKafD}!9C(3U6N%+|+gS;>!2iU6T5s(J
z;9_e_DcEiVHa+WLE7QsYWz57GcQCoG^jWTST=(#8kwO_PNc7US4SR(Nh{+UWU#hFU
zDp#x6bn}(?9V>kRJy+iDbIXrf9HJY<k+e8F0o2<z-_L$8hKSePC@Bek0>5rM;`stU
z2naO~%#iMk0?0Gh8~lsr(Cq0&_M6V=ZD_PM-6(pgeM>N#fw$c`Da5NJuh^SM04&@n
z`On?!i}2IRT<8Pq8+d$Pz4Q)4AHWoA$H<{E4j^U%RtLVDL!IfGagn^V+@$9gmj>Px
zvXeyS!g%XKM+Cw1x}V;9>iz(higjM`cvS&sLQI_29i4_R6z61*zHNYg<P%sYlNlis
zW#jur#<bNhJy-41Iu?KOoEgt=-Z?VF2zomt%k(981Nl)6ges01SSNYz$O%Fs{E&6G
zT+f$xaNvGsJv|>rXd5@nt}`OEJrgRII(P16;}ovmg9C9TO^boJZ}2P}lWjdMfLJHz
zb#gqI0+6Tps$)nTP_LBVex~(3yysbZ&)s{<kY%Ptrn3aPvOweOPL~fF!(ILHH3V>b
z-!p!Pym`3eRiOV@@*S<!xB+mx=57*gZ9>m|F8RhT>5L%aSLpO9j8g!SGwO-k)5VG$
ziroL@IqNWtd>U93Qy78Uy<EyKOyt7B+xb+&*K0yL4Fd`nN73Inpn5&%^x9i`O6PKr
z*K^YDoRS|zk-@liy-o#et8%|BYKY4W(0UDe?xNtvkuS?)$N_)SEv|P=U~iwEPu_z}
zAXG^fU@9GeGfMYlT3+h~RMx+&Zu?HYsUhdbdoZ6Jl6@xksI>(B84{}3lTPoOF7Z(-
zSv<m>o*Hg6$OCGuoy_2Eorm-5y-a6Q2jE?<5!R-+`+%gUEuv#m{qXQ&#%oV9_gCE6
z)ct>c?c(_R#ymYYcJ~%yP53Mj^ZHgrT@emEzI*HZv71_8f1<xunD%8Lt(R^8lh-rA
zHG+_Tg=YoOuGw{h-O&oV<6rC=d+Ya4=}@`ebaE{SHpWcalAySA!W|N~5SV^ARW9(H
zCiv^9gTS}LBY+i~i*Nk19ysM-6@N%`H(>C9sbl%G24uh32NrxqFAWR+mP_SQoALhv
Dx83k^

delta 15115
zcmai*c|4R~)WD5x?EAhoW8Xve?RkdcA+lu&6<Ta1q@rX?rKDn1+EA%PDy5?2xyqIb
z*(I`vNXS;vJBBg6^S-|ie>6IuGv9mex#!+{?ztC;rw8%$j|8xcQE7g=pNL>%Fqk;v
zWfpP9`Di*iVj&BHeHNf{CaH`-%wQ2*65?19?7?d>tzMDasKNwRgc+;Q;Qxt@n9d@!
zr1*ms!88yJ*p^{#YzRh}c!Tm^z=mMkKK^W7c;HQh*p}If><E^vUtZxwfD@H{o+R|R
zuT@jj;7rw=Wk)cPL;}Y$+=~Oj9*<DGX4kK?sKdEvK9+9j2SdEU31K!7yE(<37Ue9<
za>~c~J$$2Mqkm9tW1EwO9OB^arN^2r$D~2*sg^6(Pjo`Vvdw2o8wQ}B^&y81g1XSU
z-0xp8J~#r0#c7TRYl}rg{}&gt3=SApWjLxi2pv@uxW(Em4i;Q`q86N#KrMTM`+dPC
zC_~R%E-7#jbvv=8A)>k)9cYRwPcXz04!dwyCk{FMA1?hex34~Y`k>JqbUm8)z@tJu
zu-6V4cN0}zmAj)&a%%GY<`w@?{6J3(;es$8#C$GsrbYj-5<hZTVlPSsr|OPqEozf{
z$4YV6@~7G9RI#<*;^65xuVG}!3~Ie6R_aF*7WV)3ayo@+3{7y<5%RnB3aYr<>Dl?{
z9XiC&NY|69Lr7pYllOhAztTIlWgf+A55Dc-O>e@3b0gMDl}9Gg_SnuX&7T-n<?d_L
zIQ)6L>59Fy+?z)@k6rzX2l8{D*C@Y!g_eo!RH?hg17C5-3o*St2(bq0Cfi$nK^?8S
zEP0JSK}T$b^~{80;00G7(ai2WD_&dS5((T8)<$h-jHVbl29|<8lN-Sn&9UcQva(wI
z%94<U2f^qN9e9?5HJAs%Vv{yzZMthr)oCROFFn6_U9StF3SnLZdorR-{j2XrsxX@u
z!Q>Ffd6#KCd<eE6yhzeJO@XQt&WB)b5=;4(b-GA8HhJx7S@ts2d4=#JSj8`eN~xFs
z5k4Xb*Ni53+*{Z{)f5pxFoi^Kfn{2Z0D^t;D$Xb9*E*`sAW7#4QB!bP$6gS@eiRBM
z)FkRrttu2;oU|CBWgVOl$q&<3I~hd@RGkDN1S3KGNYVL0(y6h9u@B|#scpFlBiJFu
z$~iU(ax^bF8IXiFg?_c?HpEbAiXsTsz3Ta%ZNt%2;dzp9t5W)O81p}xvm~Kus+zO<
zxqpOSqNMdmzr<D<*-CA_iX`-}YU@b9{f|&X48aEAW6sk(_M$eFMiS~Xj^<_a?phJ1
zh$C1ytZE(ScB+i%M-m=qa-Ar@>bs&ytRo4(4fz-<@W9l@^(7XEB35GAg_#lvR=C1F
zx71ONs>33QVEzytB$su9B@yiXSk70svD>NeR+6wbP9<sjeHc{;OCi`PLOK`rk2#f=
zO%kR%?q$qJY^a(%YY=R6Z<gS<VSB1DoFpu`Sz-1o(Uto3E|SnR6U0UE|Fc~nI0O?+
zOvWu+_y~t!SqCCmRSx|dba({ITy@p;XP+&#i5QY_y)<JWecL9ga1f7R^oW|$%QSmw
z1RHaemy?ChifTroG=lLYVq}(ea54y%&hO}*%Fus$nm`iXPB{U#F#R)ke~^T)U+#~U
zeXL2Pxyd5f!cX^`dGZygLO>E;kzhhq>inoeML7fu9mB;rV8~0zQmCFM34a$bemee9
zhpIU%hhUV51o>qPz2p(>o5?*XfdmbzPL(`@i6QbTEbC|}AXuySdG40$$?NnIJWT<?
zoF#TI>!c`>+OG)vke8}Yb(o(bg3%@BD=uT|NIF%z&q`<2$(!dAMqdfRtS81QE$d_|
zAy^*M<UY|jYbu9D8NsL#9h8@Kf|U_$l<^^5P1~JRlUqqTuZVb+WgS=r!REW~Xj~XG
zq3UF-Aeac^I7Np?mBjH?A`EAnQFX#q5lkzwRCSrtMbh!Ec?^Ais!P>D)DWx_K9#+y
z-h^u8Ba-mJFnVC)<Uh_9QD0n<z15d#G3um24$G?)X!)nbL6R^FXFDtP-Im&f{aOTj
z0#)C}#~DNw7Oq7wszi*&G7YDJV8@G}7~TzqsAeQ+Aeda@M~co5l1_dq+acz$e^z!k
zO$1XyyrH?w0h$Qb<&MjOeVqZ7qo{>ooQWY?%R1+^5bVfW_3a^g8dRNGl8!Esux?q$
zYaN0W&)do1<!wRLsUivY<ys6&`@N?MHM9|Ig2k^rHxrzxy-U+ZFg?U>?Il`@4#~%B
zt@G2)|C6`*k%a7f=|cB>|3_Fy5(c18`xBsGY76?h2v#<-BE{|)LTw?FB=q#rqT8kX
z&#Y$AL$JY^j%>>+JE~?dNw_~?&12itf3|~GJp?mH#Op727uH9x3&%fB+Qj`EV)|Ch
zzuNBYHvOkr9s|+<&%ZpaCFMvpFq|YL^6})}VfCao+eH%I8J;j6b|5D%OEUy9T#U$M
z!{ufl8IqRS$c<6knbuNiB1Q<7@p%A)rqmWHErulYG|jPkAnijH4w8fxf>&9OgB{eb
z+Z!X;$2vUqwfKLQ*+OFkBTK}XEVqj@L9n8xAu5&j|3p9nNq7$H=Qp7E&li7?gkP9$
z>@v&$XHRxBMKC{!H%ymuV+NWmZ?aZh_qZG#T;^uG`%JAEe6)M8p+QCwbY?%&tGHVY
zai7`l-z(Y;t=D|wkfl2e<z#HFzkAJtz`ankw{iR0#qN=_M@AYhFZZclyICgq=uqJv
zU0FN~=ad};{?e;*4GZcbAC|0J^bk2$Wh9oGT4E~*i3tU<<lUIu8WT-xGsx4T$?xp2
z;`7h+e3x*b;qyJk7sZ;u(P`Vh7ZTl2!VI*nJY*P^$}AA}Os#-K<L6!+`s7H6VY9%S
zSZrHt?f>P{yA3W}Q5AzF{z9z1y$rBH>}KL%Ee{B?>9Jvx9)%vxg`91<RS(sxRooG&
zsYjJ>j1b0esu5;N4obQkxvY4HnI;GRTYBi$qX8V;S*U5~Sk3|~Hmf-(TJW#Ry`JRo
zN3_Rv#a>#jqlxp}>$Ej+7D^X=3g(3ybLKxGa=gGradHQ5#xVLOdhGbgqGm{^Z(w(f
zbvu-t7jxx%t^xr{%I1Cj*Zn`aw|6Qv*ni`P8OQ$i5cBxq)GBUb=Y@W#B>CW-%`v^`
zz`V_*qHjOyl|Hl(4z;5Xvc&${Y~v@mzt!%z<>CE*{6LAqmUf%X#Z%(oz+iHj<X8(@
z=E=Nk`ll+$VW><{cKnW7O6oKJjckDOdJ4`YeJzA`yl_zUbVmpwd~Rl^Hj?*E^0-k>
zI+U<5l^5SPIFARm28V_696v%ET*3w76IbU-mOLry{7sI&|Cbvzvz;SWVgV9;YTLp&
zD+bCMrGdwN6)@FT6-Nx|hs^uYsUVgwsGr{j_IJO#(a5=Df1~)U2<e7~+5Fz*6^+cL
zJ!`FZ5zyA<V1;X1I~kO_aKQSZy$)BmI=EW%E?`Wd0lHH5=(JkES2U#1>S|_MFY3d5
z^x8Cs6`}sYO_P{Jhm~=o<yx?MGi6AL!QndWho@8-fvy9;$#vN&$i=*1hk?r|WIr0e
z&xG+j#4dyR`~Gwrq;rJt%3u`-;icuZz#U(AuZ$bzOhk#dBVV|~UEkv1;V16SfB&$8
zEQ8Wm)8CA+xxkc_-P<gvrr1K;^x`m@m3J+n`gJ#y>6rh@<1z;!SWkG*Rzv?4dnsJX
zN!~XwxQDqE4?4GbTu&^TLFI0l|3tF5;4KaH&(l=_Itz(1&H0U@fy#symA)2qqY<W5
z^QtZZgXg%qt1e`P%T5V|<xi}#SX0e<Uf4LziES&J5RBKqZaIEZ9KIOz!N-B28`@kQ
z`?PzZ7P|j8RtD-HLcN~Uyt~1rOgL73A@Ei{Ib|S^8wbriK4tIJS0c{^C)jl{hr8k6
ztuyA_S$?c={F&w%He3g)XCiqrdTt21pDbWu6V!sTRi1yIHKat?Xu80y)Iv@S{uh^0
z0Z?G{PmjF743NMe&Hci7kR0c8&PWFfm<L!hzik{rb)6JXK0V)r{<^I8O(wq)a{hcb
z|BC!N0!L)BMv)7==m&Czgo|P?v3os)sUYGvEbRi^H2#Tgx-e07s0%feKhA$;L>z2$
zh&IKY6ocdGhCkSiH=;oz*GIi|`p_DITeCZ&2B4v)Ls-5bKEhQ8-})CW<ih~D9~3U-
ztbh4=(S4!Hd6bz&edDfcctAjE7(PFdg7*bMD!w}XX!IWQ?gZ6#bc!u^&G+J7v~i&G
zMx7-eVMO~$K}@U1%6L+^6#ty9%(Uflr2_%!o8-}xc;Mz2cv#C{93Igw5V^U%4f09h
z-q<WZ0`VpPIa>X$4*j-Yqs=<48SeG}`st!G`IPj(?4@uEPmUf5*PcYj66zn;Ul0fP
zY&ZuT)kRn38lAn96EC!DWxmkbyEd<EraI;;Iym|W7uYHe#yfb|`1Q)bjzZbKZ?tZr
zTSxr0em`hOkNGz088(hU9`r2I!qrW1_x4_Kj?}RK<hrrFG`X;g8T>H6Yy|F!f*}uJ
zi<!lNhjLq8xD?CK(4Da{MeIZ98R3ctbQ^lnPg!n1Ea?;o31iwhPqV1w#zPYix>5tm
zx<Wjl`BPMZqZkfs+AyUQaY7DQtH`h<WHh5G2eVCHdVWMFG^#FE-yT697z=*W@0B44
ztIhe9Pg2K?mfH|&e=XjE2VDPi>!b=74lqRj@qj-l08On2`-iPdA?5|v-KDx+5U1bW
zH=ChvXn@0OkDiQK*x}LH>rXM{eL8xvf<?<c<@CGgKqwEmAMb2Fuv-Kybw?ZQ+ET*e
z@A?=Oao~(Dj(iT8w|-6CR5gaa+Ys~k<mFkoX1%VPbC|#BlKu~9@sqN~{eSIDv3eP2
zr5qIlCR_9mI?K=l=D<rTpT9GLdZXMn`mAP%x$_a%54Vp{AJ1jgBP7REGKQQg#b^;q
zG_F{*r;*bo^2Fp@YLQfe#Ul_#jOdLlmFD<~v4|x$I+g9@^*D0PgdC>)6z%0tWl8OQ
zK274Fz$HO$+ItY)y{7b(#0NYG+NQ>I{Y)2Xk3S!NWosKWx(i?8VKIoNI!(i}raFXu
zwYqxM8#b?mlOPQ@OU9<U`a2$ES`Jr+e;$OCjSLFp^A%R*?hyMi8rkTwGF@r83m+N9
zK+Fu(B=bXdtCu)PGoO&(E5Qp+2TVDoaWtYc7|cX`{5SOJh1pQo>NZq@L2B=}Dnmm1
z4#VQUb>xJe><6J`dnwCH<HO{?Noxlng}Q7ts|h^V6x7QgE+)7tmk5;ckHyK$FL^Xp
zxWr^@2)i>eDmgcTT&N(Ypu)s)YfG%Lc;c(X0&?k&Y>P0B@3`iR#mY!a(9?^-%rBgU
zL6+dh;2q8Fkj1E=sa^UYG<ov|?Ap=_rJv!^Z#V9Oyi+85VMQxK@{<Rei5JKvDKb}-
zhC3GocQWTl!VDoSN*8wt01>-8hcEB^3c;d{q4BZZXzZDO=F-bwpgbQJuc#aS=uh+3
zd%yI@;kJ=;6C2<DH}~<w5T`c@Qt&tW8G&A2eo&`TH==N<2Qqd^wlv?`3)$^)Z4olA
zgZMYvXMU3#L}SMasu=G4fLkZ#H4dxBt&BCrUdouH<_~U5+$#z<mfvjra6}Y*^!C`I
z^os#N7MrKJ?|nrt71Vzz=)4V;D>gapj_F7D-S_Fu{mcTNu4?&mwJvjI>ssLw{cRzv
zPVt+Pq`l+>l{_Zm#J9GV*s)BOE!;`uV}Z)zbd{j-ozIDV2flI(!6^r;u<@Z1a9LvX
zjj(Y^;+QQSE2=k_v4hTQr6084En{pkr)w2}eK(G`a=J^xKG*b`imwX6<C*t^&xL$K
zo%qW|$|Xlpv!7q2hQw|`SnEsR-q;t|#@#tZx76o9x&1Z{K@DNNux2qIzki<~ys0zs
z1n2PTTn#2Y>wOBoD|46D-py0lN)ruy@b^Fu*@z+m0DlucR=s5cO`6tEhC|w+b4M(k
zHq^GF?hNx~FC|E+SzXNWXSE%0#?0fmq?+T4T=HC?a2bgNdk7n&cO>WhSj0+iq-Z=`
zpO_F9B*Y54n0jCgzTn^=e;5yGoRNl|MFS;+JHA4HpwP1_vwi404l^mQ!V+jf&)U(s
zbr@FhV#~9#IsBho`DdM64(u$j&AA7u!817cHt>2=ft7>HPnduBaHs)&w)Zl;xqTGU
zivD^q|8f;nvZF%U$8{LKFuOiaaq8$Im)skQy%^#>Qg0%x6^N46)OcA#)0_0$H+7Zd
zIl*8d;mNi^Vc5?sKhVvLiCAfm$EtqSGs>CVzUU{_#aN^LZYe=RH6&XK2pOoVRCMye
zYRT8kzHXdAiB<MEtjv4MT`wKUr4#Zbr~NX|#y9rd6*$0TT(PH6iVZFa7n#nzJ%yH8
z5z+m>yCHdr{nN#cedvjzBNwBmy3pf%SI0FtbO;JX4h<PwsKG|db^femJmVq`@<hz!
z?bK!=BWFV$s|04S8n?i_dtZY2j>XQBr`sALtAiz0<o3{H{v<VP#nHI0&`V*LY@Y!5
zImdr4)Ikzf6ph@rHA)Naj{Cl`DJ}&%Q8en#zNZIm_lb=wP#lKT<AZY9*AZdq&)aey
z=#i@;Wbe>&A>Bix*w+H!_dX*(8GccCsafq+xiR0o*t2T)6QenoPWQCj$}NY({x-71
z)!TPI#@L7e9i!;qGkfLXkKL$ViQOg0h81VZ;X8(cNMR1u&?@xipRIppH&_t%%zfLR
zkU_pNCEJT%GHB)BZa&?~mnIx=VOOB$v$Hs`?n(u0n<BR=*EyZ1!ZFu;Wm3>`1<Y~_
z^8>`d#8Wzh`7jZ<N-SOPWUwSGdDe|37}tjW+<8vc^kxwxuYU1t7-1CRz`lRokC!Gq
zyViarPL6zYMjlNW;yp)8j4^TCaVhDLCGt91V$0NCC-3*8o^|9_`m^-QEz@ap!^aG;
z(CIhab2?&R=S{QLpUpV<-Kg44Yo=IqUB5<%xa$~tH-SEApy@68*ZFFFs-YQyTUa#^
z-a$S4Qn-{2<EO_-X<`xs{JK13w$>33%y^D5HT_t#D!0?5cWYKS`Rq%c>MLAg(Pjwi
z_2}!LY!&Jl$<y>EEkE_V`gtk%No-X2C=);2>MuOYsj2}oJANL|;vRs0TTMEvYIi{u
zKN~YQ5xY<`!WkXQohpP-rt$Ntq8nDmh?eX0p!~3<A0I5y7oX%RDhS?nfAe-_SPSmt
z=E^-XY(g*Gx>@{+r3W2x%;dPCGl=@-sfDktUVz`;a*)IQuvuB&6_)L#cuDQR*^*r>
zg0Ss6FS9T`NwD4ZVRqUnO%UR?QJzJl50dFR=Wt=F90L8#QpMJT=z}De5E=Rfm}{%v
zQKeLBMo!^UPCVN`?o@w<nMW5G=W2Gdi^CZyd`@Nts-zQr)T0}^9jKY*-7Dse!w`>@
z;k{n&26XV3@kxzsmIQ~V(>oMMSAUfHpCXNa@9Nt8zU#;gCiq)#4oTo)>`Uw6nrO9E
zxmP<+aHzN&t@xLgiyWTfIIx!oB;a2?$-XZH+#=gQFlfmDc1)zk<HT~b^~OZROaC#n
zd%V!F_}eqIx8q3@r0GhK{ph(TK5_kuy-GCp(u0xh<@bbuif~=m#aVIi!r`^@ZGtp7
zWMDm5Z#RURZcOpJqWc-L@l^WErqB+Z^5M>EyRSoFJH@npsM&JGURthLI7d3ZM+&I_
z){d);<^vnVJgep_Wx$KWLJg;1bwif1qXWK8?NCPM(MyvB11NT~#=a_P8oqi=lh@^h
z(|>ZkK7A>;k}m>cEQI1_cd>z!TjQCPROG;h%Gq4AJ71w!ogOcTcJ@P9wfTo`3QwU&
zhtOQ^$Y~gu?nVvM$hB(ntXZ*__|^@=hMlqjdMf10G4jf$OyecbiUp?ltvHaCPOroG
zn-h+5{xJYOlLPV^9lvV~`_RJ8k(L5<4<P%PkbIS*K~zpYC7h$kl8`<#i8_l@-x{dU
zaKnGpADNgHfCKWJ{gspWVEP1MIi0oQ;NtZB9A7~x%5OA8-13}s$5Zp0u%DwF;(h05
z;S?Z82)Oa});$aAOA6IxE@jq4T}~>od&Lf)et+%c8%L724(>>4jkp7?#_g+cc`L0>
ztvAzhhb1d!j$CAc2U7<+r-yOCj^itu|9f^-u1uzTg;_nd{y@uhA4xIT&@T>#anDi;
z9ebhnHGG@(hDi0Vsv)hRQv>K8X`u@qIRns<#J`)()Uwf>Fix#ww(AJZ$lys)7sr+8
zR$KN1rOx`3P2kZ5A3T`lZ#%mon;s5Q-IQoD&$%l1t$%UT119nvJUJd{xuL!|<(WoK
zn5pXA0o}*KKxutOTrs@@d@j*MszACK62E!vv3BAxDrc49gysE=KJ0&e*mcT?P^@+M
z&KGy8f7jB)!&?^Xk<TJLaQTk~wR@sC(1WMjaOX50o~>#2dU5v^x-Cq%($TvG9o&0%
z|B17ss8FNPtW<|G!R<)sWf=}?Qcue*r~kxt%UTR>y$Wo5%@|-Q6+V6K6O3?f-;?Xw
zX#-H!CqaL&V?C&~YMi~Z^e42|dcMjtkDsvia9mfi)V>w}YA)MLSw$Cap7VVB3lFDu
zm`Dq3X@?FdW^R#qI03E3eg816yZZ(C_KfUbTCQyLldJh_M8OBWc<`W*1<ZAN$9mE$
z!9=&aJ{iS>D0|cMK;B2M(6{IwKBK8#sJ7xU7~COGc%EE(s-uNkkJ6&?@8Dd;$F5Cd
z5d2g6dPb2ryvamt+o7wPaI~6$cM<4^^yPVn@oWPSUwDq3taKgp>&28_v70*K;_j&J
zvbEGze;th<BJ_7TpVDN4@3r&#H?G6OlZm^}3|X&(J7uovZHTCXYHkjCIk;3nXZN{S
zy&3!tskn<wvg@f6+BWan7|cg5csMR5*Ay-#e)Gk?*pJ)s1FM<z1F{wZ@Uu~LvzN3M
z+;yQ~V*kV#O7}|E1T%64noU#Cy{(#q3UTp8g_>v)N|Uh4dB%$`*2wPFrg6jRH<_-y
zvv{EO#x%&TvkM(JWV34^C4ls`MP6S$U!&pXH|;K7zKx=F!?*ixjiIAnepMgXGzi}#
z`TJ@@smmmVOIdazi_0fBHRHkM^x)&$ohDJ`=ew}6>Ug+Sh_zkjOB)oFWoa!SOu8;v
zKXloDV;{=rofD-RrB0~m$o&zzKz<GJzwD)OalPI?T!#e!*Umq4y;mgx+s7QH2sWlw
zxiW^%(Hm{4^%+`w9kw^VI#VeQQiCQh1#yg^VaL1JE^gNVyUqr_5;``9zLL#0NLXJ6
z8BI-ZoD6vkrQ0z#UR;nM462W8-|*aYWm@Pg`<G(xm3CJ8Z<Auc@Z#~IRM!PmmF}aJ
zy`%;x<|*<0da)L=?dBSqUE2sn$~dmIaU4bEIlN0+_J|Umy~{~Uy0dYSOHNpIh^4zM
zu{Aa9<MAd+D^gve(r!ykDlugDQc+u%W^|R<3?IMA7Xun^j_9Qh(81esjeaKhJ%(~r
zjxKbw_oKJAeePC0K`P3c*_`cVEk{#lF3sHgt4OGRCZx{2g?#uSkAgl;uWDOf5|o?;
zK+?}07D6yT2=lBxE2Az0+qqove|ftU?bvtf9Ik8>EeIMt*;L*HO;vLEW^5KA7(RV{
z-{c0hnq|1mr7R*B_3`KPUkU<~btPI{Pb7e6o~LBwpzNyLL)u0c4s?+(*2(tLay<t;
zN6j;Y;Lm^X8#<$TfcZ>qulzL)Ap6p|@X~JpxjIClZhz|0GKJUBcJuG(Ox=E&Xdx@Y
zn07ebbu;ai(KVv+@6>!zKx~Q-FlFv$aZKg`+BYgs|72DNj9#XsGTJaY<MZTpa4P9J
zW$3xE6D+mpX@SyCabpg`d+XRM3e4oEJ7jx}Y5bdGwKI2L3?7WV+}W30PX|IC7SC@e
zl?PhIruuA;JJ739w(Gjs`cW%m{^IQmJ&?9n`G)5&*$KQKde@DxZ&^v1C|t_bw9>vm
zANic{;C;bYr1ca7ko(M;@={P93`L%5YTYpkJ!v>qyz38u${xO(acygXUNozmn{9aw
z+xwRemHARrXj*QOKEpM;0cOzf-K)KT2M?w^S<-eYt^-Fuh3yhD`T_;CzrL#Wdl-FJ
zd=k0c_a5E$(*9UMkvn1ZjN$m*Gvw5foQf@1p-DAiLI8yEC&mUW#Wh6Z_g>8i6&_d|
zAQj3PCM9#IhUmPw_FZ-GZjE15JjW24HF?mX^HLXTq5p!8i>Vnp9{XoO*tZ*Yt3Mz<
zX%ezBo)j)6{&MrYI^uAo2b876x+HmKaJ2WSor<K|s@%J~#(OhQ?_cpdEjQlw^jcPL
z9N2k3UxoQIC)joB5X(H1DmZ8Mpx}1t0JN#?+l@n{OXRZo)7KRDHA8|78#i<Xw!`tb
zHG{t12mX_r6div4$EG#F?u+YvwQ^E5xkZDnsZkAtCTH_L7aK*d6|vrFnaM`4(+}eh
z1%8609=RKQpJ;;<u3nE>h&i&zCHtLXF9R_m5W)_btC?@t2wqubU}9S!sUq*D@T2<<
zb)$x9#$>`rDKCFc9KQGUM<x8a9x9HJg*mu?KpdZD9rm0gZM5%`D+?V8P#otq)_Jct
zkYpWZ`se{;Lj1$7i1&u%cT42CK%n7nQ%cH_nBjyaBFo1P-4%uxhDLNJh+?pth>LZN
z;~;cRzl;lG(F1kWv+q`EZ9p$@oZoWfgDRmuiSw5S9re&{M#F7Z4v{l`E(l9J^1B}R
zOafLIal2O2D7-4SmhY6^vvTT%GcC7g>d=M|5*L%1J-wd96@AK3@#cdtTvpe@HQ+gf
z+8x{TAvCZT-LK{lzOdy1)W~q-mgOONf>t$?l;Ow!<~G5S-^awbU|go(HjZn;uvMd~
zf~T#>s$7>>CdaoIlHZz>{Yz`F&VI>F>fOTNjKT50cTG4!nChtR-uA!H9R1-v_S_w4
zw8D!lKG!~UXhu6C^H(n_;Qmoy*iW9I8hp5hx7llDE>XCYoiE$V|IwBv2~ePAKP+)p
z5XAVmv4w=xugcAV*SMeHqZagNx!g>r{r9+V!%eQdjn}nt@XyK#iT(UI0IQBDRk#g8
zb;4USjJZ0Y-S3MVJMMjkx`75)#5)^8{?YsQ&OX_<GMCoV#DjYaR>c&<4RZuVcej}0
zV9=lOS(+0Eqy^Vp6z?BHqe70AvWq4{d<4~ngwO)ijqkR5z?=nvFE1$fL(zY8?^=9a
z=e|}F2p^Ve&Epq@M>brnXiCQby^?7uLjExNhw10so$4CY`=t59!8c!^8}2`Ef$tWC
z*1{x~S1!~GeOh}5t2|WJOSeF-XDavlPK(1TPnmZfdW-|YyT^H6a}7Y)9dW8nE$tAC
zLaf7sQ$1+a0Q$VrT!WCT7clTmn>sHnmi<5(H{a96TwQ6*a4SJ`Tv-?oM`Y}l*w!q&
zDp&vMIJ0{{`IQ+t&S<$)QwD1kY`&mJT`G5keHRBk6Mq_`tEE9lS`5aQt`Utg)=58q
z=QA|VL&R*Z9Y#Cq$FB<XDig}p;4deL)SSVRX54B!-oMLPD*!wKl~R0t`2o+>_H(f>
zWI+kXbA?W+@2E?xeBJTF2FTUvp$qYTDdZ@w(OLIGnJ{qdNL$oq>cN@9rTF36dXea#
zmN<}bKk9OL0T*ync7C*`US?HpX#7IK92fP#NXw0p)itBrhJy{dWBf~|Il=SqcHY7H
zJ<y!$JdEfKLWX-%_B1`~Mh{s(yYm2UM%R9Nzqwd_EusB#kFX*1VI_VM8b2tRst9|K
zxO}kg)AUJBkS}-7VAE_5r1<x|n|<K`N^hOux&ClB#F&Mz9t-^ph4s~6i7-(l49F~4
zhA(lK-uzXCAz1af>Sj!>`{LwY5^5Yku$Ee}i2Z@Bixw;i(+(h*7sT!Z%daL6B3QjH
zRP%+|zpuUzF23c?Ke+smua2a{Ev@_vckrJ#d-{hEtnt?5BPz}R{*eJmh%-L>M%C!w
z_mbfVR=4x)=_U(uCck7wFiE(!QO`rt_}{nR;Rxx^Vek>l?ZOcVHY}%F$%&1;fh~P8
zn<R{U`h49}4{|Yx9JQO4y-GQDT{AoISTKeS$fj6n#TMgWy1MUce~IA1f}laW?5P6C
zM{{q}?T#_1NaxhL?D#v-pD8W_d=xXmX6gg8&|9*v{$K9J_vZ$g1%<$$DthL`APG42
z_2^`1j0o^x3e&tztV7Q$pR!fEK8&7e?7s6P=nM4AWpimE0>ioI>mRcUU0I0&T6@3U
zAYPJgAU#9k%H02bUKBQGsqL~ZQUcFy_o6rL2cQ!la-VbLc0ukYTIhkeFVIv_xrdss
z5dr6W4UyeVT@~zTqAUEn^6wi%EbuXZqUm+g1%z_bWh=N*5g4TY{pxA;88T?wy7^P|
zAiBP@ukze*2XuuSi%N8{641<J6<p`2vy8%}%(9#1cdI;ZGQt)&j#*@4#o+5@i3rwO
z9$d^Ime8eip}#kUt(k?tL5hX%2O@73pfV*X^K#s*gdara%FBM#yFgm*-(AEQ%)@br
zdGGOg$qqbxace*EB)U3RA|Unc-&XSTEOKVF!X*wJhOi8OBI5$H;T7*Y(s=32-8>d`
z4<=AuGwfsDBMP2@`x$NKYk&t|m(;tCKJ>Md=ZrdNMW20R7G~+}L$AoD{H?bTBA{4<
z_4+TU=Pf51?xDd4<IV5+z@#W+O~4Z=@VZ1jD=lAURqj<5f8SFt$kUO0igY51Mp|Mm
z*IJ&;{6c=0OODOWG_BP;IgE!x6X=9BZ=*)0ILyMb9iQy84k!++t&CXz9^Kp}{PLCh
z5R|&>M%$x(J!stMfcd%wJR!C0NRIq>atV(7M8$cTOBw6&Cf^ErrfHPHtN5hHA1QeD
z@8ZwuT$z}JphWu3%ZG#i`$UDdo%DIUaTQmTC^&*|<IY#Y0vqG8k;mOqAUo8!GV1;(
zG*bDBywye09iqE&J)xiUkl@ezy50Otgts4jriGcw7o23rxX^SUL%UAv?N2Fy*51_(
z_TmGX(|0$d3k$BwrQe?5JeWdFX=u3-znYcqUl9d{YkxPW=P-laJYoC^pA>*v$)SMR
zuU+Vc+<867y&KIn;;F(6_Mu%q(#iKr<Ol+n*H;?EQ{R@l(hOwi`@S+JE-_%U|M_2m
zI7Wa-O+EWYPyp{*7Ge$^=s`R8MK=s>>qDa@2z~3lyU>y+;j$n2Ct%|+<&3unsR80f
z!}UFHQJZp3448qZ{iTH%knY2{A-Po^JYmw~_gCnIE^zigj}0UpYrfa0JeTW+Mux!N
zE#>3zz@+w1`C9*#l#!PEq6}ngEENNEq-Tlz$LIhbi{xF$4{O0f(i(~2O+Ba_tZX0j
z_a3@q<FT{rw1!dri1K%7bqGN)Jn?<?5vsjgXzZQ&^35kA2oFA=NM=f$#DEKj#a;A1
zXsycS8uQ(B9HQRJ(sJ({#_aJ10-)(Zc!N7>dRA(B1n#`?8$EVTv*#A6xTWuvWLNsV
z4;AYU9d#&afeg>v+<iM}PuQUmP$*qM{rf;qnmF4QxWJ{hPYihChvTG!MS#<{%?%p&
XM_1);)zWVL*hjuO5?HJu(sKU?g{34a

diff --git a/tests/regression_tests/surface_source_write/case-d04/results_true.dat b/tests/regression_tests/surface_source_write/case-d04/results_true.dat
index 7fb415cb1..26b9e30a3 100644
--- a/tests/regression_tests/surface_source_write/case-d04/results_true.dat
+++ b/tests/regression_tests/surface_source_write/case-d04/results_true.dat
@@ -1,2 +1,2 @@
 k-combined:
-9.263843E-01 3.193920E-02
+9.288719E-01 6.877101E-03
diff --git a/tests/regression_tests/surface_source_write/case-d04/surface_source_true.h5 b/tests/regression_tests/surface_source_write/case-d04/surface_source_true.h5
index 6c45d92e6117a936f05040f5ce367471f98b32fa..90ab00748bcc6443109b65847c22f1d0169b1a2e 100644
GIT binary patch
delta 20026
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%0Aql-Vqu@~HIk$GDEq6hZIj&^OD
zR6tdyUnf?+rxx}}G*kAvzHNKl91G%hs8uRBL==nGKJ-vINdn8@WV<IT7YmJj^{aJL
zM`4^A>H6==20;JYem10(15FcnKXt5_inXHg+h||d|LxsRnBu%oGm!GV@TEomzTnqu
zv1>wiUNmkS1ou06tgE=X!EYn|*Pglg@Ty|Z*3B96sN-Hfm!Gy)xZlzi$CZ|xl&n7q
zP`;wvsPeu=0IB<Kx7l7s0qbGdMp*bX3<L7qcUf_?gFZ8ki-X6D0P**UpLAyWsIjW7
znu05}KTBI2Z{E}J$u~m)%eK$$I^RX9UAk}29uyG4j`W{UO?uo16=QAa<~;hqrYvI%
z^|DMT^C9O?dV>XOO1#m>uk3?sOIsX&8RO?L)xm->XJ&Pri4aA4PdwHawO7Xc$qtt)
z1Z&}1L(xx1UyTCcP9#ak;u~l^8=PBthYPLl{h4qf<|>Y*EjJehp1m@>TNLxWx9$`C
zL_m_APnk$|%45wnfjqU1!*JcK)p4(9jqvzodL!RgH6YQZ_u8c5X4FrF&$h8H49D)I
znX&*6&To4@)PvK(bo&c_6ESm@*`mWQWw7Goo!+tu1@L06XWXZ_aTw`)-Gun@4b;0<
zI|FYFAz!>UymQGqf@AS=Gfw}wjgIXJC6zm}5bn(QmJa!_Z}?sA)>%+_JWOO{_A2<i
z<AT3k)eyWQ&cXNObSGecb@%WLpB~Bs52Lk()Z#c^7sjz1_S`Dglp0O)zU-Qb@jf8b
zrg!qI*(6ZVdD42wtrrGp<U0wccfcV%zt3l9I$*|Kp&2-(fquQCpC#N+)pj?|TfOdV
z`OGHsOc*O=`s(4c$c2bUpf*(@f5E<_;N<yTJ<z*`dr!XQ0}%ayMLXxs0Brh3nhBH?
zLfIWA2VXj#!;P?q23xB9_1B0y8zOg+;j+Xp5#;FS%*`eYG8orAO1r+I2pn^?-|Vw~
l3>@^+lkF6!h9|hDUP}{IQIDF2Gs;0Lek(w!gYBci{vQK5Hzxo9

delta 18496
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
C$@%{P

diff --git a/tests/regression_tests/surface_source_write/case-d05/results_true.dat b/tests/regression_tests/surface_source_write/case-d05/results_true.dat
index 7fb415cb1..26b9e30a3 100644
--- a/tests/regression_tests/surface_source_write/case-d05/results_true.dat
+++ b/tests/regression_tests/surface_source_write/case-d05/results_true.dat
@@ -1,2 +1,2 @@
 k-combined:
-9.263843E-01 3.193920E-02
+9.288719E-01 6.877101E-03
diff --git a/tests/regression_tests/surface_source_write/case-d05/surface_source_true.h5 b/tests/regression_tests/surface_source_write/case-d05/surface_source_true.h5
index 24b04a862e42c6038d6b0e65184b43715c8145d3..2f55216798e3cf55e20e8932d6ce326a0a75fd8f 100644
GIT binary patch
delta 19706
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
R^EFyxe{Z?C%8E~q{|DhQAW#4R

delta 19732
zcmcJ$c|28L^f!)hk$IloYtB4mNV3n7;gTX!NTorBB%~q@DixvRN~TJsd7==)K9r%^
zoHEbzRHhXDZa2sM{O<SlyuSZDkAL>dzWcoQI%}`B_S);c4;I0KMX+QF6Ii2@y!XBk
zCxkPz<oZ%lI3!sYPBJl3@;J!MwG?Jfsek_xIms+vt0}&mi$6zll9{(ss_~!4Imv{x
zp{i;2JqDBmoFYztAqY(W{+JirI6uLWv60`9&(!XG9=8;B@9J~iFK6VjQ&C@1uAOTI
zgNh9?CAGbv(<1QbD*tv^^=Pz@c^47owz|L_YHLNg!SN55g8{d@CS>~X>Yw1+Nr6L|
zc_hqXrSF7`ga-C`d8FH8k$P~$Xs1%_zJBO(&b2o5T?g!~KT#HGLPU3em6`exx9P9E
zJb&fIaakz3%K>vDC2+YE?L9ab=fj()L%Rj8*ORbI!?r6b!hXP}Q?0HI-<BahbFZf3
z*~Va`qk*XR?IKWquhqRZ^F16`R>#ztV1OQ|(>dC_!)$3jF8n<x$;$yD|L5{2S8Z(m
z{`ybjv&+c@LhQPX4fjmxogUm|!qu0F*Noc9^v+6Z=lRe#T76#Y=$$$|WI}dGzRb=f
z6?$h951HAH(!uj@QR8{Z1l6{@6$!}-f0g@hT5n!5a~>s&cX8dTsAFCfo!;d?r%xYa
z%tt0vi|#`|MH|tv)2W?=X`4N)5-7csgP+VSP1(r5h!((4CJd-n{N$3Rsr}!Kjnq!N
zJnzq!EW_y!A_8QBTjfi??Sm)jo%gAoW(k_kT9^Jal3$Qa;4&^=uSVWRmoS9d=}QWa
zV|wmEf4rUAi3C^b^X%}XcanwvzVBtBMF}&7$b{eGDm)V`8uT&Z!er*hl%2whW5R{W
zgwLndW2Zj^)5r8vJFh$LXU!tp(K{VPsEcr`+<Y#23thH65i)ZCg;{hFjVMYcuveyT
zne1Lqe=t&%%xpxd#>b3P$GE#r4HFA&>0?~P$b>ub=P*~c|5y!1?F46tr#CYD(MPI^
zlbKgg0>u|+j1wml!fRTt`lzg=kC~;8v7w+6i(@<_s5s@pAD<)`)5lawkeMqf0+Nek
zbR@|HezVKn5~u$oRgxr``2?k7aZJ1vnNU<z@8NV$j}GH4MP?4AWJxW;R8hw?S|;Uj
z9I~R1F_tD1oJa}FD{I!!JJYG126LS|{*+kI)yW}4CS(xT&&rOjr*{TWJ0}WXnA{5j
z^v4@z$jn(3lI-HVh%A|~`R?WghpJWdG52N3%)^ukd<?%FnIQFK&oYml|B)?3j?5fM
zDUn;mX_q6jJ89cyCB;$vIYs~3G?_@XKbX@K2?FTYnbc1AU3yHOY8&XC;v_QjPs&cx
zB3L-dhJEhqgS}>C`pfi_sBbv`>VlrEBmFrCc`|__$p7drr#pRQp8Q`!WmZ@OBPx&y
zRwAjKXR+P%2O|~8%+D#+_?U6(7zwjL^$G_a`WP2QGT{=z+q+lQf!>KxJKNZ9dYWhb
z$Lm#<$jp<JK&5}7av2^Y7h3_os4n|iHsts~o}Zy22|*sdIgI(pW3Bfyjmq!61AH+%
ze7Yn$fQ9ahjTwf6;NgvJHTTlCq9)l@$DS4I|DBr_f>{}GXUIAEKSq}$sxO;a1g{dY
z+U5tU1%<kpqto^S1=1ZLat3TK3mk;9>DglL3FSZ{;%C8;Z;og<mlbJ^)%GP^HU`{3
zB}Z;&_7aiSJY5sVG7dzwL35+3l@R7{*J;NkKLVcp47~W|b`7Y}EWa!MsRpXu97ZQ@
zX`<I+H~yCB+_HqrzKDx&eRuY(sC5_;LRiQCbW)xOAqkayl-4Ufp!o9PyPLwhVDG%$
z4^^)o=y82uAp|tRrx}ue?6wP`Zf{q%+}^tL?*h~GfaBtNHdB^5&_7SY)~`A$`oyss
zSZ)pxj)>O49xkhhRC64K)-uNIe~#6HC!N_bv3+@9cfm#tcQ-OBQ~V;o^%q^g_|}K3
z!(y}WN<(f=<WpnoGPQOhX8X*+fVV>nOa1iTcTA-gq`b+zpy}HO1M_TB)04X3F81ST
z)7&;_&C^?J!lO4X>49<U3~S>H+47c%48Cx4{_~p?%UD%%%Ip^_vQ~J?#{O*v_*7`M
z(kyWhW;{uYd{^25(jBvkwkC6<0Y+ke+f00xaPh4ZPcgjq1$45Pkg(S6Tdzgu&p@Ty
zYbVJWyohUU&CBZ=7@P$XY(Kq6;663<i+cALxNbFbiEgSP%1q);^{fh9!d;FlV6lyI
zaOy5r=0zgy+u1{0h{(2?wR{=goJd4W!weU(1sbi9Ie+r!0C;>^*viiT3*@SZdzmq?
z0$pdez_;QHZ8xT^8}}j}%VMj->T~_r6?Tlg&tLbT7zw+4de^1Z1_X?~mot56-7qwC
zQazs&R}bfsHHQ?k>VR|ey{r^veU$syWu5%Z$X|JBDGTo+9y8^uDj<|+VHYC#O_r>M
zZ}C^WNq(9CShQjuvU6yy^GqXQDEZT}<`=Ta0e_(GWzYjp`mODV)M$cJT#w{N3%g)l
zZ|lt}Ye95)<%{g_#;r?Q!g2Ap$vZz17P9gO9E+@ZR&zxPdtk@Y>!>Ax46n=<zqR8l
z*cH#Wu0eSi2wwhu{N4L1ICN0wt8G#PvijoPhY_Nl|3h9J*HE@s%}|sdYxs5|+fkB;
zZLpkL5qeGuvsG8%h`iAN;}73o^UA#%e%Gl?e0OIUJ~b5?GVW49#Wa6<m;Ip2%a1Ey
zv5j*2m47IRAA20(yta3*IQFl5CFbc`%;B@;ITYW>bF%Q*OR%=FFJVLF7<_LT{``FM
zEb__1(8W2}hXP#wc_Sn46sJc<{BcQajjQotX9X6Fecx5}=22FxX7!`5EEx@ey)~0}
z+@%_H^CxSBQRS^*4U8&b)<cVRQmmSiwEyaXwyJ`-yp#?#z<iQIQvVlSh4B8xHbcSg
z-Mdi|mTo;*5z^cb)K;&`R?bqv{I_eeU5jal4y3q{lx<(Zh$pFdt5rWtaGFLG%?!}p
zlH()C>NYQ}rw9XX-LuPoVzqmLO4WT$o9`rSgMZgDDM=CRg71`55_cV(VP^gw5itaF
zuFM8)dG{4cFO%IrRB3`zFg4P1DVo*O-a~W|mzg4=0SKm2(M8eOw6vAx6JiXr^3E4Z
zzVVSlauNgB3!KHU43X-9-3?8^YDC1${(3+7aqA|s<x3;D9>Z_kWZDjP#>;desy685
z7f*Gguh0@g8m<Hb?(=7XPOl?nks+2D;VuCotV*Y9SmkObFx`CFdhNC@VDGo(i>PT8
z5L)MuKBUwSPmN_)F1tI9G=87gIjV7b$=7gPW=g&$AQ%+BE{@&rwxmNThFN!=J8-Cv
zPZWtiTuF!sl1AP{pS&47A%k$Y?}~*xUx0%jf_JYr9|Ly-mE>+-e+vUP)&JVds)R}y
z{k*Z8iI%j|-bR`Mx5sXye{HY;qFX2^<kKyJY-o)>$1^C3Or$>!xD@yeIti7Dm&uGk
z^T{^Z0m<8dV0#sNFxH0Xuo>ANQ1SX}V{Cs9JJh6H+nNw=6!tJ~EOhBDWEo~t&TZx0
zxSRvAyYw_6V1|g?!8~4<6O@p$b8A0-JW>mD_a`Hpnnr-$$-cu`$(5jZce(toErZCF
zS&JvCQ^%KdhvPC+O0)qr_hZ(P()cTd9K(DisI*4leOXL&m4<qGt01CzInBIp-FHZ7
z*Cw(ne6aR><@h(pqG^WlS?A^zrZbzRuqWc?%J!PGV70S}flVYk_Qr++5B}-^%F+j?
z3mv=Rx%{xilT+>RtYGSd4z~fCy|&{(<l5a!nvtWBbgT*DcLsiB{h&v1B7>yB@W=?E
zR2chpV70e`kOcDY=aopu>Ctudr{lr7{1Lb1ex0ys*QwLls)Il)!vE27eF_pj<gq;C
z^Fhjiz<)7>5w}Co@W-n)+(=&gKHc1lL`*-W99bW)gj9DxqhkB3z>bq>#_cr*v14M~
z8bOut*6(e<XDzKz=j;6Cj*r$Ztt5#-USab`d0D=a*!LW!RrA5(NTuX;qw@hWh|EP7
zjsW6UIJxJNqS>u{psba6F&G^I+=LIMJtTQFH?1k`v=Z&mO0ydUimR?Qvnl1Kt`zNm
zMM{aTHQ|kB>E(mo=1Y-WiDCB1t>@(_vCELsvcTETjwH;S{|sCGxE%6+MDvy{+bO8u
zqZ25#WenbnWbyB<e+&OOr`9Bxn4_(0y0&G6(DMl#7tgDbvJ&F7;$)E*r%rT?un8fJ
zK4P;x8ah~d%jDS%zFzRl=7+P!%63pbS(m<n(hkkh7z67)>Sz$#M4X0%<&w6P8RXSG
zbg|fzLj+l`?_nNnB!lhP^6Y+6lr9$NvQC*pyc;OAU)p$OstjN~4YGx{{qSk*=0F9O
z1%!8-(eV`t^qog#5f|Ul?it$sy64D_eHUuHH6Tqw2(N4hKb_R1=0PViZyL5hbL)F4
zYwHF9zpTlFF1}jWKWBPgXS+3;+Io&#-EH-fys8ZHvS7nI${vVf>S9&xiL+8z!NyXx
zJE%N%WR-1yjr{;LTNm%0V%QAq+*dSnsWgG8U3?i|9~+=tQEWQ~8myOaS1{mud~3^2
z$r8uHtwc}HdU9dsw?(k8P*=h%D`p>=-|YiMty^CW?CAjn&G~08DmftY2z<nMY#PDL
z_Ck{+*QFh8375iY00_ZRc9@Ym?a)f|WHp9a-OCr)BDN8+jO#20tiO1W6VBtkAXf=f
z)@k|m$)p?RZ8~Nx%=8pEga>A+=l4S;<@gZpd~5Xj%n#@+MLTHHaMc-bL&j^uzRwCH
zzE7Ne)M5n@mPj!r18pfRaeDrzV0H-<T0KB<eK`mZefotS<n90h@4c;@e3ek&n|-$*
zSZ!RgZjD7;+zJO}%4fn7IgtK@-qz_sB4*Fs2eW?7g8vOyA>FOqyk^Ie_8D;}xr8&X
z>>^>aLSHXh-e*DlH8w=Andd=VD+lxjqI#j9yy%s!4|_pa^q)=Un)l(uU>?0Q>-EvM
zK85v9*=Q9OnjSP4<;718Z#is-o5lH&vhfAY2NFcAlf-0s_W}u-{nX%5aIXk%4>qiD
z-1!Ce@4tBP+{F<nTDN*uwnYtf2@6VA;HK|Q+6?+#xOK_>?Hmb7XjvmK?AinlsiwP1
zKl=_Ib-%c_GN~72d=v5UIMWGjHBLJ?%YTEPZRac9p9rBJo+Wj36wnUJG<kIwadEE+
zHTHCl(q%&)Gzs|B>64Hj(R*VCZ1s^=g)}3}&`R*>R=>x_&E??Yfz39r`$vJgoA{6A
zMq23CO`hul1ZmYM8m>Nr9xl92-y$$e!t`F7`P;X)!wC~E``Z1=2+QYuk3RQO7_#=3
zePZ$*2&)F~bl)C>BOczBAGvhU(PKj0pMvQ2yK)g1w+CX^&Rx7mg)!bezkhb6%3xg8
z57|Pw*pNn1&L)MnufRXU+E!SMdfKxXNcLIR4Fz{TJfU$y3so?2KDll^JuhR#O=;p}
z8TuiKnIxVaNZ7IfHJGYx9AtE`LjGc}zQoU9eFyKrtacqZrr@Y;=QskDxpx+S@smJv
z-#<)>y}NE{hclp@T5U~8h<q+36+rhELx$B%G$zGmy%NFJ=ojnpzL3V;pSa5$>sLhV
zH>dc#x>EvM4n$odz8Qhp{v+q>%j&^Y1-I9YP2%X0m8-8DYNu5=Xj(U6Sj~qvdmbGK
zCt+i+_H<vaVZs8R70z3hC}VnsX2x94TVU#m_4@5xJ<!HfsBp(ZCs^rGX8H2fa#Y}B
zm;Uf_*ClT;UBty}1Np|w((HTLvD#6Orfhx^Hs#Kdv`1ARJN_-$Q*?D3@NFth)%-OG
z-xr=I-|7AUx4&{Ylb!E|j>MQu+>4>bKw8#nhU<aya}6N)h-;?jyV0@(+S>s9*TweH
z6OWeDL=vW4LaB;XX2*_q<=CssXkzc>yiY`M55SBchc~ufZHHFI1x&nb4dCpl-wR@1
z9mqY;iLUeu)I4CZ!hz%BHXnO3ByN0z9A@9P<*{a&0CwSv4pV)dCKh!0zQ9Y#5tx?G
zdH2iAeRz#!kaT3<Hz1qowrceIS0pm^TKGbE*k4@Q+u*p%C~wUG;iQYoc*kA3ry&e)
z)1VfpWcE@7k<RqKwl7y2Q5kkg`&1`}xQK7I{p8pW(v08mGFx?m_L}8;)f;Q!74A6K
zu#Xz(XTd1@+%oz;ZO(vOkI0OUN%A7ZbnorlX<~>?ora40dU51U)fe7g_W@{s#_wa$
zzAkuBb7RPY>r+s-?B;FjBg*LJqBUoC<T))xUPj#e9zL0__0m|jp2MK@MG-9A=POrW
zU=8@ma@5a(uLYh|Daa7q(hUb@R)(g}bwOdbYT-d|W%MB;=XOqT*OK;eT-<~C*e>|^
zZRSJjw+Pf-TS-JFE51t~6e41X#_)=Amwr$sw(W)~Z!6gQp|GyyK{M#Uba+GG+o4&<
zA3wPG;=mHF1%n>$S@r3=Y0F?@M`atI2#FxWmWk!{*O@V+;%QklYY_fsoBVnA-6y#7
z{Mu*zuiL;)x5?Yss1@3n7t2w!nO>)0#PzyR$lIR8jx?gW6KY~4B=p8!>Fo`QnAqM4
z{!-pvK-hg+qy9@1;7~cW@o7{itn7s^E7t0u#yJ!0ZauWBBF(z37UjkDFg3MGPQ|Vb
z9^YKCJ9tzI>-_$^?&LdptR*R&*^8+To-j4I9(T7H%=1&2H+>$2Ej1IV!d+@;nI_V9
zjzTM8(r~RA^pIvDesa>9h($g=ksOlEi@B&dXUf$mV8z@oRa#|7;pS7yRcG^R!4{`y
zn<<Y=fTNU7YgK_78WgdR{gaozv*Eb7yy1$5=1kj($f}NTpW<mA?B%Ha&VZ~=@Ka+R
zAsh7r6Tf)B`rHn9#5VWtQ=|cEfBUehP)i$aO70Xh0U!Ua+rRp4`dTu<TJIFu;m|gE
zCx-=@VAKwE3(Wt+9|TZ4^9bh%^^G2X&2*8{pmy@ftK||8|EGS6Sds}u(~GY)R{y8`
zd!O2=U1zja#*~%^{Ck|=icAQ8_-=(07u{9YFRBpV#M8_VJr@b*!W83e^iCBL5vHn9
z?KyE0wji>qNiixL?9$y|f2U;(<Qqik-;cNpeoyhPBAsAI?WR7mi@v436>VuYFyMxa
zs{Oh-z=53cp_pBx9&FU=lWmYXRcuwlpFVe+X0Yn(woTto_Ct%-?utu;Eg*%D0HxbG
zQJ8+Foc9tvNwQ}!r9YmOaOP(dfPMejd6^axlDMshavmyUi8m<4O!4jT*M?xZS!4*P
z=6&crb~_s?6vxji@o}Qkz6o#tG}20cw1BpROW9}*2+MvSJH78dtsq8w8%G91JJSDj
zqTz!e_Ctd8lkW>zth87wBPmM(+bY;D`@W?cmO8o5Xkm>ocZgk#qqQ5RD8~P(u@Xg7
zIefgL3TVqrJLWi1B*@kTYi;ZE>214~!qFy%*(U0}%30W^;WCfH^ILz*BC~(~{^?_?
zz1kI_79ZfIcClAQS_2@#^XAvg1D){nNbg$x1rn+d9_b&=vT3QX<jkPE8!M~y-cHJ5
z@bf*x01rVdefpl|bukg_evoO!iO1jIF|`zBn?&l7*3GmA?db!^?+;abh1gJ*9g)uc
z@$@janE}@;&gyggB}vR2%jqe}W5%xUVzs>7sEoZ}GZOMqX$4n!dS0H|*9$g`eo}v_
z)B%PEu>G!O6G-omm6OV!eU|j#!k~wlwxM02{v@pV+-0`tAI#X5qf(oVKI&l$v2xM@
z8#<v9qUPZL=K<Wk?#xAfy+LRkTJ}Dvij4A(d2KigXj}ztHC-8Sx9?lv)jS}HxswJ@
z%Lj;KPD7h&bsmqvGnaHbZ&MR0V~<$-lF@D`*%36dvG@xxiL<-+w%-BWrnj=Ox|@D{
za%a$k{F_d|aZVZ;5Z<^qds+n3@O;(p&7_N@iO<+s3J(DuJyQ{f@CF#OjJW3Jjjxbw
zW9fS1#tQU=-|YFvxil-G$-A9FUXIE&+Hd}lko3y(v+}aJFhVeFqBdS1>2sSFRjTL(
z+kYbk9{Eim&T8{5jjRr^tT|(+<5^)eAm4bxLxt}9I~e5k-1=PXwE6`2{$%crWE%<5
z#@ItA>h+M$I6u8(`d7g9cFujT-j9JKl89g7&O*?r+Z@K_xDFNMz4!h0B#oi}7ic1F
z$%Mlf&R^R%NjtOt>l~+c>d$o`kEbl?vCm~4l`B?D-qmeQXF2ewi@$Zl?KB<ASqY>{
z_)2mz2LUM^xl~mBZUVAeS4rR7oCJQ<$|-~jjzO<1?kkUjK7qo!Cl1Q8I-wUMyE4+!
zw=bC!9^!EPCy6$1-;RqQKiCS;wVncq@7khX{l;0)cSksAGxKx68tO~DvV9DS)nc{x
z(ktKwv9$undbH7`O&ev>x#;W(o+;wE`#dv$1Xq&~b*^V|XMHB2{aip`#xM!%xO?W5
zd~+3G*VY|RW9@+f^&JmqQ>o_{DBAJ*0yWe<YrSAPL0=vm7neJAKw9JNQ%S`1l|aEm
zHF0G7)m??me+EF;D2KY<bQzfMaGo729sw;W4@SK^>tJNX+ELxEDa0Wn^7nFM_oeKC
z9arpPJGXjt_~BI|(mlXezItFe(o&(tXP6|8rR<8Ui4GhCHFwm0EibG9l!#lOO+TIi
z0|MOku2V!*yDqHttpu%B>G-$mhO;s(i?~&q0fBu%a>z$^;mt;81(38C(zm~S6~(Lx
zPkhNjL!fWVbI=>r4z@~jG`T**U@f0zeaSH;^to}E{LbY|1vy6YMCv7bYoxOz@=iF8
zb&!1-R*<I_Gw}E)*f(!7!kjq@35O`I`U=m$cDGozg_qTE!X@qJpoln{PQFl^c$*$w
zaPkD##`EX<3;Zl=0F&Z=<408T%VqT?cCny$Kw@h-_w9RK(DtCBE6>v|IJ~ds=c_wy
zFx5wIZ&bS&`swM_7^{8sWn;v3bmC5YIW33X@jUIcaETw|irP_`=PHay+2`;%tZ#(t
zz6)$Wy`vwV_;@{h{l|8ABC0`hYWr%`&~kY+NrlD_)1tr<DYGcB2s!)PS8-OXDC>)S
zBbkJqD7R9|P2#|OIAfPd*VY1qJv$^~%ZDJ>loOlUmqr*8DRiXun<(mOFEn`VG<|Qw
zX%}1%M|UVB_P7i}ejCoukEmwbU-14x4uJ;|s@(JZq(}jbnlwBdd6`P<6r@~x<<kcO
zh7ET4@03Q<GnvvBuF~BYr!jDII8&0rd3>u7mgi>3C9+x=>wfngIk{C836r=y`l7rB
zo+*x_Boz079J|-<b2eRInq8J~^-3sm;*AtJEG2HqjTv$4eCAiMX*C1WD6Q0r2`TK`
zofMCBSrsG*5Hv0uP^0xhv{jbB9iW#dADa;eKt!YCx$&Ep=s8}izBWG^%T3d-z@h?h
zH#VOeFAXx4MZUg#<U1NAgw@@xP3<hzM}E~XM|?Qc3&JmPM@Q!6fv}qOO~{pAaG&?8
zD#?}?J<6%AJ)KF9-i)}TJ3^jkc@4ue($c%n4UjO-z}1RvtQyF;@wXi%_NSm2*S@Jw
z=Q`lG1_Jqh*&vY7YCGF7t&2XnSg`hk!qFu+UZQgr<@P^zOxyGbD{^1(pzSb9LX<3g
z=01e0VBHraOgO*wLKuHZH?Xq@<ZK^!@sRi$B-PZ-a9`p=$pw!?m9Eg`#pxh?-T08b
zhf~u!q0E?8y2~^PVTu02RiUs9Yajpa<h}1c+;-;1)K;Tb;H|=acR+0z6l8@JNJT23
z>+k425c*G9hmn}^I?<8nl`s!KP1}SYVwOTOGj}n2_H=`ze!us($hCtXgM%6iUU~4E
zzM5i5$Pfsjyb>3?Du_;^*Wmj0y-W7Mh>IA9DLvgc3+kVr&pqQLg=BLdSl^&2g20Pz
z2?w;gA!0gs<3eFCJTG`!Z{lYyVBS=*KUJF-eX*f#vTM%o|A_nDHro2695*K8AD26P
znTWKQhlO%Avm>2;nwx6_2cY`LK+}GKJm90Z&E%ze7i7`Cd~qFR0THs(vDp2Zek8}`
z#qCTnjcH>Xc^G^?)A~DafP^fZmEqHw)4>``vn{!1v%zjckG*sC7)YOS+@E(S3yhRL
zJnofli@xTq-QB}Y59>IQg!^&dc3s1WGg8P?>$^G*Mq=3bk<349GiL!7TJc!2BNd9T
z$v9<_@&zXC^*X-c)d+aBQ)Of<Ndf(0e_?%t0ga%d`2{0YG}^mL?(hyFq`oMjz{*G%
zQ(<|d-7q7A_@-U+YP;AD6-vx2Joa>e_L!R@k;*;bjLU`H!P9JLdKSxpqi4@7>6a1L
zx<_?>x0N^|a{Fq^z5eA$21#(5;>3lhZ`eCGWZ4Ey?T$W{Ep3N3dX-!5Z0dy+-Su9p
zY6xiJ;AL`}h5r(+41*u%HJ{GCLnI-MLF<CQDY9ejHwX<|MA@()A$yw~&M^>2+8H9?
zdkJXpN=9aieg^X7kKUdE=BNpaz*weR)RMp9WD~C6kH*YQzpgSPoig2`%dbcxn_J##
zn-q|cf`phG-+vZCD9iID?BO634XVFbWzzx95B-jN$l-`~x_0U9E2PuYayTH~J|@hI
zcUc3A_mkOw{*bV%r|c9Pnf3oy+~2i7&9fwECmPziG2#vv1^T@n7eqKnQFad3WRYCL
zn2(`=0x~Xoc*_Zv0WjBBR-YEp1&Rn|1FWwxpdV8aDe+Ao713Pd^1YB&`k~<xaXA-T
zR@<Uzud^hqS9z;8&q*eXg&gwW(;-<z+n}Lt#nw^yWGq$n@zF}4`-pAs8mS6gOi{~;
zxlTd{pNpwRRMLwN3X6ESU$|F|zxHpFz_ydCXNVjUh(Bf*;<ix&Iq_`O-Zy?-(B-nM
zOu9lhXn)CtHt@8;>h+m6A>wOL!|IJ&)lqs@uE-!SQ}TS1CAS2&N499xr%3|4s2iZS
zU6F{KQh1bOv}zPq>|j6X=}`ywZr$_R_f0lfA0*Lq>6#2mj1U?>mf*Z(4>)Or!%JuI
zzPKFBhXu;LG~S{nhQZQ_n_dzm#3;)&@$~r~_$skL@M%&v(7!rYG2!wB9NwqSvS+Ut
zdYR%bq;#Hs`eVd380PS>hvG=4erBVTk|g%lY5Yg)><TQJU8p0nxf$q*J{UidLoGtJ
zZTZ&ws2iwe8+t~M7@?wv{nENpXtxGw>!yqgy4doc&Dq&~<tHp}PSAXuOTyYN+Sl-w
z>0w!1K~cgM!w?ZSzGjlv2pdw}Rtc}Dh97vpk91_2qUVkr@{3EMmy>Za3WryYDUuUO
z7egW}kEoG(sh4G(nF!lui5OF8Zhrc`aQNWFjWCDxV-Q^yHtc`-9VoL`U7dDP1r;7%
zpKPH;Kj|})QTy}#vv*VdIA?}OLP(Vzv0)L*%kdJ$_TFR4&8cbtKhr+3hM|K%NvLb2
zEV&tQ+(|UF{Y*lYehkkx&C)9qI4*8y>X`=!b9pu3e#f$9G1R;-QHs<kG9Z9FvKX=m
zY^nk&JJvmsjva*=^Gpvny(j?!7W>Pj?wFy|{Y7bwj&waR(oGYlo2*<GNZ9=bhgZKd
zKfw&gEpzVGT*%>x`i@^|y|6Sac)Dn$0}98?O_behf>*=4GVZqPq1kdh`Vl7dViZm{
z;qp!r0)r;xBr#5A|8zxVR)jrdC!Z#dAcA}jm`ro+1s%-iEc$%Afql5*>5<|(&}JRc
zI~A#k-tUd)sf~46ij$1E!_P%28i+LF+nA$Gb`V8Y`(C*mD$I*;Pkl_)Jun0m(yqCG
zO#1*xeI+RepR_>Vg<f?PaZPlcaZGM;Fa30l<Kp>)=d)d&^5;lMNV`!)Vh|G|c9O5P
z-clY(5s<WWNUH>4DuE04b((=|Me}S6-!QnbDVK8gqXgRg$?Ndl8}#^q(@nS@(m1z2
zID3qU_@1z6=IrH01dHoudTuKq{R<jar0QO<bE=|ROr;m*Kfhf+7E}n2@K?pxe*A@q
zzE<7(L4v*?GvbD8rRROopMi>>BFo;qCLw=L{Fn{7DTDDA)emu<=!9qW^W(32Hh?3^
z5uZO??SnfeO55^cEYXJ3P2()7^dha+qC?>F*5<u&Yw}=1YLa4@qst|cebHuF5+re~
zSUL6r6UQs)f9`9@C~q%Bdp^E$8|wvmKV*dMu75!8M)ZvuR2*4aH%44l4~x^~rX(!Q
z#P9srD^|=bUs)_*?FxiXlk;Z5!YE`h+@@i1<ueG-o+Y>JzX21DN*?YWP(YtB<@^d_
z_gac)jI<ll$K#~eL&5|t4L}I<7>KqD(unz_i?mMKj*TP@!VM+4{xgmBAn(BZ?RwE>
z_+9SL%(W^b)N;?>f<6w~<#Jlw(ZK`5VtZC=#fCfu67oPP;na}@He{M)Hg$nRA6Z-e
z>dozxUf{#N%R3;a0Nl(il`{A01;N;Ysh7D4n)JD()Iyqm9>VE7{CK=-ue4&nFEesJ
zpG{Bh2ni9q^5^>VX<g*nN%U2%ZU^*+Vq2%$`hfDx(SujjzQTL)LfyLj3&{Jt^nHg`
z(dj%r26;!k9|b#Si(m#TD$=g!Nh7K*<w?Uggb*E>wu}!fRX~1cuT8APAgI|}e5fI-
z9U9B$M;tgMh5l*WeN~U-y`*292*d3m%#<gkbCQH*-wfgi{n-Uy7do#~zd8=L@HMyh
z8ur6(Ng<XqnccAa=8F7<cX_brQY~-azLhAe;;F1h<$IQJjTr1KCE-zQI`#M-70*+6
z#zqqPZtSdiL0A`QDJ4n82UG&~dN<`UjWKXat-xlypcrJfPg{OzQ$a23lPBKpru&;Q
z18)CZp-#{N8DuC)M6oJg7z?N(Ke#8Xi;c9L>v2^Y2G4W`H5{#4px0E6bwViy_!kyT
z!~E8wT+U}Z5+!MOp=tJj6L+|p*K(XS`asS53T))ERH=ECyQ+uB7^;gEmPJjtJm>~1
z2RGayU+e?vPd|T@Uw8|>N?0GX+}num&G>!$9ZJ7Svw9H_k2_-LNrM-(WU#Y2Nyk44
zi(nUb9XTU(Rtr-Z5G**QJP6;UOpC8H?u5o6!&B1(x$u##!oasDt5Ee(3E~w8`o4)1
zg1EdnHB7q8dP!KFYDdPl$WiDx#&Yq+kUF+HwfbU5YaOhrLWIBSya&p+$RA{nj=+VC
z7_YMPLTJJJLm7>$=vTXz2*E|*yhcQ$?SdRu6#qqW%2fc{91vY;e?SQ%zpv_-ds+@^
zxs8g7J;z||)F#{UCojOM6u5=C06}HjB2qN}bIt;|po?vz6@Pi1A3v68_A}Urm5BMh
z%$q&DT@fq45k#z+s{kRdS4cYu^+7Aqv{((79&l%`xrF!pX4F+*<?aO++I4^0x~*Nr
z!|iwY?cJ+8jb*X>xmC%l;)F2nEvS|FGfnK{Rgrh;m3@#sQJb7N+XQo$%@ZjG?SP3_
zt23@k1C`2RMu>oZj<sNr_gK)@V`0BZh-BuW5|@Am;HSlLVRyhUQ2GKoTuB%JWpg@{
zyF6O}@4j<m`EMKH{_K@cwnZDG&x|&_EiW-y@(W7_dAScY-)bw8Laa2>Fg3SPI9Dwa
ze4d*PF*q-NaxSAEM!S61WR`D%MPorhC^diJj0@lYXxTX8QQenD6n0*Uzl^vyZ)6FI
zO^~p=d~#{075hNeu=ckFZ&5_9#PoM{?<hQ<U&p;s@h$uw+{Cl5qzrPYANO)jb4Tw?
z^Ax)D(a&#;BpJ1YzDH<*6S4SsBE|GA5i{3(Fkrn&2XR)fiA|YF0_rta_081U;8eHy
zLFe%yaCqxmU7K8ElzjiSiFXw}KHy{)?ibGkvbfp<WiW$1=k{*N6~>whGhD-+^bsR1
zwvaiuF<4b=?%%xiC9tmCckfSOIS7|c_}H&xhW<_lA7`$)Ea}&VVcnRX{7DmbaRux7
zN<IFbTS_lo&^Ua6gcYiBN!Z`~0_7u?k2s;t@S;V*26Od6SdeyCc72x~diBhG{T>H;
zzGKU<ZjZ=)t6b;VFb92q<If7zd}`-z|D!tw;4bUUv4TbA&?Mih?&#6akg3;f#nACl
z5F2oab>@}|`uIirp{WP-dek}wT;J)@FOk8L$l(V<w@SCLU<-Via#9c5LFzue9!J?e
zxN9Zp>+SX)&=||sX0g8jq6N(p-_|Liyoo-<<7+=I*@GQ}9u9S<3akI1<~xd4qwA0K
zz+uytWB0#P&qIU$Ber^@0J(2+Sv9a0{xN@8p;e86i5uNLdM_1G(E|VAq5v9MNb@%w
zmvs?;>yd)z#t)?si*-Zw?<^;PuJ7)vJ2@2)h58ju#e)6NA&MtA;%qyp0*^SnbiaYp
z;0v-9<$S2(&HUvXj{Q%0aolAMg8Um$am27mkW)QH5(zQBb!U~H3ZhXt|9hKRALtGH
zu8z(3fT3RgLi1JU;7(sBr{@RxP;Z@r>Yqt8d1(yVlDw3g-qee%+E(`$Uec_a#&oTx
zF#A{&zS~~vdKOOmtcUiFI7^7DutQ??y50JMn11SEz+x?eU79O;&U`{1;UAlNa3QQ6
zJcx@sVY8<iSg(_N7rJZ^6up`<3UyzLZd+AudSuS_@0$Go*gPf*>I(?D$%(r!iPEo*
zIN;MQwxaudZwHd)uxCRH=5bX5)QnGiWuvV;*6W>r>nydRd?ER)-r>XL@LJ^C-R6fr
zP&46T9epk$`jo@%%I(wkOCEu<gm{EJ&L0*#P36=4qI)%3eFTxF4(AiWMIx9QM}5!h
zfiECNr}Gi({Slan2G$I;-3Cq%jVuyOEzpkTEF#;^-deISMm|u|B4(w*4=K!f^1|Wd
z{BLl)<Wn}kx;D0}xb9}tsX8#5`$NR?dM13oa$R!Gno(f0`Svd@8x{2KJ1F?#*Z;)D
zGpP7&M=nKcvLo+H-Z^*VNMOy&6+|MAYG5~Bh^^AQ*bl>VU$C_oB!Zi@fdwy5bwl+n
z_CI9osTbJ_=8w*%-~J!+;<#B~@|v5%`7t|}kA|@W;@Gc6{_=mr{jluamg=tCOZ+9S
z2OM`gh->A;4O~e1>Vl>{B}C-Yi*1)~_^D%!D_0jr-gyVowAzlVW()#({`cA;``e-L
z;E-#F?G}`ua`NnZbmP*x;k+nr7R;J&6n>l}A~~M|lD?L6V-CFE(gK)uF^*HOcWHfW
z1^aiM6p>g_1veBsx*TmDggfsDbpG*@M7IXKRH}UKw1kWEqBySHkpykYC=$}o%4E|I
zn6L|#oPVaMxEaoGf7fp50W%>IUk-Cu0LOjz`QFR-!EnjtvXXB^(8N^FJwr3}lO`i>
ztl!&}Yc5D33Hq)+ibj)gL^){AB2yomy)y6ZP&NPs&pCD5rWAm1y%&cyo^(R@2%(^G
z5+^F7)~S3_k4}&=;=T-f|BBSegOP2z+>h?0p5T?rmY-kFj|IND=IL?qEjajoQ!@L|
zFyuYh?=NoF2v{x0ww==<q4S3CPIqR|PlSv-?w%RZ)SGP+&|k23m1{EzlT{IxJQm7@
zO~rfhI0p8@WtZzW%)jl0{RJNd**@L?CGR{8R=bnYKkiTU{55FoAuW2~JT7hz+czAP
zF8nEuT)g%8eU1Ys_WP0Rw&0Ci2-lJD^rvropeIz5&3;e<^;M=(Z`MAjqHdBrfheHG
zt$RY#vNtW+uiN5+;eM<Zaihq1IV;k9V?~@OwE{EaUY>NrSR47c7ghYD*ahyzKQTOc
zu^()|HKbi0@ev;7Ie1K~S{l_<sTm4Y3S7d)`C;519AfUqxqo9rl(n6d9#%*oB7L=W
z1v+|2Dd({}r@xNCVA5RR?Z@?y>x=)_pD_?xJa<buU%3(u%v~F`PLy`>ju!29;PO%~
z2Lfh2N_F7B4?FhY6D_u>#pz6cBKWY$=SR2CX%UgfxgQNLo>9hRMtehV{`mm!{S5Re
zQXK(^6T973)&{6yP#W`NKM{TY>&0ltPx^&YTrW8MORbU53hREsdumeTBacbgojb`B
z2BS(?EhmzteB?3I!paH*o_&Rd>Z>)wsF%PUluGvQVje;28`gum65l0%!7~&b|J>2l
zJmd*6YzMPKwRNW?vM0ww!NfrWD_drh{N+|N>@QnmAl}>w1hziAV{xtr-d}%gUj?&0
zTB#jjNbI3sD8=mqm-keY`2BCx3WxCvq3C=djch+S650NN4SBTeRk&A06}(fUEkE|O
z3rJ^&=<j>q2V^A9Xl9d@&>R5|u|1abdk+L0aIt+;C0d+8<>ft`_*FJuDFo^|4}=mF
z6|v`r?s6khBf$R=DZg=lH89+EY`^2qYH;$)@Y$%o<*3Qz4fpwzbOsS8QgL`$<H+q>
zLr4hUx5E3wo0+lW8wI|4si<O;P4TIxRH*vAI@mQsc?i!DZ1*44_y%(>ItI#S8lhG*
zn+7T`(laYYW-`U)2Qa@ag`^##JPQ>NL!xqTADMf~fz50EDRC+q0!R4j$K6?4fki>6
zxW&^la3lL+g7QiSv~-{z88e{c@+=C9ub)F?*Gi2vIRrkw;JVI40P7OXw0F2T4o_#F
zZ;W`{3ksVhV)GR`p$Vqi@7wbY*gZE*T6b#|>iRU~&Ga^U#)dPVxE?;FG?{yjeFwG!
z5ur0*NSO9A@8Y~$97s~dx0}OUxxiY!G5(EYAFNxoZddtC4`|jJ-&mKu2EAb*8~G}c
zE-%g?;<$&aYKFJ-^?=8o37hW!AYpt``t|~+Sda~6nkPDB`#|EEWW#4SdZ2Ug4~g*S
zrSPlvhP~lAMD)iiXWls%y1Y2khvO>0E65N#LqHtk9*nv#BVi%+{yuS|!pQk|mNGjN
zDq)ar%DhK@58Nqc5Sad?7buZm0Xg=0<VgnW@1Y{P{o;%q?iVqZ`CD_2@*%b&-;G!4
z5V3_eGnQ0-ex!7T(lxv9-C&2qvb_?A-@v`UUb6__>4WA)H$NC1w?vte!Np=Nx*rSU
zf-bfN*R@KDRTjXO^)oD=lSv2`e);vu4T_j??sRi}V-GA$?HC@f?*NkI$_wplT7mp5
z`yNUyivIXud0+7^{lvle;n!Ve%hQR$)Hr-jwmzeXh+NrBBnOzNVs^LMV(m8!fN}FM
z$KjfCAayn9+}XlTh-#e7uw!*VpKP4butMp~q$q>DI?fMfpZu0W)Vi9VR@m_%w6ubH
zFKTSFqDPWKC)gX3#T{Mq4YIf8Tr+sy3nQH5Lj6o!&<z((e>J=4yp&hqj2v#iA?Y5>
zy2T>cQ9JQ6wJd4GSxA~a{gf2qKm1zpp&^yI-E$$(=f+pCwf!`U_snNNb}WsqYqdZR
zGqdCvM$z*@Mn-NjCDx|uj4VPl*L8d&A%tW<;d;MYL=IumV=ndnF$TO2)w%?+--Y@Q
zN@sbyZ-Sb`+H&%j6wn=wUM1x-^ef7ei+aHAL7@6s!24BF7?!eTCMi}7DLu_;WxoC=
z6uS0xMKJYh@_2K!xQG8eXe9oyS6s0JYInkqY6+`Q6>r|Mi9mWhWBk}m?~Kk$f{qxb
z#Uep&+RcYVihe(}(~RoRXV!$6Qa^nXn0<Ij@^J?&e`DY>ncW4|zWt8fZD5G5X`5Y7
z?4e(7X2k8kGkm6ndO<#lNBMQevUZpsAkF=yq5+b!_l&Jq>49g(ic@6j8{wxSzCfMW
zZpgQ-#zFG8FnW8%?a<vZ^oj(Ii^q47fF6q8&RJk_L`(W`5eW$z$<#Z*s)Tfwb7?9S
zRDcy*_B|dJYy<MG0|l=)4*~SWFDpN18+3S&YPWj^y>iRQO!{~8_~mqvu=3*iJ-3gJ
z!{;LJ?9R06U^P!2tei)vA7z9WQ*R1&LiYBykngE=;4R6zDxq5vm3%QY06Xb<5F<00
z5I)V1Qss<zU43T6cNV<u-00eB!-M>sjx@>N-ww7d=iW7zF#xwmMhCTK)IyQMVABbH
ze$-PUYO?^5Ua7;GN!%WkCbxdgsUacmX<rLhC``f{Ci??(-<Xj24A$_9jU8ZKs(}#a
zIS5luK;s=9Z@}HdUPX4<Cg_K6w{owxHZ1MO3Jm_He@ZOoULFxC<Q;4pzsrT#oPN$X
zDJ_VZDWPtu`-j24^1CPUt~Ud&T@|l%(+Z%d-iX)NY7%O8^kzk%2i?vXnW%_Idrqq7
z_JEq&-VY|NQrL0v17S%6GDwJ4)(U~j2e5@z>Pe+nKL~c7=JmbR4fYWw7Rv6<Bcv_s
zA9_7aUCOT*nJA)PfZAI(Htc5ld2yFc35+}L&gAV8X{5Yj*Pv}gJ<xjO_KPR(HE>AW
z>)2U10v1|)E6HzuBam0;*rrX_{*So-x8%i{C|u2=d$v}qzZ-#1V{Wdr>LX#~iJgi~
z)XyS&9#rwS|89pO{Yj2<!Tqp9q2$&Z>Sy6<;~&tM+P{(8>pcvDo?cs8HyjuD3p0y@
z2Y$|v!o511+>EIe{kcbOFH`j;kQ@-_k!3^ufY-gTZ!okIDg?@$-eg`2)Ah!m%9GZi
z$p`9h3|vcH!d?2@YEj^*4ilD^mn4jL*xIed<0p97R4ivUB!X=A%~_GbJ^~{*$!=ff
zn+2ztI_KE0egnzv*Gm(|jL_)E#0R(kb56pUGu(bf#eBKuTb3i7Pr&srNklA#J?x3z
zbrRxgmG1FQxEUB__LViXb-<|6t#`Jb>jmvsUx*5*@Sq-VPW}ozw|_}qoQcA5&u-CD
z>C%xxuKT!8iWSVk(!7!mHBnY1Sjizj@O=+_q7u!|+Eoj&OJW)8je0;b(~4zzd`9TA
zGc!e>@6vA=Xy6OB*jBRhrp4w>0+t}#(<Tv8Nacb-ql7;zrm#nKU0qilw2{yKmVS|X
zE!?Clp`CviY$}x}zrC{>B^)`{p%72UWn`k_Q_dxH<%%MCIUu!nL<;Ho5VLvQQX9$D
zT>J3(>t5iR!F)ros}nScu@SiTHG(AVt)1sIQ8Y++T(_Xdd`S;DvxDnldw{3hX=@Vl
z=*G4>0d-d7)Q8qr*(5zg>hgJ$gR6VNr&HlAZDW@~M9Hd{^(=kB7gWZ4;!;G(O@3L1
zcj+G};mi(>YhM@m)nbDTb|inuD!pGA>2`Z@BJGnNb^l~pn@FgK569IfnUs4$=+oEb
zesSHfIanC$S5roB%@$UT{G>DXIJ1MR*~e<y1C)qkYj0xHOzK=n-+j>|mu4l9khJvQ
zH{~n9cAk3DTGkO5^K*FlPme~Jd?Y@!v)&mE5O6Ala`c-*jLeQu*N1caJ@~Mx==c&Z
zeIk}{aOTD6!C&Bi!_AHDu9#M%Gdqm9Z#Q+{KM+8|_Q<@y^RbQ@`6M?`rQ!DtNN<++
zw7As;W#7dt*Zt86EGq*0wO_V_<W(AOdfv9E;truajWhH-3jeSS*MsiU;{={K5~kG0
z9kx5>4_I@^=!Ho5D4e`><jx769;ou*%+>e$U%+(Iao+^F9;m!JX^W<rExP^sHg)p|
zI_^pwaIrNzZpSgMOT>=9OX!R7<3mmuYY<<C>mfc)Zr(EozCz~y)Qg*@I>GdbwD|*m
zy<mdZ(aI-B7`1f1#{JBdz7HAvKf*O+z&-f8En$NK5fe3>E>`O1LxdAX3rcI$kahY~
zUp9rl0s5mQH@@E;1qZDu18V0#!P%Sf$;m3x=;WINUF-<Gj)F61IQ;PP1lbgBQB3Q&
zBXJ59K!TnppMQy|A-@&p0+f!9fngzHl%2&J=$=!NeQPWSXm{@nWmXbLQ!5@Ee#PbX
OcfSz+dl8lq_x}U1P<WvL

diff --git a/tests/regression_tests/surface_source_write/case-d06/results_true.dat b/tests/regression_tests/surface_source_write/case-d06/results_true.dat
index 7fb415cb1..26b9e30a3 100644
--- a/tests/regression_tests/surface_source_write/case-d06/results_true.dat
+++ b/tests/regression_tests/surface_source_write/case-d06/results_true.dat
@@ -1,2 +1,2 @@
 k-combined:
-9.263843E-01 3.193920E-02
+9.288719E-01 6.877101E-03
diff --git a/tests/regression_tests/surface_source_write/case-d06/surface_source_true.h5 b/tests/regression_tests/surface_source_write/case-d06/surface_source_true.h5
index 3eb95bef96a07b77a50c9ef9df25e0a849075c08..27227ad49cde623cf7f7fb75f15d741f333b7c3d 100644
GIT binary patch
delta 18738
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

delta 17721
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

diff --git a/tests/regression_tests/surface_source_write/case-d07/results_true.dat b/tests/regression_tests/surface_source_write/case-d07/results_true.dat
index 63ea1a64d..5a4ea6689 100644
--- a/tests/regression_tests/surface_source_write/case-d07/results_true.dat
+++ b/tests/regression_tests/surface_source_write/case-d07/results_true.dat
@@ -1,2 +1,2 @@
 k-combined:
-9.756086E-01 4.639209E-02
+9.947197E-01 3.711779E-02
diff --git a/tests/regression_tests/surface_source_write/case-d07/surface_source_true.h5 b/tests/regression_tests/surface_source_write/case-d07/surface_source_true.h5
index 0332f2dcfb100123fe3a4ee3a47f690be2af1bab..7ab2e2c807b2f2080745d6cd48db84e75f9a21b0 100644
GIT binary patch
literal 33344
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
Bgx~-G

literal 33344
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

diff --git a/tests/regression_tests/surface_source_write/case-d08/results_true.dat b/tests/regression_tests/surface_source_write/case-d08/results_true.dat
index 63ea1a64d..5a4ea6689 100644
--- a/tests/regression_tests/surface_source_write/case-d08/results_true.dat
+++ b/tests/regression_tests/surface_source_write/case-d08/results_true.dat
@@ -1,2 +1,2 @@
 k-combined:
-9.756086E-01 4.639209E-02
+9.947197E-01 3.711779E-02
diff --git a/tests/regression_tests/surface_source_write/case-d08/surface_source_true.h5 b/tests/regression_tests/surface_source_write/case-d08/surface_source_true.h5
index 2525592045ca7912138b0559d72d9d4eaeda6118..5da7564d1f4cd31322ff9a471a6dea175ba8fd0a 100644
GIT binary patch
literal 33344
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
Bgy8@H

literal 33344
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

diff --git a/tests/regression_tests/surface_source_write/case-e01/results_true.dat b/tests/regression_tests/surface_source_write/case-e01/results_true.dat
index 8979eb554..d4d1d1e5a 100644
--- a/tests/regression_tests/surface_source_write/case-e01/results_true.dat
+++ b/tests/regression_tests/surface_source_write/case-e01/results_true.dat
@@ -1,2 +1,2 @@
 k-combined:
-5.169123E-02 9.144814E-03
+5.642735E-02 1.494035E-02
diff --git a/tests/regression_tests/surface_source_write/case-e01/surface_source_true.h5 b/tests/regression_tests/surface_source_write/case-e01/surface_source_true.h5
index 3047519e8c52b140a4756266192c9d81c7d204fb..0dda15ed2192739435e8f50e126831021d620f53 100644
GIT binary patch
delta 16344
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
aVrYY7u{m!7cDBerf3wGbaon^L@c#gi>OkTE

delta 16353
zcmb_@cRbbKAHQo|Bda7L**kla^M0FGilQh=lnQAm4Js*0i^kQ^q7;?NNF?f9*%{fJ
z?7d|+{I0iq-#(A~`2K!>{rczhI`?><*FNXG&UsTpm?<I5iGoDdHxE4be-I`H5m+AB
zD3Bj<h_L-T&%~rk-ojx;?_pi&Axm(Q2*=3;PEl;Yda@*^)qiLc2HJFqUi@<k7l~j<
z_T^sub8B)Im(_ph4Ggpm1HF-fwq>C080akwv^@juz(8*!KjX6^d?R1r6J2CCnvb+d
zV$!lK{fyD<3^WG=&B;J>G0@x$^fGeWaw|eLIcqs>`qt&7MG~8C#nR6hEyzHxWT00u
z&>{@9C<84<mK3rg?v0wvE;k=1^Kq}FSzL(p-%f1mwTwftUWxzNEBQZrW&dZd-2d#A
z|DU}IjJ=EOx`~hox@3XXiyr1gb{Dbw551j%c444*GSIsjXtyPLaXNi55}}TKL5%J&
zVkEYUUke|#lb>*`!jz&y^|4iCi8bm33VF*K+OVT*NJQhK%)d4y$So)u8z@9IhcJ0;
zjT&*8WN32Xe@%dhlZZvGyTa=K+xbeIM0iXd6Q@D)uO+buxPgfe1oC?kp+)9SuO$(V
zkh9j(-HAHnh4AGydPC%4KH3nH1c|^(zAZr;k|;qUI_|dlLiCp)kMPkvKv<GQMAq*3
zRYILUL4?*BMD2V7VoDc$h1!XUptK<C9VvC9r0ceT_Wv@wS&Bq#DCasDY=L<eHd-Ci
zOc{0fQ^yqf$i-i1J||5g-tZgcQnDOhU;`VjgAI?CRwtH(evdo*-{GUuBz7^E@oSC-
z<ingo*k~himW&Yjh>Qjynfy#f)L|ic88a>ZW23do#?l6wJG0>;$$@x=7q(eAjY7W5
zEn>bbnNS+p`}q0P0C@K>eQ^Dj7C3Z+%{6CE9UUnv)10bPAVZ}^&Pdd`tcc$<4&<n;
z<yi_G1z8f|9obiQaq`WyN$HKR;FkE`t119(a?0DB{;yNlO5ropw+|5i63Ep!bb-^e
z9}*wm-feWD6@=*vsVI`SqJ~0#L)*>@E?H-WI?W6jm7`hEO^!s=|D3v)`;HW@I#+5M
zUPW$|QzvAQ1>|W1)#XV<e-C{tAx{1!o*&4Q2>RqU`9+=ybY^L-6xTej8s|LD^JC}c
ztTVMN6w{j5Maln~VT0hI=c=pvA<MA#d#!KP;L;hpj8Epus3Es$s4&%FbW<v0rW96C
zCuYKjjZZ!qEHU7zKw?Xc{is*H5I~F0P^Lg4Mv3gvSEo7yJy;Adgw2ZT#4PlDsqKHA
zAzG2d#!o7m`nrU`p+q7w9hlpZBBel%;-ES3Q6&<ypgZ}q(rTUs=WwUV$WFFa2E=8o
zq1I9Ey10q?vH2*<>VyvRm@-X+{3;}3k6H1HPhH03Bb+qY(<&r_2sulIHl~$2rc%!@
zWZw^srKw5lNQ74M?RB&<iR(zjOnY8oq{3(^zJygt#EHCsYwz;ampX%}osSA^bEhn2
z7Fb)<PcOAov-?nf162!n=Vmn$(Xh8~WurZ^FfS$|N)wTdJgW|fGnV2>lR$OpPqu52
z2%+R>8lu?X<+Q;p<SaEn$RQKdY1~SvlZb1j(XSjajtf#_(Pl}$t!c&Pp~QM^5>I^k
z<g4md1X*&q`eG{P$DFWEL!Ic)HB`AtVEdBJ6f{W$6|%49e+TkwsS~`&s207iP|J$g
zk{`Q6*l5!d%MY|k#H_3rO%np>f|4-CY2L}iOZL(NM8|A+oTtD7=afL!(6%BTlyJKI
zquFTz2+IsSG-2tDpT*?x&*Dj-8-KUwvj`hyv7ZAmI4@fj^0xsV=HxU9jO&DbZr4pa
z+&Y0a(^%ZI$ui{AhAZFiy>r1eZbk#-A#>^gqFUajS%n|HOXl>{ArbenhCD7C_)lUj
zqjsu25|v87ud^hmzAlNVU>1b*&B!mgQ8cyFMpxy>e^W3A8P&HU-Z}&t#r~5!G56Ku
zde+(Yg)$5T$)B{Oy8nTR*^%$-whV!f`=|8DNv{D1cj#%;<MrT@ez@z`3NzHr>*J#v
zi=l;SNr0{%TKllGAgeKk8CfJb5Z>k-`&QF&@J;f*&_1Ddu%*c3PNQQ#xbZH7V!HY*
z_~^T`W_yDIni2oOw`$Q@G4EN9c?Lyaow`_!=`R|5^+KOsY01ro;qXd$xM{P?XlxO5
zcqgLly1NG!ip%#N%;|z#Z9|K>UL*kKdqy_S$~>rV;w#^@1RdPkVq|{<E5bc;mcb(G
zT5_9#74gw8Hz_q&C47_=+1k*G&`rK=xR~~2X!6k;OG4NQmaZv!+C$#QwF;e4nFR5-
zN4vL(w}2xYp(k}^dqH!=s?UWM&0r5(Gw<0hB{cj&t^`b0!M#kD4oGWNOg<j`cz6hk
zWpSU7$RCA^-5khE-doXuDL3HR&CThoJ@xQHII&mLbO;#RH2B}+u|vy6Ljunel@}ZV
z)1M;wf{_(*T3brW*k5JAyRcr(g_NbY>&#rqx~xG!er_r^exVw^m9$YhmoNx4FYj)s
z4Z9E7G>;ZVJ2b)O;7WtSFiUj5bI~eoXQBTj+66m=xWu=8rp$mtrpq5(zEK8uq{e4&
zuO5ckL7TjCS<69zvf<5c<SCRr#wpB9+JFY1N+7=%l3&m;<~b$|k|&gGuX))qf=m2Z
z&B^slX%8%LX*?7o9tv6mMWQ%chQXgzitbmM%3#Tr{_1D`Qs}|fiQ}htt1oC2lM!Gt
zE>GGz`0HISyujr*sW~_c@>VCv#ftTST=(-|dv`);Ypr_3s-O!r1ix*#$!~@VPKRnt
zJ~UmB5#!F9fxFGCGT81ncjDZ2J}nODx9@=-(kla9<jWyX)x5cJ`5+JtabbVeTMeCx
zL?geKS)x_Hx#DHUrEz<2V!+Kz3s!Jh+kxY5y?TG$NLUppdU=nD`&$)UIU{X0$ukUI
zMKcQ&)@1^DjVm8*Jrq&z-c~=Uc12w3%~)*2J#jW$7dr|5Q0DRrzD&UQ_4h1aSP#J-
z^1h3lS(%_Bb3^#O>^fMvRwsM<nGSj)NuYRBtIC2+Xq&9{B%=Mn@5UQG3E)oSOuo9_
zieN!5Ur)>Sqtrn*RS(*QZ)oC!+%c_h=4H1~%%2Bmlqd)Pt)76LZUKbMfgzxI8hw!W
zpc1^7K2x02o(K9QNnhtSsH4S6zdqGF%i>z!%b*<_jYH<qx_@!)#2paw3A^73jjsle
z4hwX`Z5~#S%cRP{4{!BnBN06?G{9i5nfEB-?G-e+amo<ax+DYc+m$RlQSt1^VmCF1
z>)AJ(M2&+}c6Wxi825wfreD+Ck@bMHd;ZQT{RYr=l|67OS{+T8sqC%DS@Jb|awKX+
ze4w9_|3?E`k}(f-C3~4#5m)~>ubRKO5&oa+$!U&NdKCt3xNJkW=XeZG6A%ZrOOKZO
z{DeEt6nSqx)C+W_Ox(O%8o=YUzV0guGH86m>+aFTOo`$0G03*{=H4DVe<lh|Hp-Dr
z7yhk1!G!E!jk;9R*beO}D_%+t_Ci8@Y)SsvBJf6K-u+eSM)XF0c+58{E_FkO;jUu9
zU1jDj>X<SQ?FCMJ<}T_5G<;<5Bg5kfzuTeqTMgsPPw_Bw-)+Ou4}D;7YTO`6e=BOT
zPdWZ+vdlte!f@pna07oe{Ybl64@ZKLH=3<PgoaCT{qgFr=Q;=`Y_@Bdyy*fL-{)wQ
z8T7z?8}<G!GeJ=Y)x)<nq%o~yxJnGTn~$AIO*i-r(;D+5SGzJ(Xt)UbTKj;!)rGLd
zv3KOjs!sT(g1B9JbuVb-E_z*qnxjwrN|dzp)Ny{58F2sYQx@1+Jb~M7TFARg-jx}l
z2>m@j_bnZ^zj(-;qSym!Pxh$g)^>qMH{`xAi!?<kKfNzV<YId(j9-=i|G1d<t-~_G
za$eM2nzJ5k&k+g9Rw5uPq@QbqJ2yefzL?qo5eS`63g-Fw41y@%tM^ufYNNNk0|u(>
zwejq%&cL0O#CG4kZBtN*d2l6b*c@GY%FgGnekibI!2Bc9enGum@Uq9`VF|$=cxl~N
zxl`sSx-)M}jKAbkY?xws!teD{efgGh7@YrL%NsQ!()x}ib@_v4aMdMz<z!15a6Zm#
zWve#`B0}ox1qCcni#6iRsb|da708lYZ*E1nPL{M-T*Gb2sD%|#S#&7)=rU}DS<Ghq
zmL$Sm@)&K<E=(~JAFn*q6mA2pOt0-iBAJoq74j*^dxoHqyX?7ZTGjBx-U7G0cnVA^
zaOqBS)kCWtR&<q9!-Br86($Qf2<yf?e6Tle7Tn-bTl-^%6?x#FnbY>Q4S@Z^lM~VX
zKwzLIX#-(52zh6oe5aa-@|Q7-6XQ&9{;7un>N?#2wp>&;^d~G%9^_s1dJ-n-iJh_+
zYzG>VXX3KD+5s@#u`%puJB;OHofONNLnb@D?aWT03n=yr#}oRQm2N7%3k@}PX>%|n
z)$li8QwJWQjZ&z~dtxPwzAHz%v%UuQ#Gsp)PYeQu^)=oXPEH^aD-z#twj@90SUe^R
zVa%BYor=Ag{s(+ba9H<jM>bFq&A#Y%umf}y=@@tPw}Mj2dCR81?Lb=m=uV;UV~AKA
zQ{z{EbzDSk4CUZIB{8PiS)h5_iY?^aJXGF4CvW|80A!U3zwxZA0e=66pyb19c&Sn$
z^Xa?aNRi;25a$jB97UI0Zf8Y|`?=p(cU%^C&fRp0X>Hm|QP(Q1c^G|A#;!f@J6&)}
z%gw}_dK+4yxD`P@H>wBnho5{BX5R#+D!6<?B}`EXwNRanRNGRwM_5R5FyIEJNfO#r
zmNsGRx66-*ln{|)mxsXY)=ntV@nWz>qZN3W#Fzhm-45P6vv5~r>7g8}LEFu%*d`AP
z$&KV^o2`iUgGAtYel5Oa?jg5XS`m52?yh*Or-h$`nK8Yw*3N%C>yQRa98!2MPtQS@
z{ktPHHjIEO{(RdupESth^O-kmZ2@q+_)$7WKpyqGVi3qgm4v>1;bf3x(;qf>mXKc%
z=|#071|x9|P0LtIe`GoYTM#*;KUbPy0P~fir!NNK#fF>JqF?mU;KbJ(1$&pmcg;c!
z>7M2kx_A0)1FT89^gWzw4A|7wDy#4gK$0X(xHw)0S#3@gr@d<i6+&K4>UCDAj}1E~
zYJt~bq{&$tLi)&tBVRY@7_%Wvx9ztJQ{rI?&$1dXqaiAq?Xo6f9Vp+P*)YVN1K$2k
zUOn%jfz~z}Po#gr>H?UxG#F(3C6{c}JGW#lZn=n^fox+CIcIyQrOXrBhUFiqmL35=
zi(_rnsnryXJL64mJ2+9PHwBf`J_x>9*ha%;p|#@uVI>M&b3iQUd3556TDtC#@wLP-
zEtf)=()G=vD!TyQC7v;O2ZzDs5k({6(sk&w>@luG8|CmVxgloRLnq$3%|D(2nmt<1
z5gJUCZ=ZZe<<f@1-OS0St`_BBTO-%_sfZ6SJ0+ke+29ZIDrfmi+JOu6C2nf|u_A6u
zJ?Q)-Pz$%W2ZJuelB|;ZE)$X2@sO>K>)Uajt;@9g*V$BnZOiuh6U;imDRSFii>4mH
z{Jr9Jq_h$$eCg@xH&4uPp3TV@wh8O<dl^nC4ukrMJq{KQ<-nMa!^GCM4{rZ`<HW<<
zb|{zWwqdt(9?Yt`#cOzj4HbL%{{DJHLp)_FV1mD}_E3nfX@sbAX+WV{D{!A_D&flL
z2P~<(pS;xk08Lljx#@kV4M^~LR1)q1)SsQ*<3_j?E}}k7L{?hcb^g!&O>_7<OxY{*
zQRZIy7+`&`OfuG~fY*%UfmZqe+<c7~DPhq74#^$-9dlg`UD=x5xbLtgzRy8ucyx1@
zg-MIszG;EOF}49uO@G0~pE(eo6caSy#vpum(qLozzYNH#pMFG_rwMGYtYuMsZiUVu
zPqhCCo8zi8TlDhhV;5t34rRghC*}&&!hV7e><WMTJ4QfV4Uu>%CK(17PsiA<c>(#q
zoZ!4BtByXIy8Ekue<_dJVXIcD`<i2o!ZYAo>aDw+4WqF1I#XEj^#M4UFj%<UwGjL=
zcVE{z-wco3H2f&^O9DM@m(9j1r-^4wN1BlIrvB|&XQd~-pqeQN92zE2XhKpPq()6L
z&u0MZ7VXuay_?`MNuy-+)F8Znct-BK@K)4%RwEQTs^U3}ovdNIO0O_tisEe71v1#O
z?)MBZQDhHZ2tT1V40VnQd~eo_hQ3yju7YyaP~zw|nIQoLm7|E|SuC!pSS0h(*`l>c
z!)*G}%a|xz^piikwpP)-mts3|LQDEa36$<te}3kCAru&!E$;IlhLw{tijLfhs2EY|
z&^0zKJfEvE;Ii!5`u%bFZ``C`nXh?GyR#yz<2SB#+0z3}_%6!MI<<h142}=chkpW&
zg0vQYE>rYPbajb3l*2Owy=Y8##nSoXk>$$^069vs?|C>2WpP>#%B5BdmCbvbVZfKt
zz%|J|FmdeX9!1ZeP{e9?lDv`*dc!*N!lndCoZsy<ewk_Q+g;)n(32TiBsnNH&so(<
z&$Cc^JFPn>;vWIR6Olo|(oVS9@MPNdjlIx*hmOgVlM%XMm%|w)Z42DREogZ3Mx15b
zV!a4;+tL)6{O!?iT)*vd621NT9l$MvkI78C77`-F&z#-T4N&ghmCIw;QS{oWJBEwv
zC6<eLFyHJPIeR_Kvkl&y`hf0ppN5}I3nQZM3<5rVKQ@aaO~9Q^!7%PaGC=Zl?pR0W
zBAbeY0|l6{@*8G-F*;kcHuj=4VP9Ao&XvbSn~H9f1^IZOX#Z?Bg!;=?un15_phtMQ
zFI2h;uFJH{*?i_gryGT8?USu>sYwjD2m5PN6?eAcxNmKW+xQL>D8>3~x%X17fBeiP
z^4PLg_*b{i<J9wJ`0Aq09-X8aq~<{a*KCj>j=O^a_Y|nD2#x$h_bQ5=iF344CktiZ
z!jlV5wmo2P^8@wu_AO94FjRGC!cTBz`T8e$6Pjodn|jnBRh#q*I0w0Jn-$SN&fi4N
zc?;glg6TL~!?L~XTrn_r9@gVx?}r;M%x7l)?1k@EiIsFaw1ZQgdY|6BDg(!b<DbW}
z+M>coRplj#3V8hM(0HcraEgw*>Cb;2$8}*<QJv3|oDJUkI%_D+e}x5{ZOzJABk)|#
zW+jbtk)XV~78Lm!p>jF}hARrpa9vo@aOuf&Q&I71KNnWSQ@KZM>$N4%3j4L|DEr8B
zKvH@W_T*(P7|+kuA*Bw%)ho`efD+889a%(kAtTUtVvNOCak-`{wO#n37HPi~EXVbt
z2bg7@+-Y?<6Y^^d|4UM72RA!x&>G=>up!FiPF>qKL|@R-%;Am|UM8`@wD~AD;P-&g
zI4o4q7AFidQ8HZ`*%KW`V4*td#mt-s6x>2Yw8b;Q#@~%~9+N9j$A3nx{BZ{Og64uP
zXsf&G1amL7z~Wnd8XCDQh{~T!hX%e3fs={mNWWzsIDeeE?MFowNG{)4P@JHPwpmCY
zbydRlwwT`&X}V*lwYMkYPwam&2Yg_@&U!(1WU-rrl4=^b$M{((_`arcH2QiU$W@Tb
zf0ED!XD*(3A9!5@_0)%g9*erejs;vaJo-&d@bTYjzu*kWy?Qr}hZnaAvVSCGr`Bi_
zkf&Tv-%PLr6^hv|U#<;;PhDT~oL*?5njKpQS+QdQ#;za@mfrNAZq7AXJ_i~i<+cSF
zPvPz#=&tHome~i6X`chWX{pfSx?rYVNjp?&)pAwtScy8;wC?vBFvXV;ElimuVlS(N
zzYKyq_Ql`8W)`HazU2(}^e`Cm`mpOhOD;6&d%?axqyVHlI;nBFiJ>!}yp+7(FDY|9
zjV-z|hjX?6Ipr77xkBc?Ew9j5XQOPp9<_|^emzi%&`Bf3mV+;4f&yP=1|V4Oc4PJm
zCz{8uU?pB?fT#K`ba81d@>syt>8vk~`}GQo#p=Kgz@EOmf1}3`w7f?UTh><x=2eCL
zHvUWke%cng65%%xW~I%Cw`lIdaknzy3c2!ZPw1bc2PDE7a4K}>%seob@`119nxS}$
z=jy{Qo#5_(V`ThL2Y7MJro2*$g7`Q*mg@OyjpG_I;A+k7jQ%Y(gX2bC+vm9<dj=}6
zyt|_&u^8kFg(n}1=mYbOPgTFwv;lAHGD7!$2{cspij_(!cCCV?`h{m0tMt&3p@K-M
zKae82<#@!kA@Jq&vB&DhZ9wleU-zxK5|Ff=w*l$ygPDBerbsLqDaqLQrDXHcv1A1U
zcSY7VThD2-Q)cd}a_4>PqidDovEotpIpK2nuSu|>wWI?S%k^-n#`M6ic_aBBs~Zs8
z^|4#LE|TzcA<uvt8@wr?aqAcz4^a;YGZkSO0jI{zwudWq!<p~*hQot?!jj`}rjNC>
zf<ZLz+VEv>B%=^~>aRSGYm?DR|6KpQD3WS`kG*n-^wXFri_>yY0`~Sh_it<im4rEe
zm5)*2Q_N}Sj&5oi(*N>{Qj&l~BRc%o*6+djWn4m-mgStD&7t5{;?JmB9(lM2#PDjz
z5Hi}J)VJ<U*8}^(#hC4sQRP&a))qMwlf{Z!jUIYwqi3_gFJ>iCEWJIRj8QwctrhCm
zGF>crk`8z{?iWUh^+VqowxoKtI4G#HD@xqA9fXAJ`m3=@5sfB2in65M4ACp|%NVqo
zS?zt$lz#^3JeTQ~H^M9Q6ieqnyT7pHz?&mXZI9>6!0xKj6iwe@=%WLJ_m|&7VpmP|
z42*8aBi#w(E<Ant<v8Cl@X((3YUioHfNACPjc;38;l|4b@vKY(P^=}-d~0bs%&XDw
z&#&Ey{J3woA@}SpJo#?LP{;;to+pLbkmdRX#&54OA?Ky;6#aYN3g-XBD&|<Vf$0kQ
z2{qL&z;q`};$7xna9KV-PAxA9m(hknMmyKB59O}oU~osynVI&bEh4&MV>DMy7ZAK$
z9d;_V0k(ZGHqJ5V0CI8Kk*KE&a>UFpq*&w%UM-~Gr_$j!9uiVg4qx&VzfQpfPSGK7
zw@p?Qwlu)O=xec-sl9L=>`nq9EkHzmKKx|UFGR~~j4AUqz!zExIv}mx@cem%Qw=L+
zk>o&jNNKQ8APeGp;c50A=Wamh3wxN!N7X~E!^^>IE#UF$h+KZxIUv#<9dL6X4fk+H
zJzNvK?eW%$ox<aD!Rbh11wDc&4@N4?@&`L$>g&7Y(TEC2+IMx+Go%MPt{!aM_NoE|
zYM`l~Qa|G!F3!O3i*CIu*N$a@Egz+x>aD;}Rg}l)?yQsR>VZ9(bFm__jj(xtiLJ@L
zR&ch8zv9@W0CKv))pO6~M>wt%11`%5r<}&_LOgOd+D!R=G#UgOx;GX~3g<wf_a814
z2=-F%vdSCGPIZD<eVf<6j>{ll6suiirm)L#Y<1&izzrO9P~|%~O_v|Be@;{jj3*!|
zU2Uz8f7ionZx5a~if#kK_4)7nw)KFc{TakU@fz?|^2rph;UpfB+*sb^?w&PqdHV^j
z|C=$>9@Pg;H`U6_Q%fDj7X*$PolFJ8ZkB#b-u0k~<nw2(Dj#ZN=`DRL48hO7dNl6n
z6+fNl1KSSkvQZYhIVfY#*dB2SO~Rf>Ivb9yZ-suL284L07I<;ZlkQdQJwVxKzT;F{
zD~Rw($=^;W#l4DAn^%}RDs*bcprm*`r4LNvTIJHs{e03X3LJX;f?q1I8(uBxsR{bh
z4I-bvK3Lx1hkSJ$s>t8sk4J$jjbHj|9P9YX(5QI~x_ro9nKDO2XnZ5Qoq;|p6Cc8i
z))g=NcTsOW(}cgdy4J&r8*=f7jz@wzf%Jrdi+^!kMk}4jAW)J+mJVDEKZRTU(|VxO
zl^@SLm$ifV%Ym}YiQOQ2VsJ;FP$M{dvD{)A`T+c$xt9jrx)$`Xb)k~Vs0Ze?|Mt5^
z{)SJ})gA^-F0INNzkS>F+oA_L$2KMUI6jBI0hcHl!(E_VSL2}e-iyHYZEWY?Gc14{
z%^~<d-HL^~&@gv5zF9&N*R=6TY-t3$zifXxWLE}mcK<coSJ4JyWaWmQ+4RBv-`l=|
zdqqGodfR!0%LRDYGM<^NYgSub<-o%VVQS3|?V}jNyJY=h!rxX9egDI4-3{e1r69VL
zH>D5Wx)@(=9GC={19>#o%2h1jVv1nI9rUy2{ufzCcLa)qF%u_iC=(^;>E(&P7e?To
zbmv_6lq{&?t!LlwkOB8Q@hcyQcnn_NOzC=7!V1Wve1iW|!-j_0!O%X99$ys6pO@~N
zTxO!!S@#4<^3=c(8QXH7)E=O;i@)SBb*=IUvf(K|aSP}MrJhY$$^L%_mgj5U`z8Wk
z`YBI6V(&`#u~4!{q_3Wf=>+V%?-h&s^}<TA=-aPYFTn7+Yf)Z#Vc<?>&Bt_2uKzpm
zm-YJl493QBj>m=*9Z$rwP!c5*17a%&q4q@U^hc*UFvS19w!G*&F!pk{wHSR59F8B6
zI3D-^0RF}_pj?)`bfv=Tx`At}3JZlt)6aDL$`8n@rr95vJq*8z{Sj;Mf*?Izz)a2h
z85rCt{9@+}H^wpMY>Zw!GFzj%(g(j=rg%;lOh2W}!lWAkpSgLu;FymM^J&&z$n@e<
zYAk0W=s(S~*;J1my)#vJa|B`sUTjxEeeT00tgB|fsix*P2(XdW8e{4L0WH!W4^%aR
zd-fSTKCAjbL>jB4q*D|8k`sP4t6U#d{3_4qc}sO6g<&9USR(v;O>0<sq!()TawWQ1
zO@fq`-gT6bL2%S3=&~8hW4KYwJWkM}5w@R*s(g7BLH`VN{_f+D#}gs_{7TC&Od%iG
zf|=Li6@P@;(apJmV;H>a+}%Axt;l!2SU30Pc`vvy%|E&8ZW)M)oD3j{=%NwJ+SjzU
zE~S6Q^CrKMl$b`<3>Y+J@{^XvFFPsI5@qQI-K`+X@IdH&{!$n&GjdRHO+P&8795<g
z%?$l=!-ZG24LiqTQVU_571GN_tsTePz*$A<(-LP>;DqfSwu$lqxM^=(d17K6@Ntxl
z(95obu1$3uH66z2)8m%AK15)TQ82@<rHe~z_Xs#ih4%i#T`@vxSNd`9HlW^f{p?*r
z63n;Cwj;DsD<rDQ1&{LIfrjTlSF$|SLN(qOSf*=ZrB94I>f>DMLyotp-#G6|P6F@K
z<v)dY{f56vBl%c%w!x;|Vc&Q0R)Dwrf)u6f`=D3H-{JmkCaASU$&no<8u*4x3PZ_=
z>(0=A#X=!1FWBiUGYR*vXX2ZXse}AKqVv6``e0sO(Vv?UO>kPyw$EmtIcgf@npGB!
zRVXoDq%o9t9umH%a=M}CQ{R>2sfhr|Cr%&M8-^b$cJ?P^=E0=g>XmOY%fa`XO+mvo
z3aG4*<D+F`YB(>8rRJU$lestLm?_Bjp}x7*^U&LAleyCOTF|xcb9{VH4-8}`39O81
zgW0S**IJ+7f@)r+-1)+Xm6|bL7VoaK%w5ytj}1W!cK)nGMRfq4iVr|2ouDq+Y>0hF
zFASR1y-{@J0ZcOLLGQmOq0yJQtulqgaF53xr|M;g)OlIntphKULi)>!=D_2q)pAnS
z!(flM`RJYHmGETBgt$%(1Q#Nw`Hs9%ML&_B{n#}iiF>>ugYA!fD4jRo`U@;}b5Qt2
zv~KZnOabjz2MppQU&9X;-UV6*`{4P)zCLxg4zSY4s@yEw5PiSR>f=2d^Mxf3lhFdx
zcZ;~PC!0q<+_$ouO<j8eiV7QF@ZK>9D<soe<$GVlXtlF;4i}qY(`nK*YiT{yQu<}2
zSLsq+iLu5O?Rf8qdmw>A=Z@zNlMVBVQSczx&se>x9vTHc>;E^?2Mt9g-n$bU0kZDH
zm313*Q1>k+<r5()ICl$Q0j$z1=)2zJUCT!KViMHjAlL}{`J$^^#_Pa)D-Oq2*C8k~
zGP^@t^8?tuv;AaKz9uSRzFy+q`W#$$whX#cII!>2ZS_K68T9+hoaPu^hln<7s44$=
z3pDkcj^yd70xI86NVojy0|xQlqe*(Q=y_40q+XDNm-ZLFDOjbq`O#MP=T-l}(Vr(m
zERs8+%XIIrtl?(RvBNGkZmtiYsy5kyuGH(+xL^Igu1e@Y9MR?0B6pYt7QQrCrT1XP
z2aWd?fgp|ebg-R3-S}od-2Q8L7^s`oUjLc%3S=j<5p-6Sfm61fDl1M~q8tuFvbPME
zWMn*|dW|Xg=d&%z_B}bzQrYt#<dP-xnvZ;kjv?VYNU#qKpQt<7meU5igWqJo?J`5F
zLl61MQn{l)f852OyW}0?-}?q|%OdNSH_9|;cEBRdPi`g(!_cbzCy?G(4K66|aJ*d=
z0_?M1+>4bIM3?8rwir<}BK?SpJ?zsHURH02n)U!O=V7PdeRY8AeIsd)_y`PFv`h~Z
zEd&bE96Za`P@v22i+N8(Wzhbb6Llg~6#5Z$H3N5BTQ~%NCiK%SN)d_H6zz$bg50{R
zECm#+fZGWNoj?AAkURWRLgSih@a<Gq4pX)@O6oJZSkf<p`<?PaROr4AF}r_mkcCps
zZ&VQdY6LJpQgYgqFbI8bz2y1xGY5{Fo+<t6)&O>gRaQRiFhfOrw(K;H!|yk-=lyyT
zaTjmBmYWBHEDjNu=Q`k{S8KKrcQt{SyEB*8y&D7q#ecZYoWBnx&uJxnIxT^^x-WbC
z$y^(E-gOKjwgyF*jp_FQM=#R77k8I7I24v$sfiUGAaj}{!l14WvTj=8c)Pj_s(!lu
z{(Jx%s=BLV#n}=={1mQ^1-|0@bgO?}WAGYr^v1~AUm%O^(xwo;VOXXt&mY`M0c!?}
zx%kj3Fgo}*fX~eg?N-*@FY+Es`q+|0(=^T_Z%Wff6`7?v)5-d<@FzYa!0mQ-aK-I<
zkg@4g%zmXl(4Z@KLsG5<w0brEd3;0)O}qM9;)}_W+cDPL_8zL3*zH8E5@7#0C^a8~
zKNb8dhpxw+YJ|87z|9+$o3m6$U_$&<-{DITtYs2nDl=G*CUARhiZjl^4Z8;mwt+Vl
z8jow4Dg3;NDVcG@Fxc?z%Zuz?0D)nmlm}h#()K%l8w0CB<#AiX7$}4uTz`wWi^?5+
z6SEgX5t0n#D@^(UQy<;F#-ZH@{K!c`9h3cl|5c!e^U7j)E|+j_*V&)IyCbJo>FZY1
zc6+<F>wiMl1J~N(f1YM-do6m74H5r6xv#u>>C8Fh)vZwQt{#xIgnq`(+ygu!$!&)=
z4S^Hpg+jTC2I!`H8bi9&hw}6{p9GA%^6H%0ugy%92`OqiS7b%@h998JO?QE5QM1sf
zw_Q-I&j0d}!7}hn-^M+Tpo_YHJoNPhn=<Zq^s+Ra$@P><PtWc6JuBjJse0dLYZgjS
z(19#zk!;w&eCAC4nL6;eT+k$V-4I+h5U=EQ*%l46`>QkjpDh;S+3oq{AYrZM60S$Q
z|D$bdS&-J$kKQ5f-(kU6^Xg`kHsI$LlTszs5B7?GZVn}HM7LM0tEpSW#nR{s@|JVL
zy2o=Q-i>!cvmnU(ZW#eNpcf85BzM5S#xCwItX=R<drGN&Ya<x75I(mh*aY2rETDGn
zVm`rY=8VPdm)R51*+I;d!Kp;4yss?CqB1xT4MU;nsk~O0l=|8J{qqvw<`~vbH0TFG
zv39BEP4cLnSj$hVwuPrOSd^@yE0NYdEO@MzEchFuXEf7<;|O$EimJ|5Hva4~NZCpj
zU3dB`c+;M`A?f8X%pI)EyT5re`s}Fr$0@4J^y?8}2HX#g>1J=P;@2aTqN80}YNc!x
zPga7_->GyMw)G=RmRv7XFZ-GO^h+l^BRS)Nx+7?^T0)02SqG02>bF+Z4IxYL<<B*;
zzrn!TV-umx1j-+kcLi@JdtjeaW2?c7R&WGGGPP_Q;PRN+D82pG=)ZsElMnotHU*5;
zSXEgMn>X@HuQ+{L-|>rYAX3)Vmp&``Q49ZBa<(zw>;(ebRG$1zX@$N>fbU8Laa1Q-
zQZeg@KE5O=GDz*@9MrO>><{Raj~mP;E_u>OO7q<O*#huDh58lIx_qb-k?!@5`f|Aa
zsP?VZcg@g4#u5^7h%sJOV7w;QRK5S<pd10Yq;lChpl+6)dysRdBeL)F{s7U0{=pDJ
zJ7{8^AyirSftSb9I$!2)Mr*IjbZzey$8qU*5_GnScSA*H)tM+H$urmELnq;4KL--z
zaL&-3XBcWbtl6f(o&(<;*^%Kwt^^70d{WljyU<`LI;W(My)3}I%8U+3Yp=iI50i*s
zMeY!f3Qy)QJ@#NfI@wv@Sp~+;jjo9mwF1qQ5GJBRAFwyG+pyBy6us^0KWB8+0_WG9
z0as7k*hK3M6Cx+tmA1Mjm#zm2ymNXcDmn>lPCCf;{CpD7R1&S(Q9lBA92Iv8ELTU@
zetUh}l$tf^-nx+im-Mgtl$t9GvO3)*#p5hHviLIx(ju>1`X?g`44EGryZ^cyIB_VF
zl;yjD#7Fffo2xBR_UNE;3F;Pwp6{Hne5ZM%ZU2E30#X7~^=2;-kyyW-=YCzQ1kX7F
z9(Q|pfNw70Cg0EWfTn@F64%#QqB}!<RC}l^1O2HKV=bOn(zor0UK22$8)7~Xwe(>V
zFnQy)Cg3Z)+`B^8KmRPayP*xenoE^hrC#=-h!T2w)_3bFKW$uU`g;|+@J2#>r=ChM
zBSu?ZH|9&>SFgxt-qh_;Qmw%M$~_NtwLWlCalg1Vr3O^}UMVg+r+`LK!hLSITjEwS
zr32DhP1e(i+e6rqZ+dojnz`92i`^W^E+vFlsR_crXJ@AkmD-`$?j2{7xcY&~Y&4Iu
ztuA_zTxj-#Y9+ch-Lcr`>3ZAM#aactXEUw}g-pN}>SpuJkzpA4@0V`vr%HGrVCMHS
z?FgW3cR;}@Z3NLL*z$`nCQ>XLi(@u1rdUqy=OiE|JCm<+yq*O`L(_A0Llt0pdeCri
zya#T&otY;!-wup+w6a!;XrdnKO6-S(v3KAYiZO=b=b7T-BR>f<qMaP<p3H$0dwIHb
z-gg80P-noD*#zqg_D}eGwSixeTYZ(*3!;Y%s;jc*EpW?P(lkVGK1Fh~m0YT%#~mfm
zu<_1K<zK*D?#61%ebkz~>{HK&LiI3EH*-f#@M{<qttNV`nfe6}F~Y(}9a+edSp03E
z1Jc?cyIv*d3tjMnhZf55y`CN?2(xa9r=EQR6bkXb-lpdR&i8Q?KN=kY*&n5))%(Yg
z;(>Q*?@-JF7_L17ZiH*`N7MPG3)?{V0wwk6CeWl2ZRXbh7Us(&xLb^j0M{TJg|YCb
z;6UuO{4&=`<k`S6_7t<FJ=Jao+^KzfLZS-eVC;2*>4#EQWbtPXit!qoKjEBBU{uGi
zVrN1F;8UITA)M`lNVeA1*&0n0vB}gtO+5zD<Jy%0_upuuJIBNrh?`$!%KV*;j*F<7
zH<BmceFJWfex(hL_JR{!(+`Z!cL13%tM=JFW@wzux$=xXTDXVHGT{E%8+|N#z7W(g
z?fPkY46pVgo3>3w*@?75;}>~%n<blI=-<0$u|Il%?(D1Y-?Dxo4vDvpX#TLmJzNX(
za3;B5Ars5T;ESpo+j1T-Bdt#18~MgcfaA^H*F~9wQ26iY@%GwU;PPr}Q_E#JbXS|=
zF@ygcJs7tNnZ9?|pZGZjrH{&JBo^aa1&U<3_`9-Cr7*arcyfhv6_6?N7tGl)1oP%}
zPv^!UsN0EuE-R_HbZxF-kowMnkB(I`^S~ua^;}`VPr6r8He3mlj8#sCS$DbFu4Lwe
macic6_MIb8U8JltxkLb!%NW@kMYTQ^S8$=WO@CBGhyOntKzk1W

diff --git a/tests/regression_tests/surface_source_write/case-e02/results_true.dat b/tests/regression_tests/surface_source_write/case-e02/results_true.dat
index 8979eb554..d4d1d1e5a 100644
--- a/tests/regression_tests/surface_source_write/case-e02/results_true.dat
+++ b/tests/regression_tests/surface_source_write/case-e02/results_true.dat
@@ -1,2 +1,2 @@
 k-combined:
-5.169123E-02 9.144814E-03
+5.642735E-02 1.494035E-02
diff --git a/tests/regression_tests/surface_source_write/case-e02/surface_source_true.h5 b/tests/regression_tests/surface_source_write/case-e02/surface_source_true.h5
index 80615285332359f6d38365cce0cffbbfba1ba116..519d8891f3f5b392182949e044b62b3ca0526286 100644
GIT binary patch
delta 16344
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
aVrYY7u{m!7cDBerf3wGbaon^L@c#hNxIp6o

delta 16353
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

diff --git a/tests/regression_tests/surface_source_write/case-e03/results_true.dat b/tests/regression_tests/surface_source_write/case-e03/results_true.dat
index d793a7e42..ad927bdf3 100644
--- a/tests/regression_tests/surface_source_write/case-e03/results_true.dat
+++ b/tests/regression_tests/surface_source_write/case-e03/results_true.dat
@@ -1,2 +1,2 @@
 k-combined:
-4.752377E-02 6.773395E-03
+4.929000E-02 8.212396E-03
diff --git a/tests/regression_tests/surface_source_write/case-e03/surface_source_true.h5 b/tests/regression_tests/surface_source_write/case-e03/surface_source_true.h5
index becc9254a3f1c326d78c58a23e0be68087b3b5d2..7e7d49071965f8535391e88f5120109b9b417dc7 100644
GIT binary patch
literal 33344
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
TJDVPnIAXpS-rknc>Fxgq)!}e;

literal 33344
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

diff --git a/tests/regression_tests/surface_tally/results_true.dat b/tests/regression_tests/surface_tally/results_true.dat
index 8b27fa192..70d5cad2c 100644
--- a/tests/regression_tests/surface_tally/results_true.dat
+++ b/tests/regression_tests/surface_tally/results_true.dat
@@ -1,52 +1,52 @@
 mean,std. dev.
-2.1200000e-02,1.8366636e-03
-7.4900000e-02,2.2083176e-03
-1.6220000e-01,2.8079253e-03
-6.4010000e-01,8.6838931e-03
-2.1000000e-03,3.7859389e-04
-5.6000000e-03,6.8637534e-04
-1.1700000e-02,1.4456832e-03
-4.1700000e-02,2.7041121e-03
-2.1200000e-02,1.8366636e-03
-7.4900000e-02,2.2083176e-03
-1.6220000e-01,2.8079253e-03
-6.4010000e-01,8.6838931e-03
-2.1000000e-03,3.7859389e-04
-5.6000000e-03,6.8637534e-04
-1.1700000e-02,1.4456832e-03
-4.1700000e-02,2.7041121e-03
-5.2000000e-03,5.9254629e-04
-3.9200000e-02,2.5508169e-03
-4.0200000e-02,1.9310331e-03
-4.1360000e-01,8.0072190e-03
-0.0000000e+00,0.0000000e+00
-1.9000000e-03,3.7859389e-04
+2.4100000e-02,2.1052844e-03
+6.7900000e-02,2.3211587e-03
+1.6860000e-01,4.4800794e-03
+6.4710000e-01,9.1826527e-03
+2.2000000e-03,3.8873013e-04
+5.5000000e-03,1.0979779e-03
+1.2500000e-02,1.5438048e-03
+4.4700000e-02,1.9035055e-03
+2.4100000e-02,2.1052844e-03
+6.7900000e-02,2.3211587e-03
+1.6860000e-01,4.4800794e-03
+6.4710000e-01,9.1826527e-03
+2.2000000e-03,3.8873013e-04
+5.5000000e-03,1.0979779e-03
+1.2500000e-02,1.5438048e-03
+4.4700000e-02,1.9035055e-03
+7.3000000e-03,9.8938814e-04
+3.6600000e-02,2.5086517e-03
+4.1600000e-02,2.4864075e-03
+4.2380000e-01,9.6087923e-03
 1.0000000e-04,1.0000000e-04
-1.6400000e-02,1.2840907e-03
--5.2000000e-03,5.9254629e-04
--3.9200000e-02,2.5508169e-03
--4.0200000e-02,1.9310331e-03
--4.1360000e-01,8.0072190e-03
-0.0000000e+00,0.0000000e+00
--1.9000000e-03,3.7859389e-04
+1.5000000e-03,4.5338235e-04
+3.0000000e-04,1.5275252e-04
+1.7300000e-02,1.4609738e-03
+-7.3000000e-03,9.8938814e-04
+-3.6600000e-02,2.5086517e-03
+-4.1600000e-02,2.4864075e-03
+-4.2380000e-01,9.6087923e-03
 -1.0000000e-04,1.0000000e-04
--1.6400000e-02,1.2840907e-03
-1.6000000e-02,2.1602469e-03
-3.5700000e-02,2.9441090e-03
-1.2200000e-01,3.5932035e-03
-2.2650000e-01,9.2463206e-03
+-1.5000000e-03,4.5338235e-04
+-3.0000000e-04,1.5275252e-04
+-1.7300000e-02,1.4609738e-03
+1.6800000e-02,1.5902481e-03
+3.1300000e-02,3.8094911e-03
+1.2700000e-01,5.0990195e-03
+2.2330000e-01,9.3631073e-03
 2.1000000e-03,3.7859389e-04
-3.7000000e-03,8.1717671e-04
-1.1600000e-02,1.4772347e-03
-2.5300000e-02,1.9723083e-03
+4.0000000e-03,1.0540926e-03
+1.2200000e-02,1.6110728e-03
+2.7400000e-02,1.6613248e-03
 0.0000000e+00,0.0000000e+00
--2.9700000e-02,2.4587711e-03
+-3.2000000e-02,1.5634719e-03
 0.0000000e+00,0.0000000e+00
--3.5090000e-01,3.7161808e-03
+-3.5400000e-01,7.5938572e-03
 0.0000000e+00,0.0000000e+00
--2.1000000e-03,4.8189441e-04
+-3.0000000e-03,6.4978629e-04
 0.0000000e+00,0.0000000e+00
--2.1400000e-02,1.7397318e-03
+-2.1800000e-02,1.4892205e-03
 0.0000000e+00,0.0000000e+00
 0.0000000e+00,0.0000000e+00
 0.0000000e+00,0.0000000e+00
diff --git a/tests/regression_tests/survival_biasing/results_true.dat b/tests/regression_tests/survival_biasing/results_true.dat
index 740272201..932414e98 100644
--- a/tests/regression_tests/survival_biasing/results_true.dat
+++ b/tests/regression_tests/survival_biasing/results_true.dat
@@ -1,20 +1,20 @@
 k-combined:
-9.879232E-01 8.097582E-03
+9.517646E-01 1.303111E-02
 tally 1:
-4.295331E+01
-3.691096E+02
-1.802724E+01
-6.501934E+01
-2.193500E+00
-9.627609E-01
-1.893529E+00
-7.174104E-01
-4.902380E+00
-4.808570E+00
-3.418014E-02
-2.337353E-04
-3.667128E+08
-2.690758E+16
+4.164635E+01
+3.470110E+02
+1.724300E+01
+5.949580E+01
+2.124917E+00
+9.034789E-01
+1.844790E+00
+6.809026E-01
+4.784396E+00
+4.579552E+00
+3.348849E-02
+2.243613E-04
+3.573090E+08
+2.554338E+16
 tally 2:
-1.802724E+01
-6.501934E+01
+1.724300E+01
+5.949580E+01
diff --git a/tests/regression_tests/tallies/results_true.dat b/tests/regression_tests/tallies/results_true.dat
index 3dda0f9b2..1d3aca4b0 100644
--- a/tests/regression_tests/tallies/results_true.dat
+++ b/tests/regression_tests/tallies/results_true.dat
@@ -1 +1 @@
-ddfbb0a6f5498eb8ff33bb10beb64e244b015861919eb4837bd82855e5fd87c3ff97dfa382d3d60afa81c48d9f857fba8e0b99263e7b35587f8adb75be1fc0ec
\ No newline at end of file
+d01c3accd5b4de2aa166a77df28cfe42f5738a44c2480752fcfae7564a507362fff006b6dffb7b1dfe248e14bacef0070cabacea5d75c5996653e5605f7c7384
\ No newline at end of file
diff --git a/tests/regression_tests/tally_aggregation/results_true.dat b/tests/regression_tests/tally_aggregation/results_true.dat
index 172adbfe1..ee6263373 100644
--- a/tests/regression_tests/tally_aggregation/results_true.dat
+++ b/tests/regression_tests/tally_aggregation/results_true.dat
@@ -1,97 +1,97 @@
-[[1.6001087e-05 5.4190949e-04]
- [3.2669968e-01 1.7730523e-01]
- [1.8149266e-02 7.1525113e-01]], [[1.6239097e-05 5.7499676e-04]
- [3.1268633e-01 1.7004165e-01]
- [1.8873778e-02 7.0217885e-01]], [[1.6693071e-05 5.4106379e-04]
- [3.3370208e-01 1.8051505e-01]
- [1.9081306e-02 7.3647547e-01]], [[1.6725399e-05 5.1680146e-04]
- [3.2854628e-01 1.7757185e-01]
- [1.9529646e-02 7.1005198e-01]][[2.4751834e-07 4.3304565e-05]
- [8.6840718e-03 4.3442535e-03]
- [3.7054051e-04 6.5678133e-03]], [[4.0830852e-07 4.9612204e-05]
- [1.2104241e-02 5.9708675e-03]
- [7.1398189e-04 8.2408482e-03]], [[2.6546344e-07 2.5234256e-05]
- [6.5083211e-03 3.2185071e-03]
- [4.2935150e-04 5.1707774e-03]], [[2.7845203e-07 3.4453402e-05]
- [3.3125427e-03 1.7749508e-03]
- [6.0407731e-04 7.5353872e-03]][[1.0455251e-06 8.1938339e-04]
- [1.1392765e+00 5.6434761e-01]
- [1.4142831e-06 5.1213654e-01]], [[2.2009815e-06 1.0418935e-03]
- [1.4422554e-01 1.0070647e-01]
- [3.9488382e-05 7.9236390e-01]], [[1.4606612e-05 2.2374470e-04]
- [1.2962842e-02 2.9268594e-02]
- [3.1339824e-04 1.1056439e+00]], [[4.7805535e-05 8.9749934e-05]
- [5.1694597e-03 1.1111105e-02]
- [7.5279695e-02 4.5381305e-01]][[1.4955183e-08 1.1461548e-05]
- [1.6454649e-02 8.1236707e-03]
- [2.0028007e-08 6.8264819e-03]], [[1.6334486e-07 7.7617340e-05]
- [2.1161584e-03 1.4078445e-03]
- [1.4742097e-05 6.9350862e-03]], [[1.7444757e-07 1.9026095e-06]
- [1.4084092e-04 2.0345990e-04]
- [5.9546175e-06 8.6038812e-03]], [[5.6449127e-07 1.0110585e-06]
- [5.9158873e-05 1.2485325e-04]
- [1.0936497e-03 5.0836702e-03]][[0.2866239 0.2725595]], [[0.2729156 0.258831 ]], [[0.2920724 0.2755922]], [[0.287667  0.2703207]], [[0.035617  0.2232707]], [[0.0353082 0.2224423]], [[0.0370072 0.2288263]], [[0.0363348 0.219573 ]], [[0.0033013 0.2850034]], [[0.0032726 0.2771099]], [[0.0034234 0.2951295]], [[0.0032935 0.2778935]], [[0.0193227 0.1122647]], [[0.0200799 0.1144123]], [[0.0202971 0.1179836]], [[0.0207973 0.1203534]][[0.0086351 0.0061876]], [[0.0120688 0.0074831]], [[0.0064221 0.0035246]], [[0.0030483 0.0024267]], [[0.0009185 0.0033896]], [[0.0009223 0.0039584]], [[0.0010541 0.0038599]], [[0.0012934 0.0028331]], [[6.5126963e-05 2.8486593e-03]], [[7.1110242e-05 4.3424340e-03]], [[5.8911409e-05 2.4296178e-03]], [[8.4278765e-05 6.4182190e-03]], [[0.0003712 0.0020298]], [[0.0007152 0.0036115]], [[0.0004298 0.0019677]], [[0.0006046 0.0021965]][[2.0694650e-04]
- [4.2868191e-01]
- [1.3029457e-01]], [[1.9694048e-04]
- [4.0809445e-01]
- [1.2345525e-01]], [[2.1012645e-04]
- [4.3670571e-01]
- [1.3074883e-01]], [[2.0641548e-04]
- [4.3014207e-01]
- [1.2763930e-01]], [[0.0002584]
- [0.0608867]
- [0.1977426]], [[0.0003026]
- [0.0602368]
- [0.1972111]], [[0.0002509]
- [0.0624699]
- [0.2031126]], [[0.0002322]
- [0.0613385]
- [0.1943371]], [[5.9349736e-05]
- [1.0506741e-02]
- [2.7773865e-01]], [[5.7855564e-05]
- [1.0389781e-02]
- [2.6993483e-01]], [[6.1819700e-05]
- [1.0910874e-02]
- [2.8758020e-01]], [[5.9326317e-05]
- [1.0424040e-02]
- [2.7070367e-01]], [[3.3192167e-05]
- [3.9295320e-03]
- [1.2762462e-01]], [[3.3882691e-05]
- [4.0069157e-03]
- [1.3045143e-01]], [[3.4882103e-05]
- [4.1306182e-03]
- [1.3411514e-01]], [[3.5598508e-05]
- [4.2134987e-03]
- [1.3690156e-01]][[6.4505980e-06]
- [9.6369034e-03]
- [4.4700460e-03]], [[8.2880772e-06]
- [1.3456171e-02]
- [4.5368708e-03]], [[3.9384462e-06]
- [7.1570638e-03]
- [1.5629142e-03]], [[2.3565894e-06]
- [3.4040401e-03]
- [1.8956916e-03]], [[4.2806047e-05]
- [1.1841015e-03]
- [3.3058802e-03]], [[4.8905696e-05]
- [1.0360139e-03]
- [3.9298937e-03]], [[2.4911390e-05]
- [1.2173305e-03]
- [3.8114473e-03]], [[3.4347869e-05]
- [1.5820360e-03]
- [2.6824612e-03]], [[1.0809230e-06]
- [1.0316180e-04]
- [2.8475354e-03]], [[6.4150814e-07]
- [1.1179425e-04]
- [4.3415770e-03]], [[7.3848139e-07]
- [9.3111666e-05]
- [2.4285475e-03]], [[1.2349384e-06]
- [1.7152843e-04]
- [6.4164799e-03]], [[4.5871493e-07]
- [5.4732075e-05]
- [2.0627309e-03]], [[8.1649994e-07]
- [9.7699188e-05]
- [3.6803256e-03]], [[4.5174850e-07]
- [5.3913784e-05]
- [2.0133571e-03]], [[5.0962865e-07]
- [6.0338032e-05]
- [2.2773911e-03]]
\ No newline at end of file
+[[1.6242805e-05 6.2367673e-04]
+ [3.2895972e-01 1.7786452e-01]
+ [1.8044266e-02 7.0451122e-01]], [[1.6113947e-05 5.3572864e-04]
+ [3.1517504e-01 1.7132833e-01]
+ [1.8305682e-02 7.0072832e-01]], [[1.6472052e-05 5.5758006e-04]
+ [3.2362364e-01 1.7597163e-01]
+ [1.9107080e-02 7.2600440e-01]], [[1.6693277e-05 4.9204218e-04]
+ [3.2429262e-01 1.7600573e-01]
+ [1.9042489e-02 7.3053854e-01]][[2.9719061e-07 8.0925438e-05]
+ [8.9432259e-03 4.4057583e-03]
+ [5.2078407e-04 6.4387688e-03]], [[1.8572081e-07 2.5667235e-05]
+ [1.1641603e-02 5.7444311e-03]
+ [2.6983611e-04 6.9783224e-03]], [[2.4994113e-07 5.4993390e-05]
+ [6.0464041e-03 3.0764811e-03]
+ [2.6559118e-04 7.7279780e-03]], [[2.5965232e-07 3.9618775e-05]
+ [1.0409564e-02 5.1850104e-03]
+ [2.7831231e-04 7.4480576e-03]][[1.0329435e-06 8.0861229e-04]
+ [1.1265142e+00 5.5796079e-01]
+ [1.3965860e-06 5.0338828e-01]], [[2.2264172e-06 1.0828687e-03]
+ [1.4724979e-01 1.0226107e-01]
+ [2.2656045e-05 7.7618945e-01]], [[1.4789782e-05 2.2786630e-04]
+ [1.3149968e-02 2.9847169e-02]
+ [3.2638111e-04 1.1287326e+00]], [[4.7472938e-05 8.9680338e-05]
+ [5.1371041e-03 1.1101179e-02]
+ [7.4149084e-02 4.5347217e-01]][[1.7024771e-08 1.2878244e-05]
+ [1.8795566e-02 9.2705008e-03]
+ [2.2676749e-08 7.0878353e-03]], [[2.2018925e-07 1.0785388e-04]
+ [2.6715019e-03 1.6657928e-03]
+ [1.2479083e-05 8.6814018e-03]], [[2.0928485e-07 1.6600875e-06]
+ [1.1859535e-04 1.7969083e-04]
+ [1.5981387e-05 8.0489308e-03]], [[4.0016381e-07 7.6799157e-07]
+ [4.4157583e-05 9.4462925e-05]
+ [7.0115110e-04 3.8678806e-03]][[0.287433  0.2698042]], [[0.2751228 0.2598525]], [[0.280516  0.2648274]], [[0.2834448 0.2676736]], [[0.0370558 0.2148509]], [[0.0355217 0.2130189]], [[0.0385317 0.2292804]], [[0.0361655 0.2223832]], [[0.0033268 0.2855078]], [[0.0033498 0.2849403]], [[0.003359  0.2901157]], [[0.0034555 0.2982438]], [[0.0192046 0.1128364]], [[0.0195026 0.1147807]], [[0.0203405 0.1183102]], [[0.0202861 0.1187358]][[0.00889   0.0051934]], [[0.0115249 0.0072767]], [[0.0058841 0.0040289]], [[0.0103341 0.0063266]], [[0.0009734 0.0048865]], [[0.0016425 0.0038133]], [[0.0013902 0.0048875]], [[0.0012487 0.0039808]], [[1.8994140e-05 2.0410145e-03]], [[6.8277082e-05 3.4865782e-03]], [[6.1643568e-05 4.9220817e-03]], [[7.4147413e-05 4.9263295e-03]], [[0.0005213 0.0024208]], [[0.0002702 0.0014313]], [[0.0002665 0.0022006]], [[0.0002788 0.0014892]][[2.0601081e-04]
+ [4.2976789e-01]
+ [1.2726338e-01]], [[1.9802070e-04]
+ [4.1138025e-01]
+ [1.2339705e-01]], [[2.0174854e-04]
+ [4.1947542e-01]
+ [1.2566615e-01]], [[2.0386518e-04]
+ [4.2385140e-01]
+ [1.2706310e-01]], [[0.0003403]
+ [0.0624955]
+ [0.189071 ]], [[0.0002601]
+ [0.060449 ]
+ [0.1878314]], [[0.0002765]
+ [0.0652412]
+ [0.2022944]], [[0.0002082]
+ [0.0613252]
+ [0.1970153]], [[6.0336874e-05]
+ [1.0617692e-02]
+ [2.7815664e-01]], [[5.9823997e-05]
+ [1.0664059e-02]
+ [2.7756620e-01]], [[6.0873689e-05]
+ [1.0744209e-02]
+ [2.8266963e-01]], [[6.1621521e-05]
+ [1.0971177e-02]
+ [2.9066650e-01]], [[3.3297391e-05]
+ [3.9432037e-03]
+ [1.2806450e-01]], [[3.3863464e-05]
+ [4.0100180e-03]
+ [1.3023932e-01]], [[3.4930617e-05]
+ [4.1344613e-03]
+ [1.3448129e-01]], [[3.5061805e-05]
+ [4.1505999e-03]
+ [1.3483614e-01]][[5.8259835e-06]
+ [9.9096571e-03]
+ [2.7933778e-03]], [[8.0858909e-06]
+ [1.2843377e-02]
+ [4.5631248e-03]], [[4.3418585e-06]
+ [6.5638646e-03]
+ [2.7874612e-03]], [[6.9046376e-06]
+ [1.1531588e-02]
+ [3.7205377e-03]], [[8.0710599e-05]
+ [1.0889301e-03]
+ [4.8613465e-03]], [[2.4337121e-05]
+ [1.8861117e-03]
+ [3.6987509e-03]], [[5.4812439e-05]
+ [1.7085353e-03]
+ [4.7852139e-03]], [[3.9007791e-05]
+ [1.4998363e-03]
+ [3.8929646e-03]], [[7.5757577e-07]
+ [2.5845755e-05]
+ [2.0409391e-03]], [[1.0302346e-06]
+ [1.1907557e-04]
+ [3.4852130e-03]], [[9.1936614e-07]
+ [1.2974020e-04]
+ [4.9207575e-03]], [[5.6493555e-07]
+ [1.2113685e-04]
+ [4.9253980e-03]], [[5.4602210e-07]
+ [6.5233025e-05]
+ [2.4754550e-03]], [[3.2091909e-07]
+ [3.8472906e-05]
+ [1.4560974e-03]], [[4.8475651e-07]
+ [5.9108262e-05]
+ [2.2158781e-03]], [[3.3737822e-07]
+ [4.0544269e-05]
+ [1.5145628e-03]]
\ No newline at end of file
diff --git a/tests/regression_tests/tally_arithmetic/results_true.dat b/tests/regression_tests/tally_arithmetic/results_true.dat
index 143930dd4..baa380587 100644
--- a/tests/regression_tests/tally_arithmetic/results_true.dat
+++ b/tests/regression_tests/tally_arithmetic/results_true.dat
@@ -1,49 +1,49 @@
-[2.04229e-07 1.28343e-13 1.79333e-04 1.12698e-10 1.89952e-07 1.51210e-07
- 1.66796e-04 1.32777e-04 6.13215e-03 3.85362e-09 3.14746e-03 1.97795e-09
- 5.70345e-03 4.54021e-03 2.92742e-03 2.33037e-03 2.10575e-07 1.28419e-13
- 1.84905e-04 1.12764e-10 1.89188e-07 1.50221e-07 1.66125e-04 1.31908e-04
- 6.32269e-03 3.85587e-09 3.24526e-03 1.97911e-09 5.68054e-03 4.51051e-03
- 2.91566e-03 2.31512e-03 1.96696e-07 1.26388e-13 1.72718e-04 1.10981e-10
- 1.91283e-07 1.53449e-07 1.67964e-04 1.34743e-04 5.90596e-03 3.79491e-09
- 3.03136e-03 1.94782e-09 5.74342e-03 4.60742e-03 2.94794e-03 2.36486e-03
- 2.06016e-07 1.35264e-13 1.80901e-04 1.18775e-10 2.05873e-07 1.65814e-07
- 1.80776e-04 1.45600e-04 6.18579e-03 4.06142e-09 3.17499e-03 2.08461e-09
- 6.18150e-03 4.97869e-03 3.17279e-03 2.55542e-03 2.36089e-03 4.46651e-05
- 1.02263e-02 1.93469e-04 1.18179e-04 2.62375e-05 5.11897e-04 1.13649e-04
- 2.56040e-02 4.84394e-04 4.55595e-02 8.61927e-04 1.28165e-03 2.84546e-04
- 2.28056e-03 5.06320e-04 2.29877e-03 4.53056e-05 9.95724e-03 1.96244e-04
- 1.14803e-04 2.57898e-05 4.97276e-04 1.11710e-04 2.49302e-02 4.91340e-04
- 4.43606e-02 8.74289e-04 1.24504e-03 2.79691e-04 2.21542e-03 4.97680e-04
- 2.31940e-03 4.34238e-05 1.00466e-02 1.88093e-04 1.17620e-04 2.69280e-05
- 5.09479e-04 1.16640e-04 2.51540e-02 4.70932e-04 4.47588e-02 8.37974e-04
- 1.27560e-03 2.92034e-04 2.26979e-03 5.19644e-04 2.19212e-03 4.53914e-05
- 9.49530e-03 1.96615e-04 1.09609e-04 2.41615e-05 4.74778e-04 1.04657e-04
- 2.37736e-02 4.92271e-04 4.23026e-02 8.75944e-04 1.18871e-03 2.62032e-04
- 2.11519e-03 4.66257e-04][2.04229e-07 1.28343e-13 1.79333e-04 1.12698e-10 1.89952e-07 1.51210e-07
- 1.66796e-04 1.32777e-04 6.13215e-03 3.85362e-09 3.14746e-03 1.97795e-09
- 5.70345e-03 4.54021e-03 2.92742e-03 2.33037e-03 2.10575e-07 1.28419e-13
- 1.84905e-04 1.12764e-10 1.89188e-07 1.50221e-07 1.66125e-04 1.31908e-04
- 6.32269e-03 3.85587e-09 3.24526e-03 1.97911e-09 5.68054e-03 4.51051e-03
- 2.91566e-03 2.31512e-03 1.96696e-07 1.26388e-13 1.72718e-04 1.10981e-10
- 1.91283e-07 1.53449e-07 1.67964e-04 1.34743e-04 5.90596e-03 3.79491e-09
- 3.03136e-03 1.94782e-09 5.74342e-03 4.60742e-03 2.94794e-03 2.36486e-03
- 2.06016e-07 1.35264e-13 1.80901e-04 1.18775e-10 2.05873e-07 1.65814e-07
- 1.80776e-04 1.45600e-04 6.18579e-03 4.06142e-09 3.17499e-03 2.08461e-09
- 6.18150e-03 4.97869e-03 3.17279e-03 2.55542e-03 2.36089e-03 4.46651e-05
- 1.02263e-02 1.93469e-04 1.18179e-04 2.62375e-05 5.11897e-04 1.13649e-04
- 2.56040e-02 4.84394e-04 4.55595e-02 8.61927e-04 1.28165e-03 2.84546e-04
- 2.28056e-03 5.06320e-04 2.29877e-03 4.53056e-05 9.95724e-03 1.96244e-04
- 1.14803e-04 2.57898e-05 4.97276e-04 1.11710e-04 2.49302e-02 4.91340e-04
- 4.43606e-02 8.74289e-04 1.24504e-03 2.79691e-04 2.21542e-03 4.97680e-04
- 2.31940e-03 4.34238e-05 1.00466e-02 1.88093e-04 1.17620e-04 2.69280e-05
- 5.09479e-04 1.16640e-04 2.51540e-02 4.70932e-04 4.47588e-02 8.37974e-04
- 1.27560e-03 2.92034e-04 2.26979e-03 5.19644e-04 2.19212e-03 4.53914e-05
- 9.49530e-03 1.96615e-04 1.09609e-04 2.41615e-05 4.74778e-04 1.04657e-04
- 2.37736e-02 4.92271e-04 4.23026e-02 8.75944e-04 1.18871e-03 2.62032e-04
- 2.11519e-03 4.66257e-04][0.0057  0.00454 0.00293 0.00233 0.00568 0.00451 0.00292 0.00232 0.00574
- 0.00461 0.00295 0.00236 0.00618 0.00498 0.00317 0.00256 0.00128 0.00028
- 0.00228 0.00051 0.00125 0.00028 0.00222 0.0005  0.00128 0.00029 0.00227
- 0.00052 0.00119 0.00026 0.00212 0.00047][0.00018 0.00017 0.00315 0.00293 0.00018 0.00017 0.00325 0.00292 0.00017
- 0.00017 0.00303 0.00295 0.00018 0.00018 0.00317 0.00317 0.01023 0.00051
- 0.04556 0.00228 0.00996 0.0005  0.04436 0.00222 0.01005 0.00051 0.04476
- 0.00227 0.0095  0.00047 0.0423  0.00212][0.00293 0.00292 0.00295 0.00317 0.00228 0.00222 0.00227 0.00212]
\ No newline at end of file
+[2.29467e-07 1.47622e-13 2.02646e-04 1.30367e-10 2.20704e-07 1.76624e-07
+ 1.94907e-04 1.55980e-04 6.32267e-03 4.06754e-09 3.26873e-03 2.10286e-09
+ 6.08121e-03 4.86666e-03 3.14390e-03 2.51599e-03 1.89223e-07 1.06256e-13
+ 1.67106e-04 9.38364e-11 1.53300e-07 1.20220e-07 1.35382e-04 1.06168e-04
+ 5.21380e-03 2.92775e-09 2.69546e-03 1.51361e-09 4.22399e-03 3.31252e-03
+ 2.18374e-03 1.71253e-03 2.21146e-07 1.41349e-13 1.95297e-04 1.24828e-10
+ 2.11844e-07 1.69398e-07 1.87083e-04 1.49598e-04 6.09339e-03 3.89470e-09
+ 3.15020e-03 2.01351e-09 5.83710e-03 4.66754e-03 3.01770e-03 2.41305e-03
+ 1.92872e-07 1.05908e-13 1.70328e-04 9.35293e-11 1.59466e-07 1.25399e-07
+ 1.40827e-04 1.10741e-04 5.31433e-03 2.91817e-09 2.74744e-03 1.50865e-09
+ 4.39388e-03 3.45520e-03 2.27158e-03 1.78629e-03 2.44601e-03 4.71663e-05
+ 1.09430e-02 2.11013e-04 1.23573e-04 2.76181e-05 5.52841e-04 1.23558e-04
+ 2.71755e-02 5.24023e-04 4.76200e-02 9.18253e-04 1.37291e-03 3.06841e-04
+ 2.40577e-03 5.37681e-04 2.29014e-03 4.44674e-05 1.02456e-02 1.98938e-04
+ 1.12524e-04 2.48126e-05 5.03411e-04 1.11007e-04 2.54438e-02 4.94038e-04
+ 4.45855e-02 8.65710e-04 1.25016e-03 2.75671e-04 2.19067e-03 4.83061e-04
+ 2.38500e-03 4.58053e-05 1.06700e-02 2.04924e-04 1.22899e-04 2.95267e-05
+ 5.49826e-04 1.32097e-04 2.64977e-02 5.08903e-04 4.64323e-02 8.91758e-04
+ 1.36542e-03 3.28045e-04 2.39265e-03 5.74839e-04 2.17094e-03 4.21772e-05
+ 9.71236e-03 1.88693e-04 1.09358e-04 2.46984e-05 4.89245e-04 1.10496e-04
+ 2.41194e-02 4.68594e-04 4.22648e-02 8.21124e-04 1.21498e-03 2.74402e-04
+ 2.12902e-03 4.80839e-04][2.29467e-07 1.47622e-13 2.02646e-04 1.30367e-10 2.20704e-07 1.76624e-07
+ 1.94907e-04 1.55980e-04 6.32267e-03 4.06754e-09 3.26873e-03 2.10286e-09
+ 6.08121e-03 4.86666e-03 3.14390e-03 2.51599e-03 1.89223e-07 1.06256e-13
+ 1.67106e-04 9.38364e-11 1.53300e-07 1.20220e-07 1.35382e-04 1.06168e-04
+ 5.21380e-03 2.92775e-09 2.69546e-03 1.51361e-09 4.22399e-03 3.31252e-03
+ 2.18374e-03 1.71253e-03 2.21146e-07 1.41349e-13 1.95297e-04 1.24828e-10
+ 2.11844e-07 1.69398e-07 1.87083e-04 1.49598e-04 6.09339e-03 3.89470e-09
+ 3.15020e-03 2.01351e-09 5.83710e-03 4.66754e-03 3.01770e-03 2.41305e-03
+ 1.92872e-07 1.05908e-13 1.70328e-04 9.35293e-11 1.59466e-07 1.25399e-07
+ 1.40827e-04 1.10741e-04 5.31433e-03 2.91817e-09 2.74744e-03 1.50865e-09
+ 4.39388e-03 3.45520e-03 2.27158e-03 1.78629e-03 2.44601e-03 4.71663e-05
+ 1.09430e-02 2.11013e-04 1.23573e-04 2.76181e-05 5.52841e-04 1.23558e-04
+ 2.71755e-02 5.24023e-04 4.76200e-02 9.18253e-04 1.37291e-03 3.06841e-04
+ 2.40577e-03 5.37681e-04 2.29014e-03 4.44674e-05 1.02456e-02 1.98938e-04
+ 1.12524e-04 2.48126e-05 5.03411e-04 1.11007e-04 2.54438e-02 4.94038e-04
+ 4.45855e-02 8.65710e-04 1.25016e-03 2.75671e-04 2.19067e-03 4.83061e-04
+ 2.38500e-03 4.58053e-05 1.06700e-02 2.04924e-04 1.22899e-04 2.95267e-05
+ 5.49826e-04 1.32097e-04 2.64977e-02 5.08903e-04 4.64323e-02 8.91758e-04
+ 1.36542e-03 3.28045e-04 2.39265e-03 5.74839e-04 2.17094e-03 4.21772e-05
+ 9.71236e-03 1.88693e-04 1.09358e-04 2.46984e-05 4.89245e-04 1.10496e-04
+ 2.41194e-02 4.68594e-04 4.22648e-02 8.21124e-04 1.21498e-03 2.74402e-04
+ 2.12902e-03 4.80839e-04][0.00608 0.00487 0.00314 0.00252 0.00422 0.00331 0.00218 0.00171 0.00584
+ 0.00467 0.00302 0.00241 0.00439 0.00346 0.00227 0.00179 0.00137 0.00031
+ 0.00241 0.00054 0.00125 0.00028 0.00219 0.00048 0.00137 0.00033 0.00239
+ 0.00057 0.00121 0.00027 0.00213 0.00048][0.0002  0.00019 0.00327 0.00314 0.00017 0.00014 0.0027  0.00218 0.0002
+ 0.00019 0.00315 0.00302 0.00017 0.00014 0.00275 0.00227 0.01094 0.00055
+ 0.04762 0.00241 0.01025 0.0005  0.04459 0.00219 0.01067 0.00055 0.04643
+ 0.00239 0.00971 0.00049 0.04226 0.00213][0.00314 0.00218 0.00302 0.00227 0.00241 0.00219 0.00239 0.00213]
\ No newline at end of file
diff --git a/tests/regression_tests/tally_assumesep/results_true.dat b/tests/regression_tests/tally_assumesep/results_true.dat
index 9d7cbf9c3..c9ccf0928 100644
--- a/tests/regression_tests/tally_assumesep/results_true.dat
+++ b/tests/regression_tests/tally_assumesep/results_true.dat
@@ -1,11 +1,11 @@
 k-combined:
-5.683578E-01 1.129170E-02
+6.268465E-01 1.154810E-02
 tally 1:
-6.753950E+00
-9.188305E+00
+7.828708E+00
+1.230478E+01
 tally 2:
-2.278558E-01
-1.052944E-02
+2.582239E-01
+1.360117E-02
 tally 3:
-1.179091E+01
-2.795539E+01
+1.339335E+01
+3.663458E+01
diff --git a/tests/regression_tests/tally_nuclides/results_true.dat b/tests/regression_tests/tally_nuclides/results_true.dat
index 7f9641fc8..93a0e03fb 100644
--- a/tests/regression_tests/tally_nuclides/results_true.dat
+++ b/tests/regression_tests/tally_nuclides/results_true.dat
@@ -1,28 +1,28 @@
 k-combined:
-1.132463E+00 5.721067E-02
+9.732610E-01 1.400780E-02
 tally 1:
-7.310528E+00
-1.080411E+01
-1.664215E+00
-5.567756E-01
-1.609340E+00
-5.205634E-01
-5.646313E+00
-6.459724E+00
-7.310528E+00
-1.080411E+01
-1.664215E+00
-5.567756E-01
-1.609340E+00
-5.205634E-01
-5.646313E+00
-6.459724E+00
+7.123025E+00
+1.021136E+01
+1.619905E+00
+5.258592E-01
+1.561322E+00
+4.881841E-01
+5.503120E+00
+6.105683E+00
+7.123025E+00
+1.021136E+01
+1.619905E+00
+5.258592E-01
+1.561322E+00
+4.881841E-01
+5.503120E+00
+6.105683E+00
 tally 2:
-7.310528E+00
-1.080411E+01
-1.664215E+00
-5.567756E-01
-1.609340E+00
-5.205634E-01
-5.646313E+00
-6.459724E+00
+7.123025E+00
+1.021136E+01
+1.619905E+00
+5.258592E-01
+1.561322E+00
+4.881841E-01
+5.503120E+00
+6.105683E+00
diff --git a/tests/regression_tests/tally_slice_merge/results_true.dat b/tests/regression_tests/tally_slice_merge/results_true.dat
index 58b15fc18..4b2cbdf1a 100644
--- a/tests/regression_tests/tally_slice_merge/results_true.dat
+++ b/tests/regression_tests/tally_slice_merge/results_true.dat
@@ -1,45 +1,45 @@
    cell  energy low [eV]  energy high [eV] nuclide    score     mean  std. dev.
-0    21         0.00e+00          6.25e-01    U235  fission 1.75e-01   1.20e-02   cell  energy low [eV]  energy high [eV] nuclide       score     mean  std. dev.
-0    21         0.00e+00          6.25e-01    U235  nu-fission 4.26e-01   2.92e-02   cell  energy low [eV]  energy high [eV] nuclide    score     mean  std. dev.
-0    21         0.00e+00          6.25e-01    U238  fission 2.41e-07   1.61e-08   cell  energy low [eV]  energy high [eV] nuclide       score     mean  std. dev.
-0    21         0.00e+00          6.25e-01    U238  nu-fission 6.00e-07   4.01e-08   cell  energy low [eV]  energy high [eV] nuclide    score     mean  std. dev.
-0    21         6.25e-01          2.00e+07    U235  fission 2.89e-02   2.07e-03   cell  energy low [eV]  energy high [eV] nuclide       score     mean  std. dev.
-0    21         6.25e-01          2.00e+07    U235  nu-fission 7.07e-02   5.06e-03   cell  energy low [eV]  energy high [eV] nuclide    score     mean  std. dev.
-0    21         6.25e-01          2.00e+07    U238  fission 1.41e-02   5.76e-04   cell  energy low [eV]  energy high [eV] nuclide       score     mean  std. dev.
-0    21         6.25e-01          2.00e+07    U238  nu-fission 3.95e-02   1.90e-03   cell  energy low [eV]  energy high [eV] nuclide    score     mean  std. dev.
-0    27         0.00e+00          6.25e-01    U235  fission 1.51e-01   1.17e-02   cell  energy low [eV]  energy high [eV] nuclide       score     mean  std. dev.
-0    27         0.00e+00          6.25e-01    U235  nu-fission 3.69e-01   2.86e-02   cell  energy low [eV]  energy high [eV] nuclide    score     mean  std. dev.
-0    27         0.00e+00          6.25e-01    U238  fission 2.07e-07   1.47e-08   cell  energy low [eV]  energy high [eV] nuclide       score     mean  std. dev.
-0    27         0.00e+00          6.25e-01    U238  nu-fission 5.17e-07   3.66e-08   cell  energy low [eV]  energy high [eV] nuclide    score     mean  std. dev.
-0    27         6.25e-01          2.00e+07    U235  fission 2.57e-02   2.43e-03   cell  energy low [eV]  energy high [eV] nuclide       score     mean  std. dev.
-0    27         6.25e-01          2.00e+07    U235  nu-fission 6.30e-02   5.92e-03   cell  energy low [eV]  energy high [eV] nuclide    score     mean  std. dev.
-0    27         6.25e-01          2.00e+07    U238  fission 1.47e-02   1.41e-03   cell  energy low [eV]  energy high [eV] nuclide       score     mean  std. dev.
-0    27         6.25e-01          2.00e+07    U238  nu-fission 4.12e-02   4.02e-03    cell  energy low [eV]  energy high [eV] nuclide       score     mean  std. dev.
-0     21         0.00e+00          6.25e-01    U235     fission 1.75e-01   1.20e-02
-1     21         0.00e+00          6.25e-01    U235  nu-fission 4.26e-01   2.92e-02
-2     21         0.00e+00          6.25e-01    U238     fission 2.41e-07   1.61e-08
-3     21         0.00e+00          6.25e-01    U238  nu-fission 6.00e-07   4.01e-08
-4     21         6.25e-01          2.00e+07    U235     fission 2.89e-02   2.07e-03
-5     21         6.25e-01          2.00e+07    U235  nu-fission 7.07e-02   5.06e-03
-6     21         6.25e-01          2.00e+07    U238     fission 1.41e-02   5.76e-04
-7     21         6.25e-01          2.00e+07    U238  nu-fission 3.95e-02   1.90e-03
-8     27         0.00e+00          6.25e-01    U235     fission 1.51e-01   1.17e-02
-9     27         0.00e+00          6.25e-01    U235  nu-fission 3.69e-01   2.86e-02
-10    27         0.00e+00          6.25e-01    U238     fission 2.07e-07   1.47e-08
-11    27         0.00e+00          6.25e-01    U238  nu-fission 5.17e-07   3.66e-08
-12    27         6.25e-01          2.00e+07    U235     fission 2.57e-02   2.43e-03
-13    27         6.25e-01          2.00e+07    U235  nu-fission 6.30e-02   5.92e-03
-14    27         6.25e-01          2.00e+07    U238     fission 1.47e-02   1.41e-03
-15    27         6.25e-01          2.00e+07    U238  nu-fission 4.12e-02   4.02e-03
+0    21         0.00e+00          6.25e-01    U235  fission 1.93e-01   1.92e-02   cell  energy low [eV]  energy high [eV] nuclide       score     mean  std. dev.
+0    21         0.00e+00          6.25e-01    U235  nu-fission 4.70e-01   4.67e-02   cell  energy low [eV]  energy high [eV] nuclide    score     mean  std. dev.
+0    21         0.00e+00          6.25e-01    U238  fission 2.65e-07   2.60e-08   cell  energy low [eV]  energy high [eV] nuclide       score     mean  std. dev.
+0    21         0.00e+00          6.25e-01    U238  nu-fission 6.60e-07   6.47e-08   cell  energy low [eV]  energy high [eV] nuclide    score     mean  std. dev.
+0    21         6.25e-01          2.00e+07    U235  fission 3.39e-02   1.53e-03   cell  energy low [eV]  energy high [eV] nuclide       score     mean  std. dev.
+0    21         6.25e-01          2.00e+07    U235  nu-fission 8.30e-02   3.75e-03   cell  energy low [eV]  energy high [eV] nuclide    score     mean  std. dev.
+0    21         6.25e-01          2.00e+07    U238  fission 1.70e-02   2.01e-03   cell  energy low [eV]  energy high [eV] nuclide       score     mean  std. dev.
+0    21         6.25e-01          2.00e+07    U238  nu-fission 4.76e-02   6.12e-03   cell  energy low [eV]  energy high [eV] nuclide    score     mean  std. dev.
+0    27         0.00e+00          6.25e-01    U235  fission 7.61e-02   5.84e-03   cell  energy low [eV]  energy high [eV] nuclide       score     mean  std. dev.
+0    27         0.00e+00          6.25e-01    U235  nu-fission 1.85e-01   1.42e-02   cell  energy low [eV]  energy high [eV] nuclide    score     mean  std. dev.
+0    27         0.00e+00          6.25e-01    U238  fission 1.06e-07   7.62e-09   cell  energy low [eV]  energy high [eV] nuclide       score     mean  std. dev.
+0    27         0.00e+00          6.25e-01    U238  nu-fission 2.64e-07   1.90e-08   cell  energy low [eV]  energy high [eV] nuclide    score     mean  std. dev.
+0    27         6.25e-01          2.00e+07    U235  fission 1.69e-02   1.34e-03   cell  energy low [eV]  energy high [eV] nuclide       score     mean  std. dev.
+0    27         6.25e-01          2.00e+07    U235  nu-fission 4.15e-02   3.29e-03   cell  energy low [eV]  energy high [eV] nuclide    score     mean  std. dev.
+0    27         6.25e-01          2.00e+07    U238  fission 1.10e-02   1.69e-03   cell  energy low [eV]  energy high [eV] nuclide       score     mean  std. dev.
+0    27         6.25e-01          2.00e+07    U238  nu-fission 3.13e-02   5.35e-03    cell  energy low [eV]  energy high [eV] nuclide       score     mean  std. dev.
+0     21         0.00e+00          6.25e-01    U235     fission 1.93e-01   1.92e-02
+1     21         0.00e+00          6.25e-01    U235  nu-fission 4.70e-01   4.67e-02
+2     21         0.00e+00          6.25e-01    U238     fission 2.65e-07   2.60e-08
+3     21         0.00e+00          6.25e-01    U238  nu-fission 6.60e-07   6.47e-08
+4     21         6.25e-01          2.00e+07    U235     fission 3.39e-02   1.53e-03
+5     21         6.25e-01          2.00e+07    U235  nu-fission 8.30e-02   3.75e-03
+6     21         6.25e-01          2.00e+07    U238     fission 1.70e-02   2.01e-03
+7     21         6.25e-01          2.00e+07    U238  nu-fission 4.76e-02   6.12e-03
+8     27         0.00e+00          6.25e-01    U235     fission 7.61e-02   5.84e-03
+9     27         0.00e+00          6.25e-01    U235  nu-fission 1.85e-01   1.42e-02
+10    27         0.00e+00          6.25e-01    U238     fission 1.06e-07   7.62e-09
+11    27         0.00e+00          6.25e-01    U238  nu-fission 2.64e-07   1.90e-08
+12    27         6.25e-01          2.00e+07    U235     fission 1.69e-02   1.34e-03
+13    27         6.25e-01          2.00e+07    U235  nu-fission 4.15e-02   3.29e-03
+14    27         6.25e-01          2.00e+07    U238     fission 1.10e-02   1.69e-03
+15    27         6.25e-01          2.00e+07    U238  nu-fission 3.13e-02   5.35e-03
          sum(distribcell)  energy low [eV]  energy high [eV] nuclide       score     mean  std. dev.
 0   (0, 100, 2000, 30000)         0.00e+00          6.25e-01    U235     fission 0.00e+00   0.00e+00
 1   (0, 100, 2000, 30000)         0.00e+00          6.25e-01    U235  nu-fission 0.00e+00   0.00e+00
 2   (0, 100, 2000, 30000)         0.00e+00          6.25e-01    U238     fission 0.00e+00   0.00e+00
 3   (0, 100, 2000, 30000)         0.00e+00          6.25e-01    U238  nu-fission 0.00e+00   0.00e+00
-4   (0, 100, 2000, 30000)         6.25e-01          2.00e+07    U235     fission 9.53e-07   9.53e-07
-5   (0, 100, 2000, 30000)         6.25e-01          2.00e+07    U235  nu-fission 2.37e-06   2.37e-06
-6   (0, 100, 2000, 30000)         6.25e-01          2.00e+07    U238     fission 1.25e-08   1.25e-08
-7   (0, 100, 2000, 30000)         6.25e-01          2.00e+07    U238  nu-fission 3.15e-08   3.15e-08
+4   (0, 100, 2000, 30000)         6.25e-01          2.00e+07    U235     fission 0.00e+00   0.00e+00
+5   (0, 100, 2000, 30000)         6.25e-01          2.00e+07    U235  nu-fission 0.00e+00   0.00e+00
+6   (0, 100, 2000, 30000)         6.25e-01          2.00e+07    U238     fission 0.00e+00   0.00e+00
+7   (0, 100, 2000, 30000)         6.25e-01          2.00e+07    U238  nu-fission 0.00e+00   0.00e+00
 8      (500, 5000, 50000)         0.00e+00          6.25e-01    U235     fission 0.00e+00   0.00e+00
 9      (500, 5000, 50000)         0.00e+00          6.25e-01    U235  nu-fission 0.00e+00   0.00e+00
 10     (500, 5000, 50000)         0.00e+00          6.25e-01    U238     fission 0.00e+00   0.00e+00
@@ -49,19 +49,19 @@
 14     (500, 5000, 50000)         6.25e-01          2.00e+07    U238     fission 0.00e+00   0.00e+00
 15     (500, 5000, 50000)         6.25e-01          2.00e+07    U238  nu-fission 0.00e+00   0.00e+00
            sum(mesh)  energy low [eV]  energy high [eV] nuclide       score     mean  std. dev.
-0   ((1, 1), (1, 2))         0.00e+00          6.25e-01    U235     fission 6.73e-03   3.04e-03
-1   ((1, 1), (1, 2))         0.00e+00          6.25e-01    U235  nu-fission 1.64e-02   7.40e-03
-2   ((1, 1), (1, 2))         0.00e+00          6.25e-01    U238     fission 8.80e-09   3.84e-09
-3   ((1, 1), (1, 2))         0.00e+00          6.25e-01    U238  nu-fission 2.19e-08   9.56e-09
-4   ((1, 1), (1, 2))         6.25e-01          2.00e+07    U235     fission 9.89e-04   3.53e-04
-5   ((1, 1), (1, 2))         6.25e-01          2.00e+07    U235  nu-fission 2.42e-03   8.60e-04
-6   ((1, 1), (1, 2))         6.25e-01          2.00e+07    U238     fission 5.01e-04   2.13e-04
-7   ((1, 1), (1, 2))         6.25e-01          2.00e+07    U238  nu-fission 1.36e-03   5.86e-04
-8   ((2, 1), (2, 2))         0.00e+00          6.25e-01    U235     fission 1.63e-02   4.21e-03
-9   ((2, 1), (2, 2))         0.00e+00          6.25e-01    U235  nu-fission 3.98e-02   1.02e-02
-10  ((2, 1), (2, 2))         0.00e+00          6.25e-01    U238     fission 2.28e-08   5.90e-09
-11  ((2, 1), (2, 2))         0.00e+00          6.25e-01    U238  nu-fission 5.67e-08   1.47e-08
-12  ((2, 1), (2, 2))         6.25e-01          2.00e+07    U235     fission 1.79e-03   4.31e-04
-13  ((2, 1), (2, 2))         6.25e-01          2.00e+07    U235  nu-fission 4.37e-03   1.05e-03
-14  ((2, 1), (2, 2))         6.25e-01          2.00e+07    U238     fission 7.51e-04   2.51e-04
-15  ((2, 1), (2, 2))         6.25e-01          2.00e+07    U238  nu-fission 2.02e-03   6.71e-04
+0   ((1, 1), (1, 2))         0.00e+00          6.25e-01    U235     fission 1.94e-03   1.03e-03
+1   ((1, 1), (1, 2))         0.00e+00          6.25e-01    U235  nu-fission 4.74e-03   2.50e-03
+2   ((1, 1), (1, 2))         0.00e+00          6.25e-01    U238     fission 2.74e-09   1.42e-09
+3   ((1, 1), (1, 2))         0.00e+00          6.25e-01    U238  nu-fission 6.83e-09   3.53e-09
+4   ((1, 1), (1, 2))         6.25e-01          2.00e+07    U235     fission 9.02e-04   3.69e-04
+5   ((1, 1), (1, 2))         6.25e-01          2.00e+07    U235  nu-fission 2.24e-03   9.12e-04
+6   ((1, 1), (1, 2))         6.25e-01          2.00e+07    U238     fission 1.44e-03   8.42e-04
+7   ((1, 1), (1, 2))         6.25e-01          2.00e+07    U238  nu-fission 4.37e-03   2.64e-03
+8   ((2, 1), (2, 2))         0.00e+00          6.25e-01    U235     fission 1.27e-02   2.76e-03
+9   ((2, 1), (2, 2))         0.00e+00          6.25e-01    U235  nu-fission 3.09e-02   6.72e-03
+10  ((2, 1), (2, 2))         0.00e+00          6.25e-01    U238     fission 1.70e-08   3.57e-09
+11  ((2, 1), (2, 2))         0.00e+00          6.25e-01    U238  nu-fission 4.25e-08   8.90e-09
+12  ((2, 1), (2, 2))         6.25e-01          2.00e+07    U235     fission 1.43e-03   1.69e-04
+13  ((2, 1), (2, 2))         6.25e-01          2.00e+07    U235  nu-fission 3.52e-03   4.20e-04
+14  ((2, 1), (2, 2))         6.25e-01          2.00e+07    U238     fission 1.37e-03   2.98e-04
+15  ((2, 1), (2, 2))         6.25e-01          2.00e+07    U238  nu-fission 4.16e-03   1.08e-03
diff --git a/tests/regression_tests/torus/results_true.dat b/tests/regression_tests/torus/results_true.dat
index 42fb209cc..84cd3c7a4 100644
--- a/tests/regression_tests/torus/results_true.dat
+++ b/tests/regression_tests/torus/results_true.dat
@@ -1,2 +1,2 @@
 k-combined:
-7.667201E-01 1.136882E-02
+7.666453E-01 1.478848E-02
diff --git a/tests/regression_tests/trace/results_true.dat b/tests/regression_tests/trace/results_true.dat
index bbf03de94..97b997ae6 100644
--- a/tests/regression_tests/trace/results_true.dat
+++ b/tests/regression_tests/trace/results_true.dat
@@ -1,2 +1,2 @@
 k-combined:
-3.070134E-01 3.900396E-03
+2.940336E-01 7.338463E-04
diff --git a/tests/regression_tests/track_output/results_true.dat b/tests/regression_tests/track_output/results_true.dat
index 148b54a30..205ac3eec 100644
--- a/tests/regression_tests/track_output/results_true.dat
+++ b/tests/regression_tests/track_output/results_true.dat
@@ -143,76 +143,74 @@ neutron [((-9.469716e-01, -2.580266e-01, 1.414357e-01), (1.438873e-01, 2.365819e
  ((-3.920090e+00, -9.211794e-01, 2.908406e+00), (9.094673e-01, -3.659267e-01, -1.974002e-01), 9.547085e+00, 1.260840e-07, 1.000000e+00, 23, 2387, 1)
  ((-3.729948e+00, -9.976834e-01, 2.867135e+00), (-2.916959e-01, -6.494657e-01, -7.022164e-01), 8.590591e+00, 1.750036e-07, 1.000000e+00, 23, 2387, 1)
  ((-3.744933e+00, -1.031047e+00, 2.831062e+00), (-2.916959e-01, -6.494657e-01, -7.022164e-01), 8.590591e+00, 1.876753e-07, 0.000000e+00, 23, 2387, 1)]
-neutron [((6.474155e+00, -5.192870e+00, 5.413003e+00), (-9.112559e-01, 3.950037e-01, 1.165536e-01), 2.052226e+06, 4.450859e-05, 1.000000e+00, 21, 2367, 2)
- ((6.037250e+00, -5.003484e+00, 5.468885e+00), (-9.112559e-01, 3.950037e-01, 1.165536e-01), 2.052226e+06, 4.450883e-05, 1.000000e+00, 22, 2367, 3)
- ((5.942573e+00, -4.962444e+00, 5.480995e+00), (-9.112559e-01, 3.950037e-01, 1.165536e-01), 2.052226e+06, 4.450889e-05, 1.000000e+00, 23, 2367, 1)
- ((5.861800e+00, -4.927431e+00, 5.491326e+00), (-9.518772e-01, -3.064714e-01, -2.259335e-03), 1.141417e+06, 4.450893e-05, 1.000000e+00, 23, 2367, 1)
- ((5.725160e+00, -4.971424e+00, 5.491002e+00), (-9.518772e-01, -3.064714e-01, -2.259335e-03), 1.141417e+06, 4.450903e-05, 1.000000e+00, 23, 2366, 1)
- ((5.494150e+00, -5.045802e+00, 5.490454e+00), (-9.518772e-01, -3.064714e-01, -2.259335e-03), 1.141417e+06, 4.450919e-05, 1.000000e+00, 22, 2366, 3)
- ((5.392865e+00, -5.078412e+00, 5.490213e+00), (-9.518772e-01, -3.064714e-01, -2.259335e-03), 1.141417e+06, 4.450927e-05, 1.000000e+00, 21, 2366, 2)
- ((4.612759e+00, -5.329579e+00, 5.488362e+00), (-9.518772e-01, -3.064714e-01, -2.259335e-03), 1.141417e+06, 4.450982e-05, 1.000000e+00, 22, 2366, 3)
- ((4.511474e+00, -5.362189e+00, 5.488121e+00), (-9.518772e-01, -3.064714e-01, -2.259335e-03), 1.141417e+06, 4.450989e-05, 1.000000e+00, 23, 2366, 1)
- ((4.089400e+00, -5.498082e+00, 5.487119e+00), (-9.518772e-01, -3.064714e-01, -2.259335e-03), 1.141417e+06, 4.451019e-05, 1.000000e+00, 23, 2365, 1)
- ((3.384113e+00, -5.725160e+00, 5.485445e+00), (-9.518772e-01, -3.064714e-01, -2.259335e-03), 1.141417e+06, 4.451069e-05, 1.000000e+00, 23, 2351, 1)
- ((2.453640e+00, -6.024740e+00, 5.483237e+00), (-9.518772e-01, -3.064714e-01, -2.259335e-03), 1.141417e+06, 4.451136e-05, 1.000000e+00, 23, 2350, 1)
- ((2.086813e+00, -6.142846e+00, 5.482366e+00), (-9.518772e-01, -3.064714e-01, -2.259335e-03), 1.141417e+06, 4.451162e-05, 1.000000e+00, 22, 2350, 3)
- ((1.993594e+00, -6.172859e+00, 5.482145e+00), (-9.518772e-01, -3.064714e-01, -2.259335e-03), 1.141417e+06, 4.451168e-05, 1.000000e+00, 21, 2350, 2)
- ((1.325704e+00, -6.387896e+00, 5.480560e+00), (8.986086e-01, -4.380574e-01, -2.466265e-02), 9.775839e+05, 4.451216e-05, 1.000000e+00, 21, 2350, 2)
- ((2.061403e+00, -6.746538e+00, 5.460368e+00), (-7.778764e-01, 2.051975e-01, -5.939716e-01), 7.813219e+05, 4.451276e-05, 1.000000e+00, 21, 2350, 2)
- ((1.122794e+00, -6.498940e+00, 4.743664e+00), (-7.778764e-01, 2.051975e-01, -5.939716e-01), 7.813219e+05, 4.451375e-05, 1.000000e+00, 22, 2350, 3)
- ((1.036483e+00, -6.476172e+00, 4.677758e+00), (-7.778764e-01, 2.051975e-01, -5.939716e-01), 7.813219e+05, 4.451384e-05, 1.000000e+00, 23, 2350, 1)
- ((8.178800e-01, -6.418507e+00, 4.510837e+00), (-7.778764e-01, 2.051975e-01, -5.939716e-01), 7.813219e+05, 4.451407e-05, 1.000000e+00, 23, 2349, 1)
- ((5.725264e-01, -6.353784e+00, 4.323490e+00), (-7.778764e-01, 2.051975e-01, -5.939716e-01), 7.813219e+05, 4.451432e-05, 1.000000e+00, 22, 2349, 3)
- ((4.668297e-01, -6.325902e+00, 4.242782e+00), (-7.778764e-01, 2.051975e-01, -5.939716e-01), 7.813219e+05, 4.451444e-05, 1.000000e+00, 21, 2349, 2)
- ((-2.989816e-01, -6.123888e+00, 3.658023e+00), (-7.778764e-01, 2.051975e-01, -5.939716e-01), 7.813219e+05, 4.451524e-05, 1.000000e+00, 22, 2349, 3)
- ((-4.046782e-01, -6.096006e+00, 3.577315e+00), (-7.778764e-01, 2.051975e-01, -5.939716e-01), 7.813219e+05, 4.451535e-05, 1.000000e+00, 23, 2349, 1)
- ((-8.040445e-01, -5.990656e+00, 3.272367e+00), (-7.989001e-01, -1.890553e-01, -5.709787e-01), 6.637114e+05, 4.451577e-05, 1.000000e+00, 23, 2349, 1)
- ((-8.178800e-01, -5.993930e+00, 3.262478e+00), (-7.989001e-01, -1.890553e-01, -5.709787e-01), 6.637114e+05, 4.451579e-05, 1.000000e+00, 23, 2348, 1)
- ((-1.077910e+00, -6.055465e+00, 3.076633e+00), (-4.487118e-01, 1.670254e-01, -8.779295e-01), 4.550608e+05, 4.451608e-05, 1.000000e+00, 23, 2348, 1)
- ((-1.215611e+00, -6.004208e+00, 2.807214e+00), (7.872329e-01, 4.481433e-01, -4.235941e-01), 3.544207e+03, 4.451641e-05, 1.000000e+00, 23, 2348, 1)
- ((-1.100296e+00, -5.938564e+00, 2.745166e+00), (8.468456e-01, 5.310954e-01, 2.811230e-02), 2.812308e+03, 4.451819e-05, 1.000000e+00, 23, 2348, 1)
- ((-8.178800e-01, -5.761448e+00, 2.754541e+00), (8.468456e-01, 5.310954e-01, 2.811230e-02), 2.812308e+03, 4.452273e-05, 1.000000e+00, 23, 2349, 1)
- ((-7.600184e-01, -5.725160e+00, 2.756462e+00), (8.468456e-01, 5.310954e-01, 2.811230e-02), 2.812308e+03, 4.452366e-05, 1.000000e+00, 23, 2363, 1)
- ((-2.947156e-01, -5.433347e+00, 2.771908e+00), (8.468456e-01, 5.310954e-01, 2.811230e-02), 2.812308e+03, 4.453115e-05, 1.000000e+00, 22, 2363, 3)
- ((-2.073333e-01, -5.378546e+00, 2.774809e+00), (8.468456e-01, 5.310954e-01, 2.811230e-02), 2.812308e+03, 4.453256e-05, 1.000000e+00, 21, 2363, 2)
- ((-1.746705e-01, -5.358062e+00, 2.775893e+00), (5.278774e-01, 5.459205e-01, 6.506276e-01), 2.806481e+03, 4.453309e-05, 1.000000e+00, 21, 2363, 2)
- ((-8.681718e-02, -5.267205e+00, 2.884176e+00), (-8.975500e-01, 8.968076e-04, -4.409119e-01), 2.764929e+03, 4.453536e-05, 1.000000e+00, 21, 2363, 2)
- ((-3.684221e-01, -5.266924e+00, 2.745840e+00), (-8.975500e-01, 8.968076e-04, -4.409119e-01), 2.764929e+03, 4.453967e-05, 1.000000e+00, 22, 2363, 3)
- ((-4.840903e-01, -5.266809e+00, 2.689019e+00), (-8.975500e-01, 8.968076e-04, -4.409119e-01), 2.764929e+03, 4.454144e-05, 1.000000e+00, 23, 2363, 1)
- ((-8.178800e-01, -5.266475e+00, 2.525049e+00), (-8.975500e-01, 8.968076e-04, -4.409119e-01), 2.764929e+03, 4.454656e-05, 1.000000e+00, 23, 2362, 1)
- ((-1.151175e+00, -5.266142e+00, 2.361321e+00), (-8.975500e-01, 8.968076e-04, -4.409119e-01), 2.764929e+03, 4.455166e-05, 1.000000e+00, 22, 2362, 3)
- ((-1.266464e+00, -5.266027e+00, 2.304687e+00), (-8.975500e-01, 8.968076e-04, -4.409119e-01), 2.764929e+03, 4.455343e-05, 1.000000e+00, 21, 2362, 2)
- ((-2.005772e+00, -5.265288e+00, 1.941509e+00), (-8.975500e-01, 8.968076e-04, -4.409119e-01), 2.764929e+03, 4.456475e-05, 1.000000e+00, 22, 2362, 3)
- ((-2.121061e+00, -5.265173e+00, 1.884875e+00), (-8.975500e-01, 8.968076e-04, -4.409119e-01), 2.764929e+03, 4.456652e-05, 1.000000e+00, 23, 2362, 1)
- ((-2.393759e+00, -5.264900e+00, 1.750915e+00), (-9.607392e-01, -1.749373e-01, 2.153533e-01), 1.619469e+03, 4.457070e-05, 1.000000e+00, 23, 2362, 1)
- ((-2.453640e+00, -5.275804e+00, 1.764337e+00), (-9.607392e-01, -1.749373e-01, 2.153533e-01), 1.619469e+03, 4.457182e-05, 1.000000e+00, 23, 2361, 1)
- ((-2.470658e+00, -5.278903e+00, 1.768152e+00), (-6.728606e-01, -2.916408e-01, -6.798561e-01), 4.873672e+02, 4.457214e-05, 1.000000e+00, 23, 2361, 1)
- ((-3.463692e+00, -5.709318e+00, 7.647939e-01), (-2.249302e-01, -9.330150e-01, -2.808728e-01), 1.790901e+02, 4.462047e-05, 1.000000e+00, 23, 2361, 1)
- ((-3.467511e+00, -5.725160e+00, 7.600247e-01), (-2.249302e-01, -9.330150e-01, -2.808728e-01), 1.790901e+02, 4.462139e-05, 1.000000e+00, 23, 2347, 1)
- ((-3.533785e+00, -6.000066e+00, 6.772677e-01), (-2.249302e-01, -9.330150e-01, -2.808728e-01), 1.790901e+02, 4.463730e-05, 1.000000e+00, 22, 2347, 3)
- ((-3.562245e+00, -6.118119e+00, 6.417291e-01), (-2.249302e-01, -9.330150e-01, -2.808728e-01), 1.790901e+02, 4.464414e-05, 1.000000e+00, 21, 2347, 2)
- ((-3.723934e+00, -6.788806e+00, 4.398272e-01), (-2.249302e-01, -9.330150e-01, -2.808728e-01), 1.790901e+02, 4.468297e-05, 1.000000e+00, 22, 2347, 3)
- ((-3.752394e+00, -6.906859e+00, 4.042885e-01), (-2.249302e-01, -9.330150e-01, -2.808728e-01), 1.790901e+02, 4.468981e-05, 1.000000e+00, 23, 2347, 1)
- ((-3.848515e+00, -7.305571e+00, 2.842613e-01), (6.498448e-01, -3.243413e-01, -6.873896e-01), 2.328979e+01, 4.471290e-05, 1.000000e+00, 23, 2347, 1)
- ((-3.737619e+00, -7.360920e+00, 1.669579e-01), (6.498448e-01, -3.243413e-01, -6.873896e-01), 2.328979e+01, 4.473846e-05, 1.000000e+00, 11, 1750, 1)
- ((-3.574308e+00, -7.442429e+00, -5.788041e-03), (6.794505e-01, 3.157106e-01, -6.623246e-01), 1.590416e+01, 4.477611e-05, 1.000000e+00, 11, 1750, 1)
- ((-3.398889e+00, -7.360920e+00, -1.767852e-01), (6.794505e-01, 3.157106e-01, -6.623246e-01), 1.590416e+01, 4.482292e-05, 1.000000e+00, 23, 2347, 1)
- ((-2.904712e+00, -7.131298e+00, -6.585068e-01), (-4.836985e-02, -2.819627e-01, -9.582053e-01), 2.610202e+00, 4.495477e-05, 1.000000e+00, 23, 2347, 1)
- ((-2.923579e+00, -7.241285e+00, -1.032280e+00), (-6.089807e-01, -2.347428e-01, -7.576532e-01), 1.671268e+00, 4.512933e-05, 1.000000e+00, 23, 2347, 1)
- ((-3.012516e+00, -7.275567e+00, -1.142930e+00), (3.221931e-01, -5.406104e-01, -7.771306e-01), 1.275709e-01, 4.521100e-05, 1.000000e+00, 23, 2347, 1)
- ((-2.984032e+00, -7.323360e+00, -1.211633e+00), (-8.629564e-01, -1.719529e-01, -4.751195e-01), 1.897424e-02, 4.538995e-05, 1.000000e+00, 23, 2347, 1)
- ((-3.172528e+00, -7.360920e+00, -1.315413e+00), (-8.629564e-01, -1.719529e-01, -4.751195e-01), 1.897424e-02, 4.653641e-05, 1.000000e+00, 11, 1750, 1)
- ((-3.602328e+00, -7.446562e+00, -1.552049e+00), (-1.530190e-01, -7.092235e-01, 6.881767e-01), 1.306951e-02, 4.915052e-05, 1.000000e+00, 11, 1750, 1)
- ((-3.625236e+00, -7.552741e+00, -1.449021e+00), (-1.976867e-01, 2.826475e-01, 9.386322e-01), 2.145548e-02, 5.009730e-05, 1.000000e+00, 11, 1750, 1)
- ((-3.636290e+00, -7.536936e+00, -1.396537e+00), (1.266676e-01, 2.265353e-01, -9.657314e-01), 1.815564e-02, 5.037329e-05, 1.000000e+00, 11, 1750, 1)
- ((-3.621792e+00, -7.511008e+00, -1.507069e+00), (-4.275550e-01, 8.441443e-01, 3.234457e-01), 1.848049e-02, 5.098741e-05, 1.000000e+00, 11, 1750, 1)
- ((-3.697811e+00, -7.360920e+00, -1.449560e+00), (-4.275550e-01, 8.441443e-01, 3.234457e-01), 1.848049e-02, 5.193300e-05, 1.000000e+00, 23, 2347, 1)
- ((-3.703436e+00, -7.349814e+00, -1.445305e+00), (-7.832167e-01, 5.713670e-01, 2.451762e-01), 1.861705e-02, 5.200297e-05, 1.000000e+00, 23, 2347, 1)
- ((-3.823243e+00, -7.262414e+00, -1.407801e+00), (-9.917106e-01, 5.069164e-02, 1.180695e-01), 4.703334e-02, 5.281350e-05, 1.000000e+00, 23, 2347, 1)
- ((-4.089400e+00, -7.248809e+00, -1.376113e+00), (-9.917106e-01, 5.069164e-02, 1.180695e-01), 4.703334e-02, 5.370820e-05, 1.000000e+00, 23, 2346, 1)
- ((-4.131081e+00, -7.246679e+00, -1.371151e+00), (9.108632e-01, -4.018526e-01, 9.403556e-02), 8.057393e-02, 5.384831e-05, 1.000000e+00, 23, 2346, 1)
- ((-4.089400e+00, -7.265067e+00, -1.366848e+00), (9.108632e-01, -4.018526e-01, 9.403556e-02), 8.057393e-02, 5.396486e-05, 1.000000e+00, 23, 2347, 1)
- ((-3.872134e+00, -7.360920e+00, -1.344418e+00), (9.108632e-01, -4.018526e-01, 9.403556e-02), 8.057393e-02, 5.457240e-05, 1.000000e+00, 11, 1750, 1)
- ((-3.673062e+00, -7.448746e+00, -1.323866e+00), (2.976906e-01, 8.174443e-01, -4.931178e-01), 5.538060e-02, 5.512905e-05, 1.000000e+00, 11, 1750, 1)
- ((-3.658580e+00, -7.408978e+00, -1.347855e+00), (-5.409120e-01, 8.345378e-01, -1.046943e-01), 8.122576e-02, 5.527851e-05, 1.000000e+00, 11, 1750, 1)
- ((-3.682981e+00, -7.371331e+00, -1.352578e+00), (-5.409120e-01, 8.345378e-01, -1.046943e-01), 8.122576e-02, 5.539295e-05, 0.000000e+00, 11, 1750, 1)]
+neutron [((6.474155e+00, -5.192870e+00, 5.413003e+00), (-9.597810e-01, -1.081529e-01, -2.590820e-01), 9.900333e+05, 4.450859e-05, 1.000000e+00, 21, 2367, 2)
+ ((6.142109e+00, -5.230286e+00, 5.323371e+00), (-9.597810e-01, -1.081529e-01, -2.590820e-01), 9.900333e+05, 4.450884e-05, 1.000000e+00, 22, 2367, 3)
+ ((6.041244e+00, -5.241652e+00, 5.296144e+00), (-9.597810e-01, -1.081529e-01, -2.590820e-01), 9.900333e+05, 4.450892e-05, 1.000000e+00, 23, 2367, 1)
+ ((6.004037e+00, -5.245845e+00, 5.286100e+00), (-6.195407e-01, -7.332723e-01, -2.801446e-01), 5.512347e+05, 4.450895e-05, 1.000000e+00, 23, 2367, 1)
+ ((5.725160e+00, -5.575916e+00, 5.159997e+00), (-6.195407e-01, -7.332723e-01, -2.801446e-01), 5.512347e+05, 4.450939e-05, 1.000000e+00, 23, 2366, 1)
+ ((5.599064e+00, -5.725160e+00, 5.102979e+00), (-6.195407e-01, -7.332723e-01, -2.801446e-01), 5.512347e+05, 4.450958e-05, 1.000000e+00, 23, 2352, 1)
+ ((5.296886e+00, -6.082810e+00, 4.966340e+00), (-6.195407e-01, -7.332723e-01, -2.801446e-01), 5.512347e+05, 4.451006e-05, 1.000000e+00, 22, 2352, 3)
+ ((5.240003e+00, -6.150135e+00, 4.940619e+00), (-6.195407e-01, -7.332723e-01, -2.801446e-01), 5.512347e+05, 4.451015e-05, 1.000000e+00, 21, 2352, 2)
+ ((4.752072e+00, -6.727638e+00, 4.719986e+00), (3.721510e-02, -9.647240e-01, 2.606197e-01), 5.045933e+05, 4.451092e-05, 1.000000e+00, 21, 2352, 2)
+ ((4.764028e+00, -7.037568e+00, 4.803713e+00), (3.721510e-02, -9.647240e-01, 2.606197e-01), 5.045933e+05, 4.451124e-05, 1.000000e+00, 22, 2352, 3)
+ ((4.767580e+00, -7.129630e+00, 4.828584e+00), (3.721510e-02, -9.647240e-01, 2.606197e-01), 5.045933e+05, 4.451134e-05, 1.000000e+00, 23, 2352, 1)
+ ((4.776502e+00, -7.360920e+00, 4.891066e+00), (3.721510e-02, -9.647240e-01, 2.606197e-01), 5.045933e+05, 4.451158e-05, 1.000000e+00, 23, 2338, 1)
+ ((4.778286e+00, -7.407162e+00, 4.903559e+00), (4.571054e-01, -3.889563e-01, 7.998548e-01), 1.818775e+05, 4.451163e-05, 1.000000e+00, 23, 2338, 1)
+ ((4.981926e+00, -7.580442e+00, 5.259893e+00), (4.571054e-01, -3.889563e-01, 7.998548e-01), 1.818775e+05, 4.451239e-05, 1.000000e+00, 22, 2338, 3)
+ ((5.154144e+00, -7.726985e+00, 5.561246e+00), (4.571054e-01, -3.889563e-01, 7.998548e-01), 1.818775e+05, 4.451303e-05, 1.000000e+00, 21, 2338, 2)
+ ((5.313757e+00, -7.862801e+00, 5.840540e+00), (4.571054e-01, -3.889563e-01, 7.998548e-01), 1.818775e+05, 4.451362e-05, 1.000000e+00, 22, 2338, 3)
+ ((5.485976e+00, -8.009344e+00, 6.141893e+00), (4.571054e-01, -3.889563e-01, 7.998548e-01), 1.818775e+05, 4.451426e-05, 1.000000e+00, 23, 2338, 1)
+ ((5.725160e+00, -8.212869e+00, 6.560424e+00), (4.571054e-01, -3.889563e-01, 7.998548e-01), 1.818775e+05, 4.451515e-05, 1.000000e+00, 23, 2339, 1)
+ ((6.004950e+00, -8.450945e+00, 7.050007e+00), (4.571054e-01, -3.889563e-01, 7.998548e-01), 1.818775e+05, 4.451618e-05, 1.000000e+00, 22, 2339, 3)
+ ((6.360530e+00, -8.753512e+00, 7.672210e+00), (4.571054e-01, -3.889563e-01, 7.998548e-01), 1.818775e+05, 4.451750e-05, 1.000000e+00, 23, 2339, 1)
+ ((6.646303e+00, -8.996680e+00, 8.172263e+00), (4.571054e-01, -3.889563e-01, 7.998548e-01), 1.818775e+05, 4.451856e-05, 1.000000e+00, 23, 2326, 1)
+ ((6.702490e+00, -9.044491e+00, 8.270582e+00), (2.028534e-01, -9.607965e-01, -1.889990e-01), 1.805295e+04, 4.451877e-05, 1.000000e+00, 23, 2326, 1)
+ ((6.745127e+00, -9.246436e+00, 8.230857e+00), (2.028534e-01, -9.607965e-01, -1.889990e-01), 1.805295e+04, 4.451990e-05, 1.000000e+00, 22, 2326, 3)
+ ((6.767219e+00, -9.351070e+00, 8.210274e+00), (2.028534e-01, -9.607965e-01, -1.889990e-01), 1.805295e+04, 4.452049e-05, 1.000000e+00, 21, 2326, 2)
+ ((6.885344e+00, -9.910562e+00, 8.100216e+00), (-3.857824e-01, -3.006310e-01, -8.722344e-01), 1.795765e+04, 4.452362e-05, 1.000000e+00, 21, 2326, 2)
+ ((6.803615e+00, -9.974251e+00, 7.915431e+00), (-7.096135e-01, 6.778415e-01, 1.923009e-01), 1.779137e+04, 4.452476e-05, 1.000000e+00, 21, 2326, 2)
+ ((6.334815e+00, -9.526441e+00, 8.042473e+00), (-1.748210e-01, 9.821705e-01, -6.912779e-02), 1.729669e+04, 4.452835e-05, 1.000000e+00, 21, 2326, 2)
+ ((6.304853e+00, -9.358111e+00, 8.030625e+00), (-1.748210e-01, 9.821705e-01, -6.912779e-02), 1.729669e+04, 4.452929e-05, 1.000000e+00, 22, 2326, 3)
+ ((6.288777e+00, -9.267793e+00, 8.024268e+00), (-1.748210e-01, 9.821705e-01, -6.912779e-02), 1.729669e+04, 4.452979e-05, 1.000000e+00, 23, 2326, 1)
+ ((6.275105e+00, -9.190979e+00, 8.018862e+00), (-7.174952e-01, 5.897531e-01, -3.706642e-01), 9.207900e+03, 4.453022e-05, 1.000000e+00, 23, 2326, 1)
+ ((6.038719e+00, -8.996680e+00, 7.896743e+00), (-7.174952e-01, 5.897531e-01, -3.706642e-01), 9.207900e+03, 4.453271e-05, 1.000000e+00, 23, 2339, 1)
+ ((6.028805e+00, -8.988531e+00, 7.891621e+00), (-2.989803e-01, 4.300779e-01, -8.518473e-01), 5.653774e+03, 4.453281e-05, 1.000000e+00, 23, 2339, 1)
+ ((5.725160e+00, -8.551743e+00, 7.026484e+00), (-2.989803e-01, 4.300779e-01, -8.518473e-01), 5.653774e+03, 4.454257e-05, 1.000000e+00, 23, 2338, 1)
+ ((5.507324e+00, -8.238390e+00, 6.405832e+00), (-2.989803e-01, 4.300779e-01, -8.518473e-01), 5.653774e+03, 4.454958e-05, 1.000000e+00, 22, 2338, 3)
+ ((5.417387e+00, -8.109017e+00, 6.149584e+00), (-2.989803e-01, 4.300779e-01, -8.518473e-01), 5.653774e+03, 4.455247e-05, 1.000000e+00, 21, 2338, 2)
+ ((5.162017e+00, -7.741671e+00, 5.421991e+00), (7.522612e-01, -1.036919e-01, -6.506543e-01), 5.619608e+03, 4.456069e-05, 1.000000e+00, 21, 2338, 2)
+ ((5.184146e+00, -7.744722e+00, 5.402851e+00), (7.522612e-01, -1.036919e-01, -6.506543e-01), 5.619608e+03, 4.456097e-05, 1.000000e+00, 22, 2338, 3)
+ ((5.348057e+00, -7.767315e+00, 5.261079e+00), (7.522612e-01, -1.036919e-01, -6.506543e-01), 5.619608e+03, 4.456307e-05, 1.000000e+00, 23, 2338, 1)
+ ((5.581568e+00, -7.799502e+00, 5.059108e+00), (2.029690e-01, -4.131185e-01, -8.877706e-01), 3.359662e+03, 4.456606e-05, 1.000000e+00, 23, 2338, 1)
+ ((5.707007e+00, -8.054818e+00, 4.510447e+00), (3.894183e-01, -7.459178e-01, -5.403333e-01), 3.303714e+03, 4.457377e-05, 1.000000e+00, 23, 2338, 1)
+ ((5.725160e+00, -8.089590e+00, 4.485259e+00), (3.894183e-01, -7.459178e-01, -5.403333e-01), 3.303714e+03, 4.457436e-05, 1.000000e+00, 23, 2339, 1)
+ ((5.750893e+00, -8.138881e+00, 4.449554e+00), (-2.879829e-01, -5.545287e-01, -7.807456e-01), 1.744626e+03, 4.457519e-05, 1.000000e+00, 23, 2339, 1)
+ ((5.725160e+00, -8.188431e+00, 4.379790e+00), (-2.879829e-01, -5.545287e-01, -7.807456e-01), 1.744626e+03, 4.457674e-05, 1.000000e+00, 23, 2338, 1)
+ ((5.532143e+00, -8.560097e+00, 3.856504e+00), (-6.185172e-01, -7.766669e-01, -1.192687e-01), 8.559363e+02, 4.458834e-05, 1.000000e+00, 23, 2338, 1)
+ ((5.522333e+00, -8.572415e+00, 3.854613e+00), (-3.452053e-01, -2.657159e-02, -9.381510e-01), 9.272133e+01, 4.458873e-05, 1.000000e+00, 23, 2338, 1)
+ ((5.366948e+00, -8.584375e+00, 3.432328e+00), (4.761677e-01, -8.187551e-01, -3.207871e-01), 6.522002e+00, 4.462253e-05, 1.000000e+00, 23, 2338, 1)
+ ((5.516634e+00, -8.841755e+00, 3.331487e+00), (4.237115e-01, -6.022578e-01, 6.765752e-01), 9.968491e-01, 4.471152e-05, 1.000000e+00, 23, 2338, 1)
+ ((5.625629e+00, -8.996680e+00, 3.505530e+00), (4.237115e-01, -6.022578e-01, 6.765752e-01), 9.968491e-01, 4.489779e-05, 1.000000e+00, 23, 2325, 1)
+ ((5.723424e+00, -9.135684e+00, 3.661687e+00), (7.706137e-01, -6.358415e-01, 4.312932e-02), 5.695813e-01, 4.506493e-05, 1.000000e+00, 23, 2325, 1)
+ ((5.725160e+00, -9.137116e+00, 3.661784e+00), (7.706137e-01, -6.358415e-01, 4.312932e-02), 5.695813e-01, 4.506708e-05, 1.000000e+00, 23, 2326, 1)
+ ((6.079210e+00, -9.429247e+00, 3.681599e+00), (7.706137e-01, -6.358415e-01, 4.312932e-02), 5.695813e-01, 4.550721e-05, 1.000000e+00, 22, 2326, 3)
+ ((6.147194e+00, -9.485341e+00, 3.685404e+00), (7.706137e-01, -6.358415e-01, 4.312932e-02), 5.695813e-01, 4.559172e-05, 1.000000e+00, 21, 2326, 2)
+ ((6.864744e+00, -1.007740e+01, 3.725564e+00), (3.888690e-01, -8.895503e-01, -2.397522e-01), 5.691123e-01, 4.648372e-05, 1.000000e+00, 21, 2326, 2)
+ ((6.908415e+00, -1.017730e+01, 3.698639e+00), (3.888690e-01, -8.895503e-01, -2.397522e-01), 5.691123e-01, 4.659135e-05, 1.000000e+00, 22, 2326, 3)
+ ((6.945959e+00, -1.026318e+01, 3.675492e+00), (3.888690e-01, -8.895503e-01, -2.397522e-01), 5.691123e-01, 4.668388e-05, 1.000000e+00, 23, 2326, 1)
+ ((6.966122e+00, -1.030930e+01, 3.663060e+00), (7.493672e-01, -6.303754e-01, 2.026713e-01), 2.849108e-01, 4.673357e-05, 1.000000e+00, 23, 2326, 1)
+ ((7.350254e+00, -1.063244e+01, 3.766951e+00), (7.493672e-01, -6.303754e-01, 2.026713e-01), 2.849108e-01, 4.742789e-05, 1.000000e+00, 23, 2311, 1)
+ ((7.360920e+00, -1.064141e+01, 3.769836e+00), (7.493672e-01, -6.303754e-01, 2.026713e-01), 2.849108e-01, 4.744717e-05, 1.000000e+00, 23, 2312, 1)
+ ((7.449168e+00, -1.071565e+01, 3.793703e+00), (1.626881e-01, -1.480918e-01, 9.755006e-01), 2.025207e-01, 4.760667e-05, 1.000000e+00, 23, 2312, 1)
+ ((7.495754e+00, -1.075805e+01, 4.073039e+00), (-1.185723e-01, -6.787603e-01, 7.247241e-01), 2.121260e-01, 4.806671e-05, 1.000000e+00, 23, 2312, 1)
+ ((7.451135e+00, -1.101347e+01, 4.345753e+00), (-4.978877e-01, -3.750598e-02, 8.664301e-01), 2.609768e-02, 4.865741e-05, 1.000000e+00, 23, 2312, 1)
+ ((7.426401e+00, -1.101533e+01, 4.388795e+00), (9.221835e-01, -6.407530e-02, 3.814078e-01), 2.031765e-02, 4.887973e-05, 1.000000e+00, 23, 2312, 1)
+ ((7.438938e+00, -1.101621e+01, 4.393980e+00), (8.832139e-01, 3.563144e-01, 3.049151e-01), 2.038019e-02, 4.894869e-05, 1.000000e+00, 23, 2312, 1)
+ ((7.578355e+00, -1.095996e+01, 4.442112e+00), (5.564936e-01, 8.135970e-01, 1.684482e-01), 4.869241e-02, 4.974811e-05, 1.000000e+00, 23, 2312, 1)
+ ((7.802376e+00, -1.063244e+01, 4.509922e+00), (5.564936e-01, 8.135970e-01, 1.684482e-01), 4.869241e-02, 5.106705e-05, 1.000000e+00, 23, 2327, 1)
+ ((7.826035e+00, -1.059785e+01, 4.517083e+00), (-8.227572e-01, -5.662268e-01, 4.957651e-02), 8.202195e-02, 5.120634e-05, 1.000000e+00, 23, 2327, 1)
+ ((7.775776e+00, -1.063244e+01, 4.520112e+00), (-8.227572e-01, -5.662268e-01, 4.957651e-02), 8.202195e-02, 5.136055e-05, 1.000000e+00, 23, 2312, 1)
+ ((7.360920e+00, -1.091795e+01, 4.545109e+00), (-8.227572e-01, -5.662268e-01, 4.957651e-02), 8.202195e-02, 5.263343e-05, 1.000000e+00, 23, 2311, 1)
+ ((7.180267e+00, -1.104227e+01, 4.555995e+00), (5.568446e-01, -6.706436e-01, -4.900625e-01), 5.560680e-02, 5.318772e-05, 1.000000e+00, 23, 2311, 1)
+ ((7.207392e+00, -1.107494e+01, 4.532123e+00), (9.936512e-01, 4.529367e-02, -1.029847e-01), 8.142074e-02, 5.333706e-05, 1.000000e+00, 23, 2311, 1)
+ ((7.252245e+00, -1.107290e+01, 4.527474e+00), (9.936512e-01, 4.529367e-02, -1.029847e-01), 8.142074e-02, 5.345144e-05, 0.000000e+00, 23, 2311, 1)]
diff --git a/tests/regression_tests/translation/results_true.dat b/tests/regression_tests/translation/results_true.dat
index f832aa296..6e03d2224 100644
--- a/tests/regression_tests/translation/results_true.dat
+++ b/tests/regression_tests/translation/results_true.dat
@@ -1,2 +1,2 @@
 k-combined:
-4.087580E-01 4.466279E-03
+4.076610E-01 6.454244E-03
diff --git a/tests/regression_tests/trigger_batch_interval/results_true.dat b/tests/regression_tests/trigger_batch_interval/results_true.dat
index 0571d6c4f..92fa99d87 100644
--- a/tests/regression_tests/trigger_batch_interval/results_true.dat
+++ b/tests/regression_tests/trigger_batch_interval/results_true.dat
@@ -1,28 +1,28 @@
 k-combined:
-9.767929E-01 5.327552E-03
+9.863217E-01 6.499354E-03
 tally 1:
-1.405471E+01
-1.976444E+01
-3.186139E+00
-1.015515E+00
-3.088643E+00
-9.542994E-01
-1.086857E+01
-1.182011E+01
-1.405471E+01
-1.976444E+01
-3.186139E+00
-1.015515E+00
-3.088643E+00
-9.542994E-01
-1.086857E+01
-1.182011E+01
+1.423436E+01
+2.027258E+01
+3.223740E+00
+1.039872E+00
+3.125016E+00
+9.771709E-01
+1.101062E+01
+1.212977E+01
+1.423436E+01
+2.027258E+01
+3.223740E+00
+1.039872E+00
+3.125016E+00
+9.771709E-01
+1.101062E+01
+1.212977E+01
 tally 2:
-1.405471E+01
-1.976444E+01
-3.186139E+00
-1.015515E+00
-3.088643E+00
-9.542994E-01
-1.086857E+01
-1.182011E+01
+1.423436E+01
+2.027258E+01
+3.223740E+00
+1.039872E+00
+3.125016E+00
+9.771709E-01
+1.101062E+01
+1.212977E+01
diff --git a/tests/regression_tests/trigger_no_batch_interval/results_true.dat b/tests/regression_tests/trigger_no_batch_interval/results_true.dat
index 0571d6c4f..92fa99d87 100644
--- a/tests/regression_tests/trigger_no_batch_interval/results_true.dat
+++ b/tests/regression_tests/trigger_no_batch_interval/results_true.dat
@@ -1,28 +1,28 @@
 k-combined:
-9.767929E-01 5.327552E-03
+9.863217E-01 6.499354E-03
 tally 1:
-1.405471E+01
-1.976444E+01
-3.186139E+00
-1.015515E+00
-3.088643E+00
-9.542994E-01
-1.086857E+01
-1.182011E+01
-1.405471E+01
-1.976444E+01
-3.186139E+00
-1.015515E+00
-3.088643E+00
-9.542994E-01
-1.086857E+01
-1.182011E+01
+1.423436E+01
+2.027258E+01
+3.223740E+00
+1.039872E+00
+3.125016E+00
+9.771709E-01
+1.101062E+01
+1.212977E+01
+1.423436E+01
+2.027258E+01
+3.223740E+00
+1.039872E+00
+3.125016E+00
+9.771709E-01
+1.101062E+01
+1.212977E+01
 tally 2:
-1.405471E+01
-1.976444E+01
-3.186139E+00
-1.015515E+00
-3.088643E+00
-9.542994E-01
-1.086857E+01
-1.182011E+01
+1.423436E+01
+2.027258E+01
+3.223740E+00
+1.039872E+00
+3.125016E+00
+9.771709E-01
+1.101062E+01
+1.212977E+01
diff --git a/tests/regression_tests/trigger_no_status/results_true.dat b/tests/regression_tests/trigger_no_status/results_true.dat
index fb6c0086a..a62e1b3fe 100644
--- a/tests/regression_tests/trigger_no_status/results_true.dat
+++ b/tests/regression_tests/trigger_no_status/results_true.dat
@@ -1,28 +1,28 @@
 k-combined:
-9.682315E-01 3.302924E-03
+9.858966E-01 1.500542E-02
 tally 1:
-7.046510E+00
-9.932168E+00
-1.591675E+00
-5.067777E-01
-1.541572E+00
-4.753743E-01
-5.454835E+00
-5.951990E+00
-7.046510E+00
-9.932168E+00
-1.591675E+00
-5.067777E-01
-1.541572E+00
-4.753743E-01
-5.454835E+00
-5.951990E+00
+7.081828E+00
+1.003709E+01
+1.607382E+00
+5.171386E-01
+1.559242E+00
+4.866413E-01
+5.474447E+00
+5.997737E+00
+7.081828E+00
+1.003709E+01
+1.607382E+00
+5.171386E-01
+1.559242E+00
+4.866413E-01
+5.474447E+00
+5.997737E+00
 tally 2:
-7.046510E+00
-9.932168E+00
-1.591675E+00
-5.067777E-01
-1.541572E+00
-4.753743E-01
-5.454835E+00
-5.951990E+00
+7.081828E+00
+1.003709E+01
+1.607382E+00
+5.171386E-01
+1.559242E+00
+4.866413E-01
+5.474447E+00
+5.997737E+00
diff --git a/tests/regression_tests/trigger_statepoint_restart/inputs_true.dat b/tests/regression_tests/trigger_statepoint_restart/inputs_true.dat
index 01755ad8b..59a829700 100644
--- a/tests/regression_tests/trigger_statepoint_restart/inputs_true.dat
+++ b/tests/regression_tests/trigger_statepoint_restart/inputs_true.dat
@@ -16,7 +16,7 @@
     <batches>15</batches>
     <inactive>10</inactive>
     <keff_trigger>
-      <threshold>0.003</threshold>
+      <threshold>0.002</threshold>
       <type>std_dev</type>
     </keff_trigger>
     <trigger>
diff --git a/tests/regression_tests/trigger_statepoint_restart/results_true.dat b/tests/regression_tests/trigger_statepoint_restart/results_true.dat
index 3e6619d74..3cb1e230d 100644
--- a/tests/regression_tests/trigger_statepoint_restart/results_true.dat
+++ b/tests/regression_tests/trigger_statepoint_restart/results_true.dat
@@ -1,5 +1,5 @@
 k-combined:
-3.014717E-01 2.864764E-03
+2.948661E-01 1.949846E-03
 tally 1:
-8.946107E+01
-7.281263E+02
+5.515170E+01
+4.349007E+02
diff --git a/tests/regression_tests/trigger_statepoint_restart/test.py b/tests/regression_tests/trigger_statepoint_restart/test.py
index 8144c1d0b..b242f7f1c 100644
--- a/tests/regression_tests/trigger_statepoint_restart/test.py
+++ b/tests/regression_tests/trigger_statepoint_restart/test.py
@@ -29,7 +29,7 @@ def model():
     settings.inactive = 10
     settings.particles = 400
     # Choose a sufficiently low threshold to enable use of trigger
-    settings.keff_trigger = {'type': 'std_dev', 'threshold': 0.003}
+    settings.keff_trigger = {'type': 'std_dev', 'threshold': 0.002}
     settings.trigger_max_batches = 1000
     settings.trigger_batch_interval = 1
     settings.trigger_active = True
@@ -41,10 +41,10 @@ def model():
     tallies = openmc.Tallies([t])
 
     # Put it all together
-    model = openmc.model.Model(materials=materials,
-                               geometry=geometry,
-                               settings=settings,
-                               tallies=tallies)
+    model = openmc.Model(materials=materials,
+                         geometry=geometry,
+                         settings=settings,
+                         tallies=tallies)
     return model
 
 
diff --git a/tests/regression_tests/trigger_tallies/results_true.dat b/tests/regression_tests/trigger_tallies/results_true.dat
index 0571d6c4f..92fa99d87 100644
--- a/tests/regression_tests/trigger_tallies/results_true.dat
+++ b/tests/regression_tests/trigger_tallies/results_true.dat
@@ -1,28 +1,28 @@
 k-combined:
-9.767929E-01 5.327552E-03
+9.863217E-01 6.499354E-03
 tally 1:
-1.405471E+01
-1.976444E+01
-3.186139E+00
-1.015515E+00
-3.088643E+00
-9.542994E-01
-1.086857E+01
-1.182011E+01
-1.405471E+01
-1.976444E+01
-3.186139E+00
-1.015515E+00
-3.088643E+00
-9.542994E-01
-1.086857E+01
-1.182011E+01
+1.423436E+01
+2.027258E+01
+3.223740E+00
+1.039872E+00
+3.125016E+00
+9.771709E-01
+1.101062E+01
+1.212977E+01
+1.423436E+01
+2.027258E+01
+3.223740E+00
+1.039872E+00
+3.125016E+00
+9.771709E-01
+1.101062E+01
+1.212977E+01
 tally 2:
-1.405471E+01
-1.976444E+01
-3.186139E+00
-1.015515E+00
-3.088643E+00
-9.542994E-01
-1.086857E+01
-1.182011E+01
+1.423436E+01
+2.027258E+01
+3.223740E+00
+1.039872E+00
+3.125016E+00
+9.771709E-01
+1.101062E+01
+1.212977E+01
diff --git a/tests/regression_tests/triso/results_true.dat b/tests/regression_tests/triso/results_true.dat
index fa1842e54..d9850e410 100644
--- a/tests/regression_tests/triso/results_true.dat
+++ b/tests/regression_tests/triso/results_true.dat
@@ -1,2 +1,2 @@
 k-combined:
-1.716873E+00 5.266107E-02
+1.604832E+00 2.031393E-03
diff --git a/tests/regression_tests/uniform_fs/results_true.dat b/tests/regression_tests/uniform_fs/results_true.dat
index 46654b49b..f7ceecfb7 100644
--- a/tests/regression_tests/uniform_fs/results_true.dat
+++ b/tests/regression_tests/uniform_fs/results_true.dat
@@ -1,2 +1,2 @@
 k-combined:
-3.685309E-01 1.861720E-03
+3.675645E-01 4.342970E-03
diff --git a/tests/regression_tests/universe/results_true.dat b/tests/regression_tests/universe/results_true.dat
index bbf03de94..97b997ae6 100644
--- a/tests/regression_tests/universe/results_true.dat
+++ b/tests/regression_tests/universe/results_true.dat
@@ -1,2 +1,2 @@
 k-combined:
-3.070134E-01 3.900396E-03
+2.940336E-01 7.338463E-04
diff --git a/tests/regression_tests/white_plane/results_true.dat b/tests/regression_tests/white_plane/results_true.dat
index 6f1d064eb..ffb19491d 100644
--- a/tests/regression_tests/white_plane/results_true.dat
+++ b/tests/regression_tests/white_plane/results_true.dat
@@ -1,2 +1,2 @@
 k-combined:
-2.279719E+00 5.380792E-03
+2.274312E+00 4.223342E-03
diff --git a/tests/unit_tests/test_deplete_resultslist.py b/tests/unit_tests/test_deplete_resultslist.py
index 308eccf7b..9a4699a4f 100644
--- a/tests/unit_tests/test_deplete_resultslist.py
+++ b/tests/unit_tests/test_deplete_resultslist.py
@@ -21,14 +21,14 @@ def test_get_activity(res):
 
     t_ref = np.array([0.0, 1296000.0, 2592000.0, 3888000.0])
     a_ref = np.array(
-        [1.25167956e+06, 3.71938527e+11, 4.43264300e+11, 3.55547176e+11])
+        [1.25167956e+06, 3.69842310e+11, 3.70099291e+11, 3.53629755e+11])
 
     np.testing.assert_allclose(t, t_ref)
     np.testing.assert_allclose(a, a_ref)
 
     # Check by_nuclide
     a_xe135_ref = np.array(
-        [2.106574218e+05, 1.227519888e+11, 1.177491828e+11, 1.031986176e+11])
+        [2.10657422e+05, 1.12825236e+11, 1.09055177e+11, 1.07491257e+11])
     t_nuc, a_nuc = res.get_activity("1", by_nuclide=True)
 
     a_xe135 = np.array([a_nuc_i["Xe135"] for a_nuc_i in a_nuc])
@@ -43,7 +43,7 @@ def test_get_atoms(res):
 
     t_ref = np.array([0.0, 1296000.0, 2592000.0, 3888000.0])
     n_ref = np.array(
-        [6.67473282e+08, 3.88942731e+14, 3.73091215e+14, 3.26987387e+14])
+        [6.67473282e+08, 3.57489567e+14, 3.45544042e+14, 3.40588723e+14])
 
     np.testing.assert_allclose(t, t_ref)
     np.testing.assert_allclose(n, n_ref)
@@ -71,7 +71,7 @@ def test_get_decay_heat(res):
 
     t_ref = np.array([0.0, 1296000.0, 2592000.0, 3888000.0])
     dh_ref = np.array(
-        [1.27933813e-09, 5.85347232e-03, 7.38773010e-03, 5.79954067e-03])
+        [1.27933813e-09, 5.95370258e-03, 6.01335600e-03, 5.69831173e-03])
 
     t, dh = res.get_decay_heat("1")
 
@@ -80,7 +80,7 @@ def test_get_decay_heat(res):
 
     # Check by nuclide
     dh_xe135_ref = np.array(
-        [1.27933813e-09, 7.45481920e-04, 7.15099509e-04, 6.26732849e-04])
+        [1.27933813e-09, 6.85196014e-04, 6.62300168e-04, 6.52802366e-04])
     t_nuc, dh_nuc = res.get_decay_heat("1", by_nuclide=True)
 
     dh_nuc_xe135 = np.array([dh_nuc_i["Xe135"] for dh_nuc_i in dh_nuc])
@@ -95,7 +95,7 @@ def test_get_mass(res):
 
     t_ref = np.array([0.0, 1296000.0, 2592000.0, 3888000.0])
     n_ref = np.array(
-        [6.67473282e+08, 3.88942731e+14, 3.73091215e+14, 3.26987387e+14])
+        [6.67473282e+08, 3.57489567e+14, 3.45544042e+14, 3.40588723e+14])
 
     # Get g
     n_ref *= openmc.data.atomic_mass('Xe135') / openmc.data.AVOGADRO
@@ -123,8 +123,8 @@ def test_get_reaction_rate(res):
     t, r = res.get_reaction_rate("1", "Xe135", "(n,gamma)")
 
     t_ref = [0.0, 1296000.0, 2592000.0, 3888000.0]
-    n_ref = [6.67473282e+08, 3.88942731e+14, 3.73091215e+14, 3.26987387e+14]
-    xs_ref = [2.53336104e-05, 4.21747011e-05, 3.48616127e-05, 3.61775563e-05]
+    n_ref = [6.67473282e+08, 3.57489567e+14, 3.45544042e+14, 3.40588723e+14]
+    xs_ref = [3.10220818e-05, 3.36754072e-05, 3.12740350e-05, 3.86717693e-05]
 
     np.testing.assert_allclose(t, t_ref)
     np.testing.assert_allclose(r, np.array(n_ref) * xs_ref)
@@ -136,8 +136,8 @@ def test_get_keff(res):
     t_min, k = res.get_keff(time_units='min')
 
     t_ref = [0.0, 1296000.0, 2592000.0, 3888000.0]
-    k_ref = [1.1596402556, 1.1914183335, 1.2292570871, 1.1797030302]
-    u_ref = [0.0270680649, 0.0219163444, 0.024268508 , 0.0221401194]
+    k_ref = [1.1773089172, 1.2231748584, 1.1611455694, 1.1714783649]
+    u_ref = [0.0384666252, 0.0311915665, 0.0226370102, 0.0315964732]
 
     np.testing.assert_allclose(t, t_ref)
     np.testing.assert_allclose(t_min * 60, t_ref)
diff --git a/tests/unit_tests/test_lib.py b/tests/unit_tests/test_lib.py
index 8080ce894..43bc5a8f6 100644
--- a/tests/unit_tests/test_lib.py
+++ b/tests/unit_tests/test_lib.py
@@ -161,16 +161,21 @@ def test_properties_temperature(lib_init):
 
 def test_cell_density(lib_init):
     cell = openmc.lib.cells[1]
-    cell.set_density(1.5, 0)
-    assert cell.get_density(0) == pytest.approx(1.5)
-    cell.set_density(2.0)
-    assert cell.get_density() == pytest.approx(2.0)
+    print('density', cell.get_density())
+    orig_density = cell.get_density()
+    try:
+        cell.set_density(1.5, 0)
+        assert cell.get_density(0) == pytest.approx(1.5)
+        cell.set_density(2.0)
+        assert cell.get_density() == pytest.approx(2.0)
+    finally:
+        cell.set_density(orig_density)
 
 
 def test_properties_cell_density(lib_init):
     # Cell density should be 2.0 from above test
     cell = openmc.lib.cells[1]
-    assert cell.get_density() == pytest.approx(2.0)
+    orig_density = cell.get_density()
 
     # Export properties and change density
     openmc.lib.export_properties('properties.h5')
@@ -179,7 +184,7 @@ def test_properties_cell_density(lib_init):
 
     # Import properties and check that density is restored
     openmc.lib.import_properties('properties.h5')
-    assert cell.get_density() == pytest.approx(2.0)
+    assert cell.get_density() == pytest.approx(orig_density)
 
 
 def test_new_cell(lib_init):
diff --git a/tests/unit_tests/test_settings.py b/tests/unit_tests/test_settings.py
index 7f202bcdc..6611e4227 100644
--- a/tests/unit_tests/test_settings.py
+++ b/tests/unit_tests/test_settings.py
@@ -67,6 +67,7 @@ def test_export_to_xml(run_in_tmpdir):
         )
     }
     s.max_particle_events = 100
+    s.max_secondaries = 1_000_000
     s.source_rejection_fraction = 0.01
 
     # Make sure exporting XML works
@@ -144,4 +145,5 @@ def test_export_to_xml(run_in_tmpdir):
     assert s.random_ray['distance_active'] == 100.0
     assert s.random_ray['ray_source'].space.lower_left == [-1., -1., -1.]
     assert s.random_ray['ray_source'].space.upper_right == [1., 1., 1.]
+    assert s.max_secondaries == 1_000_000
     assert s.source_rejection_fraction == 0.01
diff --git a/tests/unit_tests/test_statepoint_batches.py b/tests/unit_tests/test_statepoint_batches.py
new file mode 100644
index 000000000..bf54e1878
--- /dev/null
+++ b/tests/unit_tests/test_statepoint_batches.py
@@ -0,0 +1,26 @@
+from pathlib import Path
+
+import openmc
+
+
+def test_statepoint_batches(run_in_tmpdir):
+    # Create a minimal model
+    mat = openmc.Material()
+    mat.add_nuclide('U235', 1.0)
+    mat.set_density('g/cm3', 4.5)
+    sphere = openmc.Sphere(r=10.0, boundary_type='vacuum')
+    cell = openmc.Cell(fill=mat, region=-sphere)
+    model = openmc.Model()
+    model.geometry = openmc.Geometry([cell])
+    model.settings.batches = 10
+    model.settings.inactive = 5
+    model.settings.particles = 100
+
+    # Specify when statepoints should be written
+    model.settings.statepoint = {'batches': [3, 6, 9]}
+
+    # Run model and ensure that statepoints are created
+    model.run()
+    sp_files = ['statepoint.03.h5', 'statepoint.06.h5', 'statepoint.09.h5']
+    for f in sp_files:
+        assert Path(f).is_file()

From ca63da91b9b0fc0cd144766155b533318d4a71c3 Mon Sep 17 00:00:00 2001
From: Patrick Shriwise <pshriwise@gmail.com>
Date: Fri, 19 Sep 2025 15:00:51 -0500
Subject: [PATCH 118/203] Ensure n_dimension_ attribute is set for unstructured
 meshes. (#3575)

---
 include/openmc/mesh.h | 3 +--
 src/mesh.cpp          | 5 +++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/include/openmc/mesh.h b/include/openmc/mesh.h
index c15e25697..fbc6c46f5 100644
--- a/include/openmc/mesh.h
+++ b/include/openmc/mesh.h
@@ -666,9 +666,8 @@ class UnstructuredMesh : public Mesh {
 
 public:
   // Constructors
-  UnstructuredMesh() {};
+  UnstructuredMesh() { n_dimension_ = 3; };
   UnstructuredMesh(pugi::xml_node node);
-  UnstructuredMesh(const std::string& filename);
 
   static const std::string mesh_type;
   virtual std::string get_mesh_type() const override;
diff --git a/src/mesh.cpp b/src/mesh.cpp
index 3e4ff1a3e..b7396a25a 100644
--- a/src/mesh.cpp
+++ b/src/mesh.cpp
@@ -590,6 +590,8 @@ Position StructuredMesh::sample_element(
 
 UnstructuredMesh::UnstructuredMesh(pugi::xml_node node) : Mesh(node)
 {
+  n_dimension_ = 3;
+
   // check the mesh type
   if (check_for_node(node, "type")) {
     auto temp = get_node_value(node, "type", true, true);
@@ -2519,7 +2521,9 @@ MOABMesh::MOABMesh(pugi::xml_node node) : UnstructuredMesh(node)
 }
 
 MOABMesh::MOABMesh(const std::string& filename, double length_multiplier)
+  : UnstructuredMesh()
 {
+  n_dimension_ = 3;
   filename_ = filename;
   set_length_multiplier(length_multiplier);
   initialize();
@@ -3242,6 +3246,7 @@ LibMesh::LibMesh(libMesh::MeshBase& input_mesh, double length_multiplier)
 LibMesh::LibMesh(const std::string& filename, double length_multiplier)
   : adaptive_(false)
 {
+  n_dimension_ = 3;
   set_mesh_pointer_from_filename(filename);
   set_length_multiplier(length_multiplier);
   initialize();

From 8f36ff2b3a5e2984254f7b21f1b92af7ad18140b Mon Sep 17 00:00:00 2001
From: Paul Romano <paul.k.romano@gmail.com>
Date: Tue, 23 Sep 2025 10:06:29 -0500
Subject: [PATCH 119/203] Update find_package calls in OpenMCConfig.cmake
 (#3572)

---
 cmake/OpenMCConfig.cmake.in                         | 11 +++++++----
 openmc/deplete/transfer_rates.py                    |  2 +-
 tests/regression_tests/unstructured_mesh/test.py    |  2 +-
 tests/unit_tests/dagmc/test_plot.py                 |  5 ++++-
 tests/unit_tests/test_model.py                      |  4 ++++
 tests/unit_tests/test_region.py                     |  4 ++++
 tests/unit_tests/test_universe.py                   |  4 ++++
 tests/unit_tests/weightwindows/test_wwinp_reader.py |  2 +-
 tools/ci/gha-script.sh                              |  5 ++++-
 9 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/cmake/OpenMCConfig.cmake.in b/cmake/OpenMCConfig.cmake.in
index 3fe0c1bcd..837a39c78 100644
--- a/cmake/OpenMCConfig.cmake.in
+++ b/cmake/OpenMCConfig.cmake.in
@@ -1,9 +1,12 @@
 get_filename_component(OpenMC_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" DIRECTORY)
 
-find_package(fmt REQUIRED HINTS ${OpenMC_CMAKE_DIR}/../fmt)
-find_package(pugixml REQUIRED HINTS ${OpenMC_CMAKE_DIR}/../pugixml)
-find_package(xtl REQUIRED HINTS ${OpenMC_CMAKE_DIR}/../xtl)
-find_package(xtensor REQUIRED HINTS ${OpenMC_CMAKE_DIR}/../xtensor)
+# Compute the install prefix from this file's location
+get_filename_component(_OPENMC_PREFIX "${OpenMC_CMAKE_DIR}/../../.." ABSOLUTE)
+
+find_package(fmt CONFIG REQUIRED HINTS ${_OPENMC_PREFIX})
+find_package(pugixml CONFIG REQUIRED HINTS ${_OPENMC_PREFIX})
+find_package(xtl CONFIG REQUIRED HINTS ${_OPENMC_PREFIX})
+find_package(xtensor CONFIG REQUIRED HINTS ${_OPENMC_PREFIX})
 if(@OPENMC_USE_DAGMC@)
   find_package(DAGMC REQUIRED HINTS @DAGMC_DIR@)
 endif()
diff --git a/openmc/deplete/transfer_rates.py b/openmc/deplete/transfer_rates.py
index 4c28c7d15..4f2b9aba5 100644
--- a/openmc/deplete/transfer_rates.py
+++ b/openmc/deplete/transfer_rates.py
@@ -366,7 +366,7 @@ class ExternalSourceRates(ExternalRates):
         rate : float
             External source rate in units of mass per time. A positive or
             negative value corresponds to a feed or removal rate, respectively.
-        units : {'g/s', 'g/min', 'g/h', 'g/d', 'g/a'}
+        rate_units : {'g/s', 'g/min', 'g/h', 'g/d', 'g/a'}
             Units for values specified in the `rate` argument. 's' for seconds,
             'min' for minutes, 'h' for hours, 'a' for Julian years.
         timesteps : list of int, optional
diff --git a/tests/regression_tests/unstructured_mesh/test.py b/tests/regression_tests/unstructured_mesh/test.py
index 0082198dd..7607531d8 100644
--- a/tests/regression_tests/unstructured_mesh/test.py
+++ b/tests/regression_tests/unstructured_mesh/test.py
@@ -256,7 +256,7 @@ for i, (lib, estimator, ext_geom, holes) in enumerate(product(*param_values)):
 def test_unstructured_mesh_tets(model, test_opts):
     # skip the test if the library is not enabled
     if test_opts['library'] == 'moab' and not openmc.lib._dagmc_enabled():
-        pytest.skip("DAGMC (and MOAB) mesh not enbaled in this build.")
+        pytest.skip("DAGMC (and MOAB) mesh not enabled in this build.")
 
     if test_opts['library'] == 'libmesh' and not openmc.lib._libmesh_enabled():
         pytest.skip("LibMesh is not enabled in this build.")
diff --git a/tests/unit_tests/dagmc/test_plot.py b/tests/unit_tests/dagmc/test_plot.py
index 62022b258..6ce1d79a2 100644
--- a/tests/unit_tests/dagmc/test_plot.py
+++ b/tests/unit_tests/dagmc/test_plot.py
@@ -64,5 +64,8 @@ def test_plotting_geometry_filled_with_dagmc_universe(request):
     cell2 = openmc.Cell(fill=csg_material, region=+sphere1 & -sphere2)
 
     geometry = openmc.Geometry([cell1, cell2])
-
     geometry.plot()
+
+    # Close plot to avoid warning
+    import matplotlib.pyplot as plt
+    plt.close()
diff --git a/tests/unit_tests/test_model.py b/tests/unit_tests/test_model.py
index 12f0df6c9..60f8b1a25 100644
--- a/tests/unit_tests/test_model.py
+++ b/tests/unit_tests/test_model.py
@@ -654,6 +654,10 @@ def test_model_plot():
     test_mask = (image_data == white) | (image_data == red)
     assert np.all(test_mask), "Colors other than white or red found in overlap plot image"
 
+    # Close plots to avoid warning
+    import matplotlib.pyplot as plt
+    plt.close('all')
+
 
 def test_model_id_map_initialization(run_in_tmpdir):
     model = openmc.examples.pwr_assembly()
diff --git a/tests/unit_tests/test_region.py b/tests/unit_tests/test_region.py
index cbcd19831..cb9fa171b 100644
--- a/tests/unit_tests/test_region.py
+++ b/tests/unit_tests/test_region.py
@@ -248,6 +248,10 @@ def test_plot():
     c_before = openmc.Cell()
     region.plot()
 
+    # Close plot to avoid warning
+    import matplotlib.pyplot as plt
+    plt.close()
+
     # Ensure that calling plot doesn't affect cell ID space
     c_after = openmc.Cell()
     assert c_after.id - 1 == c_before.id
diff --git a/tests/unit_tests/test_universe.py b/tests/unit_tests/test_universe.py
index 46d4ec3f7..efe8552a6 100644
--- a/tests/unit_tests/test_universe.py
+++ b/tests/unit_tests/test_universe.py
@@ -99,6 +99,10 @@ def test_plot(run_in_tmpdir, sphere_model):
             pixels=100,
         )
 
+    # Close plots to avoid warning
+    import matplotlib.pyplot as plt
+    plt.close('all')
+
 
 def test_get_nuclides(uo2):
     c = openmc.Cell(fill=uo2)
diff --git a/tests/unit_tests/weightwindows/test_wwinp_reader.py b/tests/unit_tests/weightwindows/test_wwinp_reader.py
index 28548a448..637463bb2 100644
--- a/tests/unit_tests/weightwindows/test_wwinp_reader.py
+++ b/tests/unit_tests/weightwindows/test_wwinp_reader.py
@@ -140,4 +140,4 @@ def test_wwinp_reader_failures(wwinp_data, request):
     filename, expected_failure = wwinp_data
 
     with pytest.raises(expected_failure):
-        _ = openmc.wwinp_to_wws(request.node.path.parent / filename)
+        _ = openmc.WeightWindowsList.from_wwinp(request.node.path.parent / filename)
diff --git a/tools/ci/gha-script.sh b/tools/ci/gha-script.sh
index c0f754c32..c1d292137 100755
--- a/tools/ci/gha-script.sh
+++ b/tools/ci/gha-script.sh
@@ -15,4 +15,7 @@ if [[ $EVENT == 'y' ]]; then
 fi
 
 # Run unit tests and then regression tests
-pytest --cov=openmc -v $args tests/unit_tests tests/regression_tests
+pytest --cov=openmc -v $args \
+  tests/test_matplotlib_import.py \
+  tests/unit_tests \
+  tests/regression_tests

From ed433fe1cd9479e355cfe4ca6ec8fb99359f98cf Mon Sep 17 00:00:00 2001
From: Kevin Sawatzky <66632997+nuclearkevin@users.noreply.github.com>
Date: Tue, 23 Sep 2025 11:31:14 -0500
Subject: [PATCH 120/203] Fix performance regression in libMesh unstructured
 mesh tallies (#3577)

---
 include/openmc/mesh.h |  49 ++++++++++++++-----
 src/mesh.cpp          | 109 ++++++++++++++++++++++++------------------
 2 files changed, 101 insertions(+), 57 deletions(-)

diff --git a/include/openmc/mesh.h b/include/openmc/mesh.h
index fbc6c46f5..a56705c9e 100644
--- a/include/openmc/mesh.h
+++ b/include/openmc/mesh.h
@@ -990,25 +990,26 @@ public:
 
   libMesh::MeshBase* mesh_ptr() const { return m_; };
 
+protected:
+  // Methods
+
+  //! Translate a bin value to an element reference
+  virtual const libMesh::Elem& get_element_from_bin(int bin) const;
+
+  //! Translate an element pointer to a bin index
+  virtual int get_bin_from_element(const libMesh::Elem* elem) const;
+
+  libMesh::MeshBase* m_; //!< pointer to libMesh MeshBase instance, always set
+                         //!< during intialization
 private:
   void initialize() override;
   void set_mesh_pointer_from_filename(const std::string& filename);
   void build_eqn_sys();
 
-  // Methods
-
-  //! Translate a bin value to an element reference
-  const libMesh::Elem& get_element_from_bin(int bin) const;
-
-  //! Translate an element pointer to a bin index
-  int get_bin_from_element(const libMesh::Elem* elem) const;
-
   // Data members
   unique_ptr<libMesh::MeshBase> unique_m_ =
     nullptr; //!< pointer to the libMesh MeshBase instance, only used if mesh is
              //!< created inside OpenMC
-  libMesh::MeshBase* m_; //!< pointer to libMesh MeshBase instance, always set
-                         //!< during intialization
   vector<unique_ptr<libMesh::PointLocatorBase>>
     pl_; //!< per-thread point locators
   unique_ptr<libMesh::EquationSystems>
@@ -1022,8 +1023,34 @@ private:
   libMesh::BoundingBox bbox_; //!< bounding box of the mesh
   libMesh::dof_id_type
     first_element_id_; //!< id of the first element in the mesh
+};
+
+class AdaptiveLibMesh : public LibMesh {
+public:
+  // Constructor
+  AdaptiveLibMesh(
+    libMesh::MeshBase& input_mesh, double length_multiplier = 1.0);
+
+  // Overridden methods
+  int n_bins() const override;
+
+  void add_score(const std::string& var_name) override;
+
+  void set_score_data(const std::string& var_name, const vector<double>& values,
+    const vector<double>& std_dev) override;
+
+  void write(const std::string& filename) const override;
+
+protected:
+  // Overridden methods
+  int get_bin_from_element(const libMesh::Elem* elem) const override;
+
+  const libMesh::Elem& get_element_from_bin(int bin) const override;
+
+private:
+  // Data members
+  const libMesh::dof_id_type num_active_; //!< cached number of active elements
 
-  const bool adaptive_; //!< whether this mesh has adaptivity enabled or not
   std::vector<libMesh::dof_id_type>
     bin_to_elem_map_; //!< mapping bin indices to dof indices for active
                       //!< elements
diff --git a/src/mesh.cpp b/src/mesh.cpp
index b7396a25a..58d218b9c 100644
--- a/src/mesh.cpp
+++ b/src/mesh.cpp
@@ -3219,7 +3219,7 @@ void MOABMesh::write(const std::string& base_filename) const
 
 const std::string LibMesh::mesh_lib_type = "libmesh";
 
-LibMesh::LibMesh(pugi::xml_node node) : UnstructuredMesh(node), adaptive_(false)
+LibMesh::LibMesh(pugi::xml_node node) : UnstructuredMesh(node)
 {
   // filename_ and length_multiplier_ will already be set by the
   // UnstructuredMesh constructor
@@ -3230,7 +3230,6 @@ LibMesh::LibMesh(pugi::xml_node node) : UnstructuredMesh(node), adaptive_(false)
 
 // create the mesh from a pointer to a libMesh Mesh
 LibMesh::LibMesh(libMesh::MeshBase& input_mesh, double length_multiplier)
-  : adaptive_(input_mesh.n_active_elem() != input_mesh.n_elem())
 {
   if (!dynamic_cast<libMesh::ReplicatedMesh*>(&input_mesh)) {
     fatal_error("At present LibMesh tallies require a replicated mesh. Please "
@@ -3244,7 +3243,6 @@ LibMesh::LibMesh(libMesh::MeshBase& input_mesh, double length_multiplier)
 
 // create the mesh from an input file
 LibMesh::LibMesh(const std::string& filename, double length_multiplier)
-  : adaptive_(false)
 {
   n_dimension_ = 3;
   set_mesh_pointer_from_filename(filename);
@@ -3307,21 +3305,6 @@ void LibMesh::initialize()
   auto first_elem = *m_->elements_begin();
   first_element_id_ = first_elem->id();
 
-  // if the mesh is adaptive elements aren't guaranteed by libMesh to be
-  // contiguous in ID space, so we need to map from bin indices (defined over
-  // active elements) to global dof ids
-  if (adaptive_) {
-    bin_to_elem_map_.reserve(m_->n_active_elem());
-    elem_to_bin_map_.resize(m_->n_elem(), -1);
-    for (auto it = m_->active_elements_begin(); it != m_->active_elements_end();
-         it++) {
-      auto elem = *it;
-
-      bin_to_elem_map_.push_back(elem->id());
-      elem_to_bin_map_[elem->id()] = bin_to_elem_map_.size() - 1;
-    }
-  }
-
   // bounding box for the mesh for quick rejection checks
   bbox_ = libMesh::MeshTools::create_bounding_box(*m_);
   libMesh::Point ll = bbox_.min();
@@ -3379,7 +3362,7 @@ std::string LibMesh::library() const
 
 int LibMesh::n_bins() const
 {
-  return m_->n_active_elem();
+  return m_->n_elem();
 }
 
 int LibMesh::n_surface_bins() const
@@ -3402,14 +3385,6 @@ int LibMesh::n_surface_bins() const
 
 void LibMesh::add_score(const std::string& var_name)
 {
-  if (adaptive_) {
-    warning(fmt::format(
-      "Exodus output cannot be provided as unstructured mesh {} is adaptive.",
-      this->id_));
-
-    return;
-  }
-
   if (!equation_systems_) {
     build_eqn_sys();
   }
@@ -3445,14 +3420,6 @@ void LibMesh::remove_scores()
 void LibMesh::set_score_data(const std::string& var_name,
   const vector<double>& values, const vector<double>& std_dev)
 {
-  if (adaptive_) {
-    warning(fmt::format(
-      "Exodus output cannot be provided as unstructured mesh {} is adaptive.",
-      this->id_));
-
-    return;
-  }
-
   if (!equation_systems_) {
     build_eqn_sys();
   }
@@ -3496,14 +3463,6 @@ void LibMesh::set_score_data(const std::string& var_name,
 
 void LibMesh::write(const std::string& filename) const
 {
-  if (adaptive_) {
-    warning(fmt::format(
-      "Exodus output cannot be provided as unstructured mesh {} is adaptive.",
-      this->id_));
-
-    return;
-  }
-
   write_message(fmt::format(
     "Writing file: {}.e for unstructured mesh {}", filename, this->id_));
   libMesh::ExodusII_IO exo(*m_);
@@ -3537,8 +3496,7 @@ int LibMesh::get_bin(Position r) const
 
 int LibMesh::get_bin_from_element(const libMesh::Elem* elem) const
 {
-  int bin =
-    adaptive_ ? elem_to_bin_map_[elem->id()] : elem->id() - first_element_id_;
+  int bin = elem->id() - first_element_id_;
   if (bin >= n_bins() || bin < 0) {
     fatal_error(fmt::format("Invalid bin: {}", bin));
   }
@@ -3553,7 +3511,7 @@ std::pair<vector<double>, vector<double>> LibMesh::plot(
 
 const libMesh::Elem& LibMesh::get_element_from_bin(int bin) const
 {
-  return adaptive_ ? m_->elem_ref(bin_to_elem_map_.at(bin)) : m_->elem_ref(bin);
+  return m_->elem_ref(bin);
 }
 
 double LibMesh::volume(int bin) const
@@ -3561,6 +3519,65 @@ double LibMesh::volume(int bin) const
   return this->get_element_from_bin(bin).volume();
 }
 
+AdaptiveLibMesh::AdaptiveLibMesh(
+  libMesh::MeshBase& input_mesh, double length_multiplier)
+  : LibMesh(input_mesh, length_multiplier), num_active_(m_->n_active_elem())
+{
+  // if the mesh is adaptive elements aren't guaranteed by libMesh to be
+  // contiguous in ID space, so we need to map from bin indices (defined over
+  // active elements) to global dof ids
+  bin_to_elem_map_.reserve(num_active_);
+  elem_to_bin_map_.resize(m_->n_elem(), -1);
+  for (auto it = m_->active_elements_begin(); it != m_->active_elements_end();
+       it++) {
+    auto elem = *it;
+
+    bin_to_elem_map_.push_back(elem->id());
+    elem_to_bin_map_[elem->id()] = bin_to_elem_map_.size() - 1;
+  }
+}
+
+int AdaptiveLibMesh::n_bins() const
+{
+  return num_active_;
+}
+
+void AdaptiveLibMesh::add_score(const std::string& var_name)
+{
+  warning(fmt::format(
+    "Exodus output cannot be provided as unstructured mesh {} is adaptive.",
+    this->id_));
+}
+
+void AdaptiveLibMesh::set_score_data(const std::string& var_name,
+  const vector<double>& values, const vector<double>& std_dev)
+{
+  warning(fmt::format(
+    "Exodus output cannot be provided as unstructured mesh {} is adaptive.",
+    this->id_));
+}
+
+void AdaptiveLibMesh::write(const std::string& filename) const
+{
+  warning(fmt::format(
+    "Exodus output cannot be provided as unstructured mesh {} is adaptive.",
+    this->id_));
+}
+
+int AdaptiveLibMesh::get_bin_from_element(const libMesh::Elem* elem) const
+{
+  int bin = elem_to_bin_map_[elem->id()];
+  if (bin >= n_bins() || bin < 0) {
+    fatal_error(fmt::format("Invalid bin: {}", bin));
+  }
+  return bin;
+}
+
+const libMesh::Elem& AdaptiveLibMesh::get_element_from_bin(int bin) const
+{
+  return m_->elem_ref(bin_to_elem_map_.at(bin));
+}
+
 #endif // OPENMC_LIBMESH_ENABLED
 
 //==============================================================================

From 66e7d8634cbace480e3f6ccf58ca959ecfbf614e Mon Sep 17 00:00:00 2001
From: GuySten <62616591+GuySten@users.noreply.github.com>
Date: Wed, 24 Sep 2025 11:02:19 +0200
Subject: [PATCH 121/203] Remove several TODOs related to C++17 support (#3574)

Co-authored-by: Paul Romano <paul.k.romano@gmail.com>
---
 src/bank.cpp           | 13 +++----------
 src/event.cpp          | 13 +++++++------
 src/hdf5_interface.cpp |  3 +--
 3 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/src/bank.cpp b/src/bank.cpp
index 9955939f6..3e806b3c0 100644
--- a/src/bank.cpp
+++ b/src/bank.cpp
@@ -79,16 +79,9 @@ void sort_fission_bank()
 
   // Perform exclusive scan summation to determine starting indices in fission
   // bank for each parent particle id
-  int64_t tmp = simulation::progeny_per_particle[0];
-  simulation::progeny_per_particle[0] = 0;
-  for (int64_t i = 1; i < simulation::progeny_per_particle.size(); i++) {
-    int64_t value = simulation::progeny_per_particle[i - 1] + tmp;
-    tmp = simulation::progeny_per_particle[i];
-    simulation::progeny_per_particle[i] = value;
-  }
-
-  // TODO: C++17 introduces the exclusive_scan() function which could be
-  // used to replace everything above this point in this function.
+  std::exclusive_scan(simulation::progeny_per_particle.begin(),
+    simulation::progeny_per_particle.end(),
+    simulation::progeny_per_particle.begin(), 0);
 
   // We need a scratch vector to make permutation of the fission bank into
   // sorted order easy. Under normal usage conditions, the fission bank is
diff --git a/src/event.cpp b/src/event.cpp
index aa3987504..f33e132d0 100644
--- a/src/event.cpp
+++ b/src/event.cpp
@@ -1,4 +1,5 @@
 #include "openmc/event.h"
+
 #include "openmc/material.h"
 #include "openmc/simulation.h"
 #include "openmc/timer.h"
@@ -73,17 +74,17 @@ void process_calculate_xs_events(SharedArray<EventQueueItem>& queue)
 {
   simulation::time_event_calculate_xs.start();
 
-  // TODO: If using C++17, perform a parallel sort of the queue
-  // by particle type, material type, and then energy, in order to
-  // improve cache locality and reduce thread divergence on GPU. Prior
-  // to C++17, std::sort is a serial only operation, which in this case
-  // makes it too slow to be practical for most test problems.
+  // TODO: If using C++17, we could perform a parallel sort of the queue by
+  // particle type, material type, and then energy, in order to improve cache
+  // locality and reduce thread divergence on GPU. However, the parallel
+  // algorithms typically require linking against an additional library (Intel
+  // TBB). Prior to C++17, std::sort is a serial only operation, which in this
+  // case makes it too slow to be practical for most test problems.
   //
   // std::sort(std::execution::par_unseq, queue.data(), queue.data() +
   // queue.size());
 
   int64_t offset = simulation::advance_particle_queue.size();
-  ;
 
 #pragma omp parallel for schedule(runtime)
   for (int64_t i = 0; i < queue.size(); i++) {
diff --git a/src/hdf5_interface.cpp b/src/hdf5_interface.cpp
index e90aa7490..bf1f79549 100644
--- a/src/hdf5_interface.cpp
+++ b/src/hdf5_interface.cpp
@@ -225,8 +225,7 @@ void get_name(hid_t obj_id, std::string& name)
 {
   size_t size = 1 + H5Iget_name(obj_id, nullptr, 0);
   name.resize(size);
-  // TODO: switch to name.data() when using C++17
-  H5Iget_name(obj_id, &name[0], size);
+  H5Iget_name(obj_id, name.data(), size);
 }
 
 int get_num_datasets(hid_t group_id)

From 767db7e6a090b88a594be72b4971d71e3c2be243 Mon Sep 17 00:00:00 2001
From: Joffrey Dorville <54550047+JoffreyDorville@users.noreply.github.com>
Date: Thu, 25 Sep 2025 14:58:29 -0500
Subject: [PATCH 122/203] Fix IFP implementation (#3580)

---
 include/openmc/ifp.h                          |   7 +++----
 include/openmc/particle_data.h                |   1 +
 src/ifp.cpp                                   |   4 ++--
 src/particle.cpp                              |   1 +
 src/physics.cpp                               |   9 +++------
 tests/regression_tests/ifp/results_true.dat   |   4 ++--
 .../case-03/surface_source_true.h5            | Bin 33344 -> 33344 bytes
 .../case-04/surface_source_true.h5            | Bin 33344 -> 33344 bytes
 .../case-05/surface_source_true.h5            | Bin 33344 -> 33344 bytes
 .../case-07/surface_source_true.h5            | Bin 33344 -> 33344 bytes
 .../case-08/surface_source_true.h5            | Bin 33344 -> 33344 bytes
 .../case-09/surface_source_true.h5            | Bin 33344 -> 33344 bytes
 .../case-10/surface_source_true.h5            | Bin 33344 -> 33344 bytes
 .../case-12/surface_source_true.h5            | Bin 33344 -> 33344 bytes
 .../case-13/surface_source_true.h5            | Bin 33344 -> 33344 bytes
 .../case-14/surface_source_true.h5            | Bin 33344 -> 33344 bytes
 .../case-a01/surface_source_true.h5           | Bin 6720 -> 6720 bytes
 .../case-d07/surface_source_true.h5           | Bin 33344 -> 33344 bytes
 .../case-d08/surface_source_true.h5           | Bin 33344 -> 33344 bytes
 .../case-e01/surface_source_true.h5           | Bin 33344 -> 33344 bytes
 .../case-e02/surface_source_true.h5           | Bin 33344 -> 33344 bytes
 .../case-e03/surface_source_true.h5           | Bin 33344 -> 33344 bytes
 22 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/include/openmc/ifp.h b/include/openmc/ifp.h
index 633a262d5..01904d13c 100644
--- a/include/openmc/ifp.h
+++ b/include/openmc/ifp.h
@@ -68,15 +68,14 @@ vector<T> _ifp(const T& value, const vector<T>& data)
 //!
 //! Add the IFP information in the IFP banks using the same index
 //! as the one used to append the fission site to the fission bank.
+//! The information stored are the delayed group number and lifetime
+//! of the neutron that created the fission event.
 //! Multithreading protection is guaranteed by the index returned by the
 //! thread_safe_append call in physics.cpp.
 //!
-//! Needs to be done after the delayed group is found.
-//!
 //! \param[in] p Particle
-//! \param[in] site Fission site
 //! \param[in] idx Bank index from the thread_safe_append call in physics.cpp
-void ifp(const Particle& p, const SourceSite& site, int64_t idx);
+void ifp(const Particle& p, int64_t idx);
 
 //! Resize the IFP banks used in the simulation
 void resize_simulation_ifp_banks();
diff --git a/include/openmc/particle_data.h b/include/openmc/particle_data.h
index 1a22f5837..afcd56476 100644
--- a/include/openmc/particle_data.h
+++ b/include/openmc/particle_data.h
@@ -631,6 +631,7 @@ public:
   int& event_mt() { return event_mt_; } // MT number of collision
   const int& event_mt() const { return event_mt_; }
   int& delayed_group() { return delayed_group_; } // delayed group
+  const int& delayed_group() const { return delayed_group_; }
   const int& parent_nuclide() const { return parent_nuclide_; }
   int& parent_nuclide() { return parent_nuclide_; } // Parent nuclide
 
diff --git a/src/ifp.cpp b/src/ifp.cpp
index 1f81f26f6..cc4a76538 100644
--- a/src/ifp.cpp
+++ b/src/ifp.cpp
@@ -28,13 +28,13 @@ bool is_generation_time_or_both()
   return false;
 }
 
-void ifp(const Particle& p, const SourceSite& site, int64_t idx)
+void ifp(const Particle& p, int64_t idx)
 {
   if (is_beta_effective_or_both()) {
     const auto& delayed_groups =
       simulation::ifp_source_delayed_group_bank[p.current_work() - 1];
     simulation::ifp_fission_delayed_group_bank[idx] =
-      _ifp(site.delayed_group, delayed_groups);
+      _ifp(p.delayed_group(), delayed_groups);
   }
   if (is_generation_time_or_both()) {
     const auto& lifetimes =
diff --git a/src/particle.cpp b/src/particle.cpp
index f5ad45d80..402af2498 100644
--- a/src/particle.cpp
+++ b/src/particle.cpp
@@ -144,6 +144,7 @@ void Particle::from_source(const SourceSite* src)
   time() = src->time;
   time_last() = src->time;
   parent_nuclide() = src->parent_nuclide;
+  delayed_group() = src->delayed_group;
 
   // Convert signed surface ID to signed index
   if (src->surf_id != SURFACE_NONE) {
diff --git a/src/physics.cpp b/src/physics.cpp
index f667fd586..e947fecbb 100644
--- a/src/physics.cpp
+++ b/src/physics.cpp
@@ -246,18 +246,15 @@ void create_fission_sites(Particle& p, int i_nuclide, const Reaction& rx)
       }
       // Iterated Fission Probability (IFP) method
       if (settings::ifp_on) {
-        ifp(p, site, idx);
+        ifp(p, idx);
       }
     } else {
       p.secondary_bank().push_back(site);
     }
 
-    // Set the delayed group on the particle as well
-    p.delayed_group() = site.delayed_group;
-
     // Increment the number of neutrons born delayed
-    if (p.delayed_group() > 0) {
-      nu_d[p.delayed_group() - 1]++;
+    if (site.delayed_group > 0) {
+      nu_d[site.delayed_group - 1]++;
     }
 
     // Write fission particles to nuBank
diff --git a/tests/regression_tests/ifp/results_true.dat b/tests/regression_tests/ifp/results_true.dat
index 1d8f69e12..466ca1f01 100644
--- a/tests/regression_tests/ifp/results_true.dat
+++ b/tests/regression_tests/ifp/results_true.dat
@@ -3,7 +3,7 @@ k-combined:
 tally 1:
 9.109384E-08
 5.667165E-16
-6.500000E-02
-6.710000E-04
+5.200000E-02
+5.420000E-04
 1.489000E+01
 1.480036E+01
diff --git a/tests/regression_tests/surface_source_write/case-03/surface_source_true.h5 b/tests/regression_tests/surface_source_write/case-03/surface_source_true.h5
index 4dd5f821af92dd98395a8df31af2a81fab8a8ba4..228f5a7d0a462f38a1cb0b4274dd40d4307b5a12 100644
GIT binary patch
delta 42
ycmX@m!gQd8X@dwmbDaH^&Eo8yDU2+W6SL1VvTZiZaTj7_nw%&gzj;R83T6N=*$u}4

delta 48
zcmX@m!gQd8X@dwm^EJ&=o5k5ZQzln%3QR7@J}|k1S75V4j)f42F}XlMVDpT+70dv*
Csu83B

diff --git a/tests/regression_tests/surface_source_write/case-04/surface_source_true.h5 b/tests/regression_tests/surface_source_write/case-04/surface_source_true.h5
index ee00af3895c349d60d786af1aedef39e05e24d20..c276af40f4302f4e0feff883bc3c472bc4df7ca1 100644
GIT binary patch
delta 38
ucmX@m!gQd8X@dwmbDaH^&Eo8xzKkrB7lxc?WZPUAI-ie`X|rI8z8nArx(svx

delta 44
xcmX@m!gQd8X@dwm^L5Qro5k5XeJ59N3QXP*a$vFtm%!$R&<T8ChC+&h8~}Sr56l1n

diff --git a/tests/regression_tests/surface_source_write/case-05/surface_source_true.h5 b/tests/regression_tests/surface_source_write/case-05/surface_source_true.h5
index ee00af3895c349d60d786af1aedef39e05e24d20..c276af40f4302f4e0feff883bc3c472bc4df7ca1 100644
GIT binary patch
delta 38
ucmX@m!gQd8X@dwmbDaH^&Eo8xzKkrB7lxc?WZPUAI-ie`X|rI8z8nArx(svx

delta 44
xcmX@m!gQd8X@dwm^L5Qro5k5XeJ59N3QXP*a$vFtm%!$R&<T8ChC+&h8~}Sr56l1n

diff --git a/tests/regression_tests/surface_source_write/case-07/surface_source_true.h5 b/tests/regression_tests/surface_source_write/case-07/surface_source_true.h5
index 60527c99bc259a790c1f71ca36c7a00bef7fdf3f..c276af40f4302f4e0feff883bc3c472bc4df7ca1 100644
GIT binary patch
delta 38
ucmX@m!gQd8X@dwmbDaH^&Eo8xzKkrB7lxc?WZPUAI-ie`X|rI8z8nArx(svx

delta 44
xcmX@m!gQd8X@dwm^G(fDo5k5XeJ59N3QXP*a$vFtm%!$R&<T8ChC+&h8~}Ta56%Dp

diff --git a/tests/regression_tests/surface_source_write/case-08/surface_source_true.h5 b/tests/regression_tests/surface_source_write/case-08/surface_source_true.h5
index 3088597c08e1b4af24b1004f8d62e66bd18d6631..94cd377d40973fcdb8b1a30152b0e12ec12e09a1 100644
GIT binary patch
delta 42
ycmX@m!gQd8X@dwmbG-eP&Eo7o{TW#%3x=O(WZV2OoSmPMX|f`({AP}H3uyp25DgUo

delta 48
zcmX@m!gQd8X@dwm^G(fDo5k6G`cJOl6qu|Keqgc(m%!!^;Xn95jL8PP0-HI~Eu;a;
CN)c@U

diff --git a/tests/regression_tests/surface_source_write/case-09/surface_source_true.h5 b/tests/regression_tests/surface_source_write/case-09/surface_source_true.h5
index 81cdbfb0fe8919edb309daee668fd689fc71507b..ebce87b36aff8050b2b6b9df2bf4292296045da5 100644
GIT binary patch
delta 42
ycmX@m!gQd8X@dwmbG-eP&Eo7o{TW#%3x=O(WZV2OoSmPMX|f`({AP}H3uyp25DgUo

delta 44
ycmX@m!gQd8X@dwm^DWI&o5k6G`cGcLAuw4X`~ZmF{2}}Y-{cHSh0Pr47SaHeClPu8

diff --git a/tests/regression_tests/surface_source_write/case-10/surface_source_true.h5 b/tests/regression_tests/surface_source_write/case-10/surface_source_true.h5
index b7843003817fac9a2a987e0d30127163a69eea43..fded9d987e392214edeb3fccd50c3ecc5f8a7728 100644
GIT binary patch
delta 38
ucmX@m!gQd8X@dwmbG-eP&Eo7UJs4RgAM`)Z$hLW6z<fSNrp<=&{K^0eVGPCq

delta 44
zcmV+{0Mq}#gaW{X0<aVZ1KKIdvlj=cNR!AA5R=ePz>|0h5VN3AkPef$3?Q>mU+^N7
CA`&M6

diff --git a/tests/regression_tests/surface_source_write/case-12/surface_source_true.h5 b/tests/regression_tests/surface_source_write/case-12/surface_source_true.h5
index ca5eda8e2f347a1fc88b05db6690ad5b6d3a2a51..6c6925daba145c5db52a281023dd017f066e0732 100644
GIT binary patch
delta 117
zcmX@m!gQd8X@dwmbAtVq&Eo8lQj<>z2yAXpOweRx+5FH;oYOG=2mfb3*B|@WHpD(y
z^yT0FTL*$W*`i<AE6y{zSh4W2{reT>%Qt;HW$zbo>Udt8lS9X5&5&?bMwZEqk?BA)
UUPkiE0XaX*)4?VeR9xT$0J0-9HUIzs

delta 124
zcmV-?0E7R)gaW{X0<aVZ1KcUfvlj<h8UX~eaUpLhlXwXbv+zm?2{B#x5A#k%_`j@x
zUEreh{=e41Q;7y!=szf)GSPUU<3IPPH>a}p%0E$1%ExYoLO_SJDO6Vllc)#~laN_h
elc)#~qxe}KlPD=5lYkHilOT9N0RppOc;5**VKsyR

diff --git a/tests/regression_tests/surface_source_write/case-13/surface_source_true.h5 b/tests/regression_tests/surface_source_write/case-13/surface_source_true.h5
index ca5eda8e2f347a1fc88b05db6690ad5b6d3a2a51..6c6925daba145c5db52a281023dd017f066e0732 100644
GIT binary patch
delta 117
zcmX@m!gQd8X@dwmbAtVq&Eo8lQj<>z2yAXpOweRx+5FH;oYOG=2mfb3*B|@WHpD(y
z^yT0FTL*$W*`i<AE6y{zSh4W2{reT>%Qt;HW$zbo>Udt8lS9X5&5&?bMwZEqk?BA)
UUPkiE0XaX*)4?VeR9xT$0J0-9HUIzs

delta 124
zcmV-?0E7R)gaW{X0<aVZ1KcUfvlj<h8UX~eaUpLhlXwXbv+zm?2{B#x5A#k%_`j@x
zUEreh{=e41Q;7y!=szf)GSPUU<3IPPH>a}p%0E$1%ExYoLO_SJDO6Vllc)#~laN_h
elc)#~qxe}KlPD=5lYkHilOT9N0RppOc;5**VKsyR

diff --git a/tests/regression_tests/surface_source_write/case-14/surface_source_true.h5 b/tests/regression_tests/surface_source_write/case-14/surface_source_true.h5
index c9900bd9c0469d3b171f863f0518d6c94e966027..6c6925daba145c5db52a281023dd017f066e0732 100644
GIT binary patch
delta 117
zcmX@m!gQd8X@dwmbAtVq&Eo8lQj<>z2yAXpOweRx+5FH;oYOG=2mfb3*B|@WHpD(y
z^yT0FTL*$W*`i<AE6y{zSh4W2{reT>%Qt;HW$zbo>Udt8lS9X5&5&?bMwZEqk?BA)
UUPkiE0XaX*)4?VeR9xT$0J0-9HUIzs

delta 124
zcmV-?0E7R)gaW{X0<aVZ1Klagvlj<h8UX~eaUpLhlXwXbv+zm?2{B#x5A#k%_`j@x
zUEreh{=e41Q;7y!=szf)GSPUU<3IPPH>a}p%0E$1%ExYoLO_SJDO6Vllc)#~laN_h
elc)#~qxe}KlPD=5lYkHilOT9N0RppOc;5**(=~+v

diff --git a/tests/regression_tests/surface_source_write/case-a01/surface_source_true.h5 b/tests/regression_tests/surface_source_write/case-a01/surface_source_true.h5
index 8dc148ee07eb33d6374387e557b35914f5fa2003..da36fc505eb67f3da0ce48511464b699a4fb16e3 100644
GIT binary patch
delta 70
zcmX?La=>JR2s?9<{gut)?19XaFK}f{&fv<}Y{8wtJxM%c@(i(z$rph10tuivkhTEQ
W1(F$)IV3$8StcLklb?J;G6MjFG#L5-

delta 68
zcmX?La=>JR2s`s*%~PAj*#ns;U*O7^oWYf`*@8QPdy;s@<QZZalPx5GVnFr+AbkNy
U7f5<cj^I<6%psXE`G#Z$0Azj`?f?J)

diff --git a/tests/regression_tests/surface_source_write/case-d07/surface_source_true.h5 b/tests/regression_tests/surface_source_write/case-d07/surface_source_true.h5
index 7ab2e2c807b2f2080745d6cd48db84e75f9a21b0..fd9f0dc572af098b9d8a53fd7c1311f3bf4dd28f 100644
GIT binary patch
delta 242
zcmX@m!gQd8X@dwmGo#y;&Eo7og)PGbBCg9+i90axa|q4m=RCjw24)US+`6a5+%D{Y
z{BY@Q**UNFr<}|)+&t^P{T2SR7Ip5*j(aD2O6zmoH+?WoO;XI^xBlcNX+6d(lQ#kd
zmpu;m&foCG{?fh4ucY<Zmuz^qIjXOAvcI$@r`WcTt17*B_t#Dil+kDWwYgDdy{_ew
z^_FrMpBOkmtv;~8*XO>X>K%LUYL4oBy*u_xg7`DD%%1Q6vVXpy?7Ij1?@Ya&Zg<tp
q@%!XVFMZC^tk{r6pI9A?H!t+sFU-iaIWaC?V)6<Ofz21n3b+BQykbEB

delta 242
zcmX@m!gQd8X@dwm^Ha@Jo5k6G3R?yXL|m7t5_jO{=Mb9B&v}3W49pyuxOGp9xn0=*
z<l)lWvU6VTPd=GvxOvun`)mAXE$ZBr9S=<Ql-B3EYx-cCnxvQmgTdq`X+6eklQ#kd
zw>=K`&foCGUf}-ZSJHay^ESNO9MxAl*<V_d^V-&st17*B_s32Sl+kDWvAI!Zy{_e=
z^_FrMpBOkmtv>L;*XO>X>K%KZYL4oBy*u{Hg7`DD%%1Q6ynnu+?7Ij1?@Ya&Zg<tp
q@!RA~FMZDXtk{r6pI9ASHZSzrFFd(|Q($vJTz~{4+vbC1_1pl=T4E*u

diff --git a/tests/regression_tests/surface_source_write/case-d08/surface_source_true.h5 b/tests/regression_tests/surface_source_write/case-d08/surface_source_true.h5
index 5da7564d1f4cd31322ff9a471a6dea175ba8fd0a..fd9f0dc572af098b9d8a53fd7c1311f3bf4dd28f 100644
GIT binary patch
delta 242
zcmX@m!gQd8X@dwmGo#y;&Eo7og)PGbBCg9+i90axa|q4m=RCjw24)US+`6a5+%D{Y
z{BY@Q**UNFr<}|)+&t^P{T2SR7Ip5*j(aD2O6zmoH+?WoO;XI^xBlcNX+6d(lQ#kd
zmpu;m&foCG{?fh4ucY<Zmuz^qIjXOAvcI$@r`WcTt17*B_t#Dil+kDWwYgDdy{_ew
z^_FrMpBOkmtv;~8*XO>X>K%LUYL4oBy*u_xg7`DD%%1Q6vVXpy?7Ij1?@Ya&Zg<tp
q@%!XVFMZC^tk{r6pI9A?H!t+sFU-iaIWaC?V)6<Ofz21n3b+BQykbEB

delta 242
zcmX@m!gQd8X@dwm^E1s;o5k6G3R?yXL|m7t5_jO{=Mb9B&v}3W49pyuxOGp9xn0=*
z<l)lWvU6VTPd=GvxOvun`)mAXE$ZBr9S=<Ql-B3EYx-cCnxvQmgTdq`X+6eklQ#kd
zw>=K`&foCGUf}-ZSJHay^ESNO9MxAl*<V_d^V-&st17*B_s32Sl+kDWvAI!Zy{_e=
z^_FrMpBOkmtv>L;*XO>X>K%KZYL4oBy*u{Hg7`DD%%1Q6ynnu+?7Ij1?@Ya&Zg<tp
q@!RA~FMZDXtk{r6pI9ASHZSzrFFd(|Q($vJTz~{4+vbC1_1pl>LSiQX

diff --git a/tests/regression_tests/surface_source_write/case-e01/surface_source_true.h5 b/tests/regression_tests/surface_source_write/case-e01/surface_source_true.h5
index 0dda15ed2192739435e8f50e126831021d620f53..bbfbd152bc6543871750cb9bd4cc55fe0899754a 100644
GIT binary patch
delta 39
vcmX@m!gQd8X@dwm^L6Jdo5k5Vtr*!hD>|xkF|us-^iEf2WZJy3sGlDI{ml#e

delta 45
zcmV+|0Mh@!gaW{X0<aVZ1DZ(8vlj;mI+OSh5VJ5r7z&ek2@tbbOIRn9m=Pee&~k7O
DZbuK+

diff --git a/tests/regression_tests/surface_source_write/case-e02/surface_source_true.h5 b/tests/regression_tests/surface_source_write/case-e02/surface_source_true.h5
index 519d8891f3f5b392182949e044b62b3ca0526286..bbfbd152bc6543871750cb9bd4cc55fe0899754a 100644
GIT binary patch
delta 39
vcmX@m!gQd8X@dwm^L6Jdo5k5Vtr*!hD>|xkF|us-^iEf2WZJy3sGlDI{ml#e

delta 45
zcmV+|0Mh@!gaW{X0<aVZ1Di<9vlj;mI+OSh5VJ5r7z&ek2@tbbOIRn9m=Pee&~k7O
DZfXzL

diff --git a/tests/regression_tests/surface_source_write/case-e03/surface_source_true.h5 b/tests/regression_tests/surface_source_write/case-e03/surface_source_true.h5
index 7e7d49071965f8535391e88f5120109b9b417dc7..22e108745d87705115c7d171e13e692a7ac6f734 100644
GIT binary patch
delta 146
zcmX@m!gQd8X@dwm^L6Jdo5k5BRVGVt3v71KZs3|6AuX`^g6RY~!}uTkpZ#2a>|fgu
z`(V+RfBSD82<~KyeqpaT&*);s!pHXSSC}u~^zD?rU%;v3d2LP(9h)bH)H5-%Y!(bR
wXPmsFL|}77#0D`CW3ohk#N->+5}P~ne=vh(CKPKhf^3?6!Bk-Ljgkyr09VyO4FCWD

delta 148
zcmX@m!gQd8X@dwm^Bj*eo5k5BRTx<|8*2A+P4<Wo*nGisf}COO5B|@7u0Qs#X^4HW
z=*z$T*A4`CvPHkJ*O+H?v0~w4`|m5vmv8!Z%04jQ)bYGFCx`aU6GQ5mCZ7-x*sKt)
z!8kcWT3~ZT#0D`SLt*j+56;Pk`Sy%Vn+x;#S-^4=ih+uNwoSfZDzN!RNd_+fhDbe!


From 781dbf9c12b70937e9d3dc10c2ba29228e996b5c Mon Sep 17 00:00:00 2001
From: Alex Nellis <79525520+realmisch@users.noreply.github.com>
Date: Fri, 26 Sep 2025 12:27:05 -0400
Subject: [PATCH 123/203] Multi-group capability for kinetics parameter
 calculations with Iterated Fission Probability (#3425)

Co-authored-by: GuySten <guyste@post.bgu.ac.il>
Co-authored-by: Paul Romano <paul.k.romano@gmail.com>
---
 docs/source/usersguide/kinetics.rst           | 25 +++++++-
 openmc/model/model.py                         | 41 +++++++++++--
 openmc/statepoint.py                          | 58 +++++++++++++++++++
 src/tallies/tally.cpp                         |  3 +-
 src/tallies/tally_scoring.cpp                 |  9 +++
 .../ifp/groupwise/__init__.py                 |  0
 .../ifp/groupwise/inputs_true.dat             | 43 ++++++++++++++
 .../ifp/groupwise/results_true.dat            | 21 +++++++
 tests/regression_tests/ifp/groupwise/test.py  | 40 +++++++++++++
 tests/regression_tests/ifp/total/__init__.py  |  0
 .../ifp/{ => total}/inputs_true.dat           |  0
 .../ifp/{ => total}/results_true.dat          |  0
 .../regression_tests/ifp/{ => total}/test.py  |  1 -
 tests/unit_tests/test_ifp.py                  | 39 +++++++++++++
 14 files changed, 272 insertions(+), 8 deletions(-)
 create mode 100644 tests/regression_tests/ifp/groupwise/__init__.py
 create mode 100644 tests/regression_tests/ifp/groupwise/inputs_true.dat
 create mode 100644 tests/regression_tests/ifp/groupwise/results_true.dat
 create mode 100644 tests/regression_tests/ifp/groupwise/test.py
 create mode 100644 tests/regression_tests/ifp/total/__init__.py
 rename tests/regression_tests/ifp/{ => total}/inputs_true.dat (100%)
 rename tests/regression_tests/ifp/{ => total}/results_true.dat (100%)
 rename tests/regression_tests/ifp/{ => total}/test.py (99%)

diff --git a/docs/source/usersguide/kinetics.rst b/docs/source/usersguide/kinetics.rst
index bdf26d341..9024ff822 100644
--- a/docs/source/usersguide/kinetics.rst
+++ b/docs/source/usersguide/kinetics.rst
@@ -67,6 +67,23 @@ are needed to compute kinetics parameters in OpenMC:
 Obtaining kinetics parameters
 -----------------------------
 
+The ``Model`` class can be used to automatically generate all IFP tallies using
+the Python API with :attr:`openmc.Settings.ifp_n_generation` greater than 0 and
+the :meth:`openmc.Model.add_ifp_kinetics_tallies` method::
+
+    model = openmc.Model(geometry, settings=settings)
+    model.add_kinetics_parameters_tallies(num_groups=6)  # Add 6 precursor groups
+
+Alternatively, each of the tallies can be manually defined using group-wise or
+total :math:`\beta_{\text{eff}}` specified by providing a 6-group
+:class:`openmc.DelayedGroupFilter`::
+
+    beta_tally = openmc.Tally(name="group-beta-score")
+    beta_tally.scores = ["ifp-beta-numerator"]
+
+    # Add DelayedGroupFilter to enable group-wise tallies
+    beta_tally.filters = [openmc.DelayedGroupFilter(list(range(1, 7)))]
+
 Here is an example showing how to declare the three available IFP scores in a
 single tally::
 
@@ -95,6 +112,12 @@ for ``ifp-denominator``:
 
     \beta_{\text{eff}} = \frac{S_{\text{ifp-beta-numerator}}}{S_{\text{ifp-denominator}}}
 
+The kinetics parameters can be retrieved directly from a statepoint file using
+the :meth:`openmc.StatePoint.ifp_results` method::
+
+    with openmc.StatePoint(output_path) as sp:
+        generation_time, beta_eff = sp.get_kinetics_parameters()
+
 .. only:: html
 
    .. rubric:: References
@@ -107,4 +130,4 @@ for ``ifp-denominator``:
     of the Iterated Fission Probability Method in OpenMC to Compute Adjoint-Weighted
     Kinetics Parameters", International Conference on Mathematics and Computational
     Methods Applied to Nuclear Science and Engineering (M&C 2025), Denver, April 27-30,
-    2025 (to be presented).
+    2025.
diff --git a/openmc/model/model.py b/openmc/model/model.py
index 59e6fa511..c1ffafafd 100644
--- a/openmc/model/model.py
+++ b/openmc/model/model.py
@@ -1,7 +1,7 @@
 from __future__ import annotations
 from collections.abc import Iterable, Sequence
 import copy
-from functools import lru_cache
+from functools import cache
 from pathlib import Path
 import math
 from numbers import Integral, Real
@@ -160,7 +160,7 @@ class Model:
             return False
 
     @property
-    @lru_cache(maxsize=None)
+    @cache
     def _materials_by_id(self) -> dict:
         """Dictionary mapping material ID --> material"""
         if self.materials:
@@ -170,14 +170,14 @@ class Model:
         return {mat.id: mat for mat in mats}
 
     @property
-    @lru_cache(maxsize=None)
+    @cache
     def _cells_by_id(self) -> dict:
         """Dictionary mapping cell ID --> cell"""
         cells = self.geometry.get_all_cells()
         return {cell.id: cell for cell in cells.values()}
 
     @property
-    @lru_cache(maxsize=None)
+    @cache
     def _cells_by_name(self) -> dict[int, openmc.Cell]:
         # Get the names maps, but since names are not unique, store a set for
         # each name key. In this way when the user requests a change by a name,
@@ -190,7 +190,7 @@ class Model:
         return result
 
     @property
-    @lru_cache(maxsize=None)
+    @cache
     def _materials_by_name(self) -> dict[int, openmc.Material]:
         if self.materials is None:
             mats = self.geometry.get_all_materials().values()
@@ -203,6 +203,37 @@ class Model:
             result[mat.name].add(mat)
         return result
 
+    def add_kinetics_parameters_tallies(self, num_groups: int | None = None):
+        """Add tallies for calculating kinetics parameters using the IFP method.
+
+        This method adds tallies to the model for calculating two kinetics
+        parameters, the generation time and the effective delayed neutron
+        fraction (beta effective). After a model is run, these parameters can be
+        determined through the :meth:`openmc.StatePoint.ifp_results` method.
+
+        Parameters
+        ----------
+        num_groups : int, optional
+            Number of precursor groups to filter the delayed neutron fraction.
+            If None, only the total effective delayed neutron fraction is
+            tallied.
+
+        """
+        if not any('ifp-time-numerator' in t.scores for t in self.tallies):
+            gen_time_tally = openmc.Tally(name='IFP time numerator')
+            gen_time_tally.scores = ['ifp-time-numerator']
+            self.tallies.append(gen_time_tally)
+        if not any('ifp-beta-numerator' in t.scores for t in self.tallies):
+            beta_tally = openmc.Tally(name='IFP beta numerator')
+            beta_tally.scores = ['ifp-beta-numerator']
+            if num_groups is not None:
+                beta_tally.filters = [openmc.DelayedGroupFilter(list(range(1, num_groups + 1)))]
+            self.tallies.append(beta_tally)
+        if not any('ifp-denominator' in t.scores for t in self.tallies):
+            denom_tally = openmc.Tally(name='IFP denominator')
+            denom_tally.scores = ['ifp-denominator']
+            self.tallies.append(denom_tally)
+
     @classmethod
     def from_xml(
         cls,
diff --git a/openmc/statepoint.py b/openmc/statepoint.py
index 715becf48..29c11921c 100644
--- a/openmc/statepoint.py
+++ b/openmc/statepoint.py
@@ -1,4 +1,5 @@
 from datetime import datetime
+from collections import namedtuple
 import glob
 import re
 import os
@@ -8,6 +9,7 @@ import h5py
 import numpy as np
 from pathlib import Path
 from uncertainties import ufloat
+from uncertainties.unumpy import uarray
 
 import openmc
 import openmc.checkvalue as cv
@@ -15,6 +17,9 @@ import openmc.checkvalue as cv
 _VERSION_STATEPOINT = 18
 
 
+KineticsParameters = namedtuple("KineticsParameters", ["generation_time", "beta_effective"])
+
+
 class StatePoint:
     """State information on a simulation at a certain point in time (at the end
     of a given batch). Statepoints can be used to analyze tally results as well
@@ -710,3 +715,56 @@ class StatePoint:
                     tally_filter.paths = cell.paths
 
         self._summary = summary
+
+    def get_kinetics_parameters(self) -> KineticsParameters:
+        """Get kinetics parameters from IFP tallies.
+
+        This method searches the tallies in the statepoint for the tallies
+        required to compute kinetics parameters using the Iterated Fission
+        Probability (IFP) method.
+
+        Returns
+        -------
+        KineticsParameters
+            A named tuple containing the generation time and effective delayed
+            neutron fraction. If the necessary tallies for one or both
+            parameters are not found, that parameter is returned as None.
+
+        """
+
+        denom_tally = None
+        gen_time_tally = None
+        beta_tally = None
+        for tally in self.tallies.values():
+            if 'ifp-denominator' in tally.scores:
+                denom_tally = self.get_tally(scores=['ifp-denominator'])
+            if 'ifp-time-numerator' in tally.scores:
+                gen_time_tally = self.get_tally(scores=['ifp-time-numerator'])
+            if 'ifp-beta-numerator' in tally.scores:
+                beta_tally = self.get_tally(scores=['ifp-beta-numerator'])
+
+        if denom_tally is None:
+            return KineticsParameters(None, None)
+
+        def get_ufloat(tally, score):
+            return uarray(tally.get_values(scores=[score]),
+                          tally.get_values(scores=[score], value='std_dev'))
+
+        denom_values = get_ufloat(denom_tally, 'ifp-denominator')
+        if gen_time_tally is None:
+            generation_time = None
+        else:
+            gen_time_values = get_ufloat(gen_time_tally, 'ifp-time-numerator')
+            gen_time_values /= denom_values*self.keff
+            generation_time = gen_time_values.flatten()[0]
+
+        if beta_tally is None:
+            beta_effective = None
+        else:
+            beta_values = get_ufloat(beta_tally, 'ifp-beta-numerator')
+            beta_values /= denom_values
+            beta_effective = beta_values.flatten()
+            if beta_effective.size == 1:
+                beta_effective = beta_effective[0]
+
+        return KineticsParameters(generation_time, beta_effective)
diff --git a/src/tallies/tally.cpp b/src/tallies/tally.cpp
index ae0bffe6e..b9c615ecb 100644
--- a/src/tallies/tally.cpp
+++ b/src/tallies/tally.cpp
@@ -560,7 +560,8 @@ void Tally::set_scores(const vector<std::string>& scores)
     // Make sure a delayed group filter wasn't used with an incompatible
     // score.
     if (delayedgroup_filter_ != C_NONE) {
-      if (score_str != "delayed-nu-fission" && score_str != "decay-rate")
+      if (score_str != "delayed-nu-fission" && score_str != "decay-rate" &&
+          score_str != "ifp-beta-numerator")
         fatal_error("Cannot tally " + score_str + "with a delayedgroup filter");
     }
 
diff --git a/src/tallies/tally_scoring.cpp b/src/tallies/tally_scoring.cpp
index 0df80a239..67e851644 100644
--- a/src/tallies/tally_scoring.cpp
+++ b/src/tallies/tally_scoring.cpp
@@ -964,6 +964,15 @@ void score_general_ce_nonanalog(Particle& p, int i_tally, int start_index,
             if (delayed_groups.size() == settings::ifp_n_generation) {
               if (delayed_groups[0] > 0) {
                 score = p.wgt_last();
+                if (tally.delayedgroup_filter_ != C_NONE) {
+                  auto i_dg_filt = tally.filters()[tally.delayedgroup_filter_];
+                  const DelayedGroupFilter& filt {
+                    *dynamic_cast<DelayedGroupFilter*>(
+                      model::tally_filters[i_dg_filt].get())};
+                  score_fission_delayed_dg(i_tally, delayed_groups[0] - 1,
+                    score, score_index, p.filter_matches());
+                  continue;
+                }
               }
             }
           }
diff --git a/tests/regression_tests/ifp/groupwise/__init__.py b/tests/regression_tests/ifp/groupwise/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/regression_tests/ifp/groupwise/inputs_true.dat b/tests/regression_tests/ifp/groupwise/inputs_true.dat
new file mode 100644
index 000000000..6d7e20717
--- /dev/null
+++ b/tests/regression_tests/ifp/groupwise/inputs_true.dat
@@ -0,0 +1,43 @@
+<?xml version='1.0' encoding='utf-8'?>
+<model>
+  <materials>
+    <material id="1" name="core" depletable="true">
+      <density value="16.0" units="g/cm3"/>
+      <nuclide name="U235" ao="1.0"/>
+    </material>
+  </materials>
+  <geometry>
+    <cell id="1" material="1" region="-1" universe="1"/>
+    <surface id="1" type="sphere" boundary="vacuum" coeffs="0.0 0.0 0.0 10.0"/>
+  </geometry>
+  <settings>
+    <run_mode>eigenvalue</run_mode>
+    <particles>1000</particles>
+    <batches>20</batches>
+    <inactive>5</inactive>
+    <source type="independent" strength="1.0" particle="neutron">
+      <space type="box">
+        <parameters>-10.0 -10.0 -10.0 10.0 10.0 10.0</parameters>
+      </space>
+      <constraints>
+        <fissionable>true</fissionable>
+      </constraints>
+    </source>
+    <ifp_n_generation>5</ifp_n_generation>
+  </settings>
+  <tallies>
+    <filter id="1" type="delayedgroup">
+      <bins>1 2 3 4 5 6</bins>
+    </filter>
+    <tally id="1" name="IFP time numerator">
+      <scores>ifp-time-numerator</scores>
+    </tally>
+    <tally id="2" name="IFP beta numerator">
+      <filters>1</filters>
+      <scores>ifp-beta-numerator</scores>
+    </tally>
+    <tally id="3" name="IFP denominator">
+      <scores>ifp-denominator</scores>
+    </tally>
+  </tallies>
+</model>
diff --git a/tests/regression_tests/ifp/groupwise/results_true.dat b/tests/regression_tests/ifp/groupwise/results_true.dat
new file mode 100644
index 000000000..ea66a8de3
--- /dev/null
+++ b/tests/regression_tests/ifp/groupwise/results_true.dat
@@ -0,0 +1,21 @@
+k-combined:
+1.006559E+00 5.389391E-03
+tally 1:
+9.109384E-08
+5.667165E-16
+tally 2:
+3.000000E-03
+9.000000E-06
+0.000000E+00
+0.000000E+00
+2.100000E-02
+1.370000E-04
+2.800000E-02
+2.220000E-04
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+tally 3:
+1.489000E+01
+1.480036E+01
diff --git a/tests/regression_tests/ifp/groupwise/test.py b/tests/regression_tests/ifp/groupwise/test.py
new file mode 100644
index 000000000..a1a0ebefb
--- /dev/null
+++ b/tests/regression_tests/ifp/groupwise/test.py
@@ -0,0 +1,40 @@
+"""Test the Iterated Fission Probability (IFP) method to compute adjoint-weighted
+kinetics parameters using dedicated tallies."""
+
+import openmc
+import pytest
+
+from tests.testing_harness import PyAPITestHarness
+
+@pytest.fixture()
+def ifp_model():
+    # Material
+    material = openmc.Material(name="core")
+    material.add_nuclide("U235", 1.0)
+    material.set_density('g/cm3', 16.0)
+
+    # Geometry
+    radius = 10.0
+    sphere = openmc.Sphere(r=radius, boundary_type="vacuum")
+    cell = openmc.Cell(region=-sphere, fill=material)
+    geometry = openmc.Geometry([cell])
+
+    # Settings
+    settings = openmc.Settings()
+    settings.particles = 1000
+    settings.batches = 20
+    settings.inactive = 5
+    settings.ifp_n_generation = 5
+
+    model = openmc.Model(settings=settings, geometry=geometry)
+
+    space = openmc.stats.Box(*cell.bounding_box)
+    model.settings.source = openmc.IndependentSource(
+        space=space, constraints={'fissionable': True})
+    model.add_kinetics_parameters_tallies(num_groups=6)
+    return model
+
+
+def test_iterated_fission_probability(ifp_model):
+    harness = PyAPITestHarness("statepoint.20.h5", model=ifp_model)
+    harness.main()
diff --git a/tests/regression_tests/ifp/total/__init__.py b/tests/regression_tests/ifp/total/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/regression_tests/ifp/inputs_true.dat b/tests/regression_tests/ifp/total/inputs_true.dat
similarity index 100%
rename from tests/regression_tests/ifp/inputs_true.dat
rename to tests/regression_tests/ifp/total/inputs_true.dat
diff --git a/tests/regression_tests/ifp/results_true.dat b/tests/regression_tests/ifp/total/results_true.dat
similarity index 100%
rename from tests/regression_tests/ifp/results_true.dat
rename to tests/regression_tests/ifp/total/results_true.dat
diff --git a/tests/regression_tests/ifp/test.py b/tests/regression_tests/ifp/total/test.py
similarity index 99%
rename from tests/regression_tests/ifp/test.py
rename to tests/regression_tests/ifp/total/test.py
index 6969a54c4..18b89cfc0 100644
--- a/tests/regression_tests/ifp/test.py
+++ b/tests/regression_tests/ifp/total/test.py
@@ -6,7 +6,6 @@ import pytest
 
 from tests.testing_harness import PyAPITestHarness
 
-
 @pytest.fixture()
 def ifp_model():
     model = openmc.Model()
diff --git a/tests/unit_tests/test_ifp.py b/tests/unit_tests/test_ifp.py
index 8d0fd9801..e527f1624 100644
--- a/tests/unit_tests/test_ifp.py
+++ b/tests/unit_tests/test_ifp.py
@@ -47,3 +47,42 @@ def test_exceptions(options, error, run_in_tmpdir, geometry):
         tallies = openmc.Tallies([tally])
         model = openmc.Model(geometry=geometry, settings=settings, tallies=tallies)
         model.run()
+
+
+@pytest.mark.parametrize(
+    "num_groups, use_auto_tallies",
+    [
+        (None, True),
+        (None, False),
+        (6, True),
+        (6, False),
+    ],
+)
+def test_get_kinetics_parameters(run_in_tmpdir, geometry, num_groups, use_auto_tallies):
+    # Create basic model
+    model = openmc.Model(geometry=geometry)
+    model.settings.particles = 1000
+    model.settings.batches = 20
+    model.settings.inactive = 5
+    model.settings.ifp_n_generation = 5
+
+    # Add IFP tallies either via the convenience method or manually
+    if use_auto_tallies:
+        model.add_kinetics_parameters_tallies(num_groups=num_groups)
+    else:
+        for score in ["ifp-time-numerator", "ifp-beta-numerator", "ifp-denominator"]:
+            tally = openmc.Tally()
+            tally.scores = [score]
+            if score == "ifp-beta-numerator" and num_groups is not None:
+                tally.filters = [openmc.DelayedGroupFilter(list(range(1, num_groups + 1)))]
+            model.tallies.append(tally)
+
+    # Run and get kinetics parameters
+    sp_file = model.run()
+    with openmc.StatePoint(sp_file) as sp:
+        params = sp.get_kinetics_parameters()
+    assert isinstance(params, openmc.KineticsParameters)
+    assert params.generation_time is not None
+    assert params.beta_effective is not None
+    if num_groups is not None:
+        assert len(params.beta_effective) == num_groups

From 4011b7a5515e4098f179d825313f574680d3a68f Mon Sep 17 00:00:00 2001
From: Perry <100789850+yrrepy@users.noreply.github.com>
Date: Fri, 26 Sep 2025 09:46:23 -0700
Subject: [PATCH 124/203] Optional separation of mesh-material-volume calc from
 get_homogenized_materials (#3581)

Co-authored-by: Paul Romano <paul.k.romano@gmail.com>
---
 openmc/mesh.py | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/openmc/mesh.py b/openmc/mesh.py
index 2e9abd1b6..9601207e9 100644
--- a/openmc/mesh.py
+++ b/openmc/mesh.py
@@ -287,6 +287,7 @@ class MeshBase(IDManagerMixin, ABC):
             model: openmc.Model,
             n_samples: int | tuple[int, int, int] = 10_000,
             include_void: bool = True,
+            material_volumes: MeshMaterialVolumes | None = None,
             **kwargs
     ) -> list[openmc.Material]:
         """Generate homogenized materials over each element in a mesh.
@@ -305,8 +306,12 @@ class MeshBase(IDManagerMixin, ABC):
             the x, y, and z dimensions.
         include_void : bool, optional
             Whether homogenization should include voids.
+        material_volumes : MeshMaterialVolumes, optional
+            Previously computed mesh material volumes to use for homogenization.
+            If not provided, they will be computed by calling
+            :meth:`material_volumes`.
         **kwargs
-            Keyword-arguments passed to :meth:`MeshBase.material_volumes`.
+            Keyword-arguments passed to :meth:`material_volumes`.
 
         Returns
         -------
@@ -314,7 +319,10 @@ class MeshBase(IDManagerMixin, ABC):
             Homogenized material in each mesh element
 
         """
-        vols = self.material_volumes(model, n_samples, **kwargs)
+        if material_volumes is None:
+            vols = self.material_volumes(model, n_samples, **kwargs)
+        else:
+            vols = material_volumes
         mat_volume_by_element = [vols.by_element(i) for i in range(vols.num_elements)]
 
         # Create homogenized material for each element
@@ -424,7 +432,6 @@ class MeshBase(IDManagerMixin, ABC):
 
         # Restore original tallies
         model.tallies = original_tallies
-
         return volumes
 
 

From feefcc671307fc84e7357430f5f07343503919e5 Mon Sep 17 00:00:00 2001
From: Jonathan Shimwell <mail@jshimwell.com>
Date: Wed, 1 Oct 2025 00:09:15 +0200
Subject: [PATCH 125/203] Adding tally filter type option to statepoint
 get_tally (#3584)

Co-authored-by: Jon Shimwell <jon@proximafusion.com>
Co-authored-by: GuySten <62616591+GuySten@users.noreply.github.com>
---
 openmc/statepoint.py                |  9 +++-
 tests/unit_tests/test_statepoint.py | 65 +++++++++++++++++++++++++++++
 2 files changed, 73 insertions(+), 1 deletion(-)
 create mode 100644 tests/unit_tests/test_statepoint.py

diff --git a/openmc/statepoint.py b/openmc/statepoint.py
index 29c11921c..a763db397 100644
--- a/openmc/statepoint.py
+++ b/openmc/statepoint.py
@@ -536,7 +536,7 @@ class StatePoint:
     def get_tally(self, scores=[], filters=[], nuclides=[],
                   name=None, id=None, estimator=None, exact_filters=False,
                   exact_nuclides=False, exact_scores=False,
-                  multiply_density=None, derivative=None):
+                  multiply_density=None, derivative=None, filter_type=None):
         """Finds and returns a Tally object with certain properties.
 
         This routine searches the list of Tallies and returns the first Tally
@@ -580,6 +580,9 @@ class StatePoint:
             to the same value as this parameter.
         derivative : openmc.TallyDerivative, optional
             TallyDerivative object to match.
+        filter_type : type, optional
+            If not None, the Tally must have at least one Filter that is an
+            instance of this type. For example `openmc.MeshFilter`.
 
         Returns
         -------
@@ -653,6 +656,10 @@ class StatePoint:
                 if not contains_filters:
                     continue
 
+            if filter_type is not None:
+                if not any(isinstance(f, filter_type) for f in test_tally.filters):
+                    continue
+
             # Determine if Tally has the queried Nuclide(s)
             if nuclides:
                 if not all(nuclide in test_tally.nuclides for nuclide in nuclides):
diff --git a/tests/unit_tests/test_statepoint.py b/tests/unit_tests/test_statepoint.py
new file mode 100644
index 000000000..7ffaf7ec2
--- /dev/null
+++ b/tests/unit_tests/test_statepoint.py
@@ -0,0 +1,65 @@
+import openmc
+
+
+def test_get_tally_filter_type(run_in_tmpdir):
+    """Test various ways of retrieving tallies from a StatePoint object."""
+
+    mat = openmc.Material()
+    mat.add_nuclide("H1", 1.0)
+    mat.set_density("g/cm3", 10.0)
+
+    sphere = openmc.Sphere(r=10.0, boundary_type="vacuum")
+    cell = openmc.Cell(fill=mat, region=-sphere)
+    geometry = openmc.Geometry([cell])
+
+    settings = openmc.Settings()
+    settings.particles = 10
+    settings.batches = 2
+    settings.run_mode = "fixed source"
+
+    reg_mesh = openmc.RegularMesh().from_domain(cell)
+    tally1 = openmc.Tally(tally_id=1)
+    mesh_filter = openmc.MeshFilter(reg_mesh)
+    tally1.filters = [mesh_filter]
+    tally1.scores = ["flux"]
+
+    tally2 = openmc.Tally(tally_id=2, name="heating tally")
+    cell_filter = openmc.CellFilter(cell)
+    tally2.filters = [cell_filter]
+    tally2.scores = ["heating"]
+
+    tallies = openmc.Tallies([tally1, tally2])
+    model = openmc.Model(
+        geometry=geometry, materials=[mat], settings=settings, tallies=tallies
+    )
+
+    sp_filename = model.run()
+
+    sp = openmc.StatePoint(sp_filename)
+
+    tally_found = sp.get_tally(filter_type=openmc.MeshFilter)
+    assert tally_found.id == 1
+
+    tally_found = sp.get_tally(filter_type=openmc.CellFilter)
+    assert tally_found.id == 2
+
+    tally_found = sp.get_tally(filters=[mesh_filter])
+    assert tally_found.id == 1
+
+    tally_found = sp.get_tally(filters=[cell_filter])
+    assert tally_found.id == 2
+
+    tally_found = sp.get_tally(scores=["heating"])
+    assert tally_found.id == 2
+
+    tally_found = sp.get_tally(name="heating tally")
+    assert tally_found.id == 2
+
+    tally_found = sp.get_tally(name=None)
+    assert tally_found.id == 1
+
+    tally_found = sp.get_tally(id=1)
+    assert tally_found.id == 1
+
+    tally_found = sp.get_tally(id=2)
+    assert tally_found.id == 2

From 3ac64d9a01d8d10ff126d62d8a9f618fbd803f4b Mon Sep 17 00:00:00 2001
From: John Tramm <john.tramm@gmail.com>
Date: Thu, 2 Oct 2025 11:02:43 -0500
Subject: [PATCH 126/203] Random Ray Base Source Region Refactor (#3576)

---
 include/openmc/constants.h                    |   5 +
 .../openmc/random_ray/flat_source_domain.h    |  47 ++-
 .../openmc/random_ray/linear_source_domain.h  |   2 +-
 include/openmc/random_ray/random_ray.h        |   1 -
 .../openmc/random_ray/random_ray_simulation.h |   9 +-
 include/openmc/random_ray/source_region.h     |   1 -
 src/random_ray/flat_source_domain.cpp         | 373 ++++++++++--------
 src/random_ray/linear_source_domain.cpp       |  47 +--
 src/random_ray/random_ray.cpp                 | 121 +++---
 src/random_ray/random_ray_simulation.cpp      | 190 ++++-----
 src/random_ray/source_region.cpp              |  28 +-
 src/settings.cpp                              |   1 -
 .../random_ray_low_density/__init__.py        |   0
 .../random_ray_low_density/inputs_true.dat    | 244 ++++++++++++
 .../random_ray_low_density/results_true.dat   |   9 +
 .../random_ray_low_density/test.py            |  60 +++
 .../results_true.dat                          |   8 +-
 17 files changed, 700 insertions(+), 446 deletions(-)
 create mode 100644 tests/regression_tests/random_ray_low_density/__init__.py
 create mode 100644 tests/regression_tests/random_ray_low_density/inputs_true.dat
 create mode 100644 tests/regression_tests/random_ray_low_density/results_true.dat
 create mode 100644 tests/regression_tests/random_ray_low_density/test.py

diff --git a/include/openmc/constants.h b/include/openmc/constants.h
index df13da370..a0d164613 100644
--- a/include/openmc/constants.h
+++ b/include/openmc/constants.h
@@ -68,6 +68,11 @@ constexpr double MIN_HITS_PER_BATCH {1.5};
 // prevent extremely large adjoint source terms from being generated.
 constexpr double ZERO_FLUX_CUTOFF {1e-22};
 
+// The minimum macroscopic cross section value considered non-void for the
+// random ray solver. Materials with any group with a cross section below this
+// value will be converted to pure void.
+constexpr double MINIMUM_MACRO_XS {1e-6};
+
 // ============================================================================
 // MATH AND PHYSICAL CONSTANTS
 
diff --git a/include/openmc/random_ray/flat_source_domain.h b/include/openmc/random_ray/flat_source_domain.h
index 78351fcc5..d4e802734 100644
--- a/include/openmc/random_ray/flat_source_domain.h
+++ b/include/openmc/random_ray/flat_source_domain.h
@@ -27,8 +27,9 @@ public:
 
   //----------------------------------------------------------------------------
   // Methods
-  virtual void update_neutron_source(double k_eff);
-  double compute_k_eff(double k_eff_old) const;
+  virtual void update_single_neutron_source(SourceRegionHandle& srh);
+  virtual void update_all_neutron_sources();
+  void compute_k_eff();
   virtual void normalize_scalar_flux_and_volumes(
     double total_active_distance_per_iteration);
 
@@ -41,7 +42,7 @@ public:
   void output_to_vtk() const;
   void convert_external_sources();
   void count_external_source_regions();
-  void set_adjoint_sources(const vector<double>& forward_flux);
+  void set_adjoint_sources();
   void flux_swap();
   virtual double evaluate_flux_at_point(Position r, int64_t sr, int g) const;
   double compute_fixed_source_normalization_factor() const;
@@ -54,9 +55,8 @@ public:
     bool is_target_void);
   void apply_mesh_to_cell_and_children(int32_t i_cell, int32_t mesh_idx,
     int32_t target_material_id, bool is_target_void);
-  void prepare_base_source_regions();
   SourceRegionHandle get_subdivided_source_region_handle(
-    int64_t sr, int mesh_bin, Position r, double dist, Direction u);
+    SourceRegionKey sr_key, Position r, Direction u);
   void finalize_discovered_source_regions();
   void apply_transport_stabilization();
   int64_t n_source_regions() const
@@ -67,6 +67,10 @@ public:
   {
     return source_regions_.n_source_regions() * negroups_;
   }
+  int64_t lookup_base_source_region_idx(const GeometryState& p) const;
+  SourceRegionKey lookup_source_region_key(const GeometryState& p) const;
+  int64_t lookup_mesh_bin(int64_t sr, Position r) const;
+  int lookup_mesh_idx(int64_t sr) const;
 
   //----------------------------------------------------------------------------
   // Static Data members
@@ -86,6 +90,7 @@ public:
 
   //----------------------------------------------------------------------------
   // Public Data members
+  double k_eff_ {1.0};              // Eigenvalue
   bool mapped_all_tallies_ {false}; // If all source regions have been visited
 
   int64_t n_external_source_regions_ {0}; // Total number of source regions with
@@ -110,14 +115,6 @@ public:
   // The abstract container holding all source region-specific data
   SourceRegionContainer source_regions_;
 
-  // Base source region container. When source region subdivision via mesh
-  // is in use, this container holds the original (non-subdivided) material
-  // filled cell instance source regions. These are useful as they can be
-  // initialized with external source and mesh domain information ahead of time.
-  // Then, dynamically discovered source regions can be initialized by cloning
-  // their base region.
-  SourceRegionContainer base_source_regions_;
-
   // Parallel hash map holding all source regions discovered during
   // a single iteration. This is a threadsafe data structure that is cleaned
   // out after each iteration and stored in the "source_regions_" container.
@@ -134,8 +131,17 @@ public:
   // Map that relates a SourceRegionKey to the external source index. This map
   // is used to check if there are any point sources within a subdivided source
   // region at the time it is discovered.
-  std::unordered_map<SourceRegionKey, int64_t, SourceRegionKey::HashFunctor>
-    point_source_map_;
+  std::unordered_map<SourceRegionKey, vector<int>, SourceRegionKey::HashFunctor>
+    external_point_source_map_;
+
+  // Map that relates a base source region index to the external source index.
+  // This map is used to check if there are any volumetric sources within a
+  // subdivided source region at the time it is discovered.
+  std::unordered_map<int64_t, vector<int>> external_volumetric_source_map_;
+
+  // Map that relates a base source region index to a mesh index. This map
+  // is used to check which subdivision mesh is present in a source region.
+  std::unordered_map<int64_t, int> mesh_map_;
 
   // If transport corrected MGXS data is being used, there may be negative
   // in-group scattering cross sections that can result in instability in MOC
@@ -147,12 +153,11 @@ protected:
   //----------------------------------------------------------------------------
   // Methods
   void apply_external_source_to_source_region(
-    Discrete* discrete, double strength_factor, SourceRegionHandle& srh);
-  void apply_external_source_to_cell_instances(int32_t i_cell,
-    Discrete* discrete, double strength_factor, int target_material_id,
-    const vector<int32_t>& instances);
-  void apply_external_source_to_cell_and_children(int32_t i_cell,
-    Discrete* discrete, double strength_factor, int32_t target_material_id);
+    int src_idx, SourceRegionHandle& srh);
+  void apply_external_source_to_cell_instances(int32_t i_cell, int src_idx,
+    int target_material_id, const vector<int32_t>& instances);
+  void apply_external_source_to_cell_and_children(
+    int32_t i_cell, int src_idx, int32_t target_material_id);
   virtual void set_flux_to_flux_plus_source(int64_t sr, double volume, int g);
   void set_flux_to_source(int64_t sr, int g);
   virtual void set_flux_to_old_flux(int64_t sr, int g);
diff --git a/include/openmc/random_ray/linear_source_domain.h b/include/openmc/random_ray/linear_source_domain.h
index 67fdd99f8..0098c7820 100644
--- a/include/openmc/random_ray/linear_source_domain.h
+++ b/include/openmc/random_ray/linear_source_domain.h
@@ -20,7 +20,7 @@ class LinearSourceDomain : public FlatSourceDomain {
 public:
   //----------------------------------------------------------------------------
   // Methods
-  void update_neutron_source(double k_eff) override;
+  void update_single_neutron_source(SourceRegionHandle& srh) override;
   void normalize_scalar_flux_and_volumes(
     double total_active_distance_per_iteration) override;
 
diff --git a/include/openmc/random_ray/random_ray.h b/include/openmc/random_ray/random_ray.h
index abf2a2688..40c67ef95 100644
--- a/include/openmc/random_ray/random_ray.h
+++ b/include/openmc/random_ray/random_ray.h
@@ -48,7 +48,6 @@ public:
   static double distance_active_;            // Active ray length
   static unique_ptr<Source> ray_source_;     // Starting source for ray sampling
   static RandomRaySourceShape source_shape_; // Flag for linear source
-  static bool mesh_subdivision_enabled_;     // Flag for mesh subdivision
   static RandomRaySampleMethod sample_method_; // Flag for sampling method
 
   //----------------------------------------------------------------------------
diff --git a/include/openmc/random_ray/random_ray_simulation.h b/include/openmc/random_ray/random_ray_simulation.h
index b94e7401b..3dec48bf2 100644
--- a/include/openmc/random_ray/random_ray_simulation.h
+++ b/include/openmc/random_ray/random_ray_simulation.h
@@ -21,11 +21,7 @@ public:
   // Methods
   void compute_segment_correction_factors();
   void apply_fixed_sources_and_mesh_domains();
-  void prepare_fixed_sources_adjoint(vector<double>& forward_flux,
-    SourceRegionContainer& forward_source_regions,
-    SourceRegionContainer& forward_base_source_regions,
-    std::unordered_map<SourceRegionKey, int64_t, SourceRegionKey::HashFunctor>&
-      forward_source_region_map);
+  void prepare_fixed_sources_adjoint();
   void simulate();
   void output_simulation_results() const;
   void instability_check(
@@ -45,9 +41,6 @@ private:
   // Contains all flat source region data
   unique_ptr<FlatSourceDomain> domain_;
 
-  // Random ray eigenvalue
-  double k_eff_ {1.0};
-
   // Tracks the average FSR miss rate for analysis and reporting
   double avg_miss_rate_ {0.0};
 
diff --git a/include/openmc/random_ray/source_region.h b/include/openmc/random_ray/source_region.h
index 5c5b31f39..0f5a747ff 100644
--- a/include/openmc/random_ray/source_region.h
+++ b/include/openmc/random_ray/source_region.h
@@ -308,7 +308,6 @@ public:
   //----------------------------------------------------------------------------
   // Constructors
   SourceRegion(int negroups, bool is_linear);
-  SourceRegion(const SourceRegionHandle& handle, int64_t parent_sr);
   SourceRegion() = default;
 
   //----------------------------------------------------------------------------
diff --git a/src/random_ray/flat_source_domain.cpp b/src/random_ray/flat_source_domain.cpp
index 409238830..1bf27e1ed 100644
--- a/src/random_ray/flat_source_domain.cpp
+++ b/src/random_ray/flat_source_domain.cpp
@@ -53,24 +53,6 @@ FlatSourceDomain::FlatSourceDomain() : negroups_(data::mg.num_energy_groups_)
   // Initialize source regions.
   bool is_linear = RandomRay::source_shape_ != RandomRaySourceShape::FLAT;
   source_regions_ = SourceRegionContainer(negroups_, is_linear);
-  source_regions_.assign(
-    base_source_regions, SourceRegion(negroups_, is_linear));
-
-  // Initialize materials
-  int64_t source_region_id = 0;
-  for (int i = 0; i < model::cells.size(); i++) {
-    Cell& cell = *model::cells[i];
-    if (cell.type_ == Fill::MATERIAL) {
-      for (int j = 0; j < cell.n_instances(); j++) {
-        source_regions_.material(source_region_id++) = cell.material(j);
-      }
-    }
-  }
-
-  // Sanity check
-  if (source_region_id != base_source_regions) {
-    fatal_error("Unexpected number of source regions");
-  }
 
   // Initialize tally volumes
   if (volume_normalized_flux_tallies_) {
@@ -118,34 +100,24 @@ void FlatSourceDomain::accumulate_iteration_flux()
   }
 }
 
-// Compute new estimate of scattering + fission sources in each source region
-// based on the flux estimate from the previous iteration.
-void FlatSourceDomain::update_neutron_source(double k_eff)
+void FlatSourceDomain::update_single_neutron_source(SourceRegionHandle& srh)
 {
-  simulation::time_update_src.start();
-
-  double inverse_k_eff = 1.0 / k_eff;
-
-// Reset all source regions to zero (important for void regions)
-#pragma omp parallel for
-  for (int64_t se = 0; se < n_source_elements(); se++) {
-    source_regions_.source(se) = 0.0;
+  // Reset all source regions to zero (important for void regions)
+  for (int g = 0; g < negroups_; g++) {
+    srh.source(g) = 0.0;
   }
 
   // Add scattering + fission source
-#pragma omp parallel for
-  for (int64_t sr = 0; sr < n_source_regions(); sr++) {
-    int material = source_regions_.material(sr);
-    if (material == MATERIAL_VOID) {
-      continue;
-    }
+  int material = srh.material();
+  if (material != MATERIAL_VOID) {
+    double inverse_k_eff = 1.0 / k_eff_;
     for (int g_out = 0; g_out < negroups_; g_out++) {
       double sigma_t = sigma_t_[material * negroups_ + g_out];
       double scatter_source = 0.0;
       double fission_source = 0.0;
 
       for (int g_in = 0; g_in < negroups_; g_in++) {
-        double scalar_flux = source_regions_.scalar_flux_old(sr, g_in);
+        double scalar_flux = srh.scalar_flux_old(g_in);
         double sigma_s =
           sigma_s_[material * negroups_ * negroups_ + g_out * negroups_ + g_in];
         double nu_sigma_f = nu_sigma_f_[material * negroups_ + g_in];
@@ -154,18 +126,30 @@ void FlatSourceDomain::update_neutron_source(double k_eff)
         scatter_source += sigma_s * scalar_flux;
         fission_source += nu_sigma_f * scalar_flux * chi;
       }
-      source_regions_.source(sr, g_out) =
+      srh.source(g_out) =
         (scatter_source + fission_source * inverse_k_eff) / sigma_t;
     }
   }
 
   // Add external source if in fixed source mode
   if (settings::run_mode == RunMode::FIXED_SOURCE) {
-#pragma omp parallel for
-    for (int64_t se = 0; se < n_source_elements(); se++) {
-      source_regions_.source(se) += source_regions_.external_source(se);
+    for (int g = 0; g < negroups_; g++) {
+      srh.source(g) += srh.external_source(g);
     }
   }
+}
+
+// Compute new estimate of scattering + fission sources in each source region
+// based on the flux estimate from the previous iteration.
+void FlatSourceDomain::update_all_neutron_sources()
+{
+  simulation::time_update_src.start();
+
+#pragma omp parallel for
+  for (int64_t sr = 0; sr < n_source_regions(); sr++) {
+    SourceRegionHandle srh = source_regions_.get_source_region_handle(sr);
+    update_single_neutron_source(srh);
+  }
 
   simulation::time_update_src.stop();
 }
@@ -320,7 +304,7 @@ int64_t FlatSourceDomain::add_source_to_scalar_flux()
 
 // Generates new estimate of k_eff based on the differences between this
 // iteration's estimate of the scalar flux and the last iteration's estimate.
-double FlatSourceDomain::compute_k_eff(double k_eff_old) const
+void FlatSourceDomain::compute_k_eff()
 {
   double fission_rate_old = 0;
   double fission_rate_new = 0;
@@ -365,7 +349,7 @@ double FlatSourceDomain::compute_k_eff(double k_eff_old) const
     p[sr] = sr_fission_source_new;
   }
 
-  double k_eff_new = k_eff_old * (fission_rate_new / fission_rate_old);
+  double k_eff_new = k_eff_ * (fission_rate_new / fission_rate_old);
 
   double H = 0.0;
   // defining an inverse sum for better performance
@@ -385,7 +369,7 @@ double FlatSourceDomain::compute_k_eff(double k_eff_old) const
   // Adds entropy value to shared entropy vector in openmc namespace.
   simulation::entropy.push_back(H);
 
-  return k_eff_new;
+  k_eff_ = k_eff_new;
 }
 
 // This function is responsible for generating a mapping between random
@@ -652,7 +636,6 @@ void FlatSourceDomain::random_ray_tally()
                       "random ray mode.");
           break;
         }
-
         // Apply score to the appropriate tally bin
         Tally& tally {*model::tallies[task.tally_idx]};
 #pragma omp atomic
@@ -726,21 +709,21 @@ void FlatSourceDomain::output_to_vtk() const
   print_plot();
 
   // Outer loop over plots
-  for (int p = 0; p < model::plots.size(); p++) {
+  for (int plt = 0; plt < model::plots.size(); plt++) {
 
     // Get handle to OpenMC plot object and extract params
-    Plot* openmc_plot = dynamic_cast<Plot*>(model::plots[p].get());
+    Plot* openmc_plot = dynamic_cast<Plot*>(model::plots[plt].get());
 
     // Random ray plots only support voxel plots
     if (!openmc_plot) {
       warning(fmt::format("Plot {} is invalid plot type -- only voxel plotting "
                           "is allowed in random ray mode.",
-        p));
+        plt));
       continue;
     } else if (openmc_plot->type_ != Plot::PlotType::voxel) {
       warning(fmt::format("Plot {} is invalid plot type -- only voxel plotting "
                           "is allowed in random ray mode.",
-        p));
+        plt));
       continue;
     }
 
@@ -794,23 +777,11 @@ void FlatSourceDomain::output_to_vtk() const
             continue;
           }
 
-          int i_cell = p.lowest_coord().cell();
-          int64_t sr = source_region_offsets_[i_cell] + p.cell_instance();
-          if (RandomRay::mesh_subdivision_enabled_) {
-            int mesh_idx = base_source_regions_.mesh(sr);
-            int mesh_bin;
-            if (mesh_idx == C_NONE) {
-              mesh_bin = 0;
-            } else {
-              mesh_bin = model::meshes[mesh_idx]->get_bin(p.r());
-            }
-            SourceRegionKey sr_key {sr, mesh_bin};
-            auto it = source_region_map_.find(sr_key);
-            if (it != source_region_map_.end()) {
-              sr = it->second;
-            } else {
-              sr = -1;
-            }
+          SourceRegionKey sr_key = lookup_source_region_key(p);
+          int64_t sr = -1;
+          auto it = source_region_map_.find(sr_key);
+          if (it != source_region_map_.end()) {
+            sr = it->second;
           }
 
           voxel_indices[z * Ny * Nx + y * Nx + x] = sr;
@@ -967,13 +938,17 @@ void FlatSourceDomain::output_to_vtk() const
 }
 
 void FlatSourceDomain::apply_external_source_to_source_region(
-  Discrete* discrete, double strength_factor, SourceRegionHandle& srh)
+  int src_idx, SourceRegionHandle& srh)
 {
-  srh.external_source_present() = 1;
-
+  auto s = model::external_sources[src_idx].get();
+  auto is = dynamic_cast<IndependentSource*>(s);
+  auto discrete = dynamic_cast<Discrete*>(is->energy());
+  double strength_factor = is->strength();
   const auto& discrete_energies = discrete->x();
   const auto& discrete_probs = discrete->prob();
 
+  srh.external_source_present() = 1;
+
   for (int i = 0; i < discrete_energies.size(); i++) {
     int g = data::mg.get_group_index(discrete_energies[i]);
     srh.external_source(g) += discrete_probs[i] * strength_factor;
@@ -981,8 +956,7 @@ void FlatSourceDomain::apply_external_source_to_source_region(
 }
 
 void FlatSourceDomain::apply_external_source_to_cell_instances(int32_t i_cell,
-  Discrete* discrete, double strength_factor, int target_material_id,
-  const vector<int32_t>& instances)
+  int src_idx, int target_material_id, const vector<int32_t>& instances)
 {
   Cell& cell = *model::cells[i_cell];
 
@@ -1000,16 +974,13 @@ void FlatSourceDomain::apply_external_source_to_cell_instances(int32_t i_cell,
     if (target_material_id == C_NONE ||
         cell_material_id == target_material_id) {
       int64_t source_region = source_region_offsets_[i_cell] + j;
-      SourceRegionHandle srh =
-        source_regions_.get_source_region_handle(source_region);
-      apply_external_source_to_source_region(discrete, strength_factor, srh);
+      external_volumetric_source_map_[source_region].push_back(src_idx);
     }
   }
 }
 
 void FlatSourceDomain::apply_external_source_to_cell_and_children(
-  int32_t i_cell, Discrete* discrete, double strength_factor,
-  int32_t target_material_id)
+  int32_t i_cell, int src_idx, int32_t target_material_id)
 {
   Cell& cell = *model::cells[i_cell];
 
@@ -1017,14 +988,14 @@ void FlatSourceDomain::apply_external_source_to_cell_and_children(
     vector<int> instances(cell.n_instances());
     std::iota(instances.begin(), instances.end(), 0);
     apply_external_source_to_cell_instances(
-      i_cell, discrete, strength_factor, target_material_id, instances);
+      i_cell, src_idx, target_material_id, instances);
   } else if (target_material_id == C_NONE) {
     std::unordered_map<int32_t, vector<int32_t>> cell_instance_list =
       cell.get_contained_cells(0, nullptr);
     for (const auto& pair : cell_instance_list) {
       int32_t i_child_cell = pair.first;
-      apply_external_source_to_cell_instances(i_child_cell, discrete,
-        strength_factor, target_material_id, pair.second);
+      apply_external_source_to_cell_instances(
+        i_child_cell, src_idx, target_material_id, pair.second);
     }
   }
 }
@@ -1070,36 +1041,17 @@ void FlatSourceDomain::convert_external_sources()
                                 "point source at {}",
           sp->r()));
       }
-      int i_cell = gs.lowest_coord().cell();
-      int64_t sr = source_region_offsets_[i_cell] + gs.cell_instance();
+      SourceRegionKey key = lookup_source_region_key(gs);
 
-      if (RandomRay::mesh_subdivision_enabled_) {
-        // If mesh subdivision is enabled, we need to determine which subdivided
-        // mesh bin the point source coordinate is in as well
-        int mesh_idx = source_regions_.mesh(sr);
-        int mesh_bin;
-        if (mesh_idx == C_NONE) {
-          mesh_bin = 0;
-        } else {
-          mesh_bin = model::meshes[mesh_idx]->get_bin(gs.r());
-        }
-        // With the source region and mesh bin known, we can use the
-        // accompanying SourceRegionKey as a key into a map that stores the
-        // corresponding external source index for the point source. Notably, we
-        // do not actually apply the external source to any source regions here,
-        // as if mesh subdivision is enabled, they haven't actually been
-        // discovered & initilized yet. When discovered, they will read from the
-        // point_source_map to determine if there are any point source terms
-        // that should be applied.
-        SourceRegionKey key {sr, mesh_bin};
-        point_source_map_[key] = es;
-      } else {
-        // If we are not using mesh subdivision, we can apply the external
-        // source directly to the source region as we do for volumetric domain
-        // constraint sources.
-        SourceRegionHandle srh = source_regions_.get_source_region_handle(sr);
-        apply_external_source_to_source_region(energy, strength_factor, srh);
-      }
+      // With the source region and mesh bin known, we can use the
+      // accompanying SourceRegionKey as a key into a map that stores the
+      // corresponding external source index for the point source. Notably, we
+      // do not actually apply the external source to any source regions here,
+      // as if mesh subdivision is enabled, they haven't actually been
+      // discovered & initilized yet. When discovered, they will read from the
+      // external_source_map to determine if there are any external source
+      // terms that should be applied.
+      external_point_source_map_[key].push_back(es);
 
     } else {
       // If not a point source, then use the volumetric domain constraints to
@@ -1107,42 +1059,25 @@ void FlatSourceDomain::convert_external_sources()
       if (is->domain_type() == Source::DomainType::MATERIAL) {
         for (int32_t material_id : domain_ids) {
           for (int i_cell = 0; i_cell < model::cells.size(); i_cell++) {
-            apply_external_source_to_cell_and_children(
-              i_cell, energy, strength_factor, material_id);
+            apply_external_source_to_cell_and_children(i_cell, es, material_id);
           }
         }
       } else if (is->domain_type() == Source::DomainType::CELL) {
         for (int32_t cell_id : domain_ids) {
           int32_t i_cell = model::cell_map[cell_id];
-          apply_external_source_to_cell_and_children(
-            i_cell, energy, strength_factor, C_NONE);
+          apply_external_source_to_cell_and_children(i_cell, es, C_NONE);
         }
       } else if (is->domain_type() == Source::DomainType::UNIVERSE) {
         for (int32_t universe_id : domain_ids) {
           int32_t i_universe = model::universe_map[universe_id];
           Universe& universe = *model::universes[i_universe];
           for (int32_t i_cell : universe.cells_) {
-            apply_external_source_to_cell_and_children(
-              i_cell, energy, strength_factor, C_NONE);
+            apply_external_source_to_cell_and_children(i_cell, es, C_NONE);
           }
         }
       }
     }
   } // End loop over external sources
-
-// Divide the fixed source term by sigma t (to save time when applying each
-// iteration)
-#pragma omp parallel for
-  for (int64_t sr = 0; sr < n_source_regions(); sr++) {
-    int material = source_regions_.material(sr);
-    if (material == MATERIAL_VOID) {
-      continue;
-    }
-    for (int g = 0; g < negroups_; g++) {
-      double sigma_t = sigma_t_[material * negroups_ + g];
-      source_regions_.external_source(sr, g) /= sigma_t;
-    }
-  }
 }
 
 void FlatSourceDomain::flux_swap()
@@ -1159,13 +1094,23 @@ void FlatSourceDomain::flatten_xs()
   const int a = 0;
 
   n_materials_ = data::mg.macro_xs_.size();
-  for (auto& m : data::mg.macro_xs_) {
+  for (int i = 0; i < n_materials_; i++) {
+    auto& m = data::mg.macro_xs_[i];
     for (int g_out = 0; g_out < negroups_; g_out++) {
       if (m.exists_in_model) {
         double sigma_t =
           m.get_xs(MgxsType::TOTAL, g_out, NULL, NULL, NULL, t, a);
         sigma_t_.push_back(sigma_t);
 
+        if (sigma_t < MINIMUM_MACRO_XS) {
+          Material* mat = model::materials[i].get();
+          warning(fmt::format(
+            "Material \"{}\" (id: {}) has a group {} total cross section "
+            "({:.3e}) below the minimum threshold "
+            "({:.3e}). Material will be treated as pure void.",
+            mat->name(), mat->id(), g_out, sigma_t, MINIMUM_MACRO_XS));
+        }
+
         double nu_sigma_f =
           m.get_xs(MgxsType::NU_FISSION, g_out, NULL, NULL, NULL, t, a);
         nu_sigma_f_.push_back(nu_sigma_f);
@@ -1206,7 +1151,7 @@ void FlatSourceDomain::flatten_xs()
   }
 }
 
-void FlatSourceDomain::set_adjoint_sources(const vector<double>& forward_flux)
+void FlatSourceDomain::set_adjoint_sources()
 {
   // Set the adjoint external source to 1/forward_flux. If the forward flux is
   // negative, zero, or extremely close to zero, set the adjoint source to zero,
@@ -1220,7 +1165,7 @@ void FlatSourceDomain::set_adjoint_sources(const vector<double>& forward_flux)
   double max_flux = 0.0;
 #pragma omp parallel for reduction(max : max_flux)
   for (int64_t se = 0; se < n_source_elements(); se++) {
-    double flux = forward_flux[se];
+    double flux = source_regions_.scalar_flux_final(se);
     if (flux > max_flux) {
       max_flux = flux;
     }
@@ -1230,7 +1175,7 @@ void FlatSourceDomain::set_adjoint_sources(const vector<double>& forward_flux)
 #pragma omp parallel for
   for (int64_t sr = 0; sr < n_source_regions(); sr++) {
     for (int g = 0; g < negroups_; g++) {
-      double flux = forward_flux[sr * negroups_ + g];
+      double flux = source_regions_.scalar_flux_final(sr, g);
       if (flux <= ZERO_FLUX_CUTOFF * max_flux) {
         source_regions_.external_source(sr, g) = 0.0;
       } else {
@@ -1239,6 +1184,7 @@ void FlatSourceDomain::set_adjoint_sources(const vector<double>& forward_flux)
       if (flux > 0.0) {
         source_regions_.external_source_present(sr) = 1;
       }
+      source_regions_.scalar_flux_final(sr, g) = 0.0;
     }
   }
 
@@ -1265,7 +1211,6 @@ void FlatSourceDomain::set_adjoint_sources(const vector<double>& forward_flux)
       source_regions_.external_source_present(sr) = 0;
     }
   }
-
   // Divide the fixed source term by sigma t (to save time when applying each
   // iteration)
 #pragma omp parallel for
@@ -1326,13 +1271,14 @@ void FlatSourceDomain::apply_mesh_to_cell_instances(int32_t i_cell,
     if ((target_material_id == C_NONE && !is_target_void) ||
         cell_material_id == target_material_id) {
       int64_t sr = source_region_offsets_[i_cell] + j;
-      if (source_regions_.mesh(sr) != C_NONE) {
-        // print out the source region that is broken:
+      // Check if the key is already present in the mesh_map_
+      if (mesh_map_.find(sr) != mesh_map_.end()) {
         fatal_error(fmt::format("Source region {} already has mesh idx {} "
                                 "applied, but trying to apply mesh idx {}",
-          sr, source_regions_.mesh(sr), mesh_idx));
+          sr, mesh_map_[sr], mesh_idx));
       }
-      source_regions_.mesh(sr) = mesh_idx;
+      // If the SR has not already been assigned, then we can write to it
+      mesh_map_[sr] = mesh_idx;
     }
   }
 }
@@ -1402,18 +1348,9 @@ void FlatSourceDomain::apply_meshes()
   }
 }
 
-void FlatSourceDomain::prepare_base_source_regions()
-{
-  std::swap(source_regions_, base_source_regions_);
-  source_regions_.negroups() = base_source_regions_.negroups();
-  source_regions_.is_linear() = base_source_regions_.is_linear();
-}
-
 SourceRegionHandle FlatSourceDomain::get_subdivided_source_region_handle(
-  int64_t sr, int mesh_bin, Position r, double dist, Direction u)
+  SourceRegionKey sr_key, Position r, Direction u)
 {
-  SourceRegionKey sr_key {sr, mesh_bin};
-
   // Case 1: Check if the source region key is already present in the permanent
   // map. This is the most common condition, as any source region visited in a
   // previous power iteration will already be present in the permanent map. If
@@ -1475,9 +1412,8 @@ SourceRegionHandle FlatSourceDomain::get_subdivided_source_region_handle(
   gs.r() = r + TINY_BIT * u;
   gs.u() = {1.0, 0.0, 0.0};
   exhaustive_find_cell(gs);
-  int gs_i_cell = gs.lowest_coord().cell();
-  int64_t sr_found = source_region_offsets_[gs_i_cell] + gs.cell_instance();
-  if (sr_found != sr) {
+  int64_t sr_found = lookup_base_source_region_idx(gs);
+  if (sr_found != sr_key.base_source_region_id) {
     discovered_source_regions_.unlock(sr_key);
     SourceRegionHandle handle;
     handle.is_numerical_fp_artifact_ = true;
@@ -1485,9 +1421,9 @@ SourceRegionHandle FlatSourceDomain::get_subdivided_source_region_handle(
   }
 
   // Sanity check on mesh bin
-  int mesh_idx = base_source_regions_.mesh(sr);
+  int mesh_idx = lookup_mesh_idx(sr_key.base_source_region_id);
   if (mesh_idx == C_NONE) {
-    if (mesh_bin != 0) {
+    if (sr_key.mesh_bin != 0) {
       discovered_source_regions_.unlock(sr_key);
       SourceRegionHandle handle;
       handle.is_numerical_fp_artifact_ = true;
@@ -1496,7 +1432,7 @@ SourceRegionHandle FlatSourceDomain::get_subdivided_source_region_handle(
   } else {
     Mesh* mesh = model::meshes[mesh_idx].get();
     int bin_found = mesh->get_bin(r + TINY_BIT * u);
-    if (bin_found != mesh_bin) {
+    if (bin_found != sr_key.mesh_bin) {
       discovered_source_regions_.unlock(sr_key);
       SourceRegionHandle handle;
       handle.is_numerical_fp_artifact_ = true;
@@ -1508,26 +1444,60 @@ SourceRegionHandle FlatSourceDomain::get_subdivided_source_region_handle(
   // condition only occurs the first time the source region is discovered
   // (typically in the first power iteration). In this case, we need to handle
   // creation of the new source region and its storage into the parallel map.
-  // The new source region is created by copying the base source region, so as
-  // to inherit material, external source, and some flux properties etc. We
-  // also pass the base source region id to allow the new source region to
-  // know which base source region it is derived from.
-  SourceRegion* sr_ptr = discovered_source_regions_.emplace(
-    sr_key, {base_source_regions_.get_source_region_handle(sr), sr});
-  discovered_source_regions_.unlock(sr_key);
+  // Additionally, we need to determine the source region's material, initialize
+  // the starting scalar flux guess, and apply any known external sources.
+
+  // Call the basic constructor for the source region and store in the parallel
+  // map.
+  bool is_linear = RandomRay::source_shape_ != RandomRaySourceShape::FLAT;
+  SourceRegion* sr_ptr =
+    discovered_source_regions_.emplace(sr_key, {negroups_, is_linear});
   SourceRegionHandle handle {*sr_ptr};
 
-  // Check if the new source region contains a point source and apply it if so
-  auto it2 = point_source_map_.find(sr_key);
-  if (it2 != point_source_map_.end()) {
-    int es = it2->second;
-    auto s = model::external_sources[es].get();
-    auto is = dynamic_cast<IndependentSource*>(s);
-    auto energy = dynamic_cast<Discrete*>(is->energy());
-    double strength_factor = is->strength();
-    apply_external_source_to_source_region(energy, strength_factor, handle);
-    int material = handle.material();
-    if (material != MATERIAL_VOID) {
+  // Determine the material
+  int gs_i_cell = gs.lowest_coord().cell();
+  Cell& cell = *model::cells[gs_i_cell];
+  int material = cell.material(gs.cell_instance());
+
+  // If material total XS is extremely low, just set it to void to avoid
+  // problems with 1/Sigma_t
+  for (int g = 0; g < negroups_; g++) {
+    double sigma_t = sigma_t_[material * negroups_ + g];
+    if (sigma_t < MINIMUM_MACRO_XS) {
+      material = MATERIAL_VOID;
+      break;
+    }
+  }
+
+  handle.material() = material;
+
+  // Store the mesh index (if any) assigned to this source region
+  handle.mesh() = mesh_idx;
+
+  if (settings::run_mode == RunMode::FIXED_SOURCE) {
+    // Determine if there are any volumetric sources, and apply them.
+    // Volumetric sources are specifc only to the base SR idx.
+    auto it_vol =
+      external_volumetric_source_map_.find(sr_key.base_source_region_id);
+    if (it_vol != external_volumetric_source_map_.end()) {
+      const vector<int>& vol_sources = it_vol->second;
+      for (int src_idx : vol_sources) {
+        apply_external_source_to_source_region(src_idx, handle);
+      }
+    }
+
+    // Determine if there are any point sources, and apply them.
+    // Point sources are specific to the source region key.
+    auto it_point = external_point_source_map_.find(sr_key);
+    if (it_point != external_point_source_map_.end()) {
+      const vector<int>& point_sources = it_point->second;
+      for (int src_idx : point_sources) {
+        apply_external_source_to_source_region(src_idx, handle);
+      }
+    }
+
+    // Divide external source term by sigma_t
+    if (material != C_NONE) {
       for (int g = 0; g < negroups_; g++) {
         double sigma_t = sigma_t_[material * negroups_ + g];
         handle.external_source(g) /= sigma_t;
@@ -1535,6 +1505,21 @@ SourceRegionHandle FlatSourceDomain::get_subdivided_source_region_handle(
     }
   }
 
+  // Compute the combined source term
+  update_single_neutron_source(handle);
+
+  // Unlock the parallel map. Note: we may be tempted to release
+  // this lock earlier, and then just use the source region's lock to protect
+  // the flux/source initialization stages above. However, the rest of the code
+  // only protects updates to the new flux and volume fields, and assumes that
+  // the source is constant for the duration of transport. Thus, using just the
+  // source region's lock by itself would result in other threads potentially
+  // reading from the source before it is computed, as they won't use the lock
+  // when only reading from the SR's source. It would be expensive to protect
+  // those operations, whereas generating the SR is only done once, so we just
+  // hold the map's bucket lock until the source region is fully initialized.
+  discovered_source_regions_.unlock(sr_key);
+
   return handle;
 }
 
@@ -1620,4 +1605,52 @@ void FlatSourceDomain::apply_transport_stabilization()
   }
 }
 
+// Determines the base source region index (i.e., a material filled cell
+// instance) that corresponds to a particular location in the geometry. Requires
+// that the "gs" object passed in has already been initialized and has called
+// find_cell etc.
+int64_t FlatSourceDomain::lookup_base_source_region_idx(
+  const GeometryState& gs) const
+{
+  int i_cell = gs.lowest_coord().cell();
+  int64_t sr = source_region_offsets_[i_cell] + gs.cell_instance();
+  return sr;
+}
+
+// Determines the index of the mesh (if any) that has been applied
+// to a particular base source region index.
+int FlatSourceDomain::lookup_mesh_idx(int64_t sr) const
+{
+  int mesh_idx = C_NONE;
+  auto mesh_it = mesh_map_.find(sr);
+  if (mesh_it != mesh_map_.end()) {
+    mesh_idx = mesh_it->second;
+  }
+  return mesh_idx;
+}
+
+// Determines the source region key that corresponds to a particular location in
+// the geometry. This takes into account both the base source region index as
+// well as the mesh bin if a mesh is applied to this source region for
+// subdivision.
+SourceRegionKey FlatSourceDomain::lookup_source_region_key(
+  const GeometryState& gs) const
+{
+  int64_t sr = lookup_base_source_region_idx(gs);
+  int64_t mesh_bin = lookup_mesh_bin(sr, gs.r());
+  return SourceRegionKey {sr, mesh_bin};
+}
+
+// Determines the mesh bin that corresponds to a particular base source region
+// index and position.
+int64_t FlatSourceDomain::lookup_mesh_bin(int64_t sr, Position r) const
+{
+  int mesh_idx = lookup_mesh_idx(sr);
+  int mesh_bin = 0;
+  if (mesh_idx != C_NONE) {
+    mesh_bin = model::meshes[mesh_idx]->get_bin(r);
+  }
+  return mesh_bin;
+}
+
 } // namespace openmc
diff --git a/src/random_ray/linear_source_domain.cpp b/src/random_ray/linear_source_domain.cpp
index 81412164e..e1ad68e3d 100644
--- a/src/random_ray/linear_source_domain.cpp
+++ b/src/random_ray/linear_source_domain.cpp
@@ -34,25 +34,18 @@ void LinearSourceDomain::batch_reset()
   }
 }
 
-void LinearSourceDomain::update_neutron_source(double k_eff)
+void LinearSourceDomain::update_single_neutron_source(SourceRegionHandle& srh)
 {
-  simulation::time_update_src.start();
-
-  double inverse_k_eff = 1.0 / k_eff;
-
-// Reset all source regions to zero (important for void regions)
-#pragma omp parallel for
-  for (int64_t se = 0; se < n_source_elements(); se++) {
-    source_regions_.source(se) = 0.0;
+  // Reset all source regions to zero (important for void regions)
+  for (int g = 0; g < negroups_; g++) {
+    srh.source(g) = 0.0;
   }
 
-#pragma omp parallel for
-  for (int64_t sr = 0; sr < n_source_regions(); sr++) {
-    int material = source_regions_.material(sr);
-    if (material == MATERIAL_VOID) {
-      continue;
-    }
-    MomentMatrix invM = source_regions_.mom_matrix(sr).inverse();
+  // Add scattering + fission source
+  int material = srh.material();
+  if (material != MATERIAL_VOID) {
+    double inverse_k_eff = 1.0 / k_eff_;
+    MomentMatrix invM = srh.mom_matrix().inverse();
 
     for (int g_out = 0; g_out < negroups_; g_out++) {
       double sigma_t = sigma_t_[material * negroups_ + g_out];
@@ -64,8 +57,8 @@ void LinearSourceDomain::update_neutron_source(double k_eff)
 
       for (int g_in = 0; g_in < negroups_; g_in++) {
         // Handles for the flat and linear components of the flux
-        double flux_flat = source_regions_.scalar_flux_old(sr, g_in);
-        MomentArray flux_linear = source_regions_.flux_moments_old(sr, g_in);
+        double flux_flat = srh.scalar_flux_old(g_in);
+        MomentArray flux_linear = srh.flux_moments_old(g_in);
 
         // Handles for cross sections
         double sigma_s =
@@ -81,7 +74,7 @@ void LinearSourceDomain::update_neutron_source(double k_eff)
       }
 
       // Compute the flat source term
-      source_regions_.source(sr, g_out) =
+      srh.source(g_out) =
         (scatter_flat + fission_flat * inverse_k_eff) / sigma_t;
 
       // Compute the linear source terms. In the first 10 iterations when the
@@ -91,25 +84,21 @@ void LinearSourceDomain::update_neutron_source(double k_eff)
       // very small/noisy or have poorly developed spatial moments, so we zero
       // the source gradients (effectively making this a flat source region
       // temporarily), so as to improve stability.
-      if (simulation::current_batch > 10 &&
-          source_regions_.source(sr, g_out) >= 0.0) {
-        source_regions_.source_gradients(sr, g_out) =
+      if (simulation::current_batch > 10 && srh.source(g_out) >= 0.0) {
+        srh.source_gradients(g_out) =
           invM * ((scatter_linear + fission_linear * inverse_k_eff) / sigma_t);
       } else {
-        source_regions_.source_gradients(sr, g_out) = {0.0, 0.0, 0.0};
+        srh.source_gradients(g_out) = {0.0, 0.0, 0.0};
       }
     }
   }
 
+  // Add external source if in fixed source mode
   if (settings::run_mode == RunMode::FIXED_SOURCE) {
-// Add external source to flat source term if in fixed source mode
-#pragma omp parallel for
-    for (int64_t se = 0; se < n_source_elements(); se++) {
-      source_regions_.source(se) += source_regions_.external_source(se);
+    for (int g = 0; g < negroups_; g++) {
+      srh.source(g) += srh.external_source(g);
     }
   }
-
-  simulation::time_update_src.stop();
 }
 
 void LinearSourceDomain::normalize_scalar_flux_and_volumes(
diff --git a/src/random_ray/random_ray.cpp b/src/random_ray/random_ray.cpp
index 27f674c42..89a91449d 100644
--- a/src/random_ray/random_ray.cpp
+++ b/src/random_ray/random_ray.cpp
@@ -237,7 +237,6 @@ double RandomRay::distance_inactive_;
 double RandomRay::distance_active_;
 unique_ptr<Source> RandomRay::ray_source_;
 RandomRaySourceShape RandomRay::source_shape_ {RandomRaySourceShape::FLAT};
-bool RandomRay::mesh_subdivision_enabled_ {false};
 RandomRaySampleMethod RandomRay::sample_method_ {RandomRaySampleMethod::PRNG};
 
 RandomRay::RandomRay()
@@ -336,71 +335,60 @@ void RandomRay::event_advance_ray()
 
 void RandomRay::attenuate_flux(double distance, bool is_active, double offset)
 {
-  // Determine source region index etc.
-  int i_cell = lowest_coord().cell();
-
-  // The base source region is the spatial region index
-  int64_t sr = domain_->source_region_offsets_[i_cell] + cell_instance();
+  // Lookup base source region index
+  int64_t sr = domain_->lookup_base_source_region_idx(*this);
 
   // Perform ray tracing across mesh
-  if (mesh_subdivision_enabled_) {
-    // Determine the mesh index for the base source region, if any
-    int mesh_idx = domain_->base_source_regions_.mesh(sr);
+  // Determine the mesh index for the base source region, if any
+  int mesh_idx = domain_->lookup_mesh_idx(sr);
 
-    if (mesh_idx == C_NONE) {
-      // If there's no mesh being applied to this cell, then
-      // we just attenuate the flux as normal, and set
-      // the mesh bin to 0
-      attenuate_flux_inner(distance, is_active, sr, 0, r());
-    } else {
-      // If there is a mesh being applied to this cell, then
-      // we loop over all the bin crossings and attenuate
-      // separately.
-      Mesh* mesh = model::meshes[mesh_idx].get();
-
-      // We adjust the start and end positions of the ray slightly
-      // to accomodate for floating point precision issues that tend
-      // to occur at mesh boundaries that overlap with geometry lattice
-      // boundaries.
-      Position start = r() + (offset + TINY_BIT) * u();
-      Position end = start + (distance - 2.0 * TINY_BIT) * u();
-      double reduced_distance = (end - start).norm();
-
-      // Ray trace through the mesh and record bins and lengths
-      mesh_bins_.resize(0);
-      mesh_fractional_lengths_.resize(0);
-      mesh->bins_crossed(start, end, u(), mesh_bins_, mesh_fractional_lengths_);
-
-      // Loop over all mesh bins and attenuate flux
-      for (int b = 0; b < mesh_bins_.size(); b++) {
-        double physical_length = reduced_distance * mesh_fractional_lengths_[b];
-        attenuate_flux_inner(
-          physical_length, is_active, sr, mesh_bins_[b], start);
-        start += physical_length * u();
-      }
-    }
+  if (mesh_idx == C_NONE) {
+    // If there's no mesh being applied to this cell, then
+    // we just attenuate the flux as normal, and set
+    // the mesh bin to 0
+    attenuate_flux_inner(distance, is_active, sr, 0, r());
   } else {
-    attenuate_flux_inner(distance, is_active, sr, C_NONE, r());
+    // If there is a mesh being applied to this cell, then
+    // we loop over all the bin crossings and attenuate
+    // separately.
+    Mesh* mesh = model::meshes[mesh_idx].get();
+
+    // We adjust the start and end positions of the ray slightly
+    // to accomodate for floating point precision issues that tend
+    // to occur at mesh boundaries that overlap with geometry lattice
+    // boundaries.
+    Position start = r() + (offset + TINY_BIT) * u();
+    Position end = start + (distance - 2.0 * TINY_BIT) * u();
+    double reduced_distance = (end - start).norm();
+
+    // Ray trace through the mesh and record bins and lengths
+    mesh_bins_.resize(0);
+    mesh_fractional_lengths_.resize(0);
+    mesh->bins_crossed(start, end, u(), mesh_bins_, mesh_fractional_lengths_);
+
+    // Loop over all mesh bins and attenuate flux
+    for (int b = 0; b < mesh_bins_.size(); b++) {
+      double physical_length = reduced_distance * mesh_fractional_lengths_[b];
+      attenuate_flux_inner(
+        physical_length, is_active, sr, mesh_bins_[b], start);
+      start += physical_length * u();
+    }
   }
 }
 
 void RandomRay::attenuate_flux_inner(
   double distance, bool is_active, int64_t sr, int mesh_bin, Position r)
 {
+  SourceRegionKey sr_key {sr, mesh_bin};
   SourceRegionHandle srh;
-  if (mesh_subdivision_enabled_) {
-    srh = domain_->get_subdivided_source_region_handle(
-      sr, mesh_bin, r, distance, u());
-    if (srh.is_numerical_fp_artifact_) {
-      return;
-    }
-  } else {
-    srh = domain_->source_regions_.get_source_region_handle(sr);
+  srh = domain_->get_subdivided_source_region_handle(sr_key, r, u());
+  if (srh.is_numerical_fp_artifact_) {
+    return;
   }
 
   switch (source_shape_) {
   case RandomRaySourceShape::FLAT:
-    if (this->material() == MATERIAL_VOID) {
+    if (srh.material() == MATERIAL_VOID) {
       attenuate_flux_flat_source_void(srh, distance, is_active, r);
     } else {
       attenuate_flux_flat_source(srh, distance, is_active, r);
@@ -408,7 +396,7 @@ void RandomRay::attenuate_flux_inner(
     break;
   case RandomRaySourceShape::LINEAR:
   case RandomRaySourceShape::LINEAR_XY:
-    if (this->material() == MATERIAL_VOID) {
+    if (srh.material() == MATERIAL_VOID) {
       attenuate_flux_linear_source_void(srh, distance, is_active, r);
     } else {
       attenuate_flux_linear_source(srh, distance, is_active, r);
@@ -439,7 +427,7 @@ void RandomRay::attenuate_flux_flat_source(
   n_event()++;
 
   // Get material
-  int material = this->material();
+  int material = srh.material();
 
   // MOC incoming flux attenuation + source contribution/attenuation equation
   for (int g = 0; g < negroups_; g++) {
@@ -490,7 +478,7 @@ void RandomRay::attenuate_flux_flat_source_void(
   // The number of geometric intersections is counted for reporting purposes
   n_event()++;
 
-  int material = this->material();
+  int material = srh.material();
 
   // If ray is in the active phase (not in dead zone), make contributions to
   // source region bookkeeping
@@ -537,7 +525,7 @@ void RandomRay::attenuate_flux_linear_source(
   // The number of geometric intersections is counted for reporting purposes
   n_event()++;
 
-  int material = this->material();
+  int material = srh.material();
 
   Position& centroid = srh.centroid();
   Position midpoint = r + u() * (distance / 2.0);
@@ -810,27 +798,12 @@ void RandomRay::initialize_ray(uint64_t ray_id, FlatSourceDomain* domain)
       cell_born() = lowest_coord().cell();
   }
 
+  SourceRegionKey sr_key = domain_->lookup_source_region_key(*this);
+  SourceRegionHandle srh =
+    domain_->get_subdivided_source_region_handle(sr_key, r(), u());
+
   // Initialize ray's starting angular flux to starting location's isotropic
   // source
-  int i_cell = lowest_coord().cell();
-  int64_t sr = domain_->source_region_offsets_[i_cell] + cell_instance();
-
-  SourceRegionHandle srh;
-  if (mesh_subdivision_enabled_) {
-    int mesh_idx = domain_->base_source_regions_.mesh(sr);
-    int mesh_bin;
-    if (mesh_idx == C_NONE) {
-      mesh_bin = 0;
-    } else {
-      Mesh* mesh = model::meshes[mesh_idx].get();
-      mesh_bin = mesh->get_bin(r());
-    }
-    srh =
-      domain_->get_subdivided_source_region_handle(sr, mesh_bin, r(), 0.0, u());
-  } else {
-    srh = domain_->source_regions_.get_source_region_handle(sr);
-  }
-
   if (!srh.is_numerical_fp_artifact_) {
     for (int g = 0; g < negroups_; g++) {
       angular_flux_[g] = srh.source(g);
diff --git a/src/random_ray/random_ray_simulation.cpp b/src/random_ray/random_ray_simulation.cpp
index 388a778b8..d475b2593 100644
--- a/src/random_ray/random_ray_simulation.cpp
+++ b/src/random_ray/random_ray_simulation.cpp
@@ -47,97 +47,82 @@ void openmc_run_random_ray()
   if (mpi::master)
     validate_random_ray_inputs();
 
-  // Declare forward flux so that it can be saved for later adjoint simulation
-  vector<double> forward_flux;
-  SourceRegionContainer forward_source_regions;
-  SourceRegionContainer forward_base_source_regions;
-  std::unordered_map<SourceRegionKey, int64_t, SourceRegionKey::HashFunctor>
-    forward_source_region_map;
+  // Initialize Random Ray Simulation Object
+  RandomRaySimulation sim;
 
-  {
-    // Initialize Random Ray Simulation Object
-    RandomRaySimulation sim;
+  // Initialize fixed sources, if present
+  sim.apply_fixed_sources_and_mesh_domains();
 
-    // Initialize fixed sources, if present
-    sim.apply_fixed_sources_and_mesh_domains();
+  // Begin main simulation timer
+  simulation::time_total.start();
 
-    // Begin main simulation timer
-    simulation::time_total.start();
+  // Execute random ray simulation
+  sim.simulate();
 
-    // Execute random ray simulation
-    sim.simulate();
+  // End main simulation timer
+  simulation::time_total.stop();
 
-    // End main simulation timer
-    simulation::time_total.stop();
-
-    // Normalize and save the final forward flux
-    sim.domain()->serialize_final_fluxes(forward_flux);
-
-    double source_normalization_factor =
-      sim.domain()->compute_fixed_source_normalization_factor() /
-      (settings::n_batches - settings::n_inactive);
+  // Normalize and save the final forward flux
+  double source_normalization_factor =
+    sim.domain()->compute_fixed_source_normalization_factor() /
+    (settings::n_batches - settings::n_inactive);
 
 #pragma omp parallel for
-    for (uint64_t i = 0; i < forward_flux.size(); i++) {
-      forward_flux[i] *= source_normalization_factor;
-    }
-
-    forward_source_regions = sim.domain()->source_regions_;
-    forward_source_region_map = sim.domain()->source_region_map_;
-    forward_base_source_regions = sim.domain()->base_source_regions_;
-
-    // Finalize OpenMC
-    openmc_simulation_finalize();
-
-    // Output all simulation results
-    sim.output_simulation_results();
+  for (uint64_t se = 0; se < sim.domain()->n_source_elements(); se++) {
+    sim.domain()->source_regions_.scalar_flux_final(se) *=
+      source_normalization_factor;
   }
 
+  // Finalize OpenMC
+  openmc_simulation_finalize();
+
+  // Output all simulation results
+  sim.output_simulation_results();
+
   //////////////////////////////////////////////////////////
   // Run adjoint simulation (if enabled)
   //////////////////////////////////////////////////////////
 
-  if (adjoint_needed) {
-    reset_timers();
-
-    // Configure the domain for adjoint simulation
-    FlatSourceDomain::adjoint_ = true;
-
-    if (mpi::master)
-      header("ADJOINT FLUX SOLVE", 3);
-
-    // Initialize OpenMC general data structures
-    openmc_simulation_init();
-
-    // Initialize Random Ray Simulation Object
-    RandomRaySimulation adjoint_sim;
-
-    // Initialize adjoint fixed sources, if present
-    adjoint_sim.prepare_fixed_sources_adjoint(forward_flux,
-      forward_source_regions, forward_base_source_regions,
-      forward_source_region_map);
-
-    // Transpose scattering matrix
-    adjoint_sim.domain()->transpose_scattering_matrix();
-
-    // Swap nu_sigma_f and chi
-    adjoint_sim.domain()->nu_sigma_f_.swap(adjoint_sim.domain()->chi_);
-
-    // Begin main simulation timer
-    simulation::time_total.start();
-
-    // Execute random ray simulation
-    adjoint_sim.simulate();
-
-    // End main simulation timer
-    simulation::time_total.stop();
-
-    // Finalize OpenMC
-    openmc_simulation_finalize();
-
-    // Output all simulation results
-    adjoint_sim.output_simulation_results();
+  if (!adjoint_needed) {
+    return;
   }
+
+  reset_timers();
+
+  // Configure the domain for adjoint simulation
+  FlatSourceDomain::adjoint_ = true;
+
+  if (mpi::master)
+    header("ADJOINT FLUX SOLVE", 3);
+
+  // Initialize OpenMC general data structures
+  openmc_simulation_init();
+
+  sim.domain()->k_eff_ = 1.0;
+
+  // Initialize adjoint fixed sources, if present
+  sim.prepare_fixed_sources_adjoint();
+
+  // Transpose scattering matrix
+  sim.domain()->transpose_scattering_matrix();
+
+  // Swap nu_sigma_f and chi
+  sim.domain()->nu_sigma_f_.swap(sim.domain()->chi_);
+
+  // Begin main simulation timer
+  simulation::time_total.start();
+
+  // Execute random ray simulation
+  sim.simulate();
+
+  // End main simulation timer
+  simulation::time_total.stop();
+
+  // Finalize OpenMC
+  openmc_simulation_finalize();
+
+  // Output all simulation results
+  sim.output_simulation_results();
 }
 
 // Enforces restrictions on inputs in random ray mode.  While there are
@@ -348,7 +333,6 @@ void validate_random_ray_inputs()
   // when generating weight windows with FW-CADIS and an overlaid mesh.
   ///////////////////////////////////////////////////////////////////
   if (RandomRay::source_shape_ == RandomRaySourceShape::LINEAR &&
-      RandomRay::mesh_subdivision_enabled_ &&
       variance_reduction::weight_windows.size() > 0) {
     warning(
       "Linear sources may result in negative fluxes in small source regions "
@@ -366,7 +350,6 @@ void openmc_reset_random_ray()
   FlatSourceDomain::mesh_domain_map_.clear();
   RandomRay::ray_source_.reset();
   RandomRay::source_shape_ = RandomRaySourceShape::FLAT;
-  RandomRay::mesh_subdivision_enabled_ = false;
   RandomRay::sample_method_ = RandomRaySampleMethod::PRNG;
 }
 
@@ -412,20 +395,11 @@ void RandomRaySimulation::apply_fixed_sources_and_mesh_domains()
   }
 }
 
-void RandomRaySimulation::prepare_fixed_sources_adjoint(
-  vector<double>& forward_flux, SourceRegionContainer& forward_source_regions,
-  SourceRegionContainer& forward_base_source_regions,
-  std::unordered_map<SourceRegionKey, int64_t, SourceRegionKey::HashFunctor>&
-    forward_source_region_map)
+void RandomRaySimulation::prepare_fixed_sources_adjoint()
 {
+  domain_->source_regions_.adjoint_reset();
   if (settings::run_mode == RunMode::FIXED_SOURCE) {
-    if (RandomRay::mesh_subdivision_enabled_) {
-      domain_->source_regions_ = forward_source_regions;
-      domain_->source_region_map_ = forward_source_region_map;
-      domain_->base_source_regions_ = forward_base_source_regions;
-      domain_->source_regions_.adjoint_reset();
-    }
-    domain_->set_adjoint_sources(forward_flux);
+    domain_->set_adjoint_sources();
   }
 }
 
@@ -445,22 +419,18 @@ void RandomRaySimulation::simulate()
       simulation::total_weight = 1.0;
 
       // Update source term (scattering + fission)
-      domain_->update_neutron_source(k_eff_);
+      domain_->update_all_neutron_sources();
 
-      // Reset scalar fluxes, iteration volume tallies, and region hit flags to
-      // zero
+      // Reset scalar fluxes, iteration volume tallies, and region hit flags
+      // to zero
       domain_->batch_reset();
 
-      // At the beginning of the simulation, if mesh subvivision is in use, we
+      // At the beginning of the simulation, if mesh subdivision is in use, we
       // need to swap the main source region container into the base container,
       // as the main source region container will be used to hold the true
       // subdivided source regions. The base container will therefore only
       // contain the external source region information, the mesh indices,
       // material properties, and initial guess values for the flux/source.
-      if (RandomRay::mesh_subdivision_enabled_ &&
-          simulation::current_batch == 1 && !FlatSourceDomain::adjoint_) {
-        domain_->prepare_base_source_regions();
-      }
 
       // Start timer for transport
       simulation::time_transport.start();
@@ -476,11 +446,9 @@ void RandomRaySimulation::simulate()
 
       simulation::time_transport.stop();
 
-      // If using mesh subdivision, add any newly discovered source regions
-      // to the main source region container.
-      if (RandomRay::mesh_subdivision_enabled_) {
-        domain_->finalize_discovered_source_regions();
-      }
+      // Add any newly discovered source regions to the main source region
+      // container.
+      domain_->finalize_discovered_source_regions();
 
       // Normalize scalar flux and update volumes
       domain_->normalize_scalar_flux_and_volumes(
@@ -494,10 +462,10 @@ void RandomRaySimulation::simulate()
 
       if (settings::run_mode == RunMode::EIGENVALUE) {
         // Compute random ray k-eff
-        k_eff_ = domain_->compute_k_eff(k_eff_);
+        domain_->compute_k_eff();
 
         // Store random ray k-eff into OpenMC's native k-eff variable
-        global_tally_tracklength = k_eff_;
+        global_tally_tracklength = domain_->k_eff_;
       }
 
       // Execute all tallying tasks, if this is an active batch
@@ -507,12 +475,6 @@ void RandomRaySimulation::simulate()
         // estimate
         domain_->accumulate_iteration_flux();
 
-        // Generate mapping between source regions and tallies
-        if (!domain_->mapped_all_tallies_ &&
-            !RandomRay::mesh_subdivision_enabled_) {
-          domain_->convert_source_regions_to_tallies(0);
-        }
-
         // Use above mapping to contribute FSR flux data to appropriate
         // tallies
         domain_->random_ray_tally();
@@ -522,7 +484,7 @@ void RandomRaySimulation::simulate()
       domain_->flux_swap();
 
       // Check for any obvious insabilities/nans/infs
-      instability_check(n_hits, k_eff_, avg_miss_rate_);
+      instability_check(n_hits, domain_->k_eff_, avg_miss_rate_);
     } // End MPI master work
 
     // Finalize the current batch
@@ -571,7 +533,7 @@ void RandomRaySimulation::instability_check(
     }
 
     if (k_eff > 10.0 || k_eff < 0.01 || !(std::isfinite(k_eff))) {
-      fatal_error("Instability detected");
+      fatal_error(fmt::format("Instability detected: k-eff = {:.5f}", k_eff));
     }
   }
 }
diff --git a/src/random_ray/source_region.cpp b/src/random_ray/source_region.cpp
index 1205b995a..3b06f0ed0 100644
--- a/src/random_ray/source_region.cpp
+++ b/src/random_ray/source_region.cpp
@@ -48,7 +48,7 @@ SourceRegion::SourceRegion(int negroups, bool is_linear)
   }
 
   scalar_flux_new_.assign(negroups, 0.0);
-  source_.resize(negroups);
+  source_.assign(negroups, 0.0);
   scalar_flux_final_.assign(negroups, 0.0);
 
   tally_task_.resize(negroups);
@@ -60,25 +60,6 @@ SourceRegion::SourceRegion(int negroups, bool is_linear)
   }
 }
 
-SourceRegion::SourceRegion(const SourceRegionHandle& handle, int64_t parent_sr)
-  : SourceRegion(handle.negroups_, handle.is_linear_)
-{
-  material_ = handle.material();
-  mesh_ = handle.mesh();
-  parent_sr_ = parent_sr;
-  for (int g = 0; g < scalar_flux_new_.size(); g++) {
-    scalar_flux_old_[g] = handle.scalar_flux_old(g);
-    source_[g] = handle.source(g);
-  }
-
-  if (settings::run_mode == RunMode::FIXED_SOURCE) {
-    external_source_present_ = handle.external_source_present();
-    for (int g = 0; g < scalar_flux_new_.size(); g++) {
-      external_source_[g] = handle.external_source(g);
-    }
-  }
-}
-
 //==============================================================================
 // SourceRegionContainer implementation
 //==============================================================================
@@ -259,9 +240,12 @@ void SourceRegionContainer::adjoint_reset()
     MomentMatrix {0.0, 0.0, 0.0, 0.0, 0.0, 0.0});
   std::fill(mom_matrix_t_.begin(), mom_matrix_t_.end(),
     MomentMatrix {0.0, 0.0, 0.0, 0.0, 0.0, 0.0});
-  std::fill(scalar_flux_old_.begin(), scalar_flux_old_.end(), 0.0);
+  if (settings::run_mode == RunMode::FIXED_SOURCE) {
+    std::fill(scalar_flux_old_.begin(), scalar_flux_old_.end(), 0.0);
+  } else {
+    std::fill(scalar_flux_old_.begin(), scalar_flux_old_.end(), 1.0);
+  }
   std::fill(scalar_flux_new_.begin(), scalar_flux_new_.end(), 0.0);
-  std::fill(scalar_flux_final_.begin(), scalar_flux_final_.end(), 0.0);
   std::fill(source_.begin(), source_.end(), 0.0f);
   std::fill(external_source_.begin(), external_source_.end(), 0.0f);
   std::fill(source_gradients_.begin(), source_gradients_.end(),
diff --git a/src/settings.cpp b/src/settings.cpp
index 03d42bb9d..f9a2469db 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -346,7 +346,6 @@ void get_run_parameters(pugi::xml_node node_base)
           }
           FlatSourceDomain::mesh_domain_map_[mesh_id].emplace_back(
             type, domain_id);
-          RandomRay::mesh_subdivision_enabled_ = true;
         }
       }
     }
diff --git a/tests/regression_tests/random_ray_low_density/__init__.py b/tests/regression_tests/random_ray_low_density/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/regression_tests/random_ray_low_density/inputs_true.dat b/tests/regression_tests/random_ray_low_density/inputs_true.dat
new file mode 100644
index 000000000..c4fd06f42
--- /dev/null
+++ b/tests/regression_tests/random_ray_low_density/inputs_true.dat
@@ -0,0 +1,244 @@
+<?xml version='1.0' encoding='utf-8'?>
+<model>
+  <materials>
+    <cross_sections>mgxs.h5</cross_sections>
+    <material id="1" name="source">
+      <density value="1.0" units="macro"/>
+      <macroscopic name="source"/>
+    </material>
+    <material id="2" name="void">
+      <density value="1.0" units="macro"/>
+      <macroscopic name="void"/>
+    </material>
+    <material id="3" name="absorber">
+      <density value="1.0" units="macro"/>
+      <macroscopic name="absorber"/>
+    </material>
+  </materials>
+  <geometry>
+    <cell id="1" name="infinite source region" material="1" universe="1"/>
+    <cell id="2" name="infinite void region" material="2" universe="2"/>
+    <cell id="3" name="infinite absorber region" material="3" universe="3"/>
+    <cell id="4" fill="4" universe="5"/>
+    <cell id="5" name="full domain" fill="5" region="1 -2 3 -4 5 -6" universe="6"/>
+    <lattice id="4">
+      <pitch>2.5 2.5 2.5</pitch>
+      <dimension>12 12 12</dimension>
+      <lower_left>0.0 0.0 0.0</lower_left>
+      <universes>
+3 3 3 3 3 3 3 3 3 3 3 3 
+3 3 3 3 3 3 3 3 3 3 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+1 1 2 2 2 2 2 2 2 2 3 3 
+1 1 2 2 2 2 2 2 2 2 3 3 
+
+3 3 3 3 3 3 3 3 3 3 3 3 
+3 3 3 3 3 3 3 3 3 3 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+1 1 2 2 2 2 2 2 2 2 3 3 
+1 1 2 2 2 2 2 2 2 2 3 3 
+
+3 3 3 3 3 3 3 3 3 3 3 3 
+3 3 3 3 3 3 3 3 3 3 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+
+3 3 3 3 3 3 3 3 3 3 3 3 
+3 3 3 3 3 3 3 3 3 3 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+
+3 3 3 3 3 3 3 3 3 3 3 3 
+3 3 3 3 3 3 3 3 3 3 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+
+3 3 3 3 3 3 3 3 3 3 3 3 
+3 3 3 3 3 3 3 3 3 3 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+
+3 3 3 3 3 3 3 3 3 3 3 3 
+3 3 3 3 3 3 3 3 3 3 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+
+3 3 3 3 3 3 3 3 3 3 3 3 
+3 3 3 3 3 3 3 3 3 3 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+
+3 3 3 3 3 3 3 3 3 3 3 3 
+3 3 3 3 3 3 3 3 3 3 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+
+3 3 3 3 3 3 3 3 3 3 3 3 
+3 3 3 3 3 3 3 3 3 3 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+2 2 2 2 2 2 2 2 2 2 3 3 
+
+3 3 3 3 3 3 3 3 3 3 3 3 
+3 3 3 3 3 3 3 3 3 3 3 3 
+3 3 3 3 3 3 3 3 3 3 3 3 
+3 3 3 3 3 3 3 3 3 3 3 3 
+3 3 3 3 3 3 3 3 3 3 3 3 
+3 3 3 3 3 3 3 3 3 3 3 3 
+3 3 3 3 3 3 3 3 3 3 3 3 
+3 3 3 3 3 3 3 3 3 3 3 3 
+3 3 3 3 3 3 3 3 3 3 3 3 
+3 3 3 3 3 3 3 3 3 3 3 3 
+3 3 3 3 3 3 3 3 3 3 3 3 
+3 3 3 3 3 3 3 3 3 3 3 3 
+
+3 3 3 3 3 3 3 3 3 3 3 3 
+3 3 3 3 3 3 3 3 3 3 3 3 
+3 3 3 3 3 3 3 3 3 3 3 3 
+3 3 3 3 3 3 3 3 3 3 3 3 
+3 3 3 3 3 3 3 3 3 3 3 3 
+3 3 3 3 3 3 3 3 3 3 3 3 
+3 3 3 3 3 3 3 3 3 3 3 3 
+3 3 3 3 3 3 3 3 3 3 3 3 
+3 3 3 3 3 3 3 3 3 3 3 3 
+3 3 3 3 3 3 3 3 3 3 3 3 
+3 3 3 3 3 3 3 3 3 3 3 3 
+3 3 3 3 3 3 3 3 3 3 3 3 </universes>
+    </lattice>
+    <surface id="1" type="x-plane" boundary="reflective" coeffs="0.0"/>
+    <surface id="2" type="x-plane" boundary="vacuum" coeffs="30.0"/>
+    <surface id="3" type="y-plane" boundary="reflective" coeffs="0.0"/>
+    <surface id="4" type="y-plane" boundary="vacuum" coeffs="30.0"/>
+    <surface id="5" type="z-plane" boundary="reflective" coeffs="0.0"/>
+    <surface id="6" type="z-plane" boundary="vacuum" coeffs="30.0"/>
+  </geometry>
+  <settings>
+    <run_mode>fixed source</run_mode>
+    <particles>90</particles>
+    <batches>10</batches>
+    <inactive>5</inactive>
+    <source type="independent" strength="3.14" particle="neutron">
+      <energy type="discrete">
+        <parameters>100.0 1.0</parameters>
+      </energy>
+      <constraints>
+        <domain_type>universe</domain_type>
+        <domain_ids>1</domain_ids>
+      </constraints>
+    </source>
+    <energy_mode>multi-group</energy_mode>
+    <random_ray>
+      <distance_active>500.0</distance_active>
+      <distance_inactive>100.0</distance_inactive>
+      <source type="independent" strength="1.0" particle="neutron">
+        <space type="box">
+          <parameters>0.0 0.0 0.0 30.0 30.0 30.0</parameters>
+        </space>
+      </source>
+      <volume_normalized_flux_tallies>True</volume_normalized_flux_tallies>
+    </random_ray>
+  </settings>
+  <tallies>
+    <filter id="3" type="material">
+      <bins>1</bins>
+    </filter>
+    <filter id="2" type="material">
+      <bins>2</bins>
+    </filter>
+    <filter id="1" type="material">
+      <bins>3</bins>
+    </filter>
+    <tally id="3" name="Source Tally">
+      <filters>3</filters>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="2" name="Void Tally">
+      <filters>2</filters>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+    <tally id="1" name="Absorber Tally">
+      <filters>1</filters>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+  </tallies>
+</model>
diff --git a/tests/regression_tests/random_ray_low_density/results_true.dat b/tests/regression_tests/random_ray_low_density/results_true.dat
new file mode 100644
index 000000000..a4b3ee1bc
--- /dev/null
+++ b/tests/regression_tests/random_ray_low_density/results_true.dat
@@ -0,0 +1,9 @@
+tally 1:
+5.973607E-01
+7.155477E-02
+tally 2:
+3.206216E-02
+2.063375E-04
+tally 3:
+2.096415E-03
+8.804963E-07
diff --git a/tests/regression_tests/random_ray_low_density/test.py b/tests/regression_tests/random_ray_low_density/test.py
new file mode 100644
index 000000000..1b4ffb781
--- /dev/null
+++ b/tests/regression_tests/random_ray_low_density/test.py
@@ -0,0 +1,60 @@
+import os
+
+import numpy as np
+import openmc
+from openmc.examples import random_ray_three_region_cube
+
+from tests.testing_harness import TolerantPyAPITestHarness
+
+
+class MGXSTestHarness(TolerantPyAPITestHarness):
+    def _cleanup(self):
+        super()._cleanup()
+        f = 'mgxs.h5'
+        if os.path.exists(f):
+            os.remove(f)
+
+
+def test_random_ray_low_density():
+    model = random_ray_three_region_cube()
+
+    # Rebuild the MGXS library to have a material with very
+    # low macroscopic cross sections
+    ebins = [1e-5, 20.0e6]
+    groups = openmc.mgxs.EnergyGroups(group_edges=ebins)
+
+    void_sigma_a = 4.0e-6
+    void_sigma_s = 3.0e-4
+    void_mat_data = openmc.XSdata('void', groups)
+    void_mat_data.order = 0
+    void_mat_data.set_total([void_sigma_a + void_sigma_s])
+    void_mat_data.set_absorption([void_sigma_a])
+    void_mat_data.set_scatter_matrix(
+        np.rollaxis(np.array([[[void_sigma_s]]]), 0, 3))
+
+    absorber_sigma_a = 0.75
+    absorber_sigma_s = 0.25
+    absorber_mat_data = openmc.XSdata('absorber', groups)
+    absorber_mat_data.order = 0
+    absorber_mat_data.set_total([absorber_sigma_a + absorber_sigma_s])
+    absorber_mat_data.set_absorption([absorber_sigma_a])
+    absorber_mat_data.set_scatter_matrix(
+        np.rollaxis(np.array([[[absorber_sigma_s]]]), 0, 3))
+
+    multiplier = 0.0000001
+    source_sigma_a = void_sigma_a * multiplier
+    source_sigma_s = void_sigma_s * multiplier
+    source_mat_data = openmc.XSdata('source', groups)
+    source_mat_data.order = 0
+    source_mat_data.set_total([source_sigma_a + source_sigma_s])
+    source_mat_data.set_absorption([source_sigma_a])
+    source_mat_data.set_scatter_matrix(
+        np.rollaxis(np.array([[[source_sigma_s]]]), 0, 3))
+
+    mg_cross_sections_file = openmc.MGXSLibrary(groups)
+    mg_cross_sections_file.add_xsdatas(
+        [source_mat_data, void_mat_data, absorber_mat_data])
+    mg_cross_sections_file.export_to_hdf5()
+
+    harness = MGXSTestHarness('statepoint.10.h5', model)
+    harness.main()
diff --git a/tests/regression_tests/random_ray_point_source_locator/results_true.dat b/tests/regression_tests/random_ray_point_source_locator/results_true.dat
index 1785dda57..8c6f358dd 100644
--- a/tests/regression_tests/random_ray_point_source_locator/results_true.dat
+++ b/tests/regression_tests/random_ray_point_source_locator/results_true.dat
@@ -1,9 +1,9 @@
 tally 1:
-2.633900E+00
-2.948207E+00
+2.633923E+00
+2.948228E+00
 tally 2:
-1.440463E-01
-3.294032E-03
+1.440456E-01
+3.293984E-03
 tally 3:
 9.425207E-03
 1.089748E-05

From 1dacf4fd2bba3582b575b6abf92b5d201eabab37 Mon Sep 17 00:00:00 2001
From: Patrick Shriwise <pshriwise@gmail.com>
Date: Thu, 2 Oct 2025 11:48:02 -0500
Subject: [PATCH 127/203] Add missing documentation on <source> in depletion
 chain file format (#3590)

Co-authored-by: Paul Romano <paul.k.romano@gmail.com>
Co-authored-by: April Novak <novak@berkeley.edu>
---
 docs/source/io_formats/depletion_chain.rst | 21 +++++++++++++++++++++
 openmc/data/decay.py                       |  2 +-
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/docs/source/io_formats/depletion_chain.rst b/docs/source/io_formats/depletion_chain.rst
index 89c76525f..74413e7b6 100644
--- a/docs/source/io_formats/depletion_chain.rst
+++ b/docs/source/io_formats/depletion_chain.rst
@@ -56,6 +56,27 @@ attributes:
 
 .. _io_chain_reaction:
 
+--------------------
+``<source>`` Element
+--------------------
+
+The ``<source>`` element represents photon and electron sources associated with
+the decay of a nuclide and contains information to construct an
+:class:`openmc.stats.Univariate` object that represents this emission as an
+energy distribution. This element has the following attributes:
+
+  :type:
+    The type of :class:`openmc.stats.Univariate` source term.
+
+  :particle:
+    The type of particle emitted, e.g., 'photon' or 'electron'
+
+  :parameters:
+    The parameters of the source term, e.g., for a
+    :class:`openmc.stats.Discrete` source, the energies (in [eV]) at which the
+    particles are emitted and their relative intensities in [Bq/atom] (in other
+    words, decay constants).
+
 ----------------------
 ``<reaction>`` Element
 ----------------------
diff --git a/openmc/data/decay.py b/openmc/data/decay.py
index 1a11d3614..c8a0bb5e7 100644
--- a/openmc/data/decay.py
+++ b/openmc/data/decay.py
@@ -591,7 +591,7 @@ def decay_photon_energy(nuclide: str) -> Univariate | None:
     openmc.stats.Univariate or None
         Distribution of energies in [eV] of photons emitted from decay, or None
         if no photon source exists. Note that the probabilities represent
-        intensities, given as [Bq].
+        intensities, given as [Bq/atom] (in other words, decay constants).
     """
     if not _DECAY_PHOTON_ENERGY:
         chain_file = openmc.config.get('chain_file')

From 91a19cf2201731017e02e445f2fc5995cfa51c46 Mon Sep 17 00:00:00 2001
From: Perry <100789850+yrrepy@users.noreply.github.com>
Date: Thu, 2 Oct 2025 14:50:42 -0700
Subject: [PATCH 128/203] Ensure weight_windows_file information is read from
 XML (#3587)

Co-authored-by: Paul Romano <paul.k.romano@gmail.com>
---
 openmc/settings.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/openmc/settings.py b/openmc/settings.py
index 7bbc31c19..dc6fa99f9 100644
--- a/openmc/settings.py
+++ b/openmc/settings.py
@@ -1641,6 +1641,7 @@ class Settings:
                 if mesh_memo is not None:
                     mesh_memo.add(ww.mesh.id)
 
+    def _create_weight_windows_on_subelement(self, root):
         if self._weight_windows_on is not None:
             elem = ET.SubElement(root, "weight_windows_on")
             elem.text = str(self._weight_windows_on).lower()
@@ -2074,10 +2075,16 @@ class Settings:
             ww = WeightWindows.from_xml_element(elem, meshes)
             self.weight_windows.append(ww)
 
+    def _weight_windows_on_from_xml_element(self, root):
         text = get_text(root, 'weight_windows_on')
         if text is not None:
             self.weight_windows_on = text in ('true', '1')
 
+    def _weight_windows_file_from_xml_element(self, root):
+        text = get_text(root, 'weight_windows_file')
+        if text is not None:
+            self.weight_windows_file = text
+
     def _weight_window_checkpoints_from_xml_element(self, root):
         elem = root.find('weight_window_checkpoints')
         if elem is None:
@@ -2214,6 +2221,7 @@ class Settings:
         self._create_log_grid_bins_subelement(element)
         self._create_write_initial_source_subelement(element)
         self._create_weight_windows_subelement(element, mesh_memo)
+        self._create_weight_windows_on_subelement(element)
         self._create_weight_window_generators_subelement(element, mesh_memo)
         self._create_weight_windows_file_element(element)
         self._create_weight_window_checkpoints_subelement(element)
@@ -2324,6 +2332,8 @@ class Settings:
         settings._log_grid_bins_from_xml_element(elem)
         settings._write_initial_source_from_xml_element(elem)
         settings._weight_windows_from_xml_element(elem, meshes)
+        settings._weight_windows_on_from_xml_element(elem)
+        settings._weight_windows_file_from_xml_element(elem)
         settings._weight_window_generators_from_xml_element(elem, meshes)
         settings._weight_window_checkpoints_from_xml_element(elem)
         settings._max_history_splits_from_xml_element(elem)

From 7806703c2614853be2d2ce49860e673e208145da Mon Sep 17 00:00:00 2001
From: Copilot <198982749+Copilot@users.noreply.github.com>
Date: Thu, 2 Oct 2025 22:52:39 +0000
Subject: [PATCH 129/203] Fix random ray source region mesh export when using
 model.export_to_xml() (#3579)

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: jtramm <1009059+jtramm@users.noreply.github.com>
Co-authored-by: Paul Romano <paul.k.romano@gmail.com>
---
 openmc/settings.py                            | 20 +++++++++++----
 .../inputs_true.dat                           |  4 +--
 .../random_ray_adjoint_k_eff/inputs_true.dat  |  4 +--
 .../cell/inputs_true.dat                      |  2 +-
 .../material/inputs_true.dat                  |  2 +-
 .../universe/inputs_true.dat                  |  2 +-
 .../linear/inputs_true.dat                    |  2 +-
 .../linear_xy/inputs_true.dat                 |  2 +-
 .../flat/inputs_true.dat                      |  2 +-
 .../linear/inputs_true.dat                    |  2 +-
 .../False/inputs_true.dat                     |  2 +-
 .../True/inputs_true.dat                      |  2 +-
 .../flat/inputs_true.dat                      |  2 +-
 .../linear_xy/inputs_true.dat                 |  2 +-
 .../random_ray_halton_samples/inputs_true.dat |  2 +-
 .../random_ray_k_eff/inputs_true.dat          |  2 +-
 .../random_ray_k_eff_mesh/inputs_true.dat     |  2 +-
 .../random_ray_linear/linear/inputs_true.dat  |  2 +-
 .../linear_xy/inputs_true.dat                 |  2 +-
 .../random_ray_low_density/inputs_true.dat    |  2 +-
 .../inputs_true.dat                           |  2 +-
 .../random_ray_void/flat/inputs_true.dat      |  2 +-
 .../random_ray_void/linear/inputs_true.dat    |  2 +-
 .../hybrid/inputs_true.dat                    |  2 +-
 .../naive/inputs_true.dat                     |  2 +-
 .../simulation_averaged/inputs_true.dat       |  2 +-
 .../hybrid/inputs_true.dat                    |  2 +-
 .../naive/inputs_true.dat                     |  2 +-
 .../simulation_averaged/inputs_true.dat       |  2 +-
 .../weightwindows_fw_cadis/inputs_true.dat    |  2 +-
 .../flat/inputs_true.dat                      |  2 +-
 .../linear/inputs_true.dat                    |  2 +-
 tests/unit_tests/test_settings.py             | 25 ++++++++++++++++++-
 33 files changed, 72 insertions(+), 39 deletions(-)

diff --git a/openmc/settings.py b/openmc/settings.py
index dc6fa99f9..8f8aedc93 100644
--- a/openmc/settings.py
+++ b/openmc/settings.py
@@ -1715,9 +1715,15 @@ class Settings:
                             domain_elem = ET.SubElement(mesh_elem, 'domain')
                             domain_elem.set('id', str(domain.id))
                             domain_elem.set('type', domain.__class__.__name__.lower())
-                        if mesh_memo is not None and mesh.id not in mesh_memo:
+                        # See if a <mesh> element already exists -- if not, add it
+                        path = f"./mesh[@id='{mesh.id}']"
+                        if root.find(path) is None:
                             root.append(mesh.to_xml_element())
-                            mesh_memo.add(mesh.id)
+                            if mesh_memo is not None:
+                                mesh_memo.add(mesh.id)
+                elif isinstance(value, bool):
+                    subelement = ET.SubElement(element, key)
+                    subelement.text = str(value).lower()
                 else:
                     subelement = ET.SubElement(element, key)
                     subelement.text = str(value)
@@ -2110,7 +2116,7 @@ class Settings:
         if text is not None:
             self.max_tracks = int(text)
 
-    def _random_ray_from_xml_element(self, root):
+    def _random_ray_from_xml_element(self, root, meshes=None):
         elem = root.find('random_ray')
         if elem is not None:
             self.random_ray = {}
@@ -2137,7 +2143,11 @@ class Settings:
                 elif child.tag == 'source_region_meshes':
                     self.random_ray['source_region_meshes'] = []
                     for mesh_elem in child.findall('mesh'):
-                        mesh = MeshBase.from_xml_element(mesh_elem)
+                        mesh_id = int(get_text(mesh_elem, 'id'))
+                        if meshes and mesh_id in meshes:
+                            mesh = meshes[mesh_id]
+                        else:
+                            mesh = MeshBase.from_xml_element(mesh_elem)
                         domains = []
                         for domain_elem in mesh_elem.findall('domain'):
                             domain_id = int(get_text(domain_elem, "id"))
@@ -2339,7 +2349,7 @@ class Settings:
         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._random_ray_from_xml_element(elem, meshes)
         settings._use_decay_photons_from_xml_element(elem)
         settings._source_rejection_fraction_from_xml_element(elem)
 
diff --git a/tests/regression_tests/random_ray_adjoint_fixed_source/inputs_true.dat b/tests/regression_tests/random_ray_adjoint_fixed_source/inputs_true.dat
index 30e62a885..0adfc5488 100644
--- a/tests/regression_tests/random_ray_adjoint_fixed_source/inputs_true.dat
+++ b/tests/regression_tests/random_ray_adjoint_fixed_source/inputs_true.dat
@@ -212,8 +212,8 @@
           <parameters>0.0 0.0 0.0 30.0 30.0 30.0</parameters>
         </space>
       </source>
-      <volume_normalized_flux_tallies>True</volume_normalized_flux_tallies>
-      <adjoint>True</adjoint>
+      <volume_normalized_flux_tallies>true</volume_normalized_flux_tallies>
+      <adjoint>true</adjoint>
       <volume_estimator>naive</volume_estimator>
     </random_ray>
   </settings>
diff --git a/tests/regression_tests/random_ray_adjoint_k_eff/inputs_true.dat b/tests/regression_tests/random_ray_adjoint_k_eff/inputs_true.dat
index cd4e92aa1..073348c41 100644
--- a/tests/regression_tests/random_ray_adjoint_k_eff/inputs_true.dat
+++ b/tests/regression_tests/random_ray_adjoint_k_eff/inputs_true.dat
@@ -85,8 +85,8 @@
           <parameters>-1.26 -1.26 -1 1.26 1.26 1</parameters>
         </space>
       </source>
-      <volume_normalized_flux_tallies>True</volume_normalized_flux_tallies>
-      <adjoint>True</adjoint>
+      <volume_normalized_flux_tallies>true</volume_normalized_flux_tallies>
+      <adjoint>true</adjoint>
     </random_ray>
   </settings>
   <tallies>
diff --git a/tests/regression_tests/random_ray_fixed_source_domain/cell/inputs_true.dat b/tests/regression_tests/random_ray_fixed_source_domain/cell/inputs_true.dat
index 4b8af76aa..9f1987f3a 100644
--- a/tests/regression_tests/random_ray_fixed_source_domain/cell/inputs_true.dat
+++ b/tests/regression_tests/random_ray_fixed_source_domain/cell/inputs_true.dat
@@ -212,7 +212,7 @@
           <parameters>0.0 0.0 0.0 30.0 30.0 30.0</parameters>
         </space>
       </source>
-      <volume_normalized_flux_tallies>True</volume_normalized_flux_tallies>
+      <volume_normalized_flux_tallies>true</volume_normalized_flux_tallies>
     </random_ray>
   </settings>
   <tallies>
diff --git a/tests/regression_tests/random_ray_fixed_source_domain/material/inputs_true.dat b/tests/regression_tests/random_ray_fixed_source_domain/material/inputs_true.dat
index 82fe48b61..b4f57dbfa 100644
--- a/tests/regression_tests/random_ray_fixed_source_domain/material/inputs_true.dat
+++ b/tests/regression_tests/random_ray_fixed_source_domain/material/inputs_true.dat
@@ -212,7 +212,7 @@
           <parameters>0.0 0.0 0.0 30.0 30.0 30.0</parameters>
         </space>
       </source>
-      <volume_normalized_flux_tallies>True</volume_normalized_flux_tallies>
+      <volume_normalized_flux_tallies>true</volume_normalized_flux_tallies>
     </random_ray>
   </settings>
   <tallies>
diff --git a/tests/regression_tests/random_ray_fixed_source_domain/universe/inputs_true.dat b/tests/regression_tests/random_ray_fixed_source_domain/universe/inputs_true.dat
index c4fd06f42..ab91f74e5 100644
--- a/tests/regression_tests/random_ray_fixed_source_domain/universe/inputs_true.dat
+++ b/tests/regression_tests/random_ray_fixed_source_domain/universe/inputs_true.dat
@@ -212,7 +212,7 @@
           <parameters>0.0 0.0 0.0 30.0 30.0 30.0</parameters>
         </space>
       </source>
-      <volume_normalized_flux_tallies>True</volume_normalized_flux_tallies>
+      <volume_normalized_flux_tallies>true</volume_normalized_flux_tallies>
     </random_ray>
   </settings>
   <tallies>
diff --git a/tests/regression_tests/random_ray_fixed_source_linear/linear/inputs_true.dat b/tests/regression_tests/random_ray_fixed_source_linear/linear/inputs_true.dat
index 4085b0c7a..220fa7db6 100644
--- a/tests/regression_tests/random_ray_fixed_source_linear/linear/inputs_true.dat
+++ b/tests/regression_tests/random_ray_fixed_source_linear/linear/inputs_true.dat
@@ -212,7 +212,7 @@
           <parameters>0.0 0.0 0.0 30.0 30.0 30.0</parameters>
         </space>
       </source>
-      <volume_normalized_flux_tallies>True</volume_normalized_flux_tallies>
+      <volume_normalized_flux_tallies>true</volume_normalized_flux_tallies>
       <source_shape>linear</source_shape>
     </random_ray>
   </settings>
diff --git a/tests/regression_tests/random_ray_fixed_source_linear/linear_xy/inputs_true.dat b/tests/regression_tests/random_ray_fixed_source_linear/linear_xy/inputs_true.dat
index ff085d2fb..f8c443085 100644
--- a/tests/regression_tests/random_ray_fixed_source_linear/linear_xy/inputs_true.dat
+++ b/tests/regression_tests/random_ray_fixed_source_linear/linear_xy/inputs_true.dat
@@ -212,7 +212,7 @@
           <parameters>0.0 0.0 0.0 30.0 30.0 30.0</parameters>
         </space>
       </source>
-      <volume_normalized_flux_tallies>True</volume_normalized_flux_tallies>
+      <volume_normalized_flux_tallies>true</volume_normalized_flux_tallies>
       <source_shape>linear_xy</source_shape>
     </random_ray>
   </settings>
diff --git a/tests/regression_tests/random_ray_fixed_source_mesh/flat/inputs_true.dat b/tests/regression_tests/random_ray_fixed_source_mesh/flat/inputs_true.dat
index 12c4d74ed..c84e544fc 100644
--- a/tests/regression_tests/random_ray_fixed_source_mesh/flat/inputs_true.dat
+++ b/tests/regression_tests/random_ray_fixed_source_mesh/flat/inputs_true.dat
@@ -212,7 +212,7 @@
           <parameters>0.0 0.0 0.0 30.0 30.0 30.0</parameters>
         </space>
       </source>
-      <volume_normalized_flux_tallies>True</volume_normalized_flux_tallies>
+      <volume_normalized_flux_tallies>true</volume_normalized_flux_tallies>
       <source_region_meshes>
         <mesh id="1">
           <domain id="1" type="universe"/>
diff --git a/tests/regression_tests/random_ray_fixed_source_mesh/linear/inputs_true.dat b/tests/regression_tests/random_ray_fixed_source_mesh/linear/inputs_true.dat
index 07adb1ff5..05c4846e6 100644
--- a/tests/regression_tests/random_ray_fixed_source_mesh/linear/inputs_true.dat
+++ b/tests/regression_tests/random_ray_fixed_source_mesh/linear/inputs_true.dat
@@ -212,7 +212,7 @@
           <parameters>0.0 0.0 0.0 30.0 30.0 30.0</parameters>
         </space>
       </source>
-      <volume_normalized_flux_tallies>True</volume_normalized_flux_tallies>
+      <volume_normalized_flux_tallies>true</volume_normalized_flux_tallies>
       <source_region_meshes>
         <mesh id="1">
           <domain id="1" type="universe"/>
diff --git a/tests/regression_tests/random_ray_fixed_source_normalization/False/inputs_true.dat b/tests/regression_tests/random_ray_fixed_source_normalization/False/inputs_true.dat
index ab077ae8a..0c870e100 100644
--- a/tests/regression_tests/random_ray_fixed_source_normalization/False/inputs_true.dat
+++ b/tests/regression_tests/random_ray_fixed_source_normalization/False/inputs_true.dat
@@ -212,7 +212,7 @@
           <parameters>0.0 0.0 0.0 30.0 30.0 30.0</parameters>
         </space>
       </source>
-      <volume_normalized_flux_tallies>False</volume_normalized_flux_tallies>
+      <volume_normalized_flux_tallies>false</volume_normalized_flux_tallies>
     </random_ray>
   </settings>
   <tallies>
diff --git a/tests/regression_tests/random_ray_fixed_source_normalization/True/inputs_true.dat b/tests/regression_tests/random_ray_fixed_source_normalization/True/inputs_true.dat
index c4fd06f42..ab91f74e5 100644
--- a/tests/regression_tests/random_ray_fixed_source_normalization/True/inputs_true.dat
+++ b/tests/regression_tests/random_ray_fixed_source_normalization/True/inputs_true.dat
@@ -212,7 +212,7 @@
           <parameters>0.0 0.0 0.0 30.0 30.0 30.0</parameters>
         </space>
       </source>
-      <volume_normalized_flux_tallies>True</volume_normalized_flux_tallies>
+      <volume_normalized_flux_tallies>true</volume_normalized_flux_tallies>
     </random_ray>
   </settings>
   <tallies>
diff --git a/tests/regression_tests/random_ray_fixed_source_subcritical/flat/inputs_true.dat b/tests/regression_tests/random_ray_fixed_source_subcritical/flat/inputs_true.dat
index a124b5e3c..0c05a71df 100644
--- a/tests/regression_tests/random_ray_fixed_source_subcritical/flat/inputs_true.dat
+++ b/tests/regression_tests/random_ray_fixed_source_subcritical/flat/inputs_true.dat
@@ -115,7 +115,7 @@
           <parameters>-1.26 -1.26 -1 1.26 1.26 1</parameters>
         </space>
       </source>
-      <volume_normalized_flux_tallies>False</volume_normalized_flux_tallies>
+      <volume_normalized_flux_tallies>false</volume_normalized_flux_tallies>
       <source_shape>flat</source_shape>
     </random_ray>
   </settings>
diff --git a/tests/regression_tests/random_ray_fixed_source_subcritical/linear_xy/inputs_true.dat b/tests/regression_tests/random_ray_fixed_source_subcritical/linear_xy/inputs_true.dat
index cc557afb6..a67495bf1 100644
--- a/tests/regression_tests/random_ray_fixed_source_subcritical/linear_xy/inputs_true.dat
+++ b/tests/regression_tests/random_ray_fixed_source_subcritical/linear_xy/inputs_true.dat
@@ -115,7 +115,7 @@
           <parameters>-1.26 -1.26 -1 1.26 1.26 1</parameters>
         </space>
       </source>
-      <volume_normalized_flux_tallies>False</volume_normalized_flux_tallies>
+      <volume_normalized_flux_tallies>false</volume_normalized_flux_tallies>
       <source_shape>linear_xy</source_shape>
     </random_ray>
   </settings>
diff --git a/tests/regression_tests/random_ray_halton_samples/inputs_true.dat b/tests/regression_tests/random_ray_halton_samples/inputs_true.dat
index 3f058e45c..36d5f6f22 100644
--- a/tests/regression_tests/random_ray_halton_samples/inputs_true.dat
+++ b/tests/regression_tests/random_ray_halton_samples/inputs_true.dat
@@ -85,7 +85,7 @@
           <parameters>-1.26 -1.26 -1 1.26 1.26 1</parameters>
         </space>
       </source>
-      <volume_normalized_flux_tallies>True</volume_normalized_flux_tallies>
+      <volume_normalized_flux_tallies>true</volume_normalized_flux_tallies>
       <sample_method>halton</sample_method>
     </random_ray>
   </settings>
diff --git a/tests/regression_tests/random_ray_k_eff/inputs_true.dat b/tests/regression_tests/random_ray_k_eff/inputs_true.dat
index 33c9cac33..545bd1d45 100644
--- a/tests/regression_tests/random_ray_k_eff/inputs_true.dat
+++ b/tests/regression_tests/random_ray_k_eff/inputs_true.dat
@@ -85,7 +85,7 @@
           <parameters>-1.26 -1.26 -1 1.26 1.26 1</parameters>
         </space>
       </source>
-      <volume_normalized_flux_tallies>True</volume_normalized_flux_tallies>
+      <volume_normalized_flux_tallies>true</volume_normalized_flux_tallies>
     </random_ray>
   </settings>
   <tallies>
diff --git a/tests/regression_tests/random_ray_k_eff_mesh/inputs_true.dat b/tests/regression_tests/random_ray_k_eff_mesh/inputs_true.dat
index f0822d9f9..98badea18 100644
--- a/tests/regression_tests/random_ray_k_eff_mesh/inputs_true.dat
+++ b/tests/regression_tests/random_ray_k_eff_mesh/inputs_true.dat
@@ -85,7 +85,7 @@
           <parameters>-1.26 -1.26 -1 1.26 1.26 1</parameters>
         </space>
       </source>
-      <volume_normalized_flux_tallies>True</volume_normalized_flux_tallies>
+      <volume_normalized_flux_tallies>true</volume_normalized_flux_tallies>
       <source_region_meshes>
         <mesh id="2">
           <domain id="7" type="universe"/>
diff --git a/tests/regression_tests/random_ray_linear/linear/inputs_true.dat b/tests/regression_tests/random_ray_linear/linear/inputs_true.dat
index 006996557..a43a66e71 100644
--- a/tests/regression_tests/random_ray_linear/linear/inputs_true.dat
+++ b/tests/regression_tests/random_ray_linear/linear/inputs_true.dat
@@ -85,7 +85,7 @@
           <parameters>-1.26 -1.26 -1 1.26 1.26 1</parameters>
         </space>
       </source>
-      <volume_normalized_flux_tallies>True</volume_normalized_flux_tallies>
+      <volume_normalized_flux_tallies>true</volume_normalized_flux_tallies>
       <source_shape>linear</source_shape>
     </random_ray>
   </settings>
diff --git a/tests/regression_tests/random_ray_linear/linear_xy/inputs_true.dat b/tests/regression_tests/random_ray_linear/linear_xy/inputs_true.dat
index 81527c479..7f76f2fd1 100644
--- a/tests/regression_tests/random_ray_linear/linear_xy/inputs_true.dat
+++ b/tests/regression_tests/random_ray_linear/linear_xy/inputs_true.dat
@@ -85,7 +85,7 @@
           <parameters>-1.26 -1.26 -1 1.26 1.26 1</parameters>
         </space>
       </source>
-      <volume_normalized_flux_tallies>True</volume_normalized_flux_tallies>
+      <volume_normalized_flux_tallies>true</volume_normalized_flux_tallies>
       <source_shape>linear_xy</source_shape>
     </random_ray>
   </settings>
diff --git a/tests/regression_tests/random_ray_low_density/inputs_true.dat b/tests/regression_tests/random_ray_low_density/inputs_true.dat
index c4fd06f42..ab91f74e5 100644
--- a/tests/regression_tests/random_ray_low_density/inputs_true.dat
+++ b/tests/regression_tests/random_ray_low_density/inputs_true.dat
@@ -212,7 +212,7 @@
           <parameters>0.0 0.0 0.0 30.0 30.0 30.0</parameters>
         </space>
       </source>
-      <volume_normalized_flux_tallies>True</volume_normalized_flux_tallies>
+      <volume_normalized_flux_tallies>true</volume_normalized_flux_tallies>
     </random_ray>
   </settings>
   <tallies>
diff --git a/tests/regression_tests/random_ray_point_source_locator/inputs_true.dat b/tests/regression_tests/random_ray_point_source_locator/inputs_true.dat
index 82ad979da..088f803bf 100644
--- a/tests/regression_tests/random_ray_point_source_locator/inputs_true.dat
+++ b/tests/regression_tests/random_ray_point_source_locator/inputs_true.dat
@@ -211,7 +211,7 @@
           <parameters>0.0 0.0 0.0 30.0 30.0 30.0</parameters>
         </space>
       </source>
-      <volume_normalized_flux_tallies>True</volume_normalized_flux_tallies>
+      <volume_normalized_flux_tallies>true</volume_normalized_flux_tallies>
       <source_region_meshes>
         <mesh id="1">
           <domain id="6" type="universe"/>
diff --git a/tests/regression_tests/random_ray_void/flat/inputs_true.dat b/tests/regression_tests/random_ray_void/flat/inputs_true.dat
index ea8c22f0b..aa28e7b68 100644
--- a/tests/regression_tests/random_ray_void/flat/inputs_true.dat
+++ b/tests/regression_tests/random_ray_void/flat/inputs_true.dat
@@ -212,7 +212,7 @@
           <parameters>0.0 0.0 0.0 30.0 30.0 30.0</parameters>
         </space>
       </source>
-      <volume_normalized_flux_tallies>True</volume_normalized_flux_tallies>
+      <volume_normalized_flux_tallies>true</volume_normalized_flux_tallies>
       <source_shape>flat</source_shape>
     </random_ray>
   </settings>
diff --git a/tests/regression_tests/random_ray_void/linear/inputs_true.dat b/tests/regression_tests/random_ray_void/linear/inputs_true.dat
index a089604ef..e4b2f22fa 100644
--- a/tests/regression_tests/random_ray_void/linear/inputs_true.dat
+++ b/tests/regression_tests/random_ray_void/linear/inputs_true.dat
@@ -212,7 +212,7 @@
           <parameters>0.0 0.0 0.0 30.0 30.0 30.0</parameters>
         </space>
       </source>
-      <volume_normalized_flux_tallies>True</volume_normalized_flux_tallies>
+      <volume_normalized_flux_tallies>true</volume_normalized_flux_tallies>
       <source_shape>linear</source_shape>
     </random_ray>
   </settings>
diff --git a/tests/regression_tests/random_ray_volume_estimator/hybrid/inputs_true.dat b/tests/regression_tests/random_ray_volume_estimator/hybrid/inputs_true.dat
index 089534d74..8e8a8ed9b 100644
--- a/tests/regression_tests/random_ray_volume_estimator/hybrid/inputs_true.dat
+++ b/tests/regression_tests/random_ray_volume_estimator/hybrid/inputs_true.dat
@@ -212,7 +212,7 @@
           <parameters>0.0 0.0 0.0 30.0 30.0 30.0</parameters>
         </space>
       </source>
-      <volume_normalized_flux_tallies>True</volume_normalized_flux_tallies>
+      <volume_normalized_flux_tallies>true</volume_normalized_flux_tallies>
       <volume_estimator>hybrid</volume_estimator>
     </random_ray>
   </settings>
diff --git a/tests/regression_tests/random_ray_volume_estimator/naive/inputs_true.dat b/tests/regression_tests/random_ray_volume_estimator/naive/inputs_true.dat
index 56507df04..1e25b97da 100644
--- a/tests/regression_tests/random_ray_volume_estimator/naive/inputs_true.dat
+++ b/tests/regression_tests/random_ray_volume_estimator/naive/inputs_true.dat
@@ -212,7 +212,7 @@
           <parameters>0.0 0.0 0.0 30.0 30.0 30.0</parameters>
         </space>
       </source>
-      <volume_normalized_flux_tallies>True</volume_normalized_flux_tallies>
+      <volume_normalized_flux_tallies>true</volume_normalized_flux_tallies>
       <volume_estimator>naive</volume_estimator>
     </random_ray>
   </settings>
diff --git a/tests/regression_tests/random_ray_volume_estimator/simulation_averaged/inputs_true.dat b/tests/regression_tests/random_ray_volume_estimator/simulation_averaged/inputs_true.dat
index 0331b562c..78c162697 100644
--- a/tests/regression_tests/random_ray_volume_estimator/simulation_averaged/inputs_true.dat
+++ b/tests/regression_tests/random_ray_volume_estimator/simulation_averaged/inputs_true.dat
@@ -212,7 +212,7 @@
           <parameters>0.0 0.0 0.0 30.0 30.0 30.0</parameters>
         </space>
       </source>
-      <volume_normalized_flux_tallies>True</volume_normalized_flux_tallies>
+      <volume_normalized_flux_tallies>true</volume_normalized_flux_tallies>
       <volume_estimator>simulation_averaged</volume_estimator>
     </random_ray>
   </settings>
diff --git a/tests/regression_tests/random_ray_volume_estimator_linear/hybrid/inputs_true.dat b/tests/regression_tests/random_ray_volume_estimator_linear/hybrid/inputs_true.dat
index 343833210..47a8a7182 100644
--- a/tests/regression_tests/random_ray_volume_estimator_linear/hybrid/inputs_true.dat
+++ b/tests/regression_tests/random_ray_volume_estimator_linear/hybrid/inputs_true.dat
@@ -212,7 +212,7 @@
           <parameters>0.0 0.0 0.0 30.0 30.0 30.0</parameters>
         </space>
       </source>
-      <volume_normalized_flux_tallies>True</volume_normalized_flux_tallies>
+      <volume_normalized_flux_tallies>true</volume_normalized_flux_tallies>
       <source_shape>linear</source_shape>
       <volume_estimator>hybrid</volume_estimator>
     </random_ray>
diff --git a/tests/regression_tests/random_ray_volume_estimator_linear/naive/inputs_true.dat b/tests/regression_tests/random_ray_volume_estimator_linear/naive/inputs_true.dat
index 50be43eb3..80a9ada4d 100644
--- a/tests/regression_tests/random_ray_volume_estimator_linear/naive/inputs_true.dat
+++ b/tests/regression_tests/random_ray_volume_estimator_linear/naive/inputs_true.dat
@@ -212,7 +212,7 @@
           <parameters>0.0 0.0 0.0 30.0 30.0 30.0</parameters>
         </space>
       </source>
-      <volume_normalized_flux_tallies>True</volume_normalized_flux_tallies>
+      <volume_normalized_flux_tallies>true</volume_normalized_flux_tallies>
       <source_shape>linear</source_shape>
       <volume_estimator>naive</volume_estimator>
     </random_ray>
diff --git a/tests/regression_tests/random_ray_volume_estimator_linear/simulation_averaged/inputs_true.dat b/tests/regression_tests/random_ray_volume_estimator_linear/simulation_averaged/inputs_true.dat
index 3d64ab978..4f032a62a 100644
--- a/tests/regression_tests/random_ray_volume_estimator_linear/simulation_averaged/inputs_true.dat
+++ b/tests/regression_tests/random_ray_volume_estimator_linear/simulation_averaged/inputs_true.dat
@@ -212,7 +212,7 @@
           <parameters>0.0 0.0 0.0 30.0 30.0 30.0</parameters>
         </space>
       </source>
-      <volume_normalized_flux_tallies>True</volume_normalized_flux_tallies>
+      <volume_normalized_flux_tallies>true</volume_normalized_flux_tallies>
       <source_shape>linear</source_shape>
       <volume_estimator>simulation_averaged</volume_estimator>
     </random_ray>
diff --git a/tests/regression_tests/weightwindows_fw_cadis/inputs_true.dat b/tests/regression_tests/weightwindows_fw_cadis/inputs_true.dat
index 448b4b145..5fa6505dd 100644
--- a/tests/regression_tests/weightwindows_fw_cadis/inputs_true.dat
+++ b/tests/regression_tests/weightwindows_fw_cadis/inputs_true.dat
@@ -227,7 +227,7 @@
           <parameters>0.0 0.0 0.0 30.0 30.0 30.0</parameters>
         </space>
       </source>
-      <volume_normalized_flux_tallies>True</volume_normalized_flux_tallies>
+      <volume_normalized_flux_tallies>true</volume_normalized_flux_tallies>
       <volume_estimator>naive</volume_estimator>
     </random_ray>
   </settings>
diff --git a/tests/regression_tests/weightwindows_fw_cadis_mesh/flat/inputs_true.dat b/tests/regression_tests/weightwindows_fw_cadis_mesh/flat/inputs_true.dat
index d82aa6fae..ceb89e6e3 100644
--- a/tests/regression_tests/weightwindows_fw_cadis_mesh/flat/inputs_true.dat
+++ b/tests/regression_tests/weightwindows_fw_cadis_mesh/flat/inputs_true.dat
@@ -227,7 +227,7 @@
           <parameters>0.0 0.0 0.0 30.0 30.0 30.0</parameters>
         </space>
       </source>
-      <volume_normalized_flux_tallies>True</volume_normalized_flux_tallies>
+      <volume_normalized_flux_tallies>true</volume_normalized_flux_tallies>
       <source_region_meshes>
         <mesh id="1">
           <domain id="6" type="universe"/>
diff --git a/tests/regression_tests/weightwindows_fw_cadis_mesh/linear/inputs_true.dat b/tests/regression_tests/weightwindows_fw_cadis_mesh/linear/inputs_true.dat
index 9e4b21d27..c7691e950 100644
--- a/tests/regression_tests/weightwindows_fw_cadis_mesh/linear/inputs_true.dat
+++ b/tests/regression_tests/weightwindows_fw_cadis_mesh/linear/inputs_true.dat
@@ -227,7 +227,7 @@
           <parameters>0.0 0.0 0.0 30.0 30.0 30.0</parameters>
         </space>
       </source>
-      <volume_normalized_flux_tallies>True</volume_normalized_flux_tallies>
+      <volume_normalized_flux_tallies>true</volume_normalized_flux_tallies>
       <source_region_meshes>
         <mesh id="1">
           <domain id="6" type="universe"/>
diff --git a/tests/unit_tests/test_settings.py b/tests/unit_tests/test_settings.py
index 6611e4227..a6abca41a 100644
--- a/tests/unit_tests/test_settings.py
+++ b/tests/unit_tests/test_settings.py
@@ -59,12 +59,23 @@ def test_export_to_xml(run_in_tmpdir):
     s.electron_treatment = 'led'
     s.write_initial_source = True
     s.weight_window_checkpoints = {'surface': True, 'collision': False}
+    source_region_mesh = openmc.RegularMesh()
+    source_region_mesh.dimension = [2, 2, 2]
+    source_region_mesh.lower_left = [-2, -2, -2]
+    source_region_mesh.upper_right = [2, 2, 2]
+    root_universe = openmc.Universe()
     s.random_ray = {
         'distance_inactive': 10.0,
         'distance_active': 100.0,
         'ray_source': openmc.IndependentSource(
             space=openmc.stats.Box((-1., -1., -1.), (1., 1., 1.))
-        )
+        ),
+        'source_region_meshes': [(source_region_mesh, [root_universe])],
+        'volume_estimator': 'hybrid',
+        'source_shape': 'linear',
+        'volume_normalized_flux_tallies': True,
+        'adjoint': False,
+        'sample_method': 'halton'
     }
     s.max_particle_events = 100
     s.max_secondaries = 1_000_000
@@ -145,5 +156,17 @@ def test_export_to_xml(run_in_tmpdir):
     assert s.random_ray['distance_active'] == 100.0
     assert s.random_ray['ray_source'].space.lower_left == [-1., -1., -1.]
     assert s.random_ray['ray_source'].space.upper_right == [1., 1., 1.]
+    assert 'source_region_meshes' in s.random_ray
+    assert len(s.random_ray['source_region_meshes']) == 1
+    mesh_and_domains = s.random_ray['source_region_meshes'][0]
+    recovered_mesh = mesh_and_domains[0]
+    assert recovered_mesh.dimension == (2, 2, 2)
+    assert recovered_mesh.lower_left == [-2., -2., -2.]
+    assert recovered_mesh.upper_right == [2., 2., 2.]
+    assert s.random_ray['volume_estimator'] == 'hybrid'
+    assert s.random_ray['source_shape'] == 'linear'
+    assert s.random_ray['volume_normalized_flux_tallies']
+    assert not s.random_ray['adjoint']
+    assert s.random_ray['sample_method'] == 'halton'
     assert s.max_secondaries == 1_000_000
     assert s.source_rejection_fraction == 0.01

From 8a62e7e3235f75810cf59fc80bd69951e0d99fda Mon Sep 17 00:00:00 2001
From: Thomas Kittelmann <tkittel@users.noreply.github.com>
Date: Fri, 3 Oct 2025 01:27:36 +0200
Subject: [PATCH 130/203] Fix caching issue when using NCrystal materials
 (#3538)

Co-authored-by: Jose Ignacio Marquez Damian <22483345+marquezj@users.noreply.github.com>
Co-authored-by: Paul Romano <paul.k.romano@gmail.com>
---
 include/openmc/particle_data.h | 7 ++++---
 openmc/plotter.py              | 2 +-
 src/particle.cpp               | 4 +++-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/include/openmc/particle_data.h b/include/openmc/particle_data.h
index afcd56476..5383487d4 100644
--- a/include/openmc/particle_data.h
+++ b/include/openmc/particle_data.h
@@ -154,9 +154,10 @@ struct NuclideMicroXS {
 
   // Energy and temperature last used to evaluate these cross sections.  If
   // these values have changed, then the cross sections must be re-evaluated.
-  double last_E {0.0};      //!< Last evaluated energy
-  double last_sqrtkT {0.0}; //!< Last temperature in sqrt(Boltzmann constant
-                            //!< * temperature (eV))
+  double last_E {0.0};       //!< Last evaluated energy
+  double last_sqrtkT {0.0};  //!< Last temperature in sqrt(Boltzmann constant
+                             //!< * temperature (eV))
+  double ncrystal_xs {-1.0}; //!< NCrystal cross section
 };
 
 //==============================================================================
diff --git a/openmc/plotter.py b/openmc/plotter.py
index 693cdaca4..abd8ab6dd 100644
--- a/openmc/plotter.py
+++ b/openmc/plotter.py
@@ -501,7 +501,7 @@ def _calculate_cexs_nuclide(this, types, temperature=294., sab_name=None,
                     elif ncrystal_cfg:
                         import NCrystal
                         nc_scatter = NCrystal.createScatter(ncrystal_cfg)
-                        nc_func = nc_scatter.crossSectionNonOriented
+                        nc_func = nc_scatter.xsect
                         nc_emax = 5 # eV # this should be obtained from NCRYSTAL_MAX_ENERGY
                         energy_grid = np.union1d(np.geomspace(min(energy_grid),
                                                               1.1*nc_emax,
diff --git a/src/particle.cpp b/src/particle.cpp
index 402af2498..06ccf462a 100644
--- a/src/particle.cpp
+++ b/src/particle.cpp
@@ -855,10 +855,12 @@ void Particle::update_neutron_xs(
 
   // If the cache doesn't match, recalculate micro xs
   if (this->E() != micro.last_E || this->sqrtkT() != micro.last_sqrtkT ||
-      i_sab != micro.index_sab || sab_frac != micro.sab_frac) {
+      i_sab != micro.index_sab || sab_frac != micro.sab_frac ||
+      ncrystal_xs != micro.ncrystal_xs) {
     data::nuclides[i_nuclide]->calculate_xs(i_sab, i_grid, sab_frac, *this);
 
     // If NCrystal is being used, update micro cross section cache
+    micro.ncrystal_xs = ncrystal_xs;
     if (ncrystal_xs >= 0.0) {
       data::nuclides[i_nuclide]->calculate_elastic_xs(*this);
       ncrystal_update_micro(ncrystal_xs, micro);

From 50071aa3bd29b78f28fe4c8efe211cb5f65778ee Mon Sep 17 00:00:00 2001
From: Jonathan Shimwell <mail@jshimwell.com>
Date: Fri, 3 Oct 2025 17:09:57 +0200
Subject: [PATCH 131/203] Speed up time correction factors (#3592)

Co-authored-by: Jon Shimwell <jon@proximafusion.com>
Co-authored-by: Paul Romano <paul.k.romano@gmail.com>
---
 openmc/deplete/d1s.py | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/openmc/deplete/d1s.py b/openmc/deplete/d1s.py
index 311bc2d69..f51dea416 100644
--- a/openmc/deplete/d1s.py
+++ b/openmc/deplete/d1s.py
@@ -108,14 +108,15 @@ def time_correction_factors(
     # Create a 2D array for the time correction factors
     h = np.zeros((n_timesteps, n_nuclides))
 
-    for i, (dt, rate) in enumerate(zip(timesteps, source_rates)):
-        # Precompute the exponential terms. Since (1 - exp(-x)) is susceptible to
-        # roundoff error, use expm1 instead (which computes exp(x) - 1)
-        g = np.exp(-decay_rate*dt)
-        one_minus_g = -np.expm1(-decay_rate*dt)
+    # Precompute all exponential terms with same shape as h
+    decay_dt = decay_rate[np.newaxis, :] * timesteps[:, np.newaxis]
+    g = np.exp(-decay_dt)
+    one_minus_g = -np.expm1(-decay_dt)
 
+    # Apply recurrence relation step by step
+    for i in range(len(timesteps)):
         # Eq. (4) in doi:10.1016/j.fusengdes.2019.111399
-        h[i + 1] = rate*one_minus_g + h[i]*g
+        h[i + 1] = source_rates[i] * one_minus_g[i] + h[i] * g[i]
 
     return {nuclides[i]: h[:, i] for i in range(n_nuclides)}
 

From 2c15480cc9f1f7407b2fecd8b47a56f976b7bd02 Mon Sep 17 00:00:00 2001
From: Paul Romano <paul.k.romano@gmail.com>
Date: Mon, 6 Oct 2025 07:45:26 -0500
Subject: [PATCH 132/203] Add user setting for free gas threshold (#3593)

---
 docs/source/io_formats/settings.rst | 10 ++++++++++
 include/openmc/physics.h            |  7 -------
 include/openmc/settings.h           |  2 ++
 openmc/settings.py                  | 28 ++++++++++++++++++++++++++++
 src/finalize.cpp                    |  1 +
 src/physics.cpp                     |  2 +-
 src/settings.cpp                    |  5 +++++
 tests/unit_tests/test_settings.py   |  2 ++
 8 files changed, 49 insertions(+), 8 deletions(-)

diff --git a/docs/source/io_formats/settings.rst b/docs/source/io_formats/settings.rst
index 26673faac..720846c85 100644
--- a/docs/source/io_formats/settings.rst
+++ b/docs/source/io_formats/settings.rst
@@ -178,6 +178,16 @@ history-based parallelism.
 
   *Default*: false
 
+--------------------------------
+``<free_gas_threshold>`` Element
+--------------------------------
+
+The ``<free_gas_threshold>`` element specifies the energy multiplier, expressed
+in units of :math:`kT`, that determines when the free gas scattering approach is
+used for elastic scattering. Values must be positive.
+
+  *Default*: 400.0
+
 -----------------------------------
 ``<generations_per_batch>`` Element
 -----------------------------------
diff --git a/include/openmc/physics.h b/include/openmc/physics.h
index f62f43a02..2472d9799 100644
--- a/include/openmc/physics.h
+++ b/include/openmc/physics.h
@@ -10,13 +10,6 @@
 
 namespace openmc {
 
-//==============================================================================
-// Constants
-//==============================================================================
-
-// Monoatomic ideal-gas scattering treatment threshold
-constexpr double FREE_GAS_THRESHOLD {400.0};
-
 //==============================================================================
 // Non-member functions
 //==============================================================================
diff --git a/include/openmc/settings.h b/include/openmc/settings.h
index 999b1b83f..78bfa088e 100644
--- a/include/openmc/settings.h
+++ b/include/openmc/settings.h
@@ -147,6 +147,8 @@ extern std::unordered_set<int>
   source_write_surf_id; //!< Surface ids where sources will be written
 extern double source_rejection_fraction; //!< Minimum fraction of source sites
                                          //!< that must be accepted
+extern double free_gas_threshold;        //!< Threshold multiplier for free gas
+                                         //!< scattering treatment
 
 extern int
   max_history_splits; //!< maximum number of particle splits for weight windows
diff --git a/openmc/settings.py b/openmc/settings.py
index 8f8aedc93..2f8a2b124 100644
--- a/openmc/settings.py
+++ b/openmc/settings.py
@@ -84,6 +84,10 @@ class Settings:
         history-based parallelism.
 
         .. versionadded:: 0.12
+    free_gas_threshold : float
+        Energy multiplier (in units of :math:`kT`) below which the free gas
+        scattering treatment is applied for elastic scattering. If not
+        specified, a value of 400.0 is used.
     generations_per_batch : int
         Number of generations per batch
     ifp_n_generation : int
@@ -376,6 +380,7 @@ class Settings:
         self._seed = None
         self._stride = None
         self._survival_biasing = None
+        self._free_gas_threshold = None
 
         # Shannon entropy mesh
         self._entropy_mesh = None
@@ -1255,6 +1260,17 @@ class Settings:
         cv.check_less_than('source_rejection_fraction', source_rejection_fraction, 1)
         self._source_rejection_fraction = source_rejection_fraction
 
+    @property
+    def free_gas_threshold(self) -> float | None:
+        return self._free_gas_threshold
+
+    @free_gas_threshold.setter
+    def free_gas_threshold(self, free_gas_threshold: float | None):
+        if free_gas_threshold is not None:
+            cv.check_type('free gas threshold', free_gas_threshold, Real)
+            cv.check_greater_than('free gas threshold', free_gas_threshold, 0.0)
+        self._free_gas_threshold = free_gas_threshold
+
     def _create_run_mode_subelement(self, root):
         elem = ET.SubElement(root, "run_mode")
         elem.text = self._run_mode.value
@@ -1733,6 +1749,11 @@ class Settings:
             element = ET.SubElement(root, "source_rejection_fraction")
             element.text = str(self._source_rejection_fraction)
 
+    def _create_free_gas_threshold_subelement(self, root):
+        if self._free_gas_threshold is not None:
+            element = ET.SubElement(root, "free_gas_threshold")
+            element.text = str(self._free_gas_threshold)
+
     def _eigenvalue_from_xml_element(self, root):
         elem = root.find('eigenvalue')
         if elem is not None:
@@ -2171,6 +2192,11 @@ class Settings:
         if text is not None:
             self.source_rejection_fraction = float(text)
 
+    def _free_gas_threshold_from_xml_element(self, root):
+        text = get_text(root, 'free_gas_threshold')
+        if text is not None:
+            self.free_gas_threshold = float(text)
+
     def to_xml_element(self, mesh_memo=None):
         """Create a 'settings' element to be written to an XML file.
 
@@ -2241,6 +2267,7 @@ class Settings:
         self._create_random_ray_subelement(element, mesh_memo)
         self._create_use_decay_photons_subelement(element)
         self._create_source_rejection_fraction_subelement(element)
+        self._create_free_gas_threshold_subelement(element)
 
         # Clean the indentation in the file to be user-readable
         clean_indentation(element)
@@ -2352,6 +2379,7 @@ class Settings:
         settings._random_ray_from_xml_element(elem, meshes)
         settings._use_decay_photons_from_xml_element(elem)
         settings._source_rejection_fraction_from_xml_element(elem)
+        settings._free_gas_threshold_from_xml_element(elem)
 
         return settings
 
diff --git a/src/finalize.cpp b/src/finalize.cpp
index 25b471a8b..76babbb96 100644
--- a/src/finalize.cpp
+++ b/src/finalize.cpp
@@ -85,6 +85,7 @@ int openmc_finalize()
   settings::time_cutoff = {INFTY, INFTY, INFTY, INFTY};
   settings::entropy_on = false;
   settings::event_based = false;
+  settings::free_gas_threshold = 400.0;
   settings::gen_per_batch = 1;
   settings::legendre_to_tabular = true;
   settings::legendre_to_tabular_points = -1;
diff --git a/src/physics.cpp b/src/physics.cpp
index e947fecbb..3a17077b3 100644
--- a/src/physics.cpp
+++ b/src/physics.cpp
@@ -851,7 +851,7 @@ Direction sample_target_velocity(const Nuclide& nuc, double E, Direction u,
 
     // otherwise, use free gas model
   } else {
-    if (E >= FREE_GAS_THRESHOLD * kT && nuc.awr_ > 1.0) {
+    if (E >= settings::free_gas_threshold * kT && nuc.awr_ > 1.0) {
       return {};
     } else {
       sampling_method = ResScatMethod::cxs;
diff --git a/src/settings.cpp b/src/settings.cpp
index f9a2469db..325256cdc 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -126,6 +126,7 @@ SolverType solver_type {SolverType::MONTE_CARLO};
 std::unordered_set<int> sourcepoint_batch;
 std::unordered_set<int> statepoint_batch;
 double source_rejection_fraction {0.05};
+double free_gas_threshold {400.0};
 std::unordered_set<int> source_write_surf_id;
 int64_t ssw_max_particles;
 int64_t ssw_max_files;
@@ -651,6 +652,10 @@ void read_settings_xml(pugi::xml_node root)
       std::stod(get_node_value(root, "source_rejection_fraction"));
   }
 
+  if (check_for_node(root, "free_gas_threshold")) {
+    free_gas_threshold = std::stod(get_node_value(root, "free_gas_threshold"));
+  }
+
   // Survival biasing
   if (check_for_node(root, "survival_biasing")) {
     survival_biasing = get_node_value_bool(root, "survival_biasing");
diff --git a/tests/unit_tests/test_settings.py b/tests/unit_tests/test_settings.py
index a6abca41a..fe618fd2d 100644
--- a/tests/unit_tests/test_settings.py
+++ b/tests/unit_tests/test_settings.py
@@ -80,6 +80,7 @@ def test_export_to_xml(run_in_tmpdir):
     s.max_particle_events = 100
     s.max_secondaries = 1_000_000
     s.source_rejection_fraction = 0.01
+    s.free_gas_threshold = 800.0
 
     # Make sure exporting XML works
     s.export_to_xml()
@@ -170,3 +171,4 @@ def test_export_to_xml(run_in_tmpdir):
     assert s.random_ray['sample_method'] == 'halton'
     assert s.max_secondaries == 1_000_000
     assert s.source_rejection_fraction == 0.01
+    assert s.free_gas_threshold == 800.0

From 3dfa34d2c6a239cad327baa5565cd71f158fc299 Mon Sep 17 00:00:00 2001
From: Paul Romano <paul.k.romano@gmail.com>
Date: Mon, 6 Oct 2025 21:14:37 -0500
Subject: [PATCH 133/203] Switch to using coveralls github action for reporting
 (#3594)

---
 .github/workflows/ci.yml | 35 +++++++++++++++++++++++++++++++----
 pyproject.toml           |  4 ++--
 tools/ci/gha-script.sh   |  2 +-
 3 files changed, 34 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 38a49b602..d75a64d66 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -75,6 +75,7 @@ jobs:
       LIBMESH: ${{ matrix.libmesh }}
       NPY_DISABLE_CPU_FEATURES: "AVX512F AVX512_SKX"
       OPENBLAS_NUM_THREADS: 1
+      PYTEST_ADDOPTS: --cov=openmc --cov-report=lcov:coverage-python.lcov
       # libfabric complains about fork() as a result of using Python multiprocessing.
       # We can work around it with RDMAV_FORK_SAFE=1 in libfabric < 1.13 and with
       # FI_EFA_FORK_SAFE=1 in more recent versions.
@@ -171,11 +172,37 @@ jobs:
         uses: mxschmitt/action-tmate@v3
         timeout-minutes: 10
 
-      - name: after_success
+      - name: Generate C++ coverage (gcovr)
         shell: bash
         run: |
-          cpp-coveralls -i src -i include -e src/external --exclude-pattern "/usr/*" --dump cpp_cov.json
-          coveralls --merge=cpp_cov.json --service=github
+          # Produce LCOV directly from gcov data in the build tree
+          gcovr \
+            --root "$GITHUB_WORKSPACE" \
+            --object-directory "$GITHUB_WORKSPACE/build" \
+            --filter "$GITHUB_WORKSPACE/src" \
+            --filter "$GITHUB_WORKSPACE/include" \
+            --exclude "$GITHUB_WORKSPACE/src/external/.*" \
+            --exclude "$GITHUB_WORKSPACE/src/include/openmc/external/.*" \
+            --gcov-ignore-errors source_not_found \
+            --gcov-ignore-errors output_error \
+            --gcov-ignore-parse-errors suspicious_hits.warn \
+            --print-summary \
+            --lcov -o coverage-cpp.lcov || true
+
+      - name: Merge C++ and Python coverage
+        shell: bash
+        run: |
+          # Merge C++ and Python LCOV into a single file for upload
+          cat coverage-cpp.lcov coverage-python.lcov > coverage.lcov
+
+      - name: Upload coverage to Coveralls
+        if: ${{ hashFiles('coverage.lcov') != '' }}
+        uses: coverallsapp/github-action@v2
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          parallel: true
+          flag-name: C++ and Python
+          path-to-lcov: coverage.lcov
 
   finish:
     needs: main
@@ -184,5 +211,5 @@ jobs:
       - name: Coveralls Finished
         uses: coverallsapp/github-action@v2
         with:
-          github-token: ${{ secrets.github_token }}
+          github-token: ${{ secrets.GITHUB_TOKEN }}
           parallel-finished: true
diff --git a/pyproject.toml b/pyproject.toml
index 7705de8da..53d429d94 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -48,8 +48,8 @@ docs = [
     "sphinxcontrib-svg2pdfconverter",
     "sphinx-rtd-theme"
 ]
-test = ["packaging", "pytest", "pytest-cov", "colorama", "openpyxl"]
-ci = ["cpp-coveralls", "coveralls"]
+test = ["packaging", "pytest", "pytest-cov>=4.0", "colorama", "openpyxl"]
+ci = ["coverage>=7.4", "gcovr>=7.2"]
 vtk = ["vtk"]
 
 [project.urls]
diff --git a/tools/ci/gha-script.sh b/tools/ci/gha-script.sh
index c1d292137..b40238ffb 100755
--- a/tools/ci/gha-script.sh
+++ b/tools/ci/gha-script.sh
@@ -15,7 +15,7 @@ if [[ $EVENT == 'y' ]]; then
 fi
 
 # Run unit tests and then regression tests
-pytest --cov=openmc -v $args \
+pytest -v $args \
   tests/test_matplotlib_import.py \
   tests/unit_tests \
   tests/regression_tests

From 58c7fbeac67a3e6db0e26a9dc2db421da3abf933 Mon Sep 17 00:00:00 2001
From: Paul Romano <paul.k.romano@gmail.com>
Date: Tue, 14 Oct 2025 07:47:26 -0500
Subject: [PATCH 134/203] Re-run flaky tests when needed (#3604)

---
 pyproject.toml                              |  9 ++++++++-
 tests/unit_tests/test_deplete_activation.py |  1 +
 tests/unit_tests/test_stats.py              | 10 ++++++++++
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index 53d429d94..2d67e8340 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -48,7 +48,14 @@ docs = [
     "sphinxcontrib-svg2pdfconverter",
     "sphinx-rtd-theme"
 ]
-test = ["packaging", "pytest", "pytest-cov>=4.0", "colorama", "openpyxl"]
+test = [
+    "packaging",
+    "pytest",
+    "pytest-cov>=4.0",
+    "pytest-rerunfailures",
+    "colorama",
+    "openpyxl",
+]
 ci = ["coverage>=7.4", "gcovr>=7.2"]
 vtk = ["vtk"]
 
diff --git a/tests/unit_tests/test_deplete_activation.py b/tests/unit_tests/test_deplete_activation.py
index cbe00d680..eace1976e 100644
--- a/tests/unit_tests/test_deplete_activation.py
+++ b/tests/unit_tests/test_deplete_activation.py
@@ -49,6 +49,7 @@ ENERGIES = np.logspace(log10(1e-5), log10(2e7), 100)
     ("flux", {'energies': ENERGIES, 'reactions': ['(n,gamma)']}, 1e-5),
     ("flux", {'energies': ENERGIES, 'reactions': ['(n,gamma)'], 'nuclides': ['W186', 'H3']}, 1e-2),
 ])
+@pytest.mark.flaky(reruns=1)
 def test_activation(run_in_tmpdir, model, reaction_rate_mode, reaction_rate_opts, tolerance):
     # Determine (n.gamma) reaction rate using initial run
     sp = model.run()
diff --git a/tests/unit_tests/test_stats.py b/tests/unit_tests/test_stats.py
index 386181f34..abf143f12 100644
--- a/tests/unit_tests/test_stats.py
+++ b/tests/unit_tests/test_stats.py
@@ -16,6 +16,7 @@ def assert_sample_mean(samples, expected_mean):
     assert np.abs(expected_mean - samples.mean()) < 4*std_dev
 
 
+@pytest.mark.flaky(reruns=1)
 def test_discrete():
     x = [0.0, 1.0, 10.0]
     p = [0.3, 0.2, 0.5]
@@ -104,6 +105,7 @@ def test_clip_discrete():
         d.clip(5)
 
 
+@pytest.mark.flaky(reruns=1)
 def test_uniform():
     a, b = 10.0, 20.0
     d = openmc.stats.Uniform(a, b)
@@ -127,6 +129,7 @@ def test_uniform():
     assert_sample_mean(samples, exp_mean)
 
 
+@pytest.mark.flaky(reruns=1)
 def test_powerlaw():
     a, b, n = 10.0, 100.0, 2.0
     d = openmc.stats.PowerLaw(a, b, n)
@@ -148,6 +151,7 @@ def test_powerlaw():
     assert_sample_mean(samples, exp_mean)
 
 
+@pytest.mark.flaky(reruns=1)
 def test_maxwell():
     theta = 1.2895e6
     d = openmc.stats.Maxwell(theta)
@@ -171,6 +175,7 @@ def test_maxwell():
     assert samples_2.mean() != samples.mean()
 
 
+@pytest.mark.flaky(reruns=1)
 def test_watt():
     a, b = 0.965e6, 2.29e-6
     d = openmc.stats.Watt(a, b)
@@ -194,6 +199,7 @@ def test_watt():
     assert_sample_mean(samples, exp_mean)
 
 
+@pytest.mark.flaky(reruns=1)
 def test_tabular():
     # test linear-linear sampling
     x = np.array([0.0, 5.0, 7.0, 10.0])
@@ -270,6 +276,7 @@ def test_legendre():
         d.to_xml_element('distribution')
 
 
+@pytest.mark.flaky(reruns=1)
 def test_mixture():
     d1 = openmc.stats.Uniform(0, 5)
     d2 = openmc.stats.Uniform(3, 7)
@@ -425,6 +432,7 @@ def test_point():
     assert d.xyz == pytest.approx(p)
 
 
+@pytest.mark.flaky(reruns=1)
 def test_normal():
     mean = 10.0
     std_dev = 2.0
@@ -444,6 +452,7 @@ def test_normal():
     assert_sample_mean(samples, mean)
 
 
+@pytest.mark.flaky(reruns=1)
 def test_muir():
     mean = 10.0
     mass = 5.0
@@ -463,6 +472,7 @@ def test_muir():
     assert_sample_mean(samples, mean)
 
 
+@pytest.mark.flaky(reruns=1)
 def test_combine_distributions():
     # Combine two discrete (same data as in test_merge_discrete)
     x1 = [0.0, 1.0, 10.0]

From e9077b1372fa1e3ee4adbcfcbfaeaf04a340c8dd Mon Sep 17 00:00:00 2001
From: jiankai-yu <jiankai.yu10@gmail.com>
Date: Tue, 14 Oct 2025 16:21:11 -0400
Subject: [PATCH 135/203] Allow V0 in atomic_mass function (for ENDF/B-VII.0
 data) (#3607)

---
 openmc/data/data.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openmc/data/data.py b/openmc/data/data.py
index 2142a5dc9..5ecadd37b 100644
--- a/openmc/data/data.py
+++ b/openmc/data/data.py
@@ -324,7 +324,7 @@ def atomic_mass(isotope):
         # isotopes of their element (e.g. C0), calculate the atomic mass as
         # the sum of the atomic mass times the natural abundance of the isotopes
         # that make up the element.
-        for element in ['C', 'Zn', 'Pt', 'Os', 'Tl']:
+        for element in ['C', 'Zn', 'Pt', 'Os', 'Tl', 'V']:
             isotope_zero = element.lower() + '0'
             _ATOMIC_MASS[isotope_zero] = 0.
             for iso, abundance in isotopes(element):

From b94b49611365a7eb9bd1a107861e5ae5c44b977d Mon Sep 17 00:00:00 2001
From: GuySten <62616591+GuySten@users.noreply.github.com>
Date: Thu, 16 Oct 2025 01:51:59 +0200
Subject: [PATCH 136/203] Ability to source electron/positrons directly (#3404)

Co-authored-by: Paul Romano <paul.k.romano@gmail.com>
---
 .../methods/charged_particles_physics.rst     | 362 ++++++++++++++++++
 docs/source/methods/index.rst                 |   3 +-
 docs/source/methods/photon_physics.rst        | 338 ----------------
 include/openmc/nuclide.h                      |   4 +-
 openmc/source.py                              |   7 +-
 src/finalize.cpp                              |   4 +-
 src/nuclide.cpp                               |   4 +-
 src/particle.cpp                              |   2 +-
 src/simulation.cpp                            |  21 +-
 src/source.cpp                                |   6 +
 .../electron_heating/__init__.py              |   0
 .../electron_heating/inputs_true.dat          |  32 ++
 .../electron_heating/results_true.dat         |   3 +
 .../regression_tests/electron_heating/test.py |  40 ++
 14 files changed, 472 insertions(+), 354 deletions(-)
 create mode 100644 docs/source/methods/charged_particles_physics.rst
 create mode 100644 tests/regression_tests/electron_heating/__init__.py
 create mode 100644 tests/regression_tests/electron_heating/inputs_true.dat
 create mode 100644 tests/regression_tests/electron_heating/results_true.dat
 create mode 100644 tests/regression_tests/electron_heating/test.py

diff --git a/docs/source/methods/charged_particles_physics.rst b/docs/source/methods/charged_particles_physics.rst
new file mode 100644
index 000000000..5d763074f
--- /dev/null
+++ b/docs/source/methods/charged_particles_physics.rst
@@ -0,0 +1,362 @@
+.. _methods_charged_particle_physics:
+
+========================
+Charged Particle Physics
+========================
+
+OpenMC neglects the spatial transport of charged particles (electrons and
+positrons), assuming they deposit all their energy locally and produce
+bremsstrahlung photons at their birth location. This approximation, called
+thick-target bremsstrahlung (TTB) approximation is justified by the fact that
+charged particles have much shorter stopping ranges compared to neutrons and
+photons, especially in high-density materials.
+
+-----------------------------
+Charged Particle Interactions
+-----------------------------
+
+Bremsstrahlung
+--------------
+
+When a charged particle is decelerated in the field of an atom, some of its
+kinetic energy is converted into electromagnetic radiation known as
+bremsstrahlung, or 'braking radiation'. In each event, an electron or positron
+with kinetic energy :math:`T` generates a photon with an energy :math:`E`
+between :math:`0` and :math:`T`. Bremsstrahlung is described by a cross section
+that is differential in photon energy, in the direction of the emitted photon,
+and in the final direction of the charged particle. However, in Monte Carlo
+simulations it is typical to integrate over the angular variables to obtain a
+single differential cross section with respect to photon energy, which is often
+expressed in the form
+
+.. math::
+    :label: bremsstrahlung-dcs
+
+    \frac{d\sigma_{\text{br}}}{dE} = \frac{Z^2}{\beta^2} \frac{1}{E}
+    \chi(Z, T, \kappa),
+
+where :math:`\kappa = E/T` is the reduced photon energy and :math:`\chi(Z, T,
+\kappa)` is the scaled bremsstrahlung cross section, which is experimentally
+measured.
+
+Because electrons are attracted to atomic nuclei whereas positrons are
+repulsed, the cross section for positrons is smaller, though it approaches that
+of electrons in the high energy limit. To obtain the positron cross section, we
+multiply :eq:`bremsstrahlung-dcs` by the :math:`\kappa`-independent factor used
+in Salvat_,
+
+.. math::
+    :label: positron-factor
+
+    \begin{aligned}
+    F_{\text{p}}(Z,T) =
+    & 1 - \text{exp}(-1.2359\times 10^{-1}t + 6.1274\times 10^{-2}t^2 - 3.1516\times 10^{-2}t^3 \\
+    & + 7.7446\times 10^{-3}t^4 - 1.0595\times 10^{-3}t^5 + 7.0568\times 10^{-5}t^6 \\
+    & - 1.8080\times 10^{-6}t^7),
+    \end{aligned}
+
+where
+
+.. math::
+    :label: positron-factor-t
+
+    t = \ln\left(1 + \frac{10^6}{Z^2}\frac{T}{\text{m}_\text{e}c^2} \right).
+
+:math:`F_{\text{p}}(Z,T)` is the ratio of the radiative stopping powers for
+positrons and electrons. Stopping power describes the average energy loss per
+unit path length of a charged particle as it passes through matter:
+
+.. math::
+    :label: stopping-power
+
+    -\frac{dT}{ds} = n \int E \frac{d\sigma}{dE} dE \equiv S(T),
+
+where :math:`n` is the number density of the material and :math:`d\sigma/dE` is
+the cross section differential in energy loss. The total stopping power
+:math:`S(T)` can be separated into two components: the radiative stopping
+power :math:`S_{\text{rad}}(T)`, which refers to energy loss due to
+bremsstrahlung, and the collision stopping power :math:`S_{\text{col}}(T)`,
+which refers to the energy loss due to inelastic collisions with bound
+electrons in the material that result in ionization and excitation. The
+radiative stopping power for electrons is given by
+
+.. math::
+    :label: radiative-stopping-power
+
+    S_{\text{rad}}(T) = n \frac{Z^2}{\beta^2} T \int_0^1 \chi(Z,T,\kappa)
+    d\kappa.
+
+
+To obtain the radiative stopping power for positrons,
+:eq:`radiative-stopping-power`  is multiplied by :eq:`positron-factor`.
+
+While the models for photon interactions with matter described above can safely
+assume interactions occur with free atoms, sampling the target atom based on
+the macroscopic cross sections, molecular effects cannot necessarily be
+disregarded for charged particle treatment. For compounds and mixtures, the
+bremsstrahlung cross section is calculated using Bragg's additivity rule as
+
+.. math::
+    :label: material-bremsstrahlung-dcs
+
+    \frac{d\sigma_{\text{br}}}{dE} = \frac{1}{\beta^2 E} \sum_i \gamma_i Z^2_i
+    \chi(Z_i, T, \kappa),
+
+where the sum is over the constituent elements and :math:`\gamma_i` is the
+atomic fraction of the :math:`i`-th element. Similarly, the radiative stopping
+power is calculated using Bragg's additivity rule as
+
+.. math::
+    :label: material-radiative-stopping-power
+
+    S_{\text{rad}}(T) = \sum_i w_i S_{\text{rad},i}(T),
+
+where :math:`w_i` is the mass fraction of the :math:`i`-th element and
+:math:`S_{\text{rad},i}(T)` is found for element :math:`i` using
+:eq:`radiative-stopping-power`. The collision stopping power, however, is a
+function of certain quantities such as the mean excitation energy :math:`I` and
+the density effect correction :math:`\delta_F` that depend on molecular
+properties. These quantities cannot simply be summed over constituent elements
+in a compound, but should instead be calculated for the material. The Bethe
+formula can be used to find the collision stopping power of the material:
+
+.. math::
+    :label: material-collision-stopping-power
+
+    S_{\text{col}}(T) = \frac{2 \pi r_e^2 m_e c^2}{\beta^2} N_A \frac{Z}{A_M}
+    [\ln(T^2/I^2) + \ln(1 + \tau/2) + F(\tau) - \delta_F(T)],
+
+where :math:`N_A` is Avogadro's number, :math:`A_M` is the molar mass,
+:math:`\tau = T/m_e`, and :math:`F(\tau)` depends on the particle type. For
+electrons,
+
+.. math::
+    :label: F-electron
+
+    F_{-}(\tau) = (1 - \beta^2)[1 + \tau^2/8 - (2\tau + 1) \ln2],
+
+while for positrons
+
+.. math::
+    :label: F-positron
+
+    F_{+}(\tau) = 2\ln2 - (\beta^2/12)[23 + 14/(\tau + 2) + 10/(\tau + 2)^2 +
+    4/(\tau + 2)^3].
+
+The density effect correction :math:`\delta_F` takes into account the reduction
+of the collision stopping power due to the polarization of the material the
+charged particle is passing through by the electric field of the particle.
+It can be evaluated using the method described by Sternheimer_, where the
+equation for :math:`\delta_F` is
+
+.. math::
+    :label: density-effect-correction
+
+    \delta_F(\beta) = \sum_{i=1}^n f_i \ln[(l_i^2 + l^2)/l_i^2] -
+    l^2(1-\beta^2).
+
+Here, :math:`f_i` is the oscillator strength of the :math:`i`-th transition,
+given by :math:`f_i = n_i/Z`, where :math:`n_i` is the number of electrons in
+the :math:`i`-th subshell. The frequency :math:`l` is the solution of the
+equation
+
+.. math::
+    :label: density-effect-l
+
+    \frac{1}{\beta^2} - 1 = \sum_{i=1}^{n} \frac{f_i}{\bar{\nu}_i^2 + l^2},
+
+where :math:`\bar{v}_i` is defined as
+
+.. math::
+    :label: density-effect-nubar
+
+    \bar{\nu}_i = h\nu_i \rho / h\nu_p.
+
+The plasma energy :math:`h\nu_p` of the medium is given by
+
+.. math::
+    :label: plasma-frequency
+
+    h\nu_p = \sqrt{\frac{(hc)^2 r_e \rho_m N_A Z}{\pi A}},
+
+where :math:`A` is the atomic weight and :math:`\rho_m` is the density of the
+material. In :eq:`density-effect-nubar`, :math:`h\nu_i` is the oscillator
+energy, and :math:`\rho` is an adjustment factor introduced to give agreement
+between the experimental values of the oscillator energies and the mean
+excitation energy. The :math:`l_i` in :eq:`density-effect-correction` are
+defined as
+
+.. math::
+    :label: density-effect-li
+
+    \begin{aligned}
+    l_i &= (\bar{\nu}_i^2 + 2/3f_i)^{1/2} ~~~~&\text{for}~~ \bar{\nu}_i > 0 \\
+    l_n &= f_n^{1/2} ~~~~&\text{for}~~ \bar{\nu}_n = 0,
+    \end{aligned}
+
+where the second case applies to conduction electrons. For a conductor,
+:math:`f_n` is given by :math:`n_c/Z`, where :math:`n_c` is the effective
+number of conduction electrons, and :math:`v_n = 0`. The adjustment factor
+:math:`\rho` is determined using the equation for the mean excitation energy:
+
+.. math::
+    :label: mean-excitation-energy
+
+    \ln I = \sum_{i=1}^{n-1} f_i \ln[(h\nu_i\rho)^2 + 2/3f_i(h\nu_p)^2]^{1/2} +
+    f_n \ln (h\nu_pf_n^{1/2}).
+
+.. _ttb:
+
+
+Thick-Target Bremsstrahlung Approximation
++++++++++++++++++++++++++++++++++++++++++
+
+Since charged particles lose their energy on a much shorter distance scale than
+neutral particles, not much error should be introduced by neglecting to
+transport electrons. However, the bremsstrahlung emitted from high energy
+electrons and positrons can travel far from the interaction site. Thus, even
+without a full electron transport mode it is necessary to model bremsstrahlung.
+We use a thick-target bremsstrahlung (TTB) approximation based on the models in
+Salvat_ and Kaltiaisenaho_ for generating bremsstrahlung photons, which assumes
+the charged particle loses all its energy in a single homogeneous material
+region.
+
+To model bremsstrahlung using the TTB approximation, we need to know the number
+of photons emitted by the charged particle and the energy distribution of the
+photons. These quantities can be calculated using the continuous slowing down
+approximation (CSDA). The CSDA assumes charged particles lose energy
+continuously along their trajectory with a rate of energy loss equal to the
+total stopping power, ignoring fluctuations in the energy loss. The
+approximation is useful for expressing average quantities that describe how
+charged particles slow down in matter. For example, the CSDA range approximates
+the average path length a charged particle travels as it slows to rest:
+
+.. math::
+    :label: csda-range
+
+    R(T) = \int^T_0 \frac{dT'}{S(T')}.
+
+Actual path lengths will fluctuate around :math:`R(T)`. The average number of
+photons emitted per unit path length is given by the inverse bremsstrahlung
+mean free path:
+
+.. math::
+    :label: inverse-bremsstrahlung-mfp
+
+    \lambda_{\text{br}}^{-1}(T,E_{\text{cut}})
+    = n\int_{E_{\text{cut}}}^T\frac{d\sigma_{\text{br}}}{dE}dE
+    = n\frac{Z^2}{\beta^2}\int_{\kappa_{\text{cut}}}^1\frac{1}{\kappa}
+    \chi(Z,T,\kappa)d\kappa.
+
+The lower limit of the integral in :eq:`inverse-bremsstrahlung-mfp` is non-zero
+because the bremsstrahlung differential cross section diverges for small photon
+energies but is finite for photon energies above some cutoff energy
+:math:`E_{\text{cut}}`. The mean free path
+:math:`\lambda_{\text{br}}^{-1}(T,E_{\text{cut}})` is used to calculate the
+photon number yield, defined as the average number of photons emitted with
+energy greater than :math:`E_{\text{cut}}` as the charged particle slows down
+from energy :math:`T` to :math:`E_{\text{cut}}`. The photon number yield is
+given by
+
+.. math::
+    :label: photon-number-yield
+
+    Y(T,E_{\text{cut}}) = \int^{R(T)}_{R(E_{\text{cut}})}
+    \lambda_{\text{br}}^{-1}(T',E_{\text{cut}})ds = \int_{E_{\text{cut}}}^T
+    \frac{\lambda_{\text{br}}^{-1}(T',E_{\text{cut}})}{S(T')}dT'.
+
+:math:`Y(T,E_{\text{cut}})` can be used to construct the energy spectrum of
+bremsstrahlung photons: the number of photons created with energy between
+:math:`E_1` and :math:`E_2` by a charged particle with initial kinetic energy
+:math:`T` as it comes to rest is given by :math:`Y(T,E_1) - Y(T,E_2)`.
+
+To simulate the emission of bremsstrahlung photons, the total stopping power
+and bremsstrahlung differential cross section for positrons and electrons must
+be calculated for a given material using :eq:`material-bremsstrahlung-dcs` and
+:eq:`material-radiative-stopping-power`. These quantities are used to build the
+tabulated bremsstrahlung energy PDF and CDF for that material for each incident
+energy :math:`T_k` on the energy grid. The following algorithm is then applied
+to sample the photon energies:
+
+1. For an incident charged particle with energy :math:`T`, sample the number of
+   emitted photons as
+
+   .. math::
+
+       N = \lfloor Y(T,E_{\text{cut}}) + \xi_1 \rfloor.
+
+2. Rather than interpolate the PDF between indices :math:`k` and :math:`k+1`
+   for which :math:`T_k < T < T_{k+1}`, which is computationally expensive, use
+   the composition method and sample from the PDF at either :math:`k` or
+   :math:`k+1`. Using linear interpolation on a logarithmic scale, the PDF can
+   be expressed as
+
+   .. math::
+
+       p_{\text{br}}(T,E) = \pi_k p_{\text{br}}(T_k,E) + \pi_{k+1}
+       p_{\text{br}}(T_{k+1},E),
+
+   where the interpolation weights are
+
+   .. math::
+
+       \pi_k = \frac{\ln T_{k+1} - \ln T}{\ln T_{k+1} - \ln T_k},~~~
+       \pi_{k+1} = \frac{\ln T - \ln T_k}{\ln T_{k+1} - \ln T_k}.
+
+   Sample either the index :math:`i = k` or :math:`i = k+1` according to the
+   point probabilities :math:`\pi_{k}` and :math:`\pi_{k+1}`.
+
+3. Determine the maximum value of the CDF :math:`P_{\text{br,max}}`.
+
+3. Sample the photon energies using the inverse transform method with the
+   tabulated CDF :math:`P_{\text{br}}(T_i, E)` i.e.,
+
+   .. math::
+
+       E = E_j \left[ (1 + a_j) \frac{\xi_2 P_{\text{br,max}} -
+       P_{\text{br}}(T_i, E_j)} {E_j p_{\text{br}}(T_i, E_j)} + 1
+       \right]^{\frac{1}{1 + a_j}}
+
+   where the interpolation factor :math:`a_j` is given by
+
+   .. math::
+
+       a_j = \frac{\ln p_{\text{br}}(T_i,E_{j+1}) - \ln p_{\text{br}}(T_i,E_j)}
+       {\ln E_{j+1} - \ln E_j}
+
+   and :math:`P_{\text{br}}(T_i, E_j) \le \xi_2 P_{\text{br,max}} \le
+   P_{\text{br}}(T_i, E_{j+1})`.
+
+We ignore the range of the electron or positron, i.e., the bremsstrahlung
+photons are produced in the same location that the charged particle was
+created. The direction of the photons is assumed to be the same as the
+direction of the incident charged particle, which is a reasonable approximation
+at higher energies when the bremsstrahlung radiation is emitted at small
+angles.
+
+
+Electron-Positron Annihilation
+------------------------------
+
+When a positron collides with an electron, both particles are annihilated and
+generally two photons with equal energy are created. If the kinetic energy of
+the positron is high enough, the two photons can have different energies, and
+the higher-energy photon is emitted preferentially in the direction of flight
+of the positron. It is also possible to produce a single photon if the
+interaction occurs with a bound electron, and in some cases three (or, rarely,
+even more) photons can be emitted. However, the annihilation cross section is
+largest for low-energy positrons, and as the positron energy decreases, the
+angular distribution of the emitted photons becomes isotropic.
+
+In OpenMC, we assume the most likely case in which a low-energy positron (which
+has already lost most of its energy to bremsstrahlung radiation) interacts with
+an electron which is free and at rest. Two photons with energy equal to the
+electron rest mass energy :math:`m_e c^2 = 0.511` MeV are emitted isotropically
+in opposite directions.
+
+
+.. _Kaltiaisenaho: https://aaltodoc.aalto.fi/bitstream/handle/123456789/21004/master_Kaltiaisenaho_Toni_2016.pdf
+
+.. _Salvat: https://doi.org/10.1787/32da5043-en
+
+.. _Sternheimer: https://doi.org/10.1103/PhysRevB.26.6067
diff --git a/docs/source/methods/index.rst b/docs/source/methods/index.rst
index 75c421c87..121d04b1d 100644
--- a/docs/source/methods/index.rst
+++ b/docs/source/methods/index.rst
@@ -14,6 +14,7 @@ Theory and Methodology
     random_numbers
     neutron_physics
     photon_physics
+    charged_particles_physics
     tallies
     eigenvalue
     depletion
@@ -21,4 +22,4 @@ Theory and Methodology
     parallelization
     cmfd
     variance_reduction
-    random_ray
\ No newline at end of file
+    random_ray
diff --git a/docs/source/methods/photon_physics.rst b/docs/source/methods/photon_physics.rst
index 22d2c7f26..d2bd3ac76 100644
--- a/docs/source/methods/photon_physics.rst
+++ b/docs/source/methods/photon_physics.rst
@@ -667,342 +667,6 @@ and Auger electrons:
 
 5. Repeat from step 1 for vacancy left by the transition electron.
 
-Electron-Positron Annihilation
-------------------------------
-
-When a positron collides with an electron, both particles are annihilated and
-generally two photons with equal energy are created. If the kinetic energy of
-the positron is high enough, the two photons can have different energies, and
-the higher-energy photon is emitted preferentially in the direction of flight
-of the positron. It is also possible to produce a single photon if the
-interaction occurs with a bound electron, and in some cases three (or, rarely,
-even more) photons can be emitted. However, the annihilation cross section is
-largest for low-energy positrons, and as the positron energy decreases, the
-angular distribution of the emitted photons becomes isotropic.
-
-In OpenMC, we assume the most likely case in which a low-energy positron (which
-has already lost most of its energy to bremsstrahlung radiation) interacts with
-an electron which is free and at rest. Two photons with energy equal to the
-electron rest mass energy :math:`m_e c^2 = 0.511` MeV are emitted isotropically
-in opposite directions.
-
-Bremsstrahlung
---------------
-
-When a charged particle is decelerated in the field of an atom, some of its
-kinetic energy is converted into electromagnetic radiation known as
-bremsstrahlung, or 'braking radiation'. In each event, an electron or positron
-with kinetic energy :math:`T` generates a photon with an energy :math:`E`
-between :math:`0` and :math:`T`. Bremsstrahlung is described by a cross section
-that is differential in photon energy, in the direction of the emitted photon,
-and in the final direction of the charged particle. However, in Monte Carlo
-simulations it is typical to integrate over the angular variables to obtain a
-single differential cross section with respect to photon energy, which is often
-expressed in the form
-
-.. math::
-    :label: bremsstrahlung-dcs
-
-    \frac{d\sigma_{\text{br}}}{dE} = \frac{Z^2}{\beta^2} \frac{1}{E}
-    \chi(Z, T, \kappa),
-
-where :math:`\kappa = E/T` is the reduced photon energy and :math:`\chi(Z, T,
-\kappa)` is the scaled bremsstrahlung cross section, which is experimentally
-measured.
-
-Because electrons are attracted to atomic nuclei whereas positrons are
-repulsed, the cross section for positrons is smaller, though it approaches that
-of electrons in the high energy limit. To obtain the positron cross section, we
-multiply :eq:`bremsstrahlung-dcs` by the :math:`\kappa`-independent factor used
-in Salvat_,
-
-.. math::
-    :label: positron-factor
-
-    \begin{aligned}
-    F_{\text{p}}(Z,T) =
-    & 1 - \text{exp}(-1.2359\times 10^{-1}t + 6.1274\times 10^{-2}t^2 - 3.1516\times 10^{-2}t^3 \\
-    & + 7.7446\times 10^{-3}t^4 - 1.0595\times 10^{-3}t^5 + 7.0568\times 10^{-5}t^6 \\
-    & - 1.8080\times 10^{-6}t^7),
-    \end{aligned}
-
-where
-
-.. math::
-    :label: positron-factor-t
-
-    t = \ln\left(1 + \frac{10^6}{Z^2}\frac{T}{\text{m}_\text{e}c^2} \right).
-
-:math:`F_{\text{p}}(Z,T)` is the ratio of the radiative stopping powers for
-positrons and electrons. Stopping power describes the average energy loss per
-unit path length of a charged particle as it passes through matter:
-
-.. math::
-    :label: stopping-power
-
-    -\frac{dT}{ds} = n \int E \frac{d\sigma}{dE} dE \equiv S(T),
-
-where :math:`n` is the number density of the material and :math:`d\sigma/dE` is
-the cross section differential in energy loss. The total stopping power
-:math:`S(T)` can be separated into two components: the radiative stopping
-power :math:`S_{\text{rad}}(T)`, which refers to energy loss due to
-bremsstrahlung, and the collision stopping power :math:`S_{\text{col}}(T)`,
-which refers to the energy loss due to inelastic collisions with bound
-electrons in the material that result in ionization and excitation. The
-radiative stopping power for electrons is given by
-
-.. math::
-    :label: radiative-stopping-power
-
-    S_{\text{rad}}(T) = n \frac{Z^2}{\beta^2} T \int_0^1 \chi(Z,T,\kappa)
-    d\kappa.
-
-
-To obtain the radiative stopping power for positrons,
-:eq:`radiative-stopping-power`  is multiplied by :eq:`positron-factor`.
-
-While the models for photon interactions with matter described above can safely
-assume interactions occur with free atoms, sampling the target atom based on
-the macroscopic cross sections, molecular effects cannot necessarily be
-disregarded for charged particle treatment. For compounds and mixtures, the
-bremsstrahlung cross section is calculated using Bragg's additivity rule as
-
-.. math::
-    :label: material-bremsstrahlung-dcs
-
-    \frac{d\sigma_{\text{br}}}{dE} = \frac{1}{\beta^2 E} \sum_i \gamma_i Z^2_i
-    \chi(Z_i, T, \kappa),
-
-where the sum is over the constituent elements and :math:`\gamma_i` is the
-atomic fraction of the :math:`i`-th element. Similarly, the radiative stopping
-power is calculated using Bragg's additivity rule as
-
-.. math::
-    :label: material-radiative-stopping-power
-
-    S_{\text{rad}}(T) = \sum_i w_i S_{\text{rad},i}(T),
-
-where :math:`w_i` is the mass fraction of the :math:`i`-th element and
-:math:`S_{\text{rad},i}(T)` is found for element :math:`i` using
-:eq:`radiative-stopping-power`. The collision stopping power, however, is a
-function of certain quantities such as the mean excitation energy :math:`I` and
-the density effect correction :math:`\delta_F` that depend on molecular
-properties. These quantities cannot simply be summed over constituent elements
-in a compound, but should instead be calculated for the material. The Bethe
-formula can be used to find the collision stopping power of the material:
-
-.. math::
-    :label: material-collision-stopping-power
-
-    S_{\text{col}}(T) = \frac{2 \pi r_e^2 m_e c^2}{\beta^2} N_A \frac{Z}{A_M}
-    [\ln(T^2/I^2) + \ln(1 + \tau/2) + F(\tau) - \delta_F(T)],
-
-where :math:`N_A` is Avogadro's number, :math:`A_M` is the molar mass,
-:math:`\tau = T/m_e`, and :math:`F(\tau)` depends on the particle type. For
-electrons,
-
-.. math::
-    :label: F-electron
-
-    F_{-}(\tau) = (1 - \beta^2)[1 + \tau^2/8 - (2\tau + 1) \ln2],
-
-while for positrons
-
-.. math::
-    :label: F-positron
-
-    F_{+}(\tau) = 2\ln2 - (\beta^2/12)[23 + 14/(\tau + 2) + 10/(\tau + 2)^2 +
-    4/(\tau + 2)^3].
-
-The density effect correction :math:`\delta_F` takes into account the reduction
-of the collision stopping power due to the polarization of the material the
-charged particle is passing through by the electric field of the particle.
-It can be evaluated using the method described by Sternheimer_, where the
-equation for :math:`\delta_F` is
-
-.. math::
-    :label: density-effect-correction
-
-    \delta_F(\beta) = \sum_{i=1}^n f_i \ln[(l_i^2 + l^2)/l_i^2] -
-    l^2(1-\beta^2).
-
-Here, :math:`f_i` is the oscillator strength of the :math:`i`-th transition,
-given by :math:`f_i = n_i/Z`, where :math:`n_i` is the number of electrons in
-the :math:`i`-th subshell. The frequency :math:`l` is the solution of the
-equation
-
-.. math::
-    :label: density-effect-l
-
-    \frac{1}{\beta^2} - 1 = \sum_{i=1}^{n} \frac{f_i}{\bar{\nu}_i^2 + l^2},
-
-where :math:`\bar{v}_i` is defined as
-
-.. math::
-    :label: density-effect-nubar
-
-    \bar{\nu}_i = h\nu_i \rho / h\nu_p.
-
-The plasma energy :math:`h\nu_p` of the medium is given by
-
-.. math::
-    :label: plasma-frequency
-
-    h\nu_p = \sqrt{\frac{(hc)^2 r_e \rho_m N_A Z}{\pi A}},
-
-where :math:`A` is the atomic weight and :math:`\rho_m` is the density of the
-material. In :eq:`density-effect-nubar`, :math:`h\nu_i` is the oscillator
-energy, and :math:`\rho` is an adjustment factor introduced to give agreement
-between the experimental values of the oscillator energies and the mean
-excitation energy. The :math:`l_i` in :eq:`density-effect-correction` are
-defined as
-
-.. math::
-    :label: density-effect-li
-
-    \begin{aligned}
-    l_i &= (\bar{\nu}_i^2 + 2/3f_i)^{1/2} ~~~~&\text{for}~~ \bar{\nu}_i > 0 \\
-    l_n &= f_n^{1/2} ~~~~&\text{for}~~ \bar{\nu}_n = 0,
-    \end{aligned}
-
-where the second case applies to conduction electrons. For a conductor,
-:math:`f_n` is given by :math:`n_c/Z`, where :math:`n_c` is the effective
-number of conduction electrons, and :math:`v_n = 0`. The adjustment factor
-:math:`\rho` is determined using the equation for the mean excitation energy:
-
-.. math::
-    :label: mean-excitation-energy
-
-    \ln I = \sum_{i=1}^{n-1} f_i \ln[(h\nu_i\rho)^2 + 2/3f_i(h\nu_p)^2]^{1/2} +
-    f_n \ln (h\nu_pf_n^{1/2}).
-
-.. _ttb:
-
-Thick-Target Bremsstrahlung Approximation
-+++++++++++++++++++++++++++++++++++++++++
-
-Since charged particles lose their energy on a much shorter distance scale than
-neutral particles, not much error should be introduced by neglecting to
-transport electrons. However, the bremsstrahlung emitted from high energy
-electrons and positrons can travel far from the interaction site. Thus, even
-without a full electron transport mode it is necessary to model bremsstrahlung.
-We use a thick-target bremsstrahlung (TTB) approximation based on the models in
-Salvat_ and Kaltiaisenaho_ for generating bremsstrahlung photons, which assumes
-the charged particle loses all its energy in a single homogeneous material
-region.
-
-To model bremsstrahlung using the TTB approximation, we need to know the number
-of photons emitted by the charged particle and the energy distribution of the
-photons. These quantities can be calculated using the continuous slowing down
-approximation (CSDA). The CSDA assumes charged particles lose energy
-continuously along their trajectory with a rate of energy loss equal to the
-total stopping power, ignoring fluctuations in the energy loss. The
-approximation is useful for expressing average quantities that describe how
-charged particles slow down in matter. For example, the CSDA range approximates
-the average path length a charged particle travels as it slows to rest:
-
-.. math::
-    :label: csda-range
-
-    R(T) = \int^T_0 \frac{dT'}{S(T')}.
-
-Actual path lengths will fluctuate around :math:`R(T)`. The average number of
-photons emitted per unit path length is given by the inverse bremsstrahlung
-mean free path:
-
-.. math::
-    :label: inverse-bremsstrahlung-mfp
-
-    \lambda_{\text{br}}^{-1}(T,E_{\text{cut}})
-    = n\int_{E_{\text{cut}}}^T\frac{d\sigma_{\text{br}}}{dE}dE
-    = n\frac{Z^2}{\beta^2}\int_{\kappa_{\text{cut}}}^1\frac{1}{\kappa}
-    \chi(Z,T,\kappa)d\kappa.
-
-The lower limit of the integral in :eq:`inverse-bremsstrahlung-mfp` is non-zero
-because the bremsstrahlung differential cross section diverges for small photon
-energies but is finite for photon energies above some cutoff energy
-:math:`E_{\text{cut}}`. The mean free path
-:math:`\lambda_{\text{br}}^{-1}(T,E_{\text{cut}})` is used to calculate the
-photon number yield, defined as the average number of photons emitted with
-energy greater than :math:`E_{\text{cut}}` as the charged particle slows down
-from energy :math:`T` to :math:`E_{\text{cut}}`. The photon number yield is
-given by
-
-.. math::
-    :label: photon-number-yield
-
-    Y(T,E_{\text{cut}}) = \int^{R(T)}_{R(E_{\text{cut}})}
-    \lambda_{\text{br}}^{-1}(T',E_{\text{cut}})ds = \int_{E_{\text{cut}}}^T
-    \frac{\lambda_{\text{br}}^{-1}(T',E_{\text{cut}})}{S(T')}dT'.
-
-:math:`Y(T,E_{\text{cut}})` can be used to construct the energy spectrum of
-bremsstrahlung photons: the number of photons created with energy between
-:math:`E_1` and :math:`E_2` by a charged particle with initial kinetic energy
-:math:`T` as it comes to rest is given by :math:`Y(T,E_1) - Y(T,E_2)`.
-
-To simulate the emission of bremsstrahlung photons, the total stopping power
-and bremsstrahlung differential cross section for positrons and electrons must
-be calculated for a given material using :eq:`material-bremsstrahlung-dcs` and
-:eq:`material-radiative-stopping-power`. These quantities are used to build the
-tabulated bremsstrahlung energy PDF and CDF for that material for each incident
-energy :math:`T_k` on the energy grid. The following algorithm is then applied
-to sample the photon energies:
-
-1. For an incident charged particle with energy :math:`T`, sample the number of
-   emitted photons as
-
-   .. math::
-
-       N = \lfloor Y(T,E_{\text{cut}}) + \xi_1 \rfloor.
-
-2. Rather than interpolate the PDF between indices :math:`k` and :math:`k+1`
-   for which :math:`T_k < T < T_{k+1}`, which is computationally expensive, use
-   the composition method and sample from the PDF at either :math:`k` or
-   :math:`k+1`. Using linear interpolation on a logarithmic scale, the PDF can
-   be expressed as
-
-   .. math::
-
-       p_{\text{br}}(T,E) = \pi_k p_{\text{br}}(T_k,E) + \pi_{k+1}
-       p_{\text{br}}(T_{k+1},E),
-
-   where the interpolation weights are
-
-   .. math::
-
-       \pi_k = \frac{\ln T_{k+1} - \ln T}{\ln T_{k+1} - \ln T_k},~~~
-       \pi_{k+1} = \frac{\ln T - \ln T_k}{\ln T_{k+1} - \ln T_k}.
-
-   Sample either the index :math:`i = k` or :math:`i = k+1` according to the
-   point probabilities :math:`\pi_{k}` and :math:`\pi_{k+1}`.
-
-3. Determine the maximum value of the CDF :math:`P_{\text{br,max}}`.
-
-3. Sample the photon energies using the inverse transform method with the
-   tabulated CDF :math:`P_{\text{br}}(T_i, E)` i.e.,
-
-   .. math::
-
-       E = E_j \left[ (1 + a_j) \frac{\xi_2 P_{\text{br,max}} -
-       P_{\text{br}}(T_i, E_j)} {E_j p_{\text{br}}(T_i, E_j)} + 1
-       \right]^{\frac{1}{1 + a_j}}
-
-   where the interpolation factor :math:`a_j` is given by
-
-   .. math::
-
-       a_j = \frac{\ln p_{\text{br}}(T_i,E_{j+1}) - \ln p_{\text{br}}(T_i,E_j)}
-       {\ln E_{j+1} - \ln E_j}
-
-   and :math:`P_{\text{br}}(T_i, E_j) \le \xi_2 P_{\text{br,max}} \le
-   P_{\text{br}}(T_i, E_{j+1})`.
-
-We ignore the range of the electron or positron, i.e., the bremsstrahlung
-photons are produced in the same location that the charged particle was
-created. The direction of the photons is assumed to be the same as the
-direction of the incident charged particle, which is a reasonable approximation
-at higher energies when the bremsstrahlung radiation is emitted at small
-angles.
 
 .. _photon_production:
 
@@ -1070,5 +734,3 @@ emitted photon.
 .. _Kaltiaisenaho: https://aaltodoc.aalto.fi/bitstream/handle/123456789/21004/master_Kaltiaisenaho_Toni_2016.pdf
 
 .. _Salvat: https://doi.org/10.1787/32da5043-en
-
-.. _Sternheimer: https://doi.org/10.1103/PhysRevB.26.6067
diff --git a/include/openmc/nuclide.h b/include/openmc/nuclide.h
index 329c776d0..60b88a153 100644
--- a/include/openmc/nuclide.h
+++ b/include/openmc/nuclide.h
@@ -164,8 +164,8 @@ namespace data {
 
 // Minimum/maximum transport energy for each particle type. Order corresponds to
 // that of the ParticleType enum
-extern array<double, 2> energy_min;
-extern array<double, 2> energy_max;
+extern array<double, 4> energy_min;
+extern array<double, 4> energy_max;
 
 //! Minimum temperature in [K] that nuclide data is available at
 extern double temperature_min;
diff --git a/openmc/source.py b/openmc/source.py
index c463ccb27..9b730cf1d 100644
--- a/openmc/source.py
+++ b/openmc/source.py
@@ -260,7 +260,7 @@ class IndependentSource(SourceBase):
         time distribution of source sites
     strength : float
         Strength of the source
-    particle : {'neutron', 'photon'}
+    particle : {'neutron', 'photon', 'electron', 'positron'}
         Source particle type
     domains : iterable of openmc.Cell, openmc.Material, or openmc.Universe
         Domains to reject based on, i.e., if a sampled spatial location is not
@@ -299,7 +299,7 @@ class IndependentSource(SourceBase):
 
     .. versionadded:: 0.14.0
 
-    particle : {'neutron', 'photon'}
+    particle : {'neutron', 'photon', 'electron', 'positron'}
         Source particle type
     constraints : dict
         Constraints on sampled source particles. Valid keys include
@@ -404,7 +404,8 @@ class IndependentSource(SourceBase):
 
     @particle.setter
     def particle(self, particle):
-        cv.check_value('source particle', particle, ['neutron', 'photon'])
+        cv.check_value('source particle', particle,
+                       ['neutron', 'photon', 'electron', 'positron'])
         self._particle = particle
 
     def populate_xml_element(self, element):
diff --git a/src/finalize.cpp b/src/finalize.cpp
index 76babbb96..659f390b3 100644
--- a/src/finalize.cpp
+++ b/src/finalize.cpp
@@ -156,8 +156,8 @@ int openmc_finalize()
   simulation::entropy_mesh = nullptr;
   simulation::ufs_mesh = nullptr;
 
-  data::energy_max = {INFTY, INFTY};
-  data::energy_min = {0.0, 0.0};
+  data::energy_max = {INFTY, INFTY, INFTY, INFTY};
+  data::energy_min = {0.0, 0.0, 0.0, 0.0};
   data::temperature_min = 0.0;
   data::temperature_max = INFTY;
   model::root_universe = -1;
diff --git a/src/nuclide.cpp b/src/nuclide.cpp
index 7cb84640d..5ae6e30ee 100644
--- a/src/nuclide.cpp
+++ b/src/nuclide.cpp
@@ -31,8 +31,8 @@ namespace openmc {
 //==============================================================================
 
 namespace data {
-array<double, 2> energy_min {0.0, 0.0};
-array<double, 2> energy_max {INFTY, INFTY};
+array<double, 4> energy_min {0.0, 0.0, 0.0, 0.0};
+array<double, 4> energy_max {INFTY, INFTY, INFTY, INFTY};
 double temperature_min {INFTY};
 double temperature_max {0.0};
 std::unordered_map<std::string, int> nuclide_map;
diff --git a/src/particle.cpp b/src/particle.cpp
index 06ccf462a..6b4c332a8 100644
--- a/src/particle.cpp
+++ b/src/particle.cpp
@@ -232,7 +232,7 @@ void Particle::event_advance()
 
   // Sample a distance to collision
   if (type() == ParticleType::electron || type() == ParticleType::positron) {
-    collision_distance() = 0.0;
+    collision_distance() = material() == MATERIAL_VOID ? INFINITY : 0.0;
   } else if (macro_xs().total == 0.0) {
     collision_distance() = INFINITY;
   } else {
diff --git a/src/simulation.cpp b/src/simulation.cpp
index b9986f473..f55546c4c 100644
--- a/src/simulation.cpp
+++ b/src/simulation.cpp
@@ -674,8 +674,9 @@ void calculate_work()
 void initialize_data()
 {
   // Determine minimum/maximum energy for incident neutron/photon data
-  data::energy_max = {INFTY, INFTY};
-  data::energy_min = {0.0, 0.0};
+  data::energy_max = {INFTY, INFTY, INFTY, INFTY};
+  data::energy_min = {0.0, 0.0, 0.0, 0.0};
+
   for (const auto& nuc : data::nuclides) {
     if (nuc->grid_.size() >= 1) {
       int neutron = static_cast<int>(ParticleType::neutron);
@@ -703,11 +704,21 @@ void initialize_data()
       // than the current minimum/maximum
       if (data::ttb_e_grid.size() >= 1) {
         int photon = static_cast<int>(ParticleType::photon);
+        int electron = static_cast<int>(ParticleType::electron);
+        int positron = static_cast<int>(ParticleType::positron);
         int n_e = data::ttb_e_grid.size();
+
+        const std::vector<int> charged = {electron, positron};
+        for (auto t : charged) {
+          data::energy_min[t] = std::exp(data::ttb_e_grid(1));
+          data::energy_max[t] = std::exp(data::ttb_e_grid(n_e - 1));
+        }
+
         data::energy_min[photon] =
-          std::max(data::energy_min[photon], std::exp(data::ttb_e_grid(1)));
-        data::energy_max[photon] = std::min(
-          data::energy_max[photon], std::exp(data::ttb_e_grid(n_e - 1)));
+          std::max(data::energy_min[photon], data::energy_min[electron]);
+
+        data::energy_max[photon] =
+          std::min(data::energy_max[photon], data::energy_max[electron]);
       }
     }
   }
diff --git a/src/source.cpp b/src/source.cpp
index 12323f7bd..f6aa665eb 100644
--- a/src/source.cpp
+++ b/src/source.cpp
@@ -290,6 +290,12 @@ IndependentSource::IndependentSource(pugi::xml_node node) : Source(node)
     } else if (temp_str == "photon") {
       particle_ = ParticleType::photon;
       settings::photon_transport = true;
+    } else if (temp_str == "electron") {
+      particle_ = ParticleType::electron;
+      settings::photon_transport = true;
+    } else if (temp_str == "positron") {
+      particle_ = ParticleType::positron;
+      settings::photon_transport = true;
     } else {
       fatal_error(std::string("Unknown source particle type: ") + temp_str);
     }
diff --git a/tests/regression_tests/electron_heating/__init__.py b/tests/regression_tests/electron_heating/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/regression_tests/electron_heating/inputs_true.dat b/tests/regression_tests/electron_heating/inputs_true.dat
new file mode 100644
index 000000000..ec8e5a837
--- /dev/null
+++ b/tests/regression_tests/electron_heating/inputs_true.dat
@@ -0,0 +1,32 @@
+<?xml version='1.0' encoding='utf-8'?>
+<model>
+  <materials>
+    <material id="1">
+      <density value="1.0" units="g/cc"/>
+      <nuclide name="H1" ao="2.0"/>
+      <nuclide name="O16" ao="1.0"/>
+    </material>
+  </materials>
+  <geometry>
+    <cell id="1" material="1" region="-1" universe="1"/>
+    <surface id="1" type="sphere" boundary="reflective" coeffs="0.0 0.0 0.0 1.0"/>
+  </geometry>
+  <settings>
+    <run_mode>fixed source</run_mode>
+    <particles>10000</particles>
+    <batches>1</batches>
+    <source type="independent" strength="1.0" particle="electron">
+      <energy type="discrete">
+        <parameters>10000000.0 1.0</parameters>
+      </energy>
+    </source>
+    <cutoff>
+      <energy_photon>1000.0</energy_photon>
+    </cutoff>
+  </settings>
+  <tallies>
+    <tally id="1">
+      <scores>heating</scores>
+    </tally>
+  </tallies>
+</model>
diff --git a/tests/regression_tests/electron_heating/results_true.dat b/tests/regression_tests/electron_heating/results_true.dat
new file mode 100644
index 000000000..4f54ceaa4
--- /dev/null
+++ b/tests/regression_tests/electron_heating/results_true.dat
@@ -0,0 +1,3 @@
+tally 1:
+1.000000E+07
+1.000000E+14
diff --git a/tests/regression_tests/electron_heating/test.py b/tests/regression_tests/electron_heating/test.py
new file mode 100644
index 000000000..e7a58560c
--- /dev/null
+++ b/tests/regression_tests/electron_heating/test.py
@@ -0,0 +1,40 @@
+import pytest
+import openmc
+
+from tests.testing_harness import PyAPITestHarness
+
+
+@pytest.fixture
+def water_model():
+    # Define materals and geometry
+    water = openmc.Material()
+    water.add_nuclide("H1", 2.0)
+    water.add_nuclide("O16", 1.0)
+    water.set_density("g/cc", 1.0)
+    sphere = openmc.Sphere(r=1.0, boundary_type="reflective")
+    sph = openmc.Cell(fill=water, region=-sphere)
+    geometry = openmc.Geometry([sph])
+    source = openmc.IndependentSource(
+        energy=openmc.stats.delta_function(10.0e6),
+        particle="electron"
+    )
+
+    # Define settings
+    settings = openmc.Settings()
+    settings.particles = 10000
+    settings.batches = 1
+    settings.cutoff = {"energy_photon": 1000.0}
+    settings.run_mode = "fixed source"
+    settings.source = source
+
+    # Define tallies
+    tally = openmc.Tally()
+    tally.scores = ["heating"]
+    tallies = openmc.Tallies([tally])
+
+    return openmc.Model(geometry=geometry, settings=settings, tallies=tallies)
+
+
+def test_electron_heating_calc(water_model):
+    harness = PyAPITestHarness("statepoint.1.h5", water_model)
+    harness.main()

From 055ea15a2ddf40f6fff4eef52990e79b37652f64 Mon Sep 17 00:00:00 2001
From: Paul Romano <paul.k.romano@gmail.com>
Date: Fri, 17 Oct 2025 18:09:37 -0500
Subject: [PATCH 137/203] Clip mixture distributions based on mean times
 integral (#3603)

---
 openmc/stats/univariate.py | 76 ++++++++++++++++++++++++++++++++------
 1 file changed, 64 insertions(+), 12 deletions(-)

diff --git a/openmc/stats/univariate.py b/openmc/stats/univariate.py
index d6cf19f2b..c48cc0075 100644
--- a/openmc/stats/univariate.py
+++ b/openmc/stats/univariate.py
@@ -295,6 +295,20 @@ class Discrete(Univariate):
         """
         return np.sum(self.p)
 
+    def mean(self) -> float:
+        """Return mean of the discrete distribution
+
+        The mean is the weighted average of the discrete values.
+
+        .. versionadded:: 0.15.3
+
+        Returns
+        -------
+        float
+            Mean of discrete distribution
+        """
+        return np.sum(self.x * self.p) / np.sum(self.p)
+
     def clip(self, tolerance: float = 1e-6, inplace: bool = False) -> Discrete:
         r"""Remove low-importance points from discrete distribution.
 
@@ -413,6 +427,18 @@ class Uniform(Univariate):
         rng = np.random.RandomState(seed)
         return rng.uniform(self.a, self.b, n_samples)
 
+    def mean(self) -> float:
+        """Return mean of the uniform distribution
+
+        .. versionadded:: 0.15.3
+
+        Returns
+        -------
+        float
+            Mean of uniform distribution
+        """
+        return 0.5 * (self.a + self.b)
+
     def to_xml_element(self, element_name: str):
         """Return XML representation of the uniform distribution
 
@@ -1123,7 +1149,7 @@ class Tabular(Univariate):
 
         """
         interpolation = get_text(elem, 'interpolation')
-        params = get_elem_list(elem, "parameters", float)        
+        params = get_elem_list(elem, "parameters", float)
         m = (len(params) + 1)//2  # +1 for when len(params) is odd
         x = params[:m]
         p = params[m:]
@@ -1347,6 +1373,30 @@ class Mixture(Univariate):
             for p, dist in zip(self.probability, self.distribution)
         ])
 
+    def mean(self) -> float:
+        """Return mean of the mixture distribution
+
+        The mean is the weighted average of the means of the component
+        distributions, weighted by probability * integral.
+
+        .. versionadded:: 0.15.3
+
+        Returns
+        -------
+        float
+            Mean of the mixture distribution
+        """
+        # Weight each component by its probability and integral
+        weights = [p*dist.integral() for p, dist in
+                   zip(self.probability, self.distribution)]
+        total_weight = sum(weights)
+
+        if total_weight == 0:
+            return 0.0
+
+        return sum([w*dist.mean() for w, dist in
+                   zip(weights, self.distribution)]) / total_weight
+
     def clip(self, tolerance: float = 1e-6, inplace: bool = False) -> Mixture:
         r"""Remove low-importance points / distributions
 
@@ -1369,14 +1419,14 @@ class Mixture(Univariate):
         Distribution with low-importance points / distributions removed
 
         """
-        # Determine integral of original distribution to compare later
-        original_integral = self.integral()
+        # Calculate mean * integral for original distribution to compare later.
+        original_mean_integral = self.mean() * self.integral()
 
         # Determine indices for any distributions that contribute non-negligibly
-        # to overall intensity
-        intensities = [prob*dist.integral() for prob, dist in
-                       zip(self.probability, self.distribution)]
-        indices = _intensity_clip(intensities, tolerance=tolerance)
+        # to overall mean * integral
+        mean_integrals = [prob*dist.mean()*dist.integral() for prob, dist in
+                          zip(self.probability, self.distribution)]
+        indices = _intensity_clip(mean_integrals, tolerance=tolerance)
 
         # Clip mixture of distributions
         probability = self.probability[indices]
@@ -1397,12 +1447,14 @@ class Mixture(Univariate):
             # Create new distribution
             new_dist = type(self)(probability, distribution)
 
-        # Show warning if integral of new distribution is not within
-        # tolerance of original
-        diff = (original_integral - new_dist.integral())/original_integral
+        # Show warning if mean * integral of new distribution is not within
+        # tolerance of original. For energy distributions, mean * integral
+        # represents total energy.
+        new_mean_integral = new_dist.mean() * new_dist.integral()
+        diff = (original_mean_integral - new_mean_integral)/original_mean_integral
         if diff > tolerance:
-            warn("Clipping mixture distribution resulted in an integral that is "
-                    f"lower by a fraction of {diff} when tolerance={tolerance}.")
+            warn("Clipping mixture distribution resulted in a mean*integral "
+                 f"that is lower by a fraction of {diff} when tolerance={tolerance}.")
 
         return new_dist
 

From 3ac5d6f8f540a0bfbe53b8264ae1d691093853ec Mon Sep 17 00:00:00 2001
From: Jonathan Shimwell <mail@jshimwell.com>
Date: Mon, 20 Oct 2025 18:45:14 +0200
Subject: [PATCH 138/203] Allow Path objects in MGXSLibrary.export_to_hdf5
 (#3608)

Co-authored-by: Paul Romano <paul.k.romano@gmail.com>
---
 openmc/mgxs_library.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/openmc/mgxs_library.py b/openmc/mgxs_library.py
index b840563cf..ce86f97df 100644
--- a/openmc/mgxs_library.py
+++ b/openmc/mgxs_library.py
@@ -11,7 +11,7 @@ import openmc
 import openmc.mgxs
 from openmc.mgxs import SCATTER_TABULAR, SCATTER_LEGENDRE, SCATTER_HISTOGRAM
 from .checkvalue import check_type, check_value, check_greater_than, \
-    check_iterable_type, check_less_than, check_filetype_version
+    check_iterable_type, check_less_than, check_filetype_version, PathLike
 
 ROOM_TEMPERATURE_KELVIN = 294.0
 
@@ -2506,7 +2506,7 @@ class MGXSLibrary:
 
         Parameters
         ----------
-        filename : str
+        filename : str or PathLike
             Filename of file, default is mgxs.h5.
         libver : {'earliest', 'latest'}
             Compatibility mode for the HDF5 file. 'latest' will produce files
@@ -2514,7 +2514,7 @@ class MGXSLibrary:
 
         """
 
-        check_type('filename', filename, str)
+        check_type('filename', filename, PathLike)
 
         # Create and write to the HDF5 file
         file = h5py.File(filename, "w", libver=libver)

From c31032cf25f5a8c839c20fdb1017cbbf6de88278 Mon Sep 17 00:00:00 2001
From: GuySten <62616591+GuySten@users.noreply.github.com>
Date: Wed, 22 Oct 2025 02:03:27 +0300
Subject: [PATCH 139/203] load mesh objects from weight_windows.h5 file (#3598)

Co-authored-by: Patrick Shriwise <pshriwise@gmail.com>
---
 include/openmc/mesh.h               |  22 ++
 src/mesh.cpp                        | 369 ++++++++++++++++++++++------
 src/weight_windows.cpp              |   4 +
 tests/cpp_unit_tests/CMakeLists.txt |   1 +
 tests/cpp_unit_tests/test_mesh.cpp  | 257 +++++++++++++++++++
 5 files changed, 579 insertions(+), 74 deletions(-)
 create mode 100644 tests/cpp_unit_tests/test_mesh.cpp

diff --git a/include/openmc/mesh.h b/include/openmc/mesh.h
index a56705c9e..5c9272e93 100644
--- a/include/openmc/mesh.h
+++ b/include/openmc/mesh.h
@@ -132,8 +132,14 @@ public:
   // Constructors and destructor
   Mesh() = default;
   Mesh(pugi::xml_node node);
+  Mesh(hid_t group);
   virtual ~Mesh() = default;
 
+  // Factory method for creating meshes from either an XML node or HDF5 group
+  template<typename T>
+  static const std::unique_ptr<Mesh>& create(
+    T dataset, const std::string& mesh_type, const std::string& mesh_library);
+
   // Methods
   //! Perform any preparation needed to support point location within the mesh
   virtual void prepare_for_point_location() {};
@@ -258,6 +264,7 @@ class StructuredMesh : public Mesh {
 public:
   StructuredMesh() = default;
   StructuredMesh(pugi::xml_node node) : Mesh {node} {};
+  StructuredMesh(hid_t group) : Mesh {group} {};
   virtual ~StructuredMesh() = default;
 
   using MeshIndex = std::array<int, 3>;
@@ -423,6 +430,7 @@ class PeriodicStructuredMesh : public StructuredMesh {
 public:
   PeriodicStructuredMesh() = default;
   PeriodicStructuredMesh(pugi::xml_node node) : StructuredMesh {node} {};
+  PeriodicStructuredMesh(hid_t group) : StructuredMesh {group} {};
 
   Position local_coords(const Position& r) const override
   {
@@ -442,6 +450,7 @@ public:
   // Constructors
   RegularMesh() = default;
   RegularMesh(pugi::xml_node node);
+  RegularMesh(hid_t group);
 
   // Overridden methods
   int get_index_in_direction(double r, int i) const override;
@@ -481,6 +490,8 @@ public:
   //! Return the volume for a given mesh index
   double volume(const MeshIndex& ijk) const override;
 
+  int set_grid();
+
   // Data members
   double volume_frac_;           //!< Volume fraction of each mesh element
   double element_volume_;        //!< Volume of each mesh element
@@ -492,6 +503,7 @@ public:
   // Constructors
   RectilinearMesh() = default;
   RectilinearMesh(pugi::xml_node node);
+  RectilinearMesh(hid_t group);
 
   // Overridden methods
   int get_index_in_direction(double r, int i) const override;
@@ -534,6 +546,7 @@ public:
   // Constructors
   CylindricalMesh() = default;
   CylindricalMesh(pugi::xml_node node);
+  CylindricalMesh(hid_t group);
 
   // Overridden methods
   virtual MeshIndex get_indices(Position r, bool& in_mesh) const override;
@@ -598,6 +611,7 @@ public:
   // Constructors
   SphericalMesh() = default;
   SphericalMesh(pugi::xml_node node);
+  SphericalMesh(hid_t group);
 
   // Overridden methods
   virtual MeshIndex get_indices(Position r, bool& in_mesh) const override;
@@ -668,6 +682,7 @@ public:
   // Constructors
   UnstructuredMesh() { n_dimension_ = 3; };
   UnstructuredMesh(pugi::xml_node node);
+  UnstructuredMesh(hid_t group);
 
   static const std::string mesh_type;
   virtual std::string get_mesh_type() const override;
@@ -774,6 +789,7 @@ public:
   // Constructors
   MOABMesh() = default;
   MOABMesh(pugi::xml_node);
+  MOABMesh(hid_t group);
   MOABMesh(const std::string& filename, double length_multiplier = 1.0);
   MOABMesh(std::shared_ptr<moab::Interface> external_mbi);
 
@@ -943,6 +959,7 @@ class LibMesh : public UnstructuredMesh {
 public:
   // Constructors
   LibMesh(pugi::xml_node node);
+  LibMesh(hid_t group);
   LibMesh(const std::string& filename, double length_multiplier = 1.0);
   LibMesh(libMesh::MeshBase& input_mesh, double length_multiplier = 1.0);
 
@@ -1069,6 +1086,11 @@ private:
 //! \param[in] root XML node
 void read_meshes(pugi::xml_node root);
 
+//! Read meshes from an HDF5 file
+//
+//! \param[in] group HDF5 group ("meshes" group)
+void read_meshes(hid_t group);
+
 //! Write mesh data to an HDF5 group
 //
 //! \param[in] group HDF5 group
diff --git a/src/mesh.cpp b/src/mesh.cpp
index 58d218b9c..610d057cf 100644
--- a/src/mesh.cpp
+++ b/src/mesh.cpp
@@ -230,6 +230,42 @@ void MaterialVolumes::add_volume_unsafe(
 // Mesh implementation
 //==============================================================================
 
+template<typename T>
+const std::unique_ptr<Mesh>& Mesh::create(
+  T dataset, const std::string& mesh_type, const std::string& mesh_library)
+{
+  // Determine mesh type. Add to model vector and map
+  if (mesh_type == RegularMesh::mesh_type) {
+    model::meshes.push_back(make_unique<RegularMesh>(dataset));
+  } else if (mesh_type == RectilinearMesh::mesh_type) {
+    model::meshes.push_back(make_unique<RectilinearMesh>(dataset));
+  } else if (mesh_type == CylindricalMesh::mesh_type) {
+    model::meshes.push_back(make_unique<CylindricalMesh>(dataset));
+  } else if (mesh_type == SphericalMesh::mesh_type) {
+    model::meshes.push_back(make_unique<SphericalMesh>(dataset));
+#ifdef OPENMC_DAGMC_ENABLED
+  } else if (mesh_type == UnstructuredMesh::mesh_type &&
+             mesh_library == MOABMesh::mesh_lib_type) {
+    model::meshes.push_back(make_unique<MOABMesh>(dataset));
+#endif
+#ifdef OPENMC_LIBMESH_ENABLED
+  } else if (mesh_type == UnstructuredMesh::mesh_type &&
+             mesh_library == LibMesh::mesh_lib_type) {
+    model::meshes.push_back(make_unique<LibMesh>(dataset));
+#endif
+  } else if (mesh_type == UnstructuredMesh::mesh_type) {
+    fatal_error("Unstructured mesh support is not enabled or the mesh "
+                "library is invalid.");
+  } else {
+    fatal_error(fmt::format("Invalid mesh type: {}", mesh_type));
+  }
+
+  // Map ID to position in vector
+  model::mesh_map[model::meshes.back()->id_] = model::meshes.size() - 1;
+
+  return model::meshes.back();
+}
+
 Mesh::Mesh(pugi::xml_node node)
 {
   // Read mesh id
@@ -238,6 +274,17 @@ Mesh::Mesh(pugi::xml_node node)
     name_ = get_node_value(node, "name");
 }
 
+Mesh::Mesh(hid_t group)
+{
+  // Read mesh ID
+  read_attribute(group, "id", id_);
+
+  // Read mesh name
+  if (object_exists(group, "name")) {
+    read_dataset(group, "name", name_);
+  }
+}
+
 void Mesh::set_id(int32_t id)
 {
   assert(id >= 0 || id == C_NONE);
@@ -265,7 +312,13 @@ void Mesh::set_id(int32_t id)
 
   // Update ID and entry in the mesh map
   id_ = id;
-  model::mesh_map[id] = model::meshes.size() - 1;
+
+  // find the index of this mesh in the model::meshes vector
+  // (search in reverse because this mesh was likely just added to the vector)
+  auto it = std::find_if(model::meshes.rbegin(), model::meshes.rend(),
+    [this](const std::unique_ptr<Mesh>& mesh) { return mesh.get() == this; });
+
+  model::mesh_map[id] = std::distance(model::meshes.begin(), it.base()) - 1;
 }
 
 vector<double> Mesh::volumes() const
@@ -627,6 +680,46 @@ UnstructuredMesh::UnstructuredMesh(pugi::xml_node node) : Mesh(node)
   }
 }
 
+UnstructuredMesh::UnstructuredMesh(hid_t group) : Mesh(group)
+{
+  n_dimension_ = 3;
+
+  // check the mesh type
+  if (object_exists(group, "type")) {
+    std::string temp;
+    read_dataset(group, "type", temp);
+    if (temp != mesh_type) {
+      fatal_error(fmt::format("Invalid mesh type: {}", temp));
+    }
+  }
+
+  // check if a length unit multiplier was specified
+  if (object_exists(group, "length_multiplier")) {
+    read_dataset(group, "length_multiplier", length_multiplier_);
+  }
+
+  // get the filename of the unstructured mesh to load
+  if (object_exists(group, "filename")) {
+    read_dataset(group, "filename", filename_);
+    if (!file_exists(filename_)) {
+      fatal_error("Mesh file '" + filename_ + "' does not exist!");
+    }
+  } else {
+    fatal_error(fmt::format(
+      "No filename supplied for unstructured mesh with ID: {}", id_));
+  }
+
+  if (attribute_exists(group, "options")) {
+    read_attribute(group, "options", options_);
+  }
+
+  // check if mesh tally data should be written with
+  // statepoint files
+  if (attribute_exists(group, "output")) {
+    read_attribute(group, "output", output_);
+  }
+}
+
 void UnstructuredMesh::determine_bounds()
 {
   double xmin = INFTY;
@@ -1086,6 +1179,72 @@ void StructuredMesh::surface_bins_crossed(
 // RegularMesh implementation
 //==============================================================================
 
+int RegularMesh::set_grid()
+{
+  auto shape = xt::adapt(shape_, {n_dimension_});
+
+  // Check that dimensions are all greater than zero
+  if (xt::any(shape <= 0)) {
+    set_errmsg("All entries for a regular mesh dimensions "
+               "must be positive.");
+    return OPENMC_E_INVALID_ARGUMENT;
+  }
+
+  // Make sure lower_left and dimension match
+  if (lower_left_.size() != n_dimension_) {
+    set_errmsg("Number of entries in lower_left must be the same "
+               "as the regular mesh dimensions.");
+    return OPENMC_E_INVALID_ARGUMENT;
+  }
+  if (width_.size() > 0) {
+
+    // Check to ensure width has same dimensions
+    if (width_.size() != n_dimension_) {
+      set_errmsg("Number of entries on width must be the same as "
+                 "the regular mesh dimensions.");
+      return OPENMC_E_INVALID_ARGUMENT;
+    }
+
+    // Check for negative widths
+    if (xt::any(width_ < 0.0)) {
+      set_errmsg("Cannot have a negative width on a regular mesh.");
+      return OPENMC_E_INVALID_ARGUMENT;
+    }
+
+    // Set width and upper right coordinate
+    upper_right_ = xt::eval(lower_left_ + shape * width_);
+
+  } else if (upper_right_.size() > 0) {
+
+    // Check to ensure upper_right_ has same dimensions
+    if (upper_right_.size() != n_dimension_) {
+      set_errmsg("Number of entries on upper_right must be the "
+                 "same as the regular mesh dimensions.");
+      return OPENMC_E_INVALID_ARGUMENT;
+    }
+
+    // Check that upper-right is above lower-left
+    if (xt::any(upper_right_ < lower_left_)) {
+      set_errmsg(
+        "The upper_right coordinates of a regular mesh must be greater than "
+        "the lower_left coordinates.");
+      return OPENMC_E_INVALID_ARGUMENT;
+    }
+
+    // Set width
+    width_ = xt::eval((upper_right_ - lower_left_) / shape);
+  }
+
+  // Set material volumes
+  volume_frac_ = 1.0 / xt::prod(shape)();
+
+  element_volume_ = 1.0;
+  for (int i = 0; i < n_dimension_; i++) {
+    element_volume_ *= width_[i];
+  }
+  return 0;
+}
+
 RegularMesh::RegularMesh(pugi::xml_node node) : StructuredMesh {node}
 {
   // Determine number of dimensions for mesh
@@ -1100,12 +1259,6 @@ RegularMesh::RegularMesh(pugi::xml_node node) : StructuredMesh {node}
   }
   std::copy(shape.begin(), shape.end(), shape_.begin());
 
-  // Check that dimensions are all greater than zero
-  if (xt::any(shape <= 0)) {
-    fatal_error("All entries on the <dimension> element for a tally "
-                "mesh must be positive.");
-  }
-
   // Check for lower-left coordinates
   if (check_for_node(node, "lower_left")) {
     // Read mesh lower-left corner location
@@ -1114,12 +1267,6 @@ RegularMesh::RegularMesh(pugi::xml_node node) : StructuredMesh {node}
     fatal_error("Must specify <lower_left> on a mesh.");
   }
 
-  // Make sure lower_left and dimension match
-  if (shape.size() != lower_left_.size()) {
-    fatal_error("Number of entries on <lower_left> must be the same "
-                "as the number of entries on <dimension>.");
-  }
-
   if (check_for_node(node, "width")) {
     // Make sure one of upper-right or width were specified
     if (check_for_node(node, "upper_right")) {
@@ -1128,49 +1275,52 @@ RegularMesh::RegularMesh(pugi::xml_node node) : StructuredMesh {node}
 
     width_ = get_node_xarray<double>(node, "width");
 
-    // Check to ensure width has same dimensions
-    auto n = width_.size();
-    if (n != lower_left_.size()) {
-      fatal_error("Number of entries on <width> must be the same as "
-                  "the number of entries on <lower_left>.");
-    }
-
-    // Check for negative widths
-    if (xt::any(width_ < 0.0)) {
-      fatal_error("Cannot have a negative <width> on a tally mesh.");
-    }
-
-    // Set width and upper right coordinate
-    upper_right_ = xt::eval(lower_left_ + shape * width_);
-
   } else if (check_for_node(node, "upper_right")) {
+
     upper_right_ = get_node_xarray<double>(node, "upper_right");
 
-    // Check to ensure width has same dimensions
-    auto n = upper_right_.size();
-    if (n != lower_left_.size()) {
-      fatal_error("Number of entries on <upper_right> must be the "
-                  "same as the number of entries on <lower_left>.");
-    }
-
-    // Check that upper-right is above lower-left
-    if (xt::any(upper_right_ < lower_left_)) {
-      fatal_error("The <upper_right> coordinates must be greater than "
-                  "the <lower_left> coordinates on a tally mesh.");
-    }
-
-    // Set width
-    width_ = xt::eval((upper_right_ - lower_left_) / shape);
   } else {
     fatal_error("Must specify either <upper_right> or <width> on a mesh.");
   }
 
-  // Set material volumes
-  volume_frac_ = 1.0 / xt::prod(shape)();
+  if (int err = set_grid()) {
+    fatal_error(openmc_err_msg);
+  }
+}
 
-  element_volume_ = 1.0;
-  for (int i = 0; i < n_dimension_; i++) {
-    element_volume_ *= width_[i];
+RegularMesh::RegularMesh(hid_t group) : StructuredMesh {group}
+{
+  // Determine number of dimensions for mesh
+  if (!object_exists(group, "dimension")) {
+    fatal_error("Must specify <dimension> on a regular mesh.");
+  }
+
+  xt::xtensor<int, 1> shape;
+  read_dataset(group, "dimension", shape);
+  int n = n_dimension_ = shape.size();
+  if (n != 1 && n != 2 && n != 3) {
+    fatal_error("Mesh must be one, two, or three dimensions.");
+  }
+  std::copy(shape.begin(), shape.end(), shape_.begin());
+
+  // Check for lower-left coordinates
+  if (object_exists(group, "lower_left")) {
+    // Read mesh lower-left corner location
+    read_dataset(group, "lower_left", lower_left_);
+  } else {
+    fatal_error("Must specify lower_left dataset on a mesh.");
+  }
+
+  if (object_exists(group, "upper_right")) {
+
+    read_dataset(group, "upper_right", upper_right_);
+
+  } else {
+    fatal_error("Must specify either upper_right dataset on a mesh.");
+  }
+
+  if (int err = set_grid()) {
+    fatal_error(openmc_err_msg);
   }
 }
 
@@ -1343,6 +1493,19 @@ RectilinearMesh::RectilinearMesh(pugi::xml_node node) : StructuredMesh {node}
   }
 }
 
+RectilinearMesh::RectilinearMesh(hid_t group) : StructuredMesh {group}
+{
+  n_dimension_ = 3;
+
+  read_dataset(group, "x_grid", grid_[0]);
+  read_dataset(group, "y_grid", grid_[1]);
+  read_dataset(group, "z_grid", grid_[2]);
+
+  if (int err = set_grid()) {
+    fatal_error(openmc_err_msg);
+  }
+}
+
 const std::string RectilinearMesh::mesh_type = "rectilinear";
 
 std::string RectilinearMesh::get_mesh_type() const
@@ -1478,6 +1641,19 @@ CylindricalMesh::CylindricalMesh(pugi::xml_node node)
   }
 }
 
+CylindricalMesh::CylindricalMesh(hid_t group) : PeriodicStructuredMesh {group}
+{
+  n_dimension_ = 3;
+  read_dataset(group, "r_grid", grid_[0]);
+  read_dataset(group, "phi_grid", grid_[1]);
+  read_dataset(group, "z_grid", grid_[2]);
+  read_dataset(group, "origin", origin_);
+
+  if (int err = set_grid()) {
+    fatal_error(openmc_err_msg);
+  }
+}
+
 const std::string CylindricalMesh::mesh_type = "cylindrical";
 
 std::string CylindricalMesh::get_mesh_type() const
@@ -1756,6 +1932,20 @@ SphericalMesh::SphericalMesh(pugi::xml_node node)
   }
 }
 
+SphericalMesh::SphericalMesh(hid_t group) : PeriodicStructuredMesh {group}
+{
+  n_dimension_ = 3;
+
+  read_dataset(group, "r_grid", grid_[0]);
+  read_dataset(group, "theta_grid", grid_[1]);
+  read_dataset(group, "phi_grid", grid_[2]);
+  read_dataset(group, "origin", origin_);
+
+  if (int err = set_grid()) {
+    fatal_error(openmc_err_msg);
+  }
+}
+
 const std::string SphericalMesh::mesh_type = "spherical";
 
 std::string SphericalMesh::get_mesh_type() const
@@ -2520,6 +2710,11 @@ MOABMesh::MOABMesh(pugi::xml_node node) : UnstructuredMesh(node)
   initialize();
 }
 
+MOABMesh::MOABMesh(hid_t group) : UnstructuredMesh(group)
+{
+  initialize();
+}
+
 MOABMesh::MOABMesh(const std::string& filename, double length_multiplier)
   : UnstructuredMesh()
 {
@@ -3228,6 +3423,15 @@ LibMesh::LibMesh(pugi::xml_node node) : UnstructuredMesh(node)
   initialize();
 }
 
+LibMesh::LibMesh(hid_t group) : UnstructuredMesh(group)
+{
+  // filename_ and length_multiplier_ will already be set by the
+  // UnstructuredMesh constructor
+  set_mesh_pointer_from_filename(filename_);
+  set_length_multiplier(length_multiplier_);
+  initialize();
+}
+
 // create the mesh from a pointer to a libMesh Mesh
 LibMesh::LibMesh(libMesh::MeshBase& input_mesh, double length_multiplier)
 {
@@ -3618,34 +3822,51 @@ void read_meshes(pugi::xml_node root)
       mesh_lib = get_node_value(node, "library", true, true);
     }
 
-    // Read mesh and add to vector
-    if (mesh_type == RegularMesh::mesh_type) {
-      model::meshes.push_back(make_unique<RegularMesh>(node));
-    } else if (mesh_type == RectilinearMesh::mesh_type) {
-      model::meshes.push_back(make_unique<RectilinearMesh>(node));
-    } else if (mesh_type == CylindricalMesh::mesh_type) {
-      model::meshes.push_back(make_unique<CylindricalMesh>(node));
-    } else if (mesh_type == SphericalMesh::mesh_type) {
-      model::meshes.push_back(make_unique<SphericalMesh>(node));
-#ifdef OPENMC_DAGMC_ENABLED
-    } else if (mesh_type == UnstructuredMesh::mesh_type &&
-               mesh_lib == MOABMesh::mesh_lib_type) {
-      model::meshes.push_back(make_unique<MOABMesh>(node));
-#endif
-#ifdef OPENMC_LIBMESH_ENABLED
-    } else if (mesh_type == UnstructuredMesh::mesh_type &&
-               mesh_lib == LibMesh::mesh_lib_type) {
-      model::meshes.push_back(make_unique<LibMesh>(node));
-#endif
-    } else if (mesh_type == UnstructuredMesh::mesh_type) {
-      fatal_error("Unstructured mesh support is not enabled or the mesh "
-                  "library is invalid.");
-    } else {
-      fatal_error("Invalid mesh type: " + mesh_type);
+    Mesh::create(node, mesh_type, mesh_lib);
+  }
+}
+
+void read_meshes(hid_t group)
+{
+  std::unordered_set<int> mesh_ids;
+
+  std::vector<int> ids;
+  read_attribute(group, "ids", ids);
+
+  for (auto id : ids) {
+
+    // Check to make sure multiple meshes in the same file don't share IDs
+    if (contains(mesh_ids, id)) {
+      fatal_error(fmt::format("Two or more meshes use the same unique ID "
+                              "'{}' in the same HDF5 input file",
+        id));
+    }
+    mesh_ids.insert(id);
+
+    // If we've already read a mesh with the same ID in a *different* file,
+    // assume it is the same here
+    if (model::mesh_map.find(id) != model::mesh_map.end()) {
+      warning(fmt::format("Mesh with ID={} appears in multiple files.", id));
+      continue;
     }
 
-    // Map ID to position in vector
-    model::mesh_map[model::meshes.back()->id_] = model::meshes.size() - 1;
+    std::string name = fmt::format("mesh {}", id);
+    hid_t mesh_group = open_group(group, name.c_str());
+
+    std::string mesh_type;
+    if (object_exists(mesh_group, "type")) {
+      read_dataset(mesh_group, "type", mesh_type);
+    } else {
+      mesh_type = "regular";
+    }
+
+    // determine the mesh library to use
+    std::string mesh_lib;
+    if (object_exists(mesh_group, "library")) {
+      read_dataset(mesh_group, "library", mesh_lib);
+    }
+
+    Mesh::create(mesh_group, mesh_type, mesh_lib);
   }
 }
 
diff --git a/src/weight_windows.cpp b/src/weight_windows.cpp
index 26762ad18..0d648d333 100644
--- a/src/weight_windows.cpp
+++ b/src/weight_windows.cpp
@@ -1328,6 +1328,10 @@ extern "C" int openmc_weight_windows_import(const char* filename)
 
   hid_t weight_windows_group = open_group(ww_file, "weight_windows");
 
+  hid_t mesh_group = open_group(ww_file, "meshes");
+
+  read_meshes(mesh_group);
+
   std::vector<std::string> names = group_names(weight_windows_group);
 
   for (const auto& name : names) {
diff --git a/tests/cpp_unit_tests/CMakeLists.txt b/tests/cpp_unit_tests/CMakeLists.txt
index 8fedc2daa..5f87db9ea 100644
--- a/tests/cpp_unit_tests/CMakeLists.txt
+++ b/tests/cpp_unit_tests/CMakeLists.txt
@@ -5,6 +5,7 @@ set(TEST_NAMES
   test_interpolate
   test_math
   test_mcpl_stat_sum
+  test_mesh
   # Add additional unit test files here
 )
 
diff --git a/tests/cpp_unit_tests/test_mesh.cpp b/tests/cpp_unit_tests/test_mesh.cpp
new file mode 100644
index 000000000..24c4f7737
--- /dev/null
+++ b/tests/cpp_unit_tests/test_mesh.cpp
@@ -0,0 +1,257 @@
+#include <cstdio>
+#include <iostream>
+#include <string>
+
+#include <catch2/catch_test_macros.hpp>
+#include <pugixml.hpp>
+
+#include "openmc/hdf5_interface.h"
+#include "openmc/mesh.h"
+
+using namespace openmc;
+
+TEST_CASE("Test mesh hdf5 roundtrip - regular")
+{
+  // The XML data as a string
+  std::string xml_string = R"(
+        <mesh id="1">
+            <dimension>3 4 5</dimension>
+            <lower_left>-2 -3 -5</lower_left>
+            <upper_right>2 3 5</upper_right>
+       </mesh>
+    )";
+
+  // Create a pugixml document object
+  pugi::xml_document doc;
+
+  // Load the XML from the string
+  pugi::xml_parse_result result = doc.load_string(xml_string.c_str());
+
+  pugi::xml_node root = doc.child("mesh");
+
+  auto mesh = RegularMesh(root);
+
+  hid_t file_id = file_open("mesh.h5", 'w');
+
+  mesh.to_hdf5(file_id);
+
+  file_close(file_id);
+
+  hid_t file_id2 = file_open("mesh.h5", 'r');
+
+  hid_t group = open_group(file_id2, "mesh 1");
+
+  auto mesh2 = RegularMesh(group);
+
+  file_close(file_id2);
+
+  remove("mesh.h5");
+
+  REQUIRE(mesh2.shape_ == mesh.shape_);
+
+  REQUIRE(mesh2.lower_left() == mesh.lower_left());
+
+  REQUIRE(mesh2.upper_right() == mesh.upper_right());
+}
+
+TEST_CASE("Test mesh hdf5 roundtrip - rectilinear")
+{
+  // The XML data as a string
+  std::string xml_string = R"(
+        <mesh id="1" type="rectilinear">
+            <x_grid>0.0 1.0 5.0 10.0</x_grid>
+            <y_grid>-10.0 -5.0 0.0</y_grid>
+            <z_grid>-100.0 0.0 100.0</z_grid>
+        </mesh>
+    )";
+
+  // Create a pugixml document object
+  pugi::xml_document doc;
+
+  // Load the XML from the string
+  pugi::xml_parse_result result = doc.load_string(xml_string.c_str());
+
+  pugi::xml_node root = doc.child("mesh");
+
+  auto mesh = RectilinearMesh(root);
+
+  hid_t file_id = file_open("mesh.h5", 'w');
+
+  mesh.to_hdf5(file_id);
+
+  file_close(file_id);
+
+  hid_t file_id2 = file_open("mesh.h5", 'r');
+
+  hid_t group = open_group(file_id2, "mesh 1");
+
+  auto mesh2 = RectilinearMesh(group);
+
+  file_close(file_id2);
+
+  remove("mesh.h5");
+
+  REQUIRE(mesh2.shape_ == mesh.shape_);
+
+  REQUIRE(mesh2.grid_ == mesh.grid_);
+}
+
+TEST_CASE("Test mesh hdf5 roundtrip - cylindrical")
+{
+  // The XML data as a string
+  std::string xml_string = R"(
+        <mesh id="1" type="cylindrical">
+            <r_grid>0.1 0.2 0.5 1.0</r_grid>
+            <phi_grid>0.0 6.283185307179586</phi_grid>
+            <z_grid>0.1 0.2 0.4 0.6 1.0</z_grid>
+            <origin>0 0 0</origin>
+        </mesh>
+    )";
+
+  // Create a pugixml document object
+  pugi::xml_document doc;
+
+  // Load the XML from the string
+  pugi::xml_parse_result result = doc.load_string(xml_string.c_str());
+
+  pugi::xml_node root = doc.child("mesh");
+
+  auto mesh = CylindricalMesh(root);
+
+  hid_t file_id = file_open("mesh.h5", 'w');
+
+  mesh.to_hdf5(file_id);
+
+  file_close(file_id);
+
+  hid_t file_id2 = file_open("mesh.h5", 'r');
+
+  hid_t group = open_group(file_id2, "mesh 1");
+
+  auto mesh2 = CylindricalMesh(group);
+
+  file_close(file_id2);
+
+  remove("mesh.h5");
+
+  REQUIRE(mesh2.shape_ == mesh.shape_);
+
+  REQUIRE(mesh2.grid_ == mesh.grid_);
+}
+
+TEST_CASE("Test mesh hdf5 roundtrip - spherical")
+{
+  // The XML data as a string
+  std::string xml_string = R"(
+        <mesh id="1" type="spherical">
+            <r_grid>0.1 0.2 0.5 1.0</r_grid>
+            <theta_grid>0.0 3.141592653589793</theta_grid>
+            <phi_grid>0.0 6.283185307179586</phi_grid>
+            <origin>0.0 0.0 0.0</origin>
+        </mesh>'
+    )";
+
+  // Create a pugixml document object
+  pugi::xml_document doc;
+
+  // Load the XML from the string
+  pugi::xml_parse_result result = doc.load_string(xml_string.c_str());
+
+  pugi::xml_node root = doc.child("mesh");
+
+  auto mesh = SphericalMesh(root);
+
+  hid_t file_id = file_open("mesh.h5", 'w');
+
+  mesh.to_hdf5(file_id);
+
+  file_close(file_id);
+
+  hid_t file_id2 = file_open("mesh.h5", 'r');
+
+  hid_t group = open_group(file_id2, "mesh 1");
+
+  auto mesh2 = SphericalMesh(group);
+
+  file_close(file_id2);
+
+  remove("mesh.h5");
+
+  REQUIRE(mesh2.shape_ == mesh.shape_);
+
+  REQUIRE(mesh2.grid_ == mesh.grid_);
+}
+
+TEST_CASE("Test multiple meshes HDF5 roundtrip - spherical")
+{
+  // The XML data as a string
+  std::string xml_string = R"(
+        <meshes>
+        <mesh id="1" type="spherical">
+            <r_grid>0.1 0.2 0.5 1.0</r_grid>
+            <theta_grid>0.0 3.141592653589793</theta_grid>
+            <phi_grid>0.0 6.283185307179586</phi_grid>
+            <origin>0.0 0.0 0.0</origin>
+        </mesh>
+         <mesh id="2">
+            <dimension>3 4 5</dimension>
+            <lower_left>-2 -3 -5</lower_left>
+            <upper_right>2 3 5</upper_right>
+       </mesh>
+       </meshes>
+    )";
+
+  // Create a pugixml document object
+  pugi::xml_document doc;
+
+  // Load the XML from the string
+  pugi::xml_parse_result result = doc.load_string(xml_string.c_str());
+
+  pugi::xml_node root = doc.child("meshes");
+
+  read_meshes(root);
+
+  const auto spherical_mesh_xml =
+    dynamic_cast<SphericalMesh*>(model::meshes[0].get());
+  const auto regular_mesh_xml =
+    dynamic_cast<RegularMesh*>(model::meshes[1].get());
+
+  hid_t file_id = file_open("meshes.h5", 'w');
+
+  hid_t root_group = create_group(file_id, "root");
+
+  open_group(file_id, "root");
+
+  meshes_to_hdf5(root_group);
+
+  close_group(root_group);
+
+  file_close(file_id);
+
+  hid_t file_id2 = file_open("meshes.h5", 'r');
+
+  hid_t root_group_read = open_group(file_id2, "root");
+
+  hid_t mesh_group_read = open_group(root_group_read, "meshes");
+
+  read_meshes(mesh_group_read);
+
+  // increment mesh IDs to avoid collision during read
+  for (auto& mesh : model::meshes) {
+    mesh->set_id(mesh->id() + 10);
+  }
+
+  const auto spherical_mesh_hdf5 = dynamic_cast<SphericalMesh*>(
+    model::meshes[model::mesh_map[spherical_mesh_xml->id_]].get());
+  const auto regular_mesh_hdf5 = dynamic_cast<RegularMesh*>(
+    model::meshes[model::mesh_map[regular_mesh_xml->id_]].get());
+
+  remove("meshes.h5");
+
+  REQUIRE(spherical_mesh_hdf5->shape_ == spherical_mesh_xml->shape_);
+  REQUIRE(spherical_mesh_hdf5->grid_ == spherical_mesh_xml->grid_);
+
+  REQUIRE(regular_mesh_hdf5->shape_ == regular_mesh_xml->shape_);
+  REQUIRE(regular_mesh_hdf5->lower_left() == regular_mesh_xml->lower_left());
+  REQUIRE(regular_mesh_hdf5->upper_right() == regular_mesh_xml->upper_right());
+}

From 70b52546624cb3a654189856d8c9e012624c7672 Mon Sep 17 00:00:00 2001
From: John Tramm <john.tramm@gmail.com>
Date: Mon, 27 Oct 2025 03:30:54 -0500
Subject: [PATCH 140/203] Random Ray Geometry Debug Mode Fix (#3615)

---
 src/random_ray/random_ray.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/random_ray/random_ray.cpp b/src/random_ray/random_ray.cpp
index 89a91449d..c19d136a4 100644
--- a/src/random_ray/random_ray.cpp
+++ b/src/random_ray/random_ray.cpp
@@ -278,6 +278,10 @@ uint64_t RandomRay::transport_history_based_single_ray()
 // Transports ray across a single source region
 void RandomRay::event_advance_ray()
 {
+  // If geometry debug mode is on, check for cell overlaps
+  if (settings::check_overlaps)
+    check_cell_overlap(*this);
+
   // Find the distance to the nearest boundary
   boundary() = distance_to_boundary(*this);
   double distance = boundary().distance();

From 230db28d39ae1e3011e3ad85cb8b5090693fe862 Mon Sep 17 00:00:00 2001
From: John Tramm <john.tramm@gmail.com>
Date: Tue, 28 Oct 2025 03:22:37 -0500
Subject: [PATCH 141/203] FW-CADIS Disregard Max Realizations Setting (#3616)

---
 docs/source/usersguide/variance_reduction.rst |  3 +--
 src/simulation.cpp                            |  7 ++-----
 src/weight_windows.cpp                        | 15 +++++++++++----
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/docs/source/usersguide/variance_reduction.rst b/docs/source/usersguide/variance_reduction.rst
index 369e33e2d..5c2485158 100644
--- a/docs/source/usersguide/variance_reduction.rst
+++ b/docs/source/usersguide/variance_reduction.rst
@@ -133,8 +133,7 @@ random ray mode can be found in the :ref:`Random Ray User Guide <random_ray>`.
        # we used for source region decomposition
        wwg = openmc.WeightWindowGenerator(
            method='fw_cadis',
-           mesh=mesh,
-           max_realizations=settings.batches
+           mesh=mesh
        )
 
        # Add generator to openmc.settings object
diff --git a/src/simulation.cpp b/src/simulation.cpp
index f55546c4c..05d554526 100644
--- a/src/simulation.cpp
+++ b/src/simulation.cpp
@@ -400,11 +400,8 @@ void finalize_batch()
   simulation::time_tallies.stop();
 
   // update weight windows if needed
-  if (settings::solver_type != SolverType::RANDOM_RAY ||
-      simulation::current_batch == settings::n_batches) {
-    for (const auto& wwg : variance_reduction::weight_windows_generators) {
-      wwg->update();
-    }
+  for (const auto& wwg : variance_reduction::weight_windows_generators) {
+    wwg->update();
   }
 
   // Reset global tally results
diff --git a/src/weight_windows.cpp b/src/weight_windows.cpp
index 0d648d333..674fae49c 100644
--- a/src/weight_windows.cpp
+++ b/src/weight_windows.cpp
@@ -26,6 +26,7 @@
 #include "openmc/random_ray/flat_source_domain.h"
 #include "openmc/search.h"
 #include "openmc/settings.h"
+#include "openmc/simulation.h"
 #include "openmc/tallies/filter_energy.h"
 #include "openmc/tallies/filter_mesh.h"
 #include "openmc/tallies/filter_particle.h"
@@ -966,11 +967,17 @@ void WeightWindowsGenerator::update() const
 
   Tally* tally = model::tallies[tally_idx_].get();
 
-  // if we're beyond the number of max realizations or not at the corrrect
-  // update interval, skip the update
-  if (max_realizations_ < tally->n_realizations_ ||
-      tally->n_realizations_ % update_interval_ != 0)
+  // If in random ray mode, only update on the last batch
+  if (settings::solver_type == SolverType::RANDOM_RAY) {
+    if (simulation::current_batch != settings::n_batches) {
+      return;
+    }
+    // If in Monte Carlo mode and beyond the number of max realizations or
+    // not at the correct update interval, skip the update
+  } else if (max_realizations_ < tally->n_realizations_ ||
+             tally->n_realizations_ % update_interval_ != 0) {
     return;
+  }
 
   wws->update_weights(tally, tally_value_, threshold_, ratio_, method_);
 

From f10d7d9f67375acb088d01e82bab957617f18e39 Mon Sep 17 00:00:00 2001
From: Paul Romano <paul.k.romano@gmail.com>
Date: Tue, 28 Oct 2025 03:23:16 -0500
Subject: [PATCH 142/203] Speed up `apply_time_correction` by reducing file I/O
 and deepcopies (#3617)

---
 openmc/deplete/d1s.py        | 27 ++++++++++++++++-----------
 tests/unit_tests/test_d1s.py | 14 ++++++++++++++
 2 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/openmc/deplete/d1s.py b/openmc/deplete/d1s.py
index f51dea416..bc99fc42d 100644
--- a/openmc/deplete/d1s.py
+++ b/openmc/deplete/d1s.py
@@ -5,7 +5,7 @@ shutdown dose rate calculations.
 
 """
 
-from copy import deepcopy
+from copy import copy
 from typing import Sequence
 from math import log, prod
 
@@ -164,8 +164,12 @@ def apply_time_correction(
     radionuclides = [str(x) for x in tally.filters[i_filter].bins]
     tcf = np.array([time_correction_factors[x][index] for x in radionuclides])
 
-    # Create copy of tally
-    new_tally = deepcopy(tally)
+    # Force tally results to be read and std_dev to be computed
+    tally.std_dev
+
+    # Create shallow copy of tally
+    new_tally = copy(tally)
+    new_tally._filters = copy(tally._filters)
 
     # Determine number of bins in other filters
     n_bins_before = prod([f.num_bins for f in tally.filters[:i_filter]])
@@ -177,32 +181,33 @@ def apply_time_correction(
     shape = (n_bins_before, n_radionuclides, n_bins_after, n_nuclides, n_scores)
     tally_sum = new_tally.sum.reshape(shape)
     tally_sum_sq = new_tally.sum_sq.reshape(shape)
+    tally_mean = new_tally.mean.reshape(shape)
+    tally_std_dev = new_tally.std_dev.reshape(shape)
 
     # Apply TCF, broadcasting to the correct dimensions
     tcf.shape = (1, -1, 1, 1, 1)
     new_tally._sum = tally_sum * tcf
     new_tally._sum_sq = tally_sum_sq * (tcf*tcf)
-    new_tally._mean = None
-    new_tally._std_dev = None
+    new_tally._mean = tally_mean * tcf
+    new_tally._std_dev = tally_std_dev * tcf
 
     shape = (-1, n_nuclides, n_scores)
 
     if sum_nuclides:
-        # Query the mean and standard deviation
-        mean = new_tally.mean
-        std_dev = new_tally.std_dev
-
         # Sum over parent nuclides (note that when combining different bins for
         # parent nuclide, we can't work directly on sum_sq)
-        new_tally._mean = mean.sum(axis=1).reshape(shape)
-        new_tally._std_dev = np.linalg.norm(std_dev, axis=1).reshape(shape)
+        new_tally._mean = new_tally.mean.sum(axis=1).reshape(shape)
+        new_tally._std_dev = np.linalg.norm(new_tally.std_dev, axis=1).reshape(shape)
         new_tally._derived = True
 
         # Remove ParentNuclideFilter
         new_tally.filters.pop(i_filter)
     else:
+        # Change shape back to (filter combinations, nuclides, scores)
         new_tally._sum.shape = shape
         new_tally._sum_sq.shape = shape
+        new_tally._mean.shape = shape
+        new_tally._std_dev.shape = shape
 
     return new_tally
 
diff --git a/tests/unit_tests/test_d1s.py b/tests/unit_tests/test_d1s.py
index 9410f2da2..8f3b62f40 100644
--- a/tests/unit_tests/test_d1s.py
+++ b/tests/unit_tests/test_d1s.py
@@ -120,6 +120,13 @@ def test_apply_time_correction(run_in_tmpdir):
         tally = sp.tallies[tally.id]
         flux = tally.mean.flatten()
 
+    # Copy attributes from original tally
+    tally_filters = list(tally.filters)
+    tally_sum = tally.sum.copy()
+    tally_sum_sq = tally.sum_sq.copy()
+    tally_mean = tally.mean.copy()
+    tally_std_dev = tally.std_dev.copy()
+
     # Apply TCF and make sure results are consistent
     result = d1s.apply_time_correction(tally, factors, sum_nuclides=False)
     tcf = np.array([factors[nuc][-1] for nuc in nuclides])
@@ -129,6 +136,13 @@ def test_apply_time_correction(run_in_tmpdir):
     result_summed = d1s.apply_time_correction(tally, factors)
     assert result_summed.mean.flatten()[0] == pytest.approx(result.mean.sum())
 
+    # Make sure original tally is unchanged
+    assert tally.filters == tally_filters
+    assert np.all(tally.sum == tally_sum)
+    assert np.all(tally.sum_sq == tally_sum_sq)
+    assert np.all(tally.mean == tally_mean)
+    assert np.all(tally.std_dev == tally_std_dev)
+
     # Make sure various tally methods work
     result.get_values()
     result_summed.get_values()

From a74c1424a8a883066b2c0afe4b23f20c84cbb815 Mon Sep 17 00:00:00 2001
From: Makarand More <40858007+Jarvis2001@users.noreply.github.com>
Date: Tue, 28 Oct 2025 20:20:11 +0530
Subject: [PATCH 143/203] Update `check_type` calls to accept both `str` and
 `os.PathLike` objects. (#3618)

Co-authored-by: Paul Romano <paul.k.romano@gmail.com>
---
 openmc/checkvalue.py                     |  2 +-
 openmc/mgxs/library.py                   |  7 ++--
 openmc/mgxs/mdgxs.py                     |  3 +-
 openmc/mgxs/mgxs.py                      |  3 +-
 openmc/mgxs_library.py                   |  5 ++-
 openmc/plots.py                          |  2 +-
 tests/unit_tests/test_pathlike_simple.py | 46 ++++++++++++++++++++++++
 7 files changed, 58 insertions(+), 10 deletions(-)
 create mode 100644 tests/unit_tests/test_pathlike_simple.py

diff --git a/openmc/checkvalue.py b/openmc/checkvalue.py
index 4fa205b14..5ff2cf9ac 100644
--- a/openmc/checkvalue.py
+++ b/openmc/checkvalue.py
@@ -37,7 +37,7 @@ def check_type(name, value, expected_type, expected_iter_type=None, *, none_ok=F
                       [t.__name__ for t in expected_type]))
         else:
             msg = (f'Unable to set "{name}" to "{value}" which is not of type "'
-                   f'{expected_type.__name__}"')
+                   f'{expected_type}"')
         raise TypeError(msg)
 
     if expected_iter_type:
diff --git a/openmc/mgxs/library.py b/openmc/mgxs/library.py
index 12a4630bd..f782cbe9e 100644
--- a/openmc/mgxs/library.py
+++ b/openmc/mgxs/library.py
@@ -10,6 +10,7 @@ import numpy as np
 import openmc
 import openmc.mgxs
 import openmc.checkvalue as cv
+from openmc.checkvalue import PathLike
 from ..tallies import ESTIMATOR_TYPES
 
 
@@ -851,7 +852,7 @@ class Library:
                   'since a statepoint has not yet been loaded'
             raise ValueError(msg)
 
-        cv.check_type('filename', filename, str)
+        cv.check_type('filename', filename, (str, PathLike))
         cv.check_type('directory', directory, str)
 
         import h5py
@@ -894,7 +895,7 @@ class Library:
 
         """
 
-        cv.check_type('filename', filename, str)
+        cv.check_type('filename', filename, (str, PathLike))
         cv.check_type('directory', directory, str)
 
         # Make directory if it does not exist
@@ -930,7 +931,7 @@ class Library:
 
         """
 
-        cv.check_type('filename', filename, str)
+        cv.check_type('filename', filename, (str, PathLike))
         cv.check_type('directory', directory, str)
 
         # Make directory if it does not exist
diff --git a/openmc/mgxs/mdgxs.py b/openmc/mgxs/mdgxs.py
index b95a4fbc0..c12c1a9ab 100644
--- a/openmc/mgxs/mdgxs.py
+++ b/openmc/mgxs/mdgxs.py
@@ -7,6 +7,7 @@ import numpy as np
 
 import openmc
 import openmc.checkvalue as cv
+from openmc.checkvalue import PathLike
 from openmc.mgxs import MGXS
 from .mgxs import _DOMAIN_TO_FILTER
 
@@ -722,7 +723,7 @@ class MDGXS(MGXS):
 
         """
 
-        cv.check_type('filename', filename, str)
+        cv.check_type('filename', filename, (str, PathLike))
         cv.check_type('directory', directory, str)
         cv.check_value('format', format, ['csv', 'excel', 'pickle', 'latex'])
         cv.check_value('xs_type', xs_type, ['macro', 'micro'])
diff --git a/openmc/mgxs/mgxs.py b/openmc/mgxs/mgxs.py
index b8f2b8d3f..533ab0ad3 100644
--- a/openmc/mgxs/mgxs.py
+++ b/openmc/mgxs/mgxs.py
@@ -10,6 +10,7 @@ import numpy as np
 import openmc
 from openmc.data import REACTION_MT, REACTION_NAME, FISSION_MTS
 import openmc.checkvalue as cv
+from openmc.checkvalue import PathLike
 from ..tallies import ESTIMATOR_TYPES
 from . import EnergyGroups
 
@@ -1982,7 +1983,7 @@ class MGXS:
 
         """
 
-        cv.check_type('filename', filename, str)
+        cv.check_type('filename', filename, (str, PathLike))
         cv.check_type('directory', directory, str)
         cv.check_value('format', format, ['csv', 'excel', 'pickle', 'latex'])
         cv.check_value('xs_type', xs_type, ['macro', 'micro'])
diff --git a/openmc/mgxs_library.py b/openmc/mgxs_library.py
index ce86f97df..4bc2d4a5a 100644
--- a/openmc/mgxs_library.py
+++ b/openmc/mgxs_library.py
@@ -2514,8 +2514,7 @@ class MGXSLibrary:
 
         """
 
-        check_type('filename', filename, PathLike)
-
+        check_type('filename', filename, (str, PathLike))
         # Create and write to the HDF5 file
         file = h5py.File(filename, "w", libver=libver)
         file.attrs['filetype'] = np.bytes_(_FILETYPE_MGXS_LIBRARY)
@@ -2554,7 +2553,7 @@ class MGXSLibrary:
             raise ValueError("Either path or openmc.config['mg_cross_sections']"
                              "must be set")
 
-        check_type('filename', filename, str)
+        check_type('filename', filename, (str, PathLike))
         file = h5py.File(filename, 'r')
 
         # Check filetype and version
diff --git a/openmc/plots.py b/openmc/plots.py
index e9130f0be..a0bde3f00 100644
--- a/openmc/plots.py
+++ b/openmc/plots.py
@@ -439,7 +439,7 @@ class PlotBase(IDManagerMixin):
 
     @filename.setter
     def filename(self, filename):
-        cv.check_type('filename', filename, str)
+        cv.check_type('filename', filename, (str, PathLike))
         self._filename = filename
 
     @property
diff --git a/tests/unit_tests/test_pathlike_simple.py b/tests/unit_tests/test_pathlike_simple.py
new file mode 100644
index 000000000..e0116bf01
--- /dev/null
+++ b/tests/unit_tests/test_pathlike_simple.py
@@ -0,0 +1,46 @@
+"""Simple test for PathLike filename support"""
+
+from pathlib import Path
+
+import pytest
+import openmc
+from openmc.checkvalue import check_type, PathLike
+
+
+def test_pathlike_type_checking():
+    """Test that PathLike type checking works correctly"""
+
+    # Test with string (should work)
+    check_type('filename', 'test.txt', PathLike)
+
+    # Test with Path object (should work)
+    path_obj = Path('test.txt')
+    check_type('filename', path_obj, PathLike)
+
+    # Test with Path object containing subdirectories (should work)
+    path_with_subdir = Path('subdir') / 'test.txt'
+    check_type('filename', path_with_subdir, PathLike)
+
+    # Test with invalid type (should raise TypeError)
+    with pytest.raises(TypeError):
+        check_type('filename', 123, PathLike)
+
+
+def test_plot_filename_pathlike():
+    """Test that plot filename accepts Path objects"""
+
+    plot = openmc.Plot()
+
+    # Test with string (should still work)
+    plot.filename = "test_plot"
+    assert plot.filename == "test_plot"
+
+    # Test with Path object
+    path_obj = Path("test_plot_path")
+    plot.filename = path_obj
+    assert plot.filename == path_obj
+
+    # Test with Path object containing subdirectories
+    path_with_subdir = Path("subdir") / "test_plot"
+    plot.filename = path_with_subdir
+    assert plot.filename == path_with_subdir

From 4c4176661124fe92f5304d20d1b6e7675c44d455 Mon Sep 17 00:00:00 2001
From: Paul Romano <paul.k.romano@gmail.com>
Date: Tue, 28 Oct 2025 11:36:03 -0500
Subject: [PATCH 144/203] Criticality search method on the Model class (#3569)

---
 openmc/model/model.py          | 270 ++++++++++++++++++++++++++++++++-
 src/settings.cpp               |   5 -
 tests/unit_tests/test_lib.py   |   3 -
 tests/unit_tests/test_model.py |  57 +++++++
 4 files changed, 326 insertions(+), 9 deletions(-)

diff --git a/openmc/model/model.py b/openmc/model/model.py
index c1ffafafd..7963751d5 100644
--- a/openmc/model/model.py
+++ b/openmc/model/model.py
@@ -1,6 +1,7 @@
 from __future__ import annotations
-from collections.abc import Iterable, Sequence
+from collections.abc import Callable, Iterable, Sequence
 import copy
+from dataclasses import dataclass, field
 from functools import cache
 from pathlib import Path
 import math
@@ -8,11 +9,13 @@ from numbers import Integral, Real
 import random
 import re
 from tempfile import NamedTemporaryFile, TemporaryDirectory
+from typing import Any, Protocol
 import warnings
 
 import h5py
 import lxml.etree as ET
 import numpy as np
+from scipy.optimize import curve_fit
 
 import openmc
 import openmc._xml as xml
@@ -24,6 +27,12 @@ from openmc.plots import add_plot_params, _BASIS_INDICES
 from openmc.utility_funcs import change_directory
 
 
+# Protocol for a function that is passed to search_keff
+class ModelModifier(Protocol):
+    def __call__(self, val: float, **kwargs: Any) -> None:
+        ...
+
+
 class Model:
     """Model container.
 
@@ -2196,3 +2205,262 @@ class Model:
 
         # Take a wild guess as to how many rays are needed
         self.settings.particles = 2 * int(max_length)
+
+    def keff_search(
+        self,
+        func: ModelModifier,
+        x0: float,
+        x1: float,
+        target: float = 1.0,
+        k_tol: float = 1e-4,
+        sigma_final: float = 3e-4,
+        p: float = 0.5,
+        q: float = 0.95,
+        memory: int = 4,
+        x_min: float | None = None,
+        x_max: float | None = None,
+        b0: int | None = None,
+        b_min: int = 20,
+        b_max: int | None = None,
+        maxiter: int = 50,
+        output: bool = False,
+        func_kwargs: dict[str, Any] | None = None,
+        run_kwargs: dict[str, Any] | None = None,
+    ) -> SearchResult:
+        r"""Perform a keff search on a model parametrized by a single variable.
+
+        This method uses the GRsecant method described in a paper by `Price and
+        Roskoff <https://doi.org/10.1016/j.pnucene.2023.104731>`_. The GRsecant
+        method is a modification of the secant method that accounts for
+        uncertainties in the function evaluations. The method uses a weighted
+        linear fit of the most recent function evaluations to predict the next
+        point to evaluate. It also adaptively changes the number of batches to
+        meet the target uncertainty value at each iteration.
+
+        The target uncertainty for iteration :math:`n+1` is determined by the
+        following equation (following Eq. (8) in the paper):
+
+        .. math::
+            \sigma_{i+1} = q \sigma_\text{final} \left ( \frac{ \min \left \{
+            \left\lvert k_i - k_\text{target} \right\rvert : k=0,1,\dots,n
+            \right \} }{k_\text{tol}} \right )^p
+
+        where :math:`q` is a multiplicative factor less than 1, given as the
+        ``sigma_factor`` parameter below.
+
+        Parameters
+        ----------
+        func : ModelModifier
+            Function that takes the parameter to be searched and makes a
+            modification to the model.
+        x0 : float
+            First guess for the parameter passed to `func`
+        x1 : float
+            Second guess for the parameter passed to `func`
+        target : float, optional
+            keff value to search for
+        k_tol : float, optional
+            Stopping criterion on the function value; the absolute value must be
+            within ``k_tol`` of zero to be accepted.
+        sigma_final : float, optional
+            Maximum accepted k-effective uncertainty for the stopping criterion.
+        p : float, optional
+            Exponent used in the stopping criterion.
+        q : float, optional
+            Multiplicative factor used in the stopping criterion.
+        memory : int, optional
+            Number of most-recent points used in the weighted linear fit of
+            ``f(x) = a + b x`` to predict the next point.
+        x_min : float, optional
+            Minimum allowed value for the parameter ``x``.
+        x_max : float, optional
+            Maximum allowed value for the parameter ``x``.
+        b0 : int, optional
+            Number of active batches to use for the initial function
+            evaluations. If None, uses the model's current setting.
+        b_min : int, optional
+            Minimum number of active batches to use in a function evaluation.
+        b_max : int, optional
+            Maximum number of active batches to use in a function evaluation.
+        maxiter : int, optional
+            Maximum number of iterations to perform.
+        output : bool, optional
+            Whether or not to display output showing iteration progress.
+        func_kwargs : dict, optional
+            Keyword-based arguments to pass to the `func` function.
+        run_kwargs : dict, optional
+            Keyword arguments to pass to :meth:`openmc.Model.run` or
+            :meth:`openmc.lib.run`.
+
+        Returns
+        -------
+        SearchResult
+            Result object containing the estimated root (parameter value) and
+            evaluation history (parameters, means, standard deviations, and
+            batches), plus convergence status and termination reason.
+
+        """
+        import openmc.lib
+
+        check_type('model modifier', func, Callable)
+        check_type('target', target, Real)
+        if memory < 2:
+            raise ValueError("memory must be ≥ 2")
+        func_kwargs = {} if func_kwargs is None else dict(func_kwargs)
+        run_kwargs = {} if run_kwargs is None else dict(run_kwargs)
+        run_kwargs.setdefault('output', False)
+
+        # Create lists to store the history of evaluations
+        xs: list[float] = []
+        fs: list[float] = []
+        ss: list[float] = []
+        gs: list[int] = []
+        count = 0
+
+        # Helper function to evaluate f and store results
+        def eval_at(x: float, batches: int) -> tuple[float, float]:
+            # Modify the model with the current guess
+            func(x, **func_kwargs)
+
+            # Change the number of batches and run the model
+            batches += self.settings.inactive
+            if openmc.lib.is_initialized:
+                openmc.lib.settings.set_batches(batches)
+                openmc.lib.reset()
+                openmc.lib.run(**run_kwargs)
+                sp_filepath = f'statepoint.{batches}.h5'
+            else:
+                self.settings.batches = batches
+                sp_filepath = self.run(**run_kwargs)
+
+            # Extract keff and its uncertainty
+            with openmc.StatePoint(sp_filepath) as sp:
+                keff = sp.keff
+
+            if output:
+                nonlocal count
+                count += 1
+                print(f'Iteration {count}: {batches=}, {x=:.6g}, {keff=:.5f}')
+
+            xs.append(float(x))
+            fs.append(float(keff.n - target))
+            ss.append(float(keff.s))
+            gs.append(int(batches))
+            return fs[-1], ss[-1]
+
+        # Default b0 to current model settings if not explicitly provided
+        if b0 is None:
+            b0 = self.settings.batches - self.settings.inactive
+
+        # Perform the search (inlined GRsecant) in a temporary directory
+        with TemporaryDirectory() as tmpdir:
+            if not openmc.lib.is_initialized:
+                run_kwargs.setdefault('cwd', tmpdir)
+
+            # ---- Seed with two evaluations
+            f0, s0 = eval_at(x0, b0)
+            if abs(f0) <= k_tol and s0 <= sigma_final:
+                return SearchResult(x0, xs, fs, ss, gs, True, "converged")
+            f1, s1 = eval_at(x1, b0)
+            if abs(f1) <= k_tol and s1 <= sigma_final:
+                return SearchResult(x1, xs, fs, ss, gs, True, "converged")
+
+            for _ in range(maxiter - 2):
+                # ------ Step 1: propose next x via GRsecant
+                m = min(memory, len(xs))
+
+                # Perform a curve fit on f(x) = a + bx accounting for
+                # uncertainties. This is equivalent to minimizing the function
+                # in Equation (A.14)
+                (a, b), _ = curve_fit(
+                    lambda x, a, b: a + b*x,
+                    xs[-m:], fs[-m:], sigma=ss[-m:], absolute_sigma=True
+                )
+                x_new = float(-a / b)
+
+                # Clamp x_new to the bounds if provided
+                if x_min is not None:
+                    x_new = max(x_new, x_min)
+                if x_max is not None:
+                    x_new = min(x_new, x_max)
+
+                # ------ Step 2: choose target σ for next run (Eq. 8 + clamp)
+
+                min_abs_f = float(np.min(np.abs(fs)))
+                base = q * sigma_final
+                ratio = min_abs_f / k_tol if k_tol > 0 else 1.0
+                sig = base * (ratio ** p)
+                sig_target = max(sig, base)
+
+                # ------ Step 3: choose generations to hit σ_target (Appendix C)
+
+                # Use at least two past points for regression
+                if len(gs) >= 2 and np.var(np.log(gs)) > 0.0:
+                    # Perform a curve fit based on Eq. (C.3) to solve for ln(k).
+                    # Note that unlike in the paper, we do not leave r as an
+                    # undetermined parameter and choose r=0.5.
+                    (ln_k,), _ = curve_fit(
+                        lambda ln_b, ln_k: ln_k - 0.5*ln_b,
+                        np.log(gs[-4:]), np.log(ss[-4:]),
+                    )
+                    k = float(np.exp(ln_k))
+                else:
+                    k = float(ss[-1] * math.sqrt(gs[-1]))
+
+                b_new = (k / sig_target) ** 2
+
+                # Clamp and round up to integer
+                b_new = max(b_min, math.ceil(b_new))
+                if b_max is not None:
+                    b_new = min(b_new, b_max)
+
+                # Evaluate at proposed x with batches determined above
+                f_new, s_new = eval_at(x_new, b_new)
+
+                # Termination based on both criteria (|f| and σ)
+                if abs(f_new) <= k_tol and s_new <= sigma_final:
+                    return SearchResult(x_new, xs, fs, ss, gs, True, "converged")
+
+            return SearchResult(xs[-1], xs, fs, ss, gs, False, "maxiter")
+
+
+@dataclass
+class SearchResult:
+    """Result of a GRsecant keff search.
+
+    Attributes
+    ----------
+    root : float
+        Estimated parameter value where f(x) = 0 at termination.
+    parameters : list[float]
+        Parameter values (x) evaluated during the search, in order.
+    keffs : list[float]
+        Estimated keff values for each evaluation.
+    stdevs : list[float]
+        One-sigma uncertainties of keff for each evaluation.
+    batches : list[int]
+        Number of active batches used for each evaluation.
+    converged : bool
+        Whether both |f| <= k_tol and sigma <= sigma_final were met.
+    flag : str
+        Reason for termination (e.g., "converged", "maxiter").
+    """
+    root: float
+    parameters: list[float] = field(repr=False)
+    means: list[float] = field(repr=False)
+    stdevs: list[float] = field(repr=False)
+    batches: list[int] = field(repr=False)
+    converged: bool
+    flag: str
+
+    @property
+    def function_calls(self) -> int:
+        """Number of function evaluations performed."""
+        return len(self.parameters)
+
+    @property
+    def total_batches(self) -> int:
+        """Total number of active batches used across all evaluations."""
+        return sum(self.batches)
+
+
diff --git a/src/settings.cpp b/src/settings.cpp
index 325256cdc..13b91b0e4 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -1220,11 +1220,6 @@ extern "C" int openmc_set_n_batches(
     return OPENMC_E_INVALID_ARGUMENT;
   }
 
-  if (simulation::current_batch >= n_batches) {
-    set_errmsg("Number of batches must be greater than current batch.");
-    return OPENMC_E_INVALID_ARGUMENT;
-  }
-
   if (!settings::trigger_on) {
     // Set n_batches and n_max_batches to same value
     settings::n_batches = n_batches;
diff --git a/tests/unit_tests/test_lib.py b/tests/unit_tests/test_lib.py
index 43bc5a8f6..eb4dc3dce 100644
--- a/tests/unit_tests/test_lib.py
+++ b/tests/unit_tests/test_lib.py
@@ -496,9 +496,6 @@ def test_set_n_batches(lib_run):
 
     for i in range(7):
         openmc.lib.next_batch()
-    # Setting n_batches less than current_batch should raise error
-    with pytest.raises(exc.InvalidArgumentError):
-        settings.set_batches(6)
     # n_batches should stay the same
     assert settings.get_batches() == 10
 
diff --git a/tests/unit_tests/test_model.py b/tests/unit_tests/test_model.py
index 60f8b1a25..f4f94a47c 100644
--- a/tests/unit_tests/test_model.py
+++ b/tests/unit_tests/test_model.py
@@ -901,6 +901,7 @@ def test_id_map_aligned_model():
     assert tr_instance == 3, f"Expected cell instance 3 at top-right corner, got {tr_instance}"
     assert tr_material == 5, f"Expected material ID 5 at top-right corner, got {tr_material}"
 
+
 def test_setter_from_list():
     mat = openmc.Material()
     model = openmc.Model(materials=[mat])
@@ -913,3 +914,59 @@ def test_setter_from_list():
     plot = openmc.Plot()
     model = openmc.Model(plots=[plot])
     assert isinstance(model.plots, openmc.Plots)
+
+
+def test_keff_search(run_in_tmpdir):
+    """Test the Model.keff_search method"""
+
+    # Create model of a sphere of U235
+    mat = openmc.Material()
+    mat.set_density('g/cm3', 18.9)
+    mat.add_nuclide('U235', 1.0)
+    sphere = openmc.Sphere(r=10.0, boundary_type='vacuum')
+    cell = openmc.Cell(fill=mat, region=-sphere)
+    geometry = openmc.Geometry([cell])
+    settings = openmc.Settings(particles=1000, inactive=10, batches=30)
+    model = openmc.Model(geometry=geometry, settings=settings)
+
+    # Define function to modify sphere radius
+    def modify_radius(radius):
+        sphere.r = radius
+
+    # Perform keff search
+    k_tol = 4e-3
+    sigma_final = 2e-3
+    result = model.keff_search(
+        func=modify_radius,
+        x0=6.0,
+        x1=9.0,
+        k_tol=k_tol,
+        sigma_final=sigma_final,
+        output=True,
+    )
+
+    final_keff = result.means[-1] + 1.0  # Add back target since means are (keff - target)
+    final_sigma = result.stdevs[-1]
+
+    # Check for convergence and that tolerances are met
+    assert result.converged, "keff_search did not converge"
+    assert abs(final_keff - 1.0) <= k_tol, \
+        f"Final keff {final_keff:.5f} not within k_tol {k_tol}"
+    assert final_sigma <= sigma_final, \
+        f"Final uncertainty {final_sigma:.5f} exceeds sigma_final {sigma_final}"
+
+    # Check type of result
+    assert isinstance(result, openmc.model.SearchResult)
+
+    # Check that we have function evaluation history
+    assert len(result.parameters) >= 2
+    assert len(result.means) == len(result.parameters)
+    assert len(result.stdevs) == len(result.parameters)
+    assert len(result.batches) == len(result.parameters)
+
+    # Check that function_calls property works
+    assert result.function_calls == len(result.parameters)
+
+    # Check that total_batches property works
+    assert result.total_batches == sum(result.batches)
+    assert result.total_batches > 0

From 5fc289b99d6ace24d6bcf736a77cfef4c59f6a82 Mon Sep 17 00:00:00 2001
From: Paul Romano <paul.k.romano@gmail.com>
Date: Fri, 31 Oct 2025 19:15:25 -0500
Subject: [PATCH 145/203] Automate workflow for mesh- or cell-based R2S
 calculations (#3508)

Co-authored-by: Ethan Peterson <eepeterson3@gmail.com>
Co-authored-by: Jonathan Shimwell <drshimwell@gmail.com>
---
 docs/source/pythonapi/deplete.rst        |  10 +
 docs/source/usersguide/decay_sources.rst | 205 ++++++-
 openmc/deplete/__init__.py               |   1 +
 openmc/deplete/microxs.py                | 113 +++-
 openmc/deplete/r2s.py                    | 680 +++++++++++++++++++++++
 openmc/mesh.py                           |  18 +-
 openmc/model/model.py                    |  23 +
 openmc/utility_funcs.py                  |  19 +
 tests/unit_tests/test_r2s.py             | 152 +++++
 9 files changed, 1173 insertions(+), 48 deletions(-)
 create mode 100644 openmc/deplete/r2s.py
 create mode 100644 tests/unit_tests/test_r2s.py

diff --git a/docs/source/pythonapi/deplete.rst b/docs/source/pythonapi/deplete.rst
index f112cf8cc..25fcd898f 100644
--- a/docs/source/pythonapi/deplete.rst
+++ b/docs/source/pythonapi/deplete.rst
@@ -287,6 +287,16 @@ the following abstract base classes:
    abc.SIIntegrator
    abc.DepSystemSolver
 
+R2S Automation
+--------------
+
+.. autosummary::
+   :toctree: generated
+   :nosignatures:
+   :template: myclass.rst
+
+   R2SManager
+
 D1S Functions
 -------------
 
diff --git a/docs/source/usersguide/decay_sources.rst b/docs/source/usersguide/decay_sources.rst
index d5a078135..398680e74 100644
--- a/docs/source/usersguide/decay_sources.rst
+++ b/docs/source/usersguide/decay_sources.rst
@@ -6,42 +6,189 @@ Decay Sources
 
 Through the :ref:`depletion <usersguide_depletion>` capabilities in OpenMC, it
 is possible to simulate radiation emitted from the decay of activated materials.
-For fusion energy systems, this is commonly done using what is known as the
-`rigorous 2-step <https://doi.org/10.1016/S0920-3796(02)00144-8>`_ (R2S) method.
-In this method, a neutron transport calculation is used to determine the neutron
-flux and reaction rates over a cell- or mesh-based spatial discretization of the
-model. Then, the neutron flux in each discrete region is used to predict the
-activated material composition using a depletion solver. Finally, a photon
-transport calculation with a source based on the activity and energy spectrum of
-the activated materials is used to determine a desired physical response (e.g.,
-a dose rate) at one or more locations of interest.
+For fusion energy systems, this is commonly done using either the `rigorous
+2-step <https://doi.org/10.1016/S0920-3796(02)00144-8>`_ (R2S) method or the
+`direct 1-step <https://doi.org/10.1016/S0920-3796(01)00188-0>`_ (D1S) method.
+In the R2S method, a neutron transport calculation is used to determine the
+neutron flux and reaction rates over a cell- or mesh-based spatial
+discretization of the model. Then, the neutron flux in each discrete region is
+used to predict the activated material composition using a depletion solver.
+Finally, a photon transport calculation with a source based on the activity and
+energy spectrum of the activated materials is used to determine a desired
+physical response (e.g., a dose rate) at one or more locations of interest.
+OpenMC includes automation for both the R2S and D1S methods as described in the
+following sections.
 
-Once a depletion simulation has been completed in OpenMC, the intrinsic decay
-source can be determined as follows. First the activated material composition
-can be determined using the :class:`openmc.deplete.Results` object. Indexing an
-instance of this class with the timestep index returns a
-:class:`~openmc.deplete.StepResult` object, which itself has a
-:meth:`~openmc.deplete.StepResult.get_material` method. Once the activated
-:class:`~openmc.Material` has been obtained, the
-:meth:`~openmc.Material.get_decay_photon_energy` method will give the energy
-spectrum of the decay photon source. The integral of the spectrum also indicates
-the intensity of the source in units of [Bq]. Altogether, the workflow looks as
-follows::
+Rigorous 2-Step (R2S) Calculations
+==================================
 
+OpenMC includes an :class:`openmc.deplete.R2SManager` class that fully automates
+cell- and mesh-based R2S calculations. Before we describe this class, it is
+useful to understand the basic mechanics of how an R2S calculation works.
+Generally, it involves the following steps:
+
+1. The :meth:`openmc.deplete.get_microxs_and_flux` function is called to run a
+   neutron transport calculation that determines fluxes and microscopic cross
+   sections in each activation region.
+2. The :class:`openmc.deplete.IndependentOperator` and
+   :class:`openmc.deplete.PredictorIntegrator` classes are used to carry out a
+   depletion (activation) calculation in order to determine predicted material
+   compositions based on a set of timesteps and source rates.
+3. The activated material composition is determined using the
+   :class:`openmc.deplete.Results` class. Indexing an instance of this class
+   with the timestep index returns a :class:`~openmc.deplete.StepResult` object,
+   which itself has a :meth:`~openmc.deplete.StepResult.get_material` method
+   returning an activated material.
+4. The :meth:`openmc.Material.get_decay_photon_energy` method is used to obtain
+   the energy spectrum of the decay photon source. The integral of the spectrum
+   also indicates the intensity of the source in units of [Bq].
+5. A new photon source is defined using one of OpenMC's source classes with the
+   energy distribution set equal to the object returned by the
+   :meth:`openmc.Material.get_decay_photon_energy` method. The source is then
+   assigned to a photon :class:`~openmc.Model`.
+6. A photon transport calculation is run with ``model.run()``.
+
+Altogether, the workflow looks as follows::
+
+    # Run neutron transport calculation
+    fluxes, micros = openmc.deplete.get_microxs_and_flux(model, domains)
+
+    # Run activation calculation
+    op = openmc.deplete.IndependentOperator(mats, fluxes, micros)
+    timesteps = ...
+    source_rates = ...
+    integrator = openmc.deplete.Integrator(op, timesteps, source_rates)
+    integrator.integrate()
+
+    # Get decay photon source at last timestep
     results = openmc.deplete.Results("depletion_results.h5")
-
-    # Get results at last timestep
     step = results[-1]
-
-    # Get activated material composition for ID=1
     activated_mat = step.get_material('1')
-
-    # Determine photon source
     photon_energy = activated_mat.get_decay_photon_energy()
+    photon_source = openmc.IndependentSource(
+        space=...,
+        energy=photon_energy,
+        particle='photon',
+        strength=photon_energy.integral()
+    )
 
-By default, the :meth:`~openmc.Material.get_decay_photon_energy` method will
-eliminate spectral lines with very low intensity, but this behavior can be
-configured with the ``clip_tolerance`` argument.
+    # Run photon transport calculation
+    model.settings.source = photon_source
+    model.run()
+
+Note that by default, the :meth:`~openmc.Material.get_decay_photon_energy`
+method will eliminate spectral lines with very low intensity, but this behavior
+can be configured with the ``clip_tolerance`` argument.
+
+Cell-based R2S
+--------------
+
+In practice, users do not need to manually go through each of the steps in an R2S
+calculation described above. The :class:`~openmc.deplete.R2SManager` fully
+automates the execution of neutron transport, depletion, decay source
+generation, and photon transport. For a cell-based R2S calculation, once you
+have a :class:`~openmc.Model` that has been defined, simply create an instance
+of :class:`~openmc.deplete.R2SManager` by passing the model and a list of cells
+to activate::
+
+    r2s = openmc.deplete.R2SManager(model, [cell1, cell2, cell3])
+
+Note that the ``volume`` attribute must be set for any cell that is to be
+activated. The :class:`~openmc.deplete.R2SManager` class allows you to
+optionally specify a separate photon model; if not given as an argument, it will
+create a shallow copy of the original neutron model (available as the
+``neutron_model`` attribute) and store it in the ``photon_model`` attribute. We
+can use this to define tallies specific to the photon model::
+
+    dose_tally = openmc.Tally()
+    ...
+    r2s.photon_model.tallies = [dose_tally]
+
+Next, define the timesteps and source rates for the activation calculation::
+
+    timesteps = [(3.0, 'd'), (5.0, 'h')]
+    source_rates = [1e12, 0.0]
+
+In this case, the model is irradiated for 3 days with a source rate of
+:math:`10^{12}` neutron/sec and then the source is turned off and the activated
+materials are allowed to decay for 5 hours. These parameters should be passed to
+the :meth:`~openmc.deplete.R2SManager.run` method to execute the full R2S
+calculation. Before we can do that though, for a cell-based calculation, the one
+other piece of information that is needed is bounding boxes of the activated
+cells::
+
+    bounding_boxes = {
+        cell1.id: cell1.bounding_box,
+        cell2.id: cell2.bounding_box,
+        cell3.id: cell3.bounding_box
+    }
+
+Note that calling the ``bounding_box`` attribute may not work for all
+constructive solid geometry regions (for example, a cell that uses a
+non-axis-aligned plane). In these cases, the bounding box will need to be
+specified manually. Once you have a set of bounding boxes, the R2S calculation
+can be run::
+
+    r2s.run(timesteps, source_rates, bounding_boxes=bounding_boxes)
+
+If not specified otherwise, a photon transport calculation is run at each time
+in the depletion schedule. That means in the case above, we would see three
+photon transport calculations. To specify specific times at which photon
+transport calculations should be run, pass the ``photon_time_indices`` argument.
+For example, if we wanted to run a photon transport calculation only on the last
+time (after the 5 hour decay), we would run::
+
+    r2s.run(timesteps, source_rates, bounding_boxes=bounding_boxes,
+            photon_time_indices=[2])
+
+After an R2S calculation has been run, the :class:`~openmc.deplete.R2SManager`
+instance will have a ``results`` dictionary that allows you to directly access
+results from each of the steps. It will also write out all the output files into
+a directory that is named "r2s_<timestamp>/". The ``output_dir`` argument to the
+:meth:`~openmc.deplete.R2SManager.run` method enables you to override the
+default output directory name if desired.
+
+The :meth:`~openmc.deplete.R2SManager.run` method actually runs three
+lower-level methods under the hood::
+
+    r2s.step1_neutron_transport(...)
+    r2s.step2_activation(...)
+    r2s.step3_photon_transport(...)
+
+For users looking for more control over the calculation, these lower-level
+methods can be used in lieu of the :meth:`openmc.deplete.R2SManager.run` method.
+
+Mesh-based R2S
+--------------
+
+Executing a mesh-based R2S calculation looks nearly identical to the cell-based
+R2S workflow described above. The only difference is that instead of passing a
+list of cells to the ``domains`` argument of
+:class:`~openmc.deplete.R2SManager`, you need to define a mesh object and pass
+that instead. This might look like the following::
+
+    # Define a regular Cartesian mesh
+    mesh = openmc.RegularMesh()
+    mesh.lower_left = (-50., -50., 0.)
+    mesh.upper_right = (50., 50., 75.)
+    mesh.dimension = (10, 10, 5)
+
+    r2s = openmc.deplete.R2SManager(model, mesh)
+
+Executing the R2S calculation is then performed by adding photon tallies and
+calling the :meth:`~openmc.deplete.R2SManager.run` method with the appropriate
+timesteps and source rates. Note that in this case we do not need to define cell
+volumes or bounding boxes as is required for a cell-based R2S calculation.
+Instead, during the neutron transport step, OpenMC will run a raytracing
+calculation to determine material volume fractions within each mesh element
+using the :meth:`openmc.MeshBase.material_volumes` method. Arguments to this
+method can be customized via the ``mat_vol_kwargs`` argument to the
+:meth:`~openmc.deplete.R2SManager.run` method. Most often, this would involve
+customizing the number of rays traced to obtain better estimates of volumes. As
+an example, if we wanted to run the raytracing calculation with 10 million rays,
+we would run::
+
+    r2s.run(timesteps, source_rates, mat_vol_kwargs={'n_samples': 10_000_000})
 
 Direct 1-Step (D1S) Calculations
 ================================
diff --git a/openmc/deplete/__init__.py b/openmc/deplete/__init__.py
index 8a9509e90..052e22459 100644
--- a/openmc/deplete/__init__.py
+++ b/openmc/deplete/__init__.py
@@ -17,6 +17,7 @@ from .stepresult import *
 from .results import *
 from .integrators import *
 from .transfer_rates import *
+from .r2s import *
 from . import abc
 from . import cram
 from . import helpers
diff --git a/openmc/deplete/microxs.py b/openmc/deplete/microxs.py
index 4ce199f0c..e351c923d 100644
--- a/openmc/deplete/microxs.py
+++ b/openmc/deplete/microxs.py
@@ -8,8 +8,9 @@ from __future__ import annotations
 from collections.abc import Sequence
 import shutil
 from tempfile import TemporaryDirectory
-from typing import Union, TypeAlias
+from typing import Union, TypeAlias, Self
 
+import h5py
 import pandas as pd
 import numpy as np
 
@@ -20,6 +21,7 @@ from openmc.data import REACTION_MT
 import openmc
 from .chain import Chain, REACTIONS, _get_chain
 from .coupled_operator import _find_cross_sections, _get_nuclides_with_data
+from ..utility_funcs import h5py_file_or_group
 import openmc.lib
 from openmc.mpi import comm
 
@@ -47,6 +49,7 @@ def get_microxs_and_flux(
     reaction_rate_mode: str = 'direct',
     chain_file: PathLike | Chain | None = None,
     path_statepoint: PathLike | None = None,
+    path_input: PathLike | None = None,
     run_kwargs=None
 ) -> tuple[list[np.ndarray], list[MicroXS]]:
     """Generate microscopic cross sections and fluxes for multiple domains.
@@ -59,7 +62,7 @@ def get_microxs_and_flux(
     .. versionadded:: 0.14.0
 
     .. versionchanged:: 0.15.3
-        Added `reaction_rate_mode` and `path_statepoint` arguments.
+        Added `reaction_rate_mode`, `path_statepoint`, `path_input` arguments.
 
     Parameters
     ----------
@@ -90,6 +93,10 @@ def get_microxs_and_flux(
         Path to write the statepoint file from the neutron transport solve to.
         By default, The statepoint file is written to a temporary directory and
         is not kept.
+    path_input : path-like, optional
+        Path to write the model XML file from the neutron transport solve to.
+        By default, the model XML file is written to a temporary directory and
+        not kept.
     run_kwargs : dict, optional
         Keyword arguments passed to :meth:`openmc.Model.run`
 
@@ -108,7 +115,7 @@ def get_microxs_and_flux(
     check_value('reaction_rate_mode', reaction_rate_mode, {'direct', 'flux'})
 
     # Save any original tallies on the model
-    original_tallies = model.tallies
+    original_tallies = list(model.tallies)
 
     # Determine what reactions and nuclides are available in chain
     chain = _get_chain(chain_file)
@@ -178,6 +185,10 @@ def get_microxs_and_flux(
                 shutil.move(statepoint_path, path_statepoint)
                 statepoint_path = path_statepoint
 
+            # Export the model to path_input if provided
+            if path_input is not None:
+                model.export_to_model_xml(path_input)
+
             with StatePoint(statepoint_path) as sp:
                 if reaction_rate_mode == 'direct':
                     rr_tally = sp.tallies[rr_tally.id]
@@ -383,8 +394,7 @@ class MicroXS:
         MicroXS
 
         """
-        if 'float_precision' not in kwargs:
-            kwargs['float_precision'] = 'round_trip'
+        kwargs.setdefault('float_precision', 'round_trip')
 
         df = pd.read_csv(csv_file, **kwargs)
         df.set_index(['nuclides', 'reactions', 'groups'], inplace=True)
@@ -419,3 +429,96 @@ class MicroXS:
         )
         df = pd.DataFrame({'xs': self.data.flatten()}, index=multi_index)
         df.to_csv(*args, **kwargs)
+
+    def to_hdf5(self, group_or_filename: h5py.Group | PathLike, **kwargs):
+        """Export microscopic cross section data to HDF5 format
+
+        Parameters
+        ----------
+        group_or_filename : h5py.Group or path-like
+            HDF5 group or filename to write to
+        kwargs : dict, optional
+            Keyword arguments to pass to :meth:`h5py.Group.create_dataset`.
+            Defaults to {'compression': 'lzf'}.
+
+        """
+        kwargs.setdefault('compression', 'lzf')
+
+        with h5py_file_or_group(group_or_filename, 'w') as group:
+            # Store cross section data as 3D dataset
+            group.create_dataset('data', data=self.data, **kwargs)
+
+            # Store metadata as datasets using string encoding
+            group.create_dataset('nuclides', data=np.array(self.nuclides, dtype='S'))
+            group.create_dataset('reactions', data=np.array(self.reactions, dtype='S'))
+
+    @classmethod
+    def from_hdf5(cls, group_or_filename: h5py.Group | PathLike) -> Self:
+        """Load data from an HDF5 file
+
+        Parameters
+        ----------
+        group_or_filename : h5py.Group or str or PathLike
+            HDF5 group or path to HDF5 file. If given as an h5py.Group, the
+            data is read from that group. If given as a string, it is assumed
+            to be the filename for the HDF5 file.
+
+        Returns
+        -------
+        MicroXS
+        """
+
+        with h5py_file_or_group(group_or_filename, 'r') as group:
+            # Read data from HDF5 group
+            data = group['data'][:]
+            nuclides = [nuc.decode('utf-8') for nuc in group['nuclides'][:]]
+            reactions = [rxn.decode('utf-8') for rxn in group['reactions'][:]]
+
+        return cls(data, nuclides, reactions)
+
+
+def write_microxs_hdf5(
+    micros: Sequence[MicroXS],
+    filename: PathLike,
+    names: Sequence[str] | None = None,
+    **kwargs
+):
+    """Write multiple MicroXS objects to an HDF5 file
+
+    Parameters
+    ----------
+    micros : list of MicroXS
+        List of MicroXS objects
+    filename : PathLike
+        Output HDF5 filename
+    names : list of str, optional
+        Names for each MicroXS object. If None, uses 'domain_0', 'domain_1',
+        etc.
+    **kwargs
+        Additional keyword arguments passed to :meth:`h5py.Group.create_dataset`
+    """
+    if names is None:
+        names = [f'domain_{i}' for i in range(len(micros))]
+
+    # Open file once and write all domains using group interface
+    with h5py.File(filename, 'w') as f:
+        for microxs, name in zip(micros, names):
+            group = f.create_group(name)
+            microxs.to_hdf5(group, **kwargs)
+
+
+def read_microxs_hdf5(filename: PathLike) -> dict[str, MicroXS]:
+    """Read multiple MicroXS objects from an HDF5 file
+
+    Parameters
+    ----------
+    filename : path-like
+        HDF5 filename
+
+    Returns
+    -------
+    dict
+        Dictionary mapping domain names to MicroXS objects
+    """
+    with h5py.File(filename, 'r') as f:
+        return {name: MicroXS.from_hdf5(group) for name, group in f.items()}
diff --git a/openmc/deplete/r2s.py b/openmc/deplete/r2s.py
new file mode 100644
index 000000000..7b5deddc2
--- /dev/null
+++ b/openmc/deplete/r2s.py
@@ -0,0 +1,680 @@
+from __future__ import annotations
+from collections.abc import Sequence
+import copy
+from datetime import datetime
+import json
+from pathlib import Path
+
+import numpy as np
+import openmc
+from . import IndependentOperator, PredictorIntegrator
+from .microxs import get_microxs_and_flux, write_microxs_hdf5, read_microxs_hdf5
+from .results import Results
+from ..checkvalue import PathLike
+
+
+def get_activation_materials(
+    model: openmc.Model, mmv: openmc.MeshMaterialVolumes
+) -> openmc.Materials:
+    """Get a list of activation materials for each mesh element/material.
+
+    When performing a mesh-based R2S calculation, a unique material is needed
+    for each activation region, which is a combination of a mesh element and a
+    material within that mesh element. This function generates a list of such
+    materials, each with a unique name and volume corresponding to the mesh
+    element and material.
+
+    Parameters
+    ----------
+    model : openmc.Model
+        The full model containing the geometry and materials.
+    mmv : openmc.MeshMaterialVolumes
+        The mesh material volumes object containing the materials and their
+        volumes for each mesh element.
+
+    Returns
+    -------
+    openmc.Materials
+        A list of materials, each corresponding to a unique mesh element and
+        material combination.
+
+    """
+    # Get the material ID, volume, and element index for each element-material
+    # combination
+    mat_ids = mmv._materials[mmv._materials > -1]
+    volumes = mmv._volumes[mmv._materials > -1]
+    elems, _ = np.where(mmv._materials > -1)
+
+    # Get all materials in the model
+    material_dict = model._get_all_materials()
+
+    # Create a new activation material for each element-material combination
+    materials = openmc.Materials()
+    for elem, mat_id, vol in zip(elems, mat_ids, volumes):
+        mat = material_dict[mat_id]
+        new_mat = mat.clone()
+        new_mat.depletable = True
+        new_mat.name = f'Element {elem}, Material {mat_id}'
+        new_mat.volume = vol
+        materials.append(new_mat)
+
+    return materials
+
+
+class R2SManager:
+    """Manager for Rigorous 2-Step (R2S) method calculations.
+
+    This class is responsible for managing the materials and sources needed for
+    mesh-based or cell-based R2S calculations. It provides methods to get
+    activation materials and decay photon sources based on the mesh/cells and
+    materials in the OpenMC model.
+
+    This class supports the use of a different models for the neutron and photon
+    transport calculation. However, for cell-based calculations, it assumes that
+    the only changes in the model are material assignments. For mesh-based
+    calculations, it checks material assignments in the photon model and any
+    element--material combinations that don't appear in the photon model are
+    skipped.
+
+    Parameters
+    ----------
+    neutron_model : openmc.Model
+        The OpenMC model to use for neutron transport.
+    domains : openmc.MeshBase or Sequence[openmc.Cell]
+        The mesh or a sequence of cells that represent the spatial units over
+        which the R2S calculation will be performed.
+    photon_model : openmc.Model, optional
+        The OpenMC model to use for photon transport calculations. If None, a
+        shallow copy of the neutron_model will be created and used.
+
+    Attributes
+    ----------
+    domains : openmc.MeshBase or Sequence[openmc.Cell]
+        The mesh or a sequence of cells that represent the spatial units over
+        which the R2S calculation will be performed.
+    neutron_model : openmc.Model
+        The OpenMC model used for neutron transport.
+    photon_model : openmc.Model
+        The OpenMC model used for photon transport calculations.
+    method : {'mesh-based', 'cell-based'}
+        Indicates whether the R2S calculation uses mesh elements ('mesh-based')
+        as the spatial discetization or a list of a cells ('cell-based').
+    results : dict
+        A dictionary that stores results from the R2S calculation.
+
+    """
+    def __init__(
+        self,
+        neutron_model: openmc.Model,
+        domains: openmc.MeshBase | Sequence[openmc.Cell],
+        photon_model: openmc.Model | None = None,
+    ):
+        self.neutron_model = neutron_model
+        if photon_model is None:
+            # Create a shallow copy of the neutron model for photon transport
+            self.photon_model = openmc.Model(
+                geometry=copy.copy(neutron_model.geometry),
+                materials=copy.copy(neutron_model.materials),
+                settings=copy.copy(neutron_model.settings),
+                tallies=copy.copy(neutron_model.tallies),
+                plots=copy.copy(neutron_model.plots),
+            )
+        else:
+            self.photon_model = photon_model
+        if isinstance(domains, openmc.MeshBase):
+            self.method = 'mesh-based'
+        else:
+            self.method = 'cell-based'
+        self.domains = domains
+        self.results = {}
+
+    def run(
+        self,
+        timesteps: Sequence[float] | Sequence[tuple[float, str]],
+        source_rates: float | Sequence[float],
+        timestep_units: str = 's',
+        photon_time_indices: Sequence[int] | None = None,
+        output_dir: PathLike | None = None,
+        bounding_boxes: dict[int, openmc.BoundingBox] | None = None,
+        chain_file: PathLike | None = None,
+        micro_kwargs: dict | None = None,
+        mat_vol_kwargs: dict | None = None,
+        run_kwargs: dict | None = None,
+        operator_kwargs: dict | None = None,
+    ):
+        """Run the R2S calculation.
+
+        Parameters
+        ----------
+        timesteps : Sequence[float] or Sequence[tuple[float, str]]
+            Sequence of timesteps. Note that values are not cumulative. The
+            units are specified by the `timestep_units` argument when
+            `timesteps` is an iterable of float. Alternatively, units can be
+            specified for each step by passing an iterable of (value, unit)
+            tuples.
+        source_rates : float or Sequence[float]
+            Source rate in [neutron/sec] for each interval in `timesteps`.
+        timestep_units : {'s', 'min', 'h', 'd', 'a'}, optional
+            Units for values specified in the `timesteps` argument when passing
+            float values. 's' means seconds, 'min' means minutes, 'h' means
+            hours, 'd' means days, and 'a' means years (Julian).
+        photon_time_indices : Sequence[int], optional
+            Sequence of time indices at which photon transport should be run;
+            represented as indices into the array of times formed by the
+            timesteps. For example, if two timesteps are specified, the array of
+            times would contain three entries, and [2] would indicate computing
+            photon results at the last time. A value of None indicates to run
+            photon transport for each time.
+        output_dir : PathLike, optional
+            Path to directory where R2S calculation outputs will be saved. If
+            not provided, a timestamped directory 'r2s_YYYY-MM-DDTHH-MM-SS' is
+            created. Subdirectories will be created for the neutron transport,
+            activation, and photon transport steps.
+        bounding_boxes : dict[int, openmc.BoundingBox], optional
+            Dictionary mapping cell IDs to bounding boxes used for spatial
+            source sampling in cell-based R2S calculations. Required if method
+            is 'cell-based'.
+        chain_file : PathLike, optional
+            Path to the depletion chain XML file to use during activation. If
+            not provided, the default configured chain file will be used.
+        micro_kwargs : dict, optional
+            Additional keyword arguments passed to
+            :func:`openmc.deplete.get_microxs_and_flux` during the neutron
+            transport step.
+        mat_vol_kwargs : dict, optional
+            Additional keyword arguments passed to
+            :meth:`openmc.MeshBase.material_volumes`.
+        run_kwargs : dict, optional
+            Additional keyword arguments passed to :meth:`openmc.Model.run`
+            during the neutron and photon transport step. By default, output is
+            disabled.
+        operator_kwargs : dict, optional
+            Additional keyword arguments passed to
+            :class:`openmc.deplete.IndependentOperator`.
+
+        Returns
+        -------
+        Path
+            Path to the output directory containing all calculation results
+        """
+
+        if output_dir is None:
+            stamp = datetime.now().strftime('%Y-%m-%dT%H-%M-%S')
+            output_dir = Path(f'r2s_{stamp}')
+
+        # Set run_kwargs for the neutron transport step
+        if micro_kwargs is None:
+            micro_kwargs = {}
+        if run_kwargs is None:
+            run_kwargs = {}
+        if operator_kwargs is None:
+            operator_kwargs = {}
+        run_kwargs.setdefault('output', False)
+        micro_kwargs.setdefault('run_kwargs', run_kwargs)
+        # If a chain file is provided, prefer it for steps 1 and 2
+        if chain_file is not None:
+            micro_kwargs.setdefault('chain_file', chain_file)
+            operator_kwargs.setdefault('chain_file', chain_file)
+
+        self.step1_neutron_transport(
+            output_dir / 'neutron_transport', mat_vol_kwargs, micro_kwargs
+        )
+        self.step2_activation(
+            timesteps, source_rates, timestep_units, output_dir / 'activation',
+            operator_kwargs=operator_kwargs
+        )
+        self.step3_photon_transport(
+            photon_time_indices, bounding_boxes, output_dir / 'photon_transport',
+            mat_vol_kwargs=mat_vol_kwargs, run_kwargs=run_kwargs
+        )
+
+        return output_dir
+
+    def step1_neutron_transport(
+        self,
+        output_dir: PathLike = "neutron_transport",
+        mat_vol_kwargs: dict | None = None,
+        micro_kwargs: dict | None = None
+    ):
+        """Run the neutron transport step.
+
+        This step computes the material volume fractions on the mesh, creates a
+        mesh-material filter, and retrieves the fluxes and microscopic cross
+        sections for each mesh/material combination. This step will populate the
+        'fluxes' and 'micros' keys in the results dictionary. For a mesh-based
+        calculation, it will also populate the 'mesh_material_volumes' key.
+
+        Parameters
+        ----------
+        output_dir : PathLike, optional
+            The directory where the results will be saved.
+        mat_vol_kwargs : dict, optional
+            Additional keyword arguments based to
+            :meth:`openmc.MeshBase.material_volumes`.
+        micro_kwargs : dict, optional
+            Additional keyword arguments passed to
+            :func:`openmc.deplete.get_microxs_and_flux`.
+
+        """
+
+        output_dir = Path(output_dir)
+        output_dir.mkdir(parents=True, exist_ok=True)
+
+        if self.method == 'mesh-based':
+            # Compute material volume fractions on the mesh
+            if mat_vol_kwargs is None:
+                mat_vol_kwargs = {}
+            self.results['mesh_material_volumes'] = mmv = \
+                self.domains.material_volumes(self.neutron_model, **mat_vol_kwargs)
+
+            # Save results to file
+            mmv.save(output_dir / 'mesh_material_volumes.npz')
+
+            # Create mesh-material filter based on what combos were found
+            domains = openmc.MeshMaterialFilter.from_volumes(self.domains, mmv)
+        else:
+            domains: Sequence[openmc.Cell] = self.domains
+
+            # Check to make sure that each cell is filled with a material and
+            # that the volume has been set
+
+            # TODO: If volumes are not set, run volume calculation for cells
+            for cell in domains:
+                if cell.fill is None:
+                    raise ValueError(
+                        f"Cell {cell.id} is not filled with a materials. "
+                        "Please set the fill material for each cell before "
+                        "running the R2S calculation."
+                    )
+                if cell.volume is None:
+                    raise ValueError(
+                        f"Cell {cell.id} does not have a volume set. "
+                        "Please set the volume for each cell before running "
+                        "the R2S calculation."
+                    )
+
+        # Set default keyword arguments for microxs and flux calculation
+        if micro_kwargs is None:
+            micro_kwargs = {}
+        micro_kwargs.setdefault('path_statepoint', output_dir / 'statepoint.h5')
+        micro_kwargs.setdefault('path_input', output_dir / 'model.xml')
+
+        # Run neutron transport and get fluxes and micros
+        self.results['fluxes'], self.results['micros'] = get_microxs_and_flux(
+            self.neutron_model, domains, **micro_kwargs)
+
+        # Save flux and micros to file
+        np.save(output_dir / 'fluxes.npy', self.results['fluxes'])
+        write_microxs_hdf5(self.results['micros'], output_dir / 'micros.h5')
+
+    def step2_activation(
+        self,
+        timesteps: Sequence[float] | Sequence[tuple[float, str]],
+        source_rates: float | Sequence[float],
+        timestep_units: str = 's',
+        output_dir: PathLike = 'activation',
+        operator_kwargs: dict | None = None,
+    ):
+        """Run the activation step.
+
+        This step creates a unique copy of each activation material based on the
+        mesh elements or cells, then solves the depletion equations for each
+        material using the fluxes and microscopic cross sections obtained in the
+        neutron transport step. This step will populate the 'depletion_results'
+        and 'activation_materials' keys in the results dictionary.
+
+        Parameters
+        ----------
+        timesteps : Sequence[float] or Sequence[tuple[float, str]]
+            Sequence of timesteps. Note that values are not cumulative. The
+            units are specified by the `timestep_units` argument when
+            `timesteps` is an iterable of float. Alternatively, units can be
+            specified for each step by passing an iterable of (value, unit)
+            tuples.
+        source_rates : float | Sequence[float]
+            Source rate in [neutron/sec] for each interval in `timesteps`.
+        timestep_units : {'s', 'min', 'h', 'd', 'a'}, optional
+            Units for values specified in the `timesteps` argument when passing
+            float values. 's' means seconds, 'min' means minutes, 'h' means
+            hours, 'd' means days, and 'a' means years (Julian).
+        output_dir : PathLike, optional
+            Path to directory where activation calculation outputs will be
+            saved.
+        operator_kwargs : dict, optional
+            Additional keyword arguments passed to
+            :class:`openmc.deplete.IndependentOperator`.
+        """
+
+        if self.method == 'mesh-based':
+            # Get unique material for each (mesh, material) combination
+            mmv = self.results['mesh_material_volumes']
+            self.results['activation_materials'] = get_activation_materials(self.neutron_model, mmv)
+        else:
+            # Create unique material for each cell
+            activation_mats = openmc.Materials()
+            for cell in self.domains:
+                mat = cell.fill.clone()
+                mat.name = f'Cell {cell.id}'
+                mat.depletable = True
+                mat.volume = cell.volume
+                activation_mats.append(mat)
+            self.results['activation_materials'] = activation_mats
+
+        # Save activation materials to file
+        output_dir = Path(output_dir)
+        output_dir.mkdir(parents=True, exist_ok=True)
+        self.results['activation_materials'].export_to_xml(
+            output_dir / 'materials.xml')
+
+        # Create depletion operator for the activation materials
+        if operator_kwargs is None:
+            operator_kwargs = {}
+        operator_kwargs.setdefault('normalization_mode', 'source-rate')
+        op = IndependentOperator(
+            self.results['activation_materials'],
+            self.results['fluxes'],
+            self.results['micros'],
+            **operator_kwargs
+        )
+
+        # Create time integrator and solve depletion equations
+        integrator = PredictorIntegrator(
+            op, timesteps, source_rates=source_rates, timestep_units=timestep_units
+        )
+        output_path = output_dir / 'depletion_results.h5'
+        integrator.integrate(final_step=False, path=output_path)
+
+        # Get depletion results
+        self.results['depletion_results'] = Results(output_path)
+
+    def step3_photon_transport(
+        self,
+        time_indices: Sequence[int] | None = None,
+        bounding_boxes: dict[int, openmc.BoundingBox] | None = None,
+        output_dir: PathLike = 'photon_transport',
+        mat_vol_kwargs: dict | None = None,
+        run_kwargs: dict | None = None,
+    ):
+        """Run the photon transport step.
+
+        This step performs photon transport calculations using decay photon
+        sources created from the activated materials. For each specified time,
+        it creates appropriate photon sources and runs a transport calculation.
+        In mesh-based mode, the sources are created using the mesh material
+        volumes, while in cell-based mode, they are created using bounding boxes
+        for each cell.  This step will populate the 'photon_tallies' key in the
+        results dictionary.
+
+        Parameters
+        ----------
+        time_indices : Sequence[int], optional
+            Sequence of time indices at which photon transport should be run;
+            represented as indices into the array of times formed by the
+            timesteps. For example, if two timesteps are specified, the array of
+            times would contain three entries, and [2] would indicate computing
+            photon results at the last time. A value of None indicates to run
+            photon transport for each time.
+        bounding_boxes : dict[int, openmc.BoundingBox], optional
+            Dictionary mapping cell IDs to bounding boxes used for spatial
+            source sampling in cell-based R2S calculations. Required if method
+            is 'cell-based'.
+        output_dir : PathLike, optional
+            Path to directory where photon transport outputs will be saved.
+        mat_vol_kwargs : dict, optional
+            Additional keyword arguments passed to
+            :meth:`openmc.MeshBase.material_volumes`.
+        run_kwargs : dict, optional
+            Additional keyword arguments passed to :meth:`openmc.Model.run`
+            during the photon transport step. By default, output is disabled.
+        """
+
+        # TODO: Automatically determine bounding box for each cell
+        if bounding_boxes is None and self.method == 'cell-based':
+            raise ValueError("bounding_boxes must be provided for cell-based "
+                             "R2S calculations.")
+
+        # Set default run arguments if not provided
+        if run_kwargs is None:
+            run_kwargs = {}
+        run_kwargs.setdefault('output', False)
+
+        # Write out JSON file with tally IDs that can be used for loading
+        # results
+        output_dir = Path(output_dir)
+        output_dir.mkdir(parents=True, exist_ok=True)
+
+        # Get default time indices if not provided
+        if time_indices is None:
+            n_steps = len(self.results['depletion_results'])
+            time_indices = list(range(n_steps))
+
+        # Check whether the photon model is different
+        neutron_univ = self.neutron_model.geometry.root_universe
+        photon_univ = self.photon_model.geometry.root_universe
+        different_photon_model = (neutron_univ != photon_univ)
+
+        # For mesh-based calculations, compute material volume fractions for the
+        # photon model if it is different from the neutron model to account for
+        # potential material changes
+        if self.method == 'mesh-based' and different_photon_model:
+            self.results['mesh_material_volumes_photon'] = photon_mmv = \
+                self.domains.material_volumes(self.photon_model, **mat_vol_kwargs)
+
+            # Save photon MMV results to file
+            photon_mmv.save(output_dir / 'mesh_material_volumes.npz')
+
+        tally_ids = [tally.id for tally in self.photon_model.tallies]
+        with open(output_dir / 'tally_ids.json', 'w') as f:
+            json.dump(tally_ids, f)
+
+        self.results['photon_tallies'] = {}
+
+        # Get dictionary of cells in the photon model
+        if different_photon_model:
+            photon_cells = self.photon_model.geometry.get_all_cells()
+
+        for time_index in time_indices:
+            # Create decay photon source
+            if self.method == 'mesh-based':
+                self.photon_model.settings.source = \
+                    self.get_decay_photon_source_mesh(time_index)
+            else:
+                sources = []
+                results = self.results['depletion_results']
+                for cell, original_mat in zip(self.domains, self.results['activation_materials']):
+                    # Skip if the cell is not in the photon model or the
+                    # material has changed
+                    if different_photon_model:
+                        if cell.id not in photon_cells or \
+                            cell.fill.id != photon_cells[cell.id].fill.id:
+                            continue
+
+                    # Get bounding box for the cell
+                    bounding_box = bounding_boxes[cell.id]
+
+                    # Get activated material composition
+                    activated_mat = results[time_index].get_material(str(original_mat.id))
+
+                    # Create decay photon source source
+                    space = openmc.stats.Box(*bounding_box)
+                    energy = activated_mat.get_decay_photon_energy()
+                    strength = energy.integral() if energy is not None else 0.0
+                    source = openmc.IndependentSource(
+                        space=space,
+                        energy=energy,
+                        particle='photon',
+                        strength=strength,
+                        constraints={'domains': [cell]}
+                    )
+                    sources.append(source)
+                self.photon_model.settings.source = sources
+
+            # Convert time_index (which may be negative) to a normal index
+            if time_index < 0:
+                time_index = len(self.results['depletion_results']) + time_index
+
+            # Run photon transport calculation
+            run_kwargs['cwd'] = Path(output_dir) / f'time_{time_index}'
+            statepoint_path = self.photon_model.run(**run_kwargs)
+
+            # Store tally results
+            with openmc.StatePoint(statepoint_path) as sp:
+                self.results['photon_tallies'][time_index] = [
+                    sp.tallies[tally.id] for tally in self.photon_model.tallies
+                ]
+
+    def get_decay_photon_source_mesh(
+        self,
+        time_index: int = -1
+    ) -> list[openmc.MeshSource]:
+        """Create decay photon source for a mesh-based calculation.
+
+        This function creates N :class:`MeshSource` objects where N is the
+        maximum number of unique materials that appears in a single mesh
+        element. For each mesh element-material combination, and
+        IndependentSource instance is created with a spatial constraint limited
+        the sampled decay photons to the correct region.
+
+        When the photon transport model is different from the neutron model, the
+        photon MeshMaterialVolumes is used to determine whether an (element,
+        material) combination exists in the photon model.
+
+        Parameters
+        ----------
+        time_index : int, optional
+            Time index for the decay photon source. Default is -1 (last time).
+
+        Returns
+        -------
+        list of openmc.MeshSource
+            A list of MeshSource objects, each containing IndependentSource
+            instances for the decay photons in the corresponding mesh element.
+
+        """
+        mat_dict = self.neutron_model._get_all_materials()
+
+        # Some MeshSource objects will have empty positions; create a "null source"
+        # that is used for this case
+        null_source = openmc.IndependentSource(particle='photon', strength=0.0)
+
+        # List to hold sources for each MeshSource (length = N)
+        source_lists = []
+
+        # Index in the overall list of activated materials
+        index_mat = 0
+
+        # Get various results from previous steps
+        mat_vols = self.results['mesh_material_volumes']
+        materials = self.results['activation_materials']
+        results = self.results['depletion_results']
+        photon_mat_vols = self.results.get('mesh_material_volumes_photon')
+
+        # Total number of mesh elements
+        n_elements = mat_vols.num_elements
+
+        for index_elem in range(n_elements):
+            # Determine which materials exist in the photon model for this element
+            if photon_mat_vols is not None:
+                photon_materials = {
+                    mat_id
+                    for mat_id, _ in photon_mat_vols.by_element(index_elem)
+                    if mat_id is not None
+                }
+
+            for j, (mat_id, _) in enumerate(mat_vols.by_element(index_elem)):
+                # Skip void volume
+                if mat_id is None:
+                    continue
+
+                # Skip if this material doesn't exist in photon model
+                if photon_mat_vols is not None and mat_id not in photon_materials:
+                    index_mat += 1
+                    continue
+
+                # Check whether a new MeshSource object is needed
+                if j >= len(source_lists):
+                    source_lists.append([null_source]*n_elements)
+
+                # Get activated material composition
+                original_mat = materials[index_mat]
+                activated_mat = results[time_index].get_material(str(original_mat.id))
+
+                # Create decay photon source source
+                energy = activated_mat.get_decay_photon_energy()
+                if energy is not None:
+                    strength = energy.integral()
+                    source_lists[j][index_elem] = openmc.IndependentSource(
+                        energy=energy,
+                        particle='photon',
+                        strength=strength,
+                        constraints={'domains': [mat_dict[mat_id]]}
+                    )
+
+                # Increment index of activated material
+                index_mat += 1
+
+        # Return list of mesh sources
+        return [openmc.MeshSource(self.domains, sources) for sources in source_lists]
+
+    def load_results(self, path: PathLike):
+        """Load results from a previous R2S calculation.
+
+        Parameters
+        ----------
+        path : PathLike
+            Path to the directory containing the R2S calculation results.
+
+        """
+        path = Path(path)
+
+        # Load neutron transport results
+        neutron_dir = path / 'neutron_transport'
+        if self.method == 'mesh-based':
+            mmv_file = neutron_dir / 'mesh_material_volumes.npz'
+            if mmv_file.exists():
+                self.results['mesh_material_volumes'] = \
+                    openmc.MeshMaterialVolumes.from_npz(mmv_file)
+        fluxes_file = neutron_dir / 'fluxes.npy'
+        if fluxes_file.exists():
+            self.results['fluxes'] = list(np.load(fluxes_file, allow_pickle=True))
+            micros_dict = read_microxs_hdf5(neutron_dir / 'micros.h5')
+            self.results['micros'] = [
+                micros_dict[f'domain_{i}'] for i in range(len(micros_dict))
+            ]
+
+        # Load activation results
+        activation_dir = path / 'activation'
+        activation_results = activation_dir / 'depletion_results.h5'
+        if activation_results.exists():
+            self.results['depletion_results'] = Results(activation_results)
+        activation_mats_file = activation_dir / 'materials.xml'
+        if activation_mats_file.exists():
+            self.results['activation_materials'] = \
+                openmc.Materials.from_xml(activation_mats_file)
+
+        # Load photon transport results
+        photon_dir = path / 'photon_transport'
+
+        # Load photon mesh material volumes if they exist (for mesh-based calculations)
+        if self.method == 'mesh-based':
+            photon_mmv_file = photon_dir / 'mesh_material_volumes.npz'
+            if photon_mmv_file.exists():
+                self.results['mesh_material_volumes_photon'] = \
+                    openmc.MeshMaterialVolumes.from_npz(photon_mmv_file)
+
+        # Load tally IDs from JSON file
+        tally_ids_path = photon_dir / 'tally_ids.json'
+        if tally_ids_path.exists():
+            with tally_ids_path.open('r') as f:
+                tally_ids = json.load(f)
+            self.results['photon_tallies'] = {}
+
+            # For each photon transport calc, load the statepoint and get the
+            # tally results based on tally_ids
+            for time_dir in photon_dir.glob('time_*'):
+                time_index = int(time_dir.name.split('_')[1])
+                for sp_path in time_dir.glob('statepoint.*.h5'):
+                    with openmc.StatePoint(sp_path) as sp:
+                        self.results['photon_tallies'][time_index] = [
+                            sp.tallies[tally_id] for tally_id in tally_ids
+                        ]
diff --git a/openmc/mesh.py b/openmc/mesh.py
index 9601207e9..3d93d87a1 100644
--- a/openmc/mesh.py
+++ b/openmc/mesh.py
@@ -325,20 +325,10 @@ class MeshBase(IDManagerMixin, ABC):
             vols = material_volumes
         mat_volume_by_element = [vols.by_element(i) for i in range(vols.num_elements)]
 
+        # Get dictionary of all materials
+        materials = model._get_all_materials()
+
         # Create homogenized material for each element
-        materials = model.geometry.get_all_materials()
-
-        # Account for materials in DAGMC universes
-        # TODO: This should really get incorporated in lower-level calls to
-        # get_all_materials, but right now it requires information from the
-        # Model object
-        for cell in model.geometry.get_all_cells().values():
-            if isinstance(cell.fill, openmc.DAGMCUniverse):
-                names = cell.fill.material_names
-                materials.update({
-                    mat.id: mat for mat in model.materials if mat.name in names
-                })
-
         homogenized_materials = []
         for mat_volume_list in mat_volume_by_element:
             material_ids, volumes = [list(x) for x in zip(*mat_volume_list)]
@@ -410,7 +400,7 @@ class MeshBase(IDManagerMixin, ABC):
 
         # In order to get mesh into model, we temporarily replace the
         # tallies with a single mesh tally using the current mesh
-        original_tallies = model.tallies
+        original_tallies = list(model.tallies)
         new_tally = openmc.Tally()
         new_tally.filters = [openmc.MeshFilter(self)]
         new_tally.scores = ['flux']
diff --git a/openmc/model/model.py b/openmc/model/model.py
index 7963751d5..64294c23c 100644
--- a/openmc/model/model.py
+++ b/openmc/model/model.py
@@ -212,6 +212,29 @@ class Model:
             result[mat.name].add(mat)
         return result
 
+    # TODO: This should really get incorporated in lower-level calls to
+    # get_all_materials, but right now it requires information from the Model object
+    def _get_all_materials(self) -> dict[int, openmc.Material]:
+        """Get all materials including those in DAGMC universes
+
+        Returns
+        -------
+        dict
+            Dictionary mapping material ID to material instances
+        """
+        # Get all materials from the Geometry object
+        materials = self.geometry.get_all_materials()
+
+        # Account for materials in DAGMC universes
+        for cell in self.geometry.get_all_cells().values():
+            if isinstance(cell.fill, openmc.DAGMCUniverse):
+                names = cell.fill.material_names
+                materials.update({
+                    mat.id: mat for mat in self.materials if mat.name in names
+                })
+
+        return materials
+
     def add_kinetics_parameters_tallies(self, num_groups: int | None = None):
         """Add tallies for calculating kinetics parameters using the IFP method.
 
diff --git a/openmc/utility_funcs.py b/openmc/utility_funcs.py
index da9f73b16..935a58985 100644
--- a/openmc/utility_funcs.py
+++ b/openmc/utility_funcs.py
@@ -3,6 +3,8 @@ import os
 from pathlib import Path
 from tempfile import TemporaryDirectory
 
+import h5py
+
 import openmc
 from .checkvalue import PathLike
 
@@ -57,3 +59,20 @@ def input_path(filename: PathLike) -> Path:
         return Path(filename).resolve()
     else:
         return Path(filename)
+
+
+@contextmanager
+def h5py_file_or_group(group_or_filename: PathLike | h5py.Group, *args, **kwargs):
+    """Context manager for opening an HDF5 file or using an existing group
+
+    Parameters
+    ----------
+    group_or_filename : path-like or h5py.Group
+        Path to HDF5 file, or group from an existing HDF5 file
+
+    """
+    if isinstance(group_or_filename, h5py.Group):
+        yield group_or_filename
+    else:
+        with h5py.File(group_or_filename, *args, **kwargs) as f:
+            yield f
diff --git a/tests/unit_tests/test_r2s.py b/tests/unit_tests/test_r2s.py
new file mode 100644
index 000000000..a94f85c8c
--- /dev/null
+++ b/tests/unit_tests/test_r2s.py
@@ -0,0 +1,152 @@
+from pathlib import Path
+
+import pytest
+import openmc
+from openmc.deplete import Chain, R2SManager
+
+
+@pytest.fixture
+def simple_model_and_mesh(tmp_path):
+    # Define two materials: water and Ni
+    h2o = openmc.Material()
+    h2o.add_nuclide("H1", 2.0)
+    h2o.add_nuclide("O16", 1.0)
+    h2o.set_density("g/cm3", 1.0)
+    nickel = openmc.Material()
+    nickel.add_element("Ni", 1.0)
+    nickel.set_density("g/cm3", 4.0)
+
+    # Geometry: two half-spaces split by x=0 plane
+    left = openmc.XPlane(0.0)
+    x_min = openmc.XPlane(-10.0, boundary_type='vacuum')
+    x_max = openmc.XPlane(10.0, boundary_type='vacuum')
+    y_min = openmc.YPlane(-10.0, boundary_type='vacuum')
+    y_max = openmc.YPlane(10.0, boundary_type='vacuum')
+    z_min = openmc.ZPlane(-10.0, boundary_type='vacuum')
+    z_max = openmc.ZPlane(10.0, boundary_type='vacuum')
+
+    c1 = openmc.Cell(fill=h2o, region=+x_min & -left & +y_min & -y_max & +z_min & -z_max)
+    c2 = openmc.Cell(fill=nickel, region=+left & -x_max & +y_min & -y_max & +z_min & -z_max)
+    c1.volume = 4000.0
+    c2.volume = 4000.0
+    geometry = openmc.Geometry([c1, c2])
+
+    # Simple settings with a point source
+    settings = openmc.Settings()
+    settings.batches = 10
+    settings.particles = 1000
+    settings.run_mode = 'fixed source'
+    settings.source = openmc.IndependentSource()
+    model = openmc.Model(geometry, settings=settings)
+
+    mesh = openmc.RegularMesh()
+    mesh.lower_left = (-10.0, -10.0, -10.0)
+    mesh.upper_right = (10.0, 10.0, 10.0)
+    mesh.dimension = (1, 1, 1)
+    return model, (c1, c2), mesh
+
+
+def test_r2s_mesh_expected_output(simple_model_and_mesh, tmp_path):
+    model, (c1, c2), mesh = simple_model_and_mesh
+
+    # Use mesh-based domains
+    r2s = R2SManager(model, mesh)
+
+    # Use custom reduced chain file for Ni
+    chain = Chain.from_xml(Path(__file__).parents[1] / "chain_ni.xml")
+
+    # Run R2S calculation
+    outdir = r2s.run(
+        timesteps=[(1.0, 'd')],
+        source_rates=[1.0],
+        photon_time_indices=[1],
+        output_dir=tmp_path,
+        chain_file=chain,
+    )
+
+    # Check directories and files exist
+    nt = Path(outdir) / 'neutron_transport'
+    assert (nt / 'fluxes.npy').exists()
+    assert (nt / 'micros.h5').exists()
+    assert (nt / 'mesh_material_volumes.npz').exists()
+    act = Path(outdir) / 'activation'
+    assert (act / 'depletion_results.h5').exists()
+    pt = Path(outdir) / 'photon_transport'
+    assert (pt / 'tally_ids.json').exists()
+    assert (pt / 'time_1' / 'statepoint.10.h5').exists()
+
+    # Basic results structure checks
+    assert len(r2s.results['fluxes']) == 2
+    assert len(r2s.results['micros']) == 2
+    assert len(r2s.results['mesh_material_volumes']) == 2
+    assert len(r2s.results['activation_materials']) == 2
+    assert len(r2s.results['depletion_results']) == 2
+
+    # Check activation materials
+    amats = r2s.results['activation_materials']
+    assert all(m.depletable for m in amats)
+    # Volumes preserved
+    assert {m.volume for m in amats} == {c1.volume, c2.volume}
+
+    # Check loading results
+    r2s_loaded = R2SManager(model, mesh)
+    r2s_loaded.load_results(outdir)
+    assert len(r2s_loaded.results['fluxes']) == 2
+    assert len(r2s_loaded.results['micros']) == 2
+    assert len(r2s_loaded.results['mesh_material_volumes']) == 2
+    assert len(r2s_loaded.results['activation_materials']) == 2
+    assert len(r2s_loaded.results['depletion_results']) == 2
+
+
+def test_r2s_cell_expected_output(simple_model_and_mesh, tmp_path):
+    model, (c1, c2), _ = simple_model_and_mesh
+
+    # Use cell-based domains
+    r2s = R2SManager(model, [c1, c2])
+
+    # Use custom reduced chain file for Ni
+    chain = Chain.from_xml(Path(__file__).parents[1] / "chain_ni.xml")
+
+    # Run R2S calculation
+    bounding_boxes = {c1.id: c1.bounding_box, c2.id: c2.bounding_box}
+    outdir = r2s.run(
+        timesteps=[(1.0, 'd')],
+        source_rates=[1.0],
+        photon_time_indices=[1],
+        output_dir=tmp_path,
+        bounding_boxes=bounding_boxes,
+        chain_file=chain
+    )
+
+    # Check directories and files exist
+    nt = Path(outdir) / 'neutron_transport'
+    assert (nt / 'fluxes.npy').exists()
+    assert (nt / 'micros.h5').exists()
+    act = Path(outdir) / 'activation'
+    assert (act / 'depletion_results.h5').exists()
+    pt = Path(outdir) / 'photon_transport'
+    assert (pt / 'tally_ids.json').exists()
+    assert (pt / 'time_1' / 'statepoint.10.h5').exists()
+
+    # Basic results structure checks
+    assert len(r2s.results['fluxes']) == 2
+    assert len(r2s.results['micros']) == 2
+    assert len(r2s.results['activation_materials']) == 2
+    assert len(r2s.results['depletion_results']) == 2
+
+    # Check activation materials
+    amats = r2s.results['activation_materials']
+    assert all(m.depletable for m in amats)
+    # Names include cell IDs
+    assert any(f"Cell {c1.id}" in m.name for m in amats)
+    assert any(f"Cell {c2.id}" in m.name for m in amats)
+    # Volumes preserved
+    assert {m.volume for m in amats} == {c1.volume, c2.volume}
+
+    # Check loading results
+    r2s_loaded = R2SManager(model, [c1, c2])
+    r2s_loaded.load_results(outdir)
+    assert len(r2s_loaded.results['fluxes']) == 2
+    assert len(r2s_loaded.results['micros']) == 2
+    assert len(r2s_loaded.results['activation_materials']) == 2
+    assert len(r2s_loaded.results['depletion_results']) == 2

From fd964bc9b04dcf2090b212b8307551b32fea810b Mon Sep 17 00:00:00 2001
From: GuySten <62616591+GuySten@users.noreply.github.com>
Date: Mon, 3 Nov 2025 09:42:59 +0200
Subject: [PATCH 146/203] Enable specifying reference direction for azimuthal
 angle in PolarAzimuthal distribution (#3582)

Co-authored-by: shimwell <mail@jshimwell.com>
---
 include/openmc/distribution_multi.h           |  2 ++
 openmc/stats/multivariate.py                  | 25 +++++++++++++++-
 src/distribution_multi.cpp                    | 15 +++++++++-
 tests/regression_tests/source/inputs_true.dat |  2 +-
 .../regression_tests/source/results_true.dat  |  2 +-
 tests/unit_tests/test_stats.py                | 30 +++++++++++++++++++
 6 files changed, 72 insertions(+), 4 deletions(-)

diff --git a/include/openmc/distribution_multi.h b/include/openmc/distribution_multi.h
index 9e84d03d5..75126593f 100644
--- a/include/openmc/distribution_multi.h
+++ b/include/openmc/distribution_multi.h
@@ -51,6 +51,8 @@ public:
   Distribution* phi() const { return phi_.get(); }
 
 private:
+  Direction v_ref_ {1.0, 0.0, 0.0}; //!< reference direction
+  Direction w_ref_;
   UPtrDist mu_;  //!< Distribution of polar angle
   UPtrDist phi_; //!< Distribution of azimuthal angle
 };
diff --git a/openmc/stats/multivariate.py b/openmc/stats/multivariate.py
index 222d2d18a..1ce998758 100644
--- a/openmc/stats/multivariate.py
+++ b/openmc/stats/multivariate.py
@@ -79,6 +79,9 @@ class PolarAzimuthal(UnitSphere):
     reference_uvw : Iterable of float
         Direction from which polar angle is measured. Defaults to the positive
         z-direction.
+    reference_vwu : Iterable of float
+        Direction from which azimuthal angle is measured. Defaults to the positive
+        x-direction.    
 
     Attributes
     ----------
@@ -89,8 +92,9 @@ class PolarAzimuthal(UnitSphere):
 
     """
 
-    def __init__(self, mu=None, phi=None, reference_uvw=(0., 0., 1.)):
+    def __init__(self, mu=None, phi=None, reference_uvw=(0., 0., 1.), reference_vwu=(1., 0., 0.)):
         super().__init__(reference_uvw)
+        self.reference_vwu = reference_vwu
         if mu is not None:
             self.mu = mu
         else:
@@ -100,6 +104,20 @@ class PolarAzimuthal(UnitSphere):
             self.phi = phi
         else:
             self.phi = Uniform(0., 2*pi)
+            
+    @property
+    def reference_vwu(self):
+        return self._reference_vwu
+
+    @reference_vwu.setter
+    def reference_vwu(self, vwu):
+        cv.check_type('reference v direction', vwu, Iterable, Real)
+        vwu = np.asarray(vwu)
+        uvw = self.reference_uvw
+        cv.check_greater_than('reference v direction must not be parallel to reference u direction', np.linalg.norm(np.cross(vwu,uvw)), 1e-6*np.linalg.norm(vwu))        
+        vwu -= vwu.dot(uvw)*uvw        
+        cv.check_less_than('reference v direction must be orthogonal to reference u direction', np.abs(vwu.dot(uvw)), 1e-6)
+        self._reference_vwu = vwu/np.linalg.norm(vwu)
 
     @property
     def mu(self):
@@ -132,6 +150,8 @@ class PolarAzimuthal(UnitSphere):
         element.set("type", "mu-phi")
         if self.reference_uvw is not None:
             element.set("reference_uvw", ' '.join(map(str, self.reference_uvw)))
+        if self.reference_vwu is not None:
+            element.set("reference_vwu", ' '.join(map(str, self.reference_vwu)))    
         element.append(self.mu.to_xml_element('mu'))
         element.append(self.phi.to_xml_element('phi'))
         return element
@@ -155,6 +175,9 @@ class PolarAzimuthal(UnitSphere):
         uvw = get_elem_list(elem, "reference_uvw", float)
         if uvw is not None:
             mu_phi.reference_uvw = uvw
+        vwu = get_elem_list(elem, "reference_vwu", float)
+        if vwu is not None:
+            mu_phi.reference_vwu = vwu            
         mu_phi.mu = Univariate.from_xml_element(elem.find('mu'))
         mu_phi.phi = Univariate.from_xml_element(elem.find('phi'))
         return mu_phi
diff --git a/src/distribution_multi.cpp b/src/distribution_multi.cpp
index b7b3efe52..cdb33adc2 100644
--- a/src/distribution_multi.cpp
+++ b/src/distribution_multi.cpp
@@ -58,6 +58,15 @@ PolarAzimuthal::PolarAzimuthal(Direction u, UPtrDist mu, UPtrDist phi)
 PolarAzimuthal::PolarAzimuthal(pugi::xml_node node)
   : UnitSphereDistribution {node}
 {
+  // Read reference directional unit vector
+  if (check_for_node(node, "reference_vwu")) {
+    auto v_ref = get_node_array<double>(node, "reference_vwu");
+    if (v_ref.size() != 3)
+      fatal_error("Angular distribution reference v direction must have "
+                  "three parameters specified.");
+    v_ref_ = Direction(v_ref.data());
+  }
+  w_ref_ = u_ref_.cross(v_ref_);
   if (check_for_node(node, "mu")) {
     pugi::xml_node node_dist = node.child("mu");
     mu_ = distribution_from_xml(node_dist);
@@ -79,11 +88,15 @@ Direction PolarAzimuthal::sample(uint64_t* seed) const
   double mu = mu_->sample(seed);
   if (mu == 1.0)
     return u_ref_;
+  if (mu == -1.0)
+    return -u_ref_;
 
   // Sample azimuthal angle
   double phi = phi_->sample(seed);
 
-  return rotate_angle(u_ref_, mu, &phi, seed);
+  double f = std::sqrt(1 - mu * mu);
+
+  return mu * u_ref_ + f * std::cos(phi) * v_ref_ + f * std::sin(phi) * w_ref_;
 }
 
 //==============================================================================
diff --git a/tests/regression_tests/source/inputs_true.dat b/tests/regression_tests/source/inputs_true.dat
index 9f10b79d6..0c3764ba6 100644
--- a/tests/regression_tests/source/inputs_true.dat
+++ b/tests/regression_tests/source/inputs_true.dat
@@ -25,7 +25,7 @@
           <parameters>-2.0 0.0 2.0 0.2 0.3 0.2</parameters>
         </z>
       </space>
-      <angle type="mu-phi" reference_uvw="0.0 0.0 1.0">
+      <angle type="mu-phi" reference_uvw="0.0 0.0 1.0" reference_vwu="1.0 0.0 0.0">
         <mu type="discrete">
           <parameters>-1.0 0.0 1.0 0.5 0.25 0.25</parameters>
         </mu>
diff --git a/tests/regression_tests/source/results_true.dat b/tests/regression_tests/source/results_true.dat
index 951075bbb..7d03c696d 100644
--- a/tests/regression_tests/source/results_true.dat
+++ b/tests/regression_tests/source/results_true.dat
@@ -1,2 +1,2 @@
 k-combined:
-3.034717E-01 2.799386E-03
+3.080655E-01 4.837707E-03
diff --git a/tests/unit_tests/test_stats.py b/tests/unit_tests/test_stats.py
index abf143f12..998d4b984 100644
--- a/tests/unit_tests/test_stats.py
+++ b/tests/unit_tests/test_stats.py
@@ -516,3 +516,33 @@ def test_combine_distributions():
     # uncertainty of the expected value
     samples = combined.sample(10_000)
     assert_sample_mean(samples, 0.25)
+
+def test_reference_vwu_projection():
+    """When a non-orthogonal vector is provided, the setter should project out
+    any component along reference_uvw so the stored vector is orthogonal.
+    """
+    pa = openmc.stats.PolarAzimuthal()  # default reference_uvw == (0, 0, 1)
+
+    # Provide a vector that is not orthogonal to (0,0,1)
+    pa.reference_vwu = (2.0, 0.5, 0.3)
+
+    reference_v = np.asarray(pa.reference_vwu)
+    reference_u = np.asarray(pa.reference_uvw)
+
+    # reference_v should be orthogonal to reference_u
+    assert abs(np.dot(reference_v, reference_u)) < 1e-6
+
+
+def test_reference_vwu_normalization():
+    """When a non-normalized vector is provided, the setter should normalize
+    the projected vector to unit length.
+    """
+    pa = openmc.stats.PolarAzimuthal()  # default reference_uvw == (0, 0, 1)
+
+    # Provide a vector that is neither orthogonal to (0,0,1) nor unit-length
+    pa.reference_vwu = (2.0, 0.5, 0.3)
+
+    reference_v = np.asarray(pa.reference_vwu)
+
+    # reference_v should be unit length
+    assert np.isclose(np.linalg.norm(reference_v), 1.0, atol=1e-12)

From 2d8e006c3de9c8fbc0b010357ebf5a870909c8bc Mon Sep 17 00:00:00 2001
From: Perry <100789850+yrrepy@users.noreply.github.com>
Date: Mon, 3 Nov 2025 09:10:30 -0800
Subject: [PATCH 147/203] Enable nuclide filters with get_decay_photon_energy
 (#3614)

Co-authored-by: Paul Romano <paul.k.romano@gmail.com>
---
 openmc/material.py | 34 +++++++++++++++++++++++++---------
 1 file changed, 25 insertions(+), 9 deletions(-)

diff --git a/openmc/material.py b/openmc/material.py
index c7b954b66..1609da05a 100644
--- a/openmc/material.py
+++ b/openmc/material.py
@@ -290,11 +290,13 @@ class Material(IDManagerMixin):
         return self.get_decay_photon_energy(0.0)
 
     def get_decay_photon_energy(
-            self,
-            clip_tolerance: float = 1e-6,
-            units: str = 'Bq',
-            volume: float | None = None
-        ) -> Univariate | None:
+        self,
+        clip_tolerance: float = 1e-6,
+        units: str = 'Bq',
+        volume: float | None = None,
+        exclude_nuclides: list[str] | None = None,
+        include_nuclides: list[str] | None = None
+    ) -> Univariate | None:
         r"""Return energy distribution of decay photons from unstable nuclides.
 
         .. versionadded:: 0.14.0
@@ -302,22 +304,31 @@ class Material(IDManagerMixin):
         Parameters
         ----------
         clip_tolerance : float
-            Maximum fraction of :math:`\sum_i x_i p_i` for discrete
-            distributions that will be discarded.
+            Maximum fraction of :math:`\sum_i x_i p_i` for discrete distributions
+            that will be discarded.
         units : {'Bq', 'Bq/g', 'Bq/kg', 'Bq/cm3'}
             Specifies the units on the integral of the distribution.
         volume : float, optional
             Volume of the material. If not passed, defaults to using the
             :attr:`Material.volume` attribute.
+        exclude_nuclides : list of str, optional
+            Nuclides to exclude from the photon source calculation.
+        include_nuclides : list of str, optional
+            Nuclides to include in the photon source calculation. If specified,
+            only these nuclides are used.
 
         Returns
         -------
         Univariate or None
-            Decay photon energy distribution. The integral of this distribution
-            is the total intensity of the photon source in the requested units.
+            Decay photon energy distribution. The integral of this distribution is
+            the total intensity of the photon source in the requested units.
 
         """
         cv.check_value('units', units, {'Bq', 'Bq/g', 'Bq/kg', 'Bq/cm3'})
+
+        if exclude_nuclides is not None and include_nuclides is not None:
+            raise ValueError("Cannot specify both exclude_nuclides and include_nuclides")
+
         if units == 'Bq':
             multiplier = volume if volume is not None else self.volume
             if multiplier is None:
@@ -332,6 +343,11 @@ class Material(IDManagerMixin):
         dists = []
         probs = []
         for nuc, atoms_per_bcm in self.get_nuclide_atom_densities().items():
+            if exclude_nuclides is not None and nuc in exclude_nuclides:
+                continue
+            if include_nuclides is not None and nuc not in include_nuclides:
+                continue
+
             source_per_atom = openmc.data.decay_photon_energy(nuc)
             if source_per_atom is not None and atoms_per_bcm > 0.0:
                 dists.append(source_per_atom)

From bd76fc056651e33d138d18dbee061c0a7bc83823 Mon Sep 17 00:00:00 2001
From: Paul Romano <paul.k.romano@gmail.com>
Date: Mon, 3 Nov 2025 11:11:57 -0600
Subject: [PATCH 148/203] Fix bug in normalization of tally results with
 no_reduce (#3619)

---
 src/tallies/tally.cpp              |  7 +++++-
 tests/unit_tests/test_no_reduce.py | 40 ++++++++++++++++++++++++++++++
 2 files changed, 46 insertions(+), 1 deletion(-)
 create mode 100644 tests/unit_tests/test_no_reduce.py

diff --git a/src/tallies/tally.cpp b/src/tallies/tally.cpp
index b9c615ecb..12ee3427e 100644
--- a/src/tallies/tally.cpp
+++ b/src/tallies/tally.cpp
@@ -825,9 +825,14 @@ void Tally::accumulate()
       total_source = 1.0;
     }
 
+    // Determine number of particles contributing to tally
+    double contributing_particles = settings::reduce_tallies
+                                      ? settings::n_particles
+                                      : simulation::work_per_rank;
+
     // Account for number of source particles in normalization
     double norm =
-      total_source / (settings::n_particles * settings::gen_per_batch);
+      total_source / (contributing_particles * settings::gen_per_batch);
 
     if (settings::solver_type == SolverType::RANDOM_RAY) {
       norm = 1.0;
diff --git a/tests/unit_tests/test_no_reduce.py b/tests/unit_tests/test_no_reduce.py
new file mode 100644
index 000000000..00ddb5a95
--- /dev/null
+++ b/tests/unit_tests/test_no_reduce.py
@@ -0,0 +1,40 @@
+"""Test the settings.no_reduce feature to ensure tallies are correctly
+reduced across MPI processes."""
+
+import openmc
+import pytest
+
+from tests.testing_harness import config
+
+
+@pytest.mark.parametrize('no_reduce', [True, False])
+def test_no_reduce(no_reduce, run_in_tmpdir):
+    """Test that tally results are correct with and without no_reduce."""
+
+    # Create simple sphere model with vacuum
+    model = openmc.Model()
+    sphere = openmc.Sphere(r=1.0, boundary_type='vacuum')
+    cell = openmc.Cell(region=-sphere)
+    model.geometry = openmc.Geometry([cell])
+    model.settings.run_mode = 'fixed source'
+    model.settings.batches = 10
+    model.settings.particles = 100
+    model.settings.source = openmc.IndependentSource(space=openmc.stats.Point())
+    model.settings.no_reduce = no_reduce
+
+    # Tally: surface current on vacuum boundary
+    surf_filter = openmc.SurfaceFilter(sphere)
+    tally = openmc.Tally()
+    tally.filters = [surf_filter]
+    tally.scores = ['current']
+    model.tallies = [tally]
+
+    # Run OpenMC with proper MPI arguments if needed
+    kwargs = {'apply_tally_results': True, 'openmc_exec': config['exe']}
+    if config['mpi']:
+        kwargs['mpi_args'] = [config['mpiexec'], '-n', config['mpi_np']]
+    model.run(**kwargs)
+
+    # The tally should be ~1.0 (every particle crosses the surface once)
+    tally_mean = tally.mean.flatten()[0]
+    assert tally_mean == pytest.approx(1.0)

From e5c7d0ca88983cdd37bb9870cd1fccc8e4301736 Mon Sep 17 00:00:00 2001
From: Jon Shimwell <jon@proximafusion.com>
Date: Wed, 5 Nov 2025 17:03:20 +0100
Subject: [PATCH 149/203] Adding vtkhdf option to write vtk data (#3252)

Co-authored-by: shimwell <mail@jshimwell.com>
Co-authored-by: Jonathan Shimwell <drshimwell@gmail.com>
Co-authored-by: rherrero-pf <156206440+rherrero-pf@users.noreply.github.com>
Co-authored-by: Patrick Shriwise <pshriwise@gmail.com>
Co-authored-by: Paul Romano <paul.k.romano@gmail.com>
---
 openmc/mesh.py                                | 166 ++++++++++++++++--
 .../test_mesh_dagmc_tets.vtk                  | 159 +++++++++++++++++
 tests/unit_tests/test_mesh.py                 |  69 ++++++++
 tests/unit_tests/test_mesh_dagmc_tets.vtk     |   1 +
 4 files changed, 377 insertions(+), 18 deletions(-)
 create mode 100644 tests/regression_tests/unstructured_mesh/test_mesh_dagmc_tets.vtk
 create mode 120000 tests/unit_tests/test_mesh_dagmc_tets.vtk

diff --git a/openmc/mesh.py b/openmc/mesh.py
index 3d93d87a1..ce5218b5e 100644
--- a/openmc/mesh.py
+++ b/openmc/mesh.py
@@ -5,6 +5,7 @@ from collections.abc import Iterable, Sequence, Mapping
 from functools import wraps
 from math import pi, sqrt, atan2
 from numbers import Integral, Real
+from pathlib import Path
 from typing import Protocol
 
 import h5py
@@ -2443,6 +2444,7 @@ class UnstructuredMesh(MeshBase):
     _UNSUPPORTED_ELEM = -1
     _LINEAR_TET = 0
     _LINEAR_HEX = 1
+    _VTK_TETRA = 10
 
     def __init__(self, filename: PathLike, library: str, mesh_id: int | None = None,
                  name: str = '', length_multiplier: float = 1.0,
@@ -2652,7 +2654,8 @@ class UnstructuredMesh(MeshBase):
         warnings.warn(
             "The 'UnstructuredMesh.write_vtk_mesh' method has been renamed "
             "to 'write_data_to_vtk' and will be removed in a future version "
-            " of OpenMC.", FutureWarning
+            " of OpenMC.",
+            FutureWarning,
         )
         self.write_data_to_vtk(**kwargs)
 
@@ -2670,9 +2673,10 @@ class UnstructuredMesh(MeshBase):
         Parameters
         ----------
         filename : str or pathlib.Path
-            Name of the VTK file to write. If the filename ends in '.vtu' then a
-            binary VTU format file will be written, if the filename ends in
-            '.vtk' then a legacy VTK file will be written.
+            Name of the VTK file to write. If the filename ends in '.vtkhdf'
+            then a VTKHDF format file will be written. If the filename ends in
+            '.vtu' then a binary VTU format file will be written. If the
+            filename ends in '.vtk' then a legacy VTK file will be written.
         datasets : dict
             Dictionary whose keys are the data labels and values are numpy
             appropriately sized arrays of the data
@@ -2680,6 +2684,35 @@ class UnstructuredMesh(MeshBase):
             Whether or not to normalize the data by the volume of the mesh
             elements
         """
+
+        if Path(filename).suffix == ".vtkhdf":
+
+            self._write_data_to_vtk_hdf5_format(
+                filename=filename,
+                datasets=datasets,
+                volume_normalization=volume_normalization,
+            )
+
+        elif Path(filename).suffix == ".vtk" or Path(filename).suffix == ".vtu":
+
+            self._write_data_to_vtk_ascii_format(
+                filename=filename,
+                datasets=datasets,
+                volume_normalization=volume_normalization,
+            )
+
+        else:
+            raise ValueError(
+                "Unsupported file extension, The filename must end with "
+                "'.vtkhdf', '.vtu' or '.vtk'"
+            )
+
+    def _write_data_to_vtk_ascii_format(
+        self,
+        filename: PathLike | None = None,
+        datasets: dict | None = None,
+        volume_normalization: bool = True,
+    ):
         from vtkmodules.util import numpy_support
         from vtkmodules import vtkCommonCore
         from vtkmodules import vtkCommonDataModel
@@ -2687,9 +2720,7 @@ class UnstructuredMesh(MeshBase):
         from vtkmodules import vtkIOXML
 
         if self.connectivity is None or self.vertices is None:
-            raise RuntimeError(
-                "This mesh has not been loaded from a statepoint file."
-            )
+            raise RuntimeError("This mesh has not been loaded from a statepoint file.")
 
         if filename is None:
             filename = f"mesh_{self.id}.vtk"
@@ -2771,29 +2802,128 @@ class UnstructuredMesh(MeshBase):
 
         writer.Write()
 
+    def _write_data_to_vtk_hdf5_format(
+        self,
+        filename: PathLike | None = None,
+        datasets: dict | None = None,
+        volume_normalization: bool = True,
+    ):
+        def append_dataset(dset, array):
+            """Convenience function to append data to an HDF5 dataset"""
+            origLen = dset.shape[0]
+            dset.resize(origLen + array.shape[0], axis=0)
+            dset[origLen:] = array
+
+        if self.library != "moab":
+            raise NotImplementedError("VTKHDF output is only supported for MOAB meshes")
+
+        # the self.connectivity contains arrays of length 8 to support hex
+        # elements as well, in the case of tetrahedra mesh elements, the
+        # last 4 values are -1 and are removed
+        trimmed_connectivity = []
+        for cell in self.connectivity:
+            # Find the index of the first -1 value, if any
+            first_negative_index = np.where(cell == -1)[0]
+            if first_negative_index.size > 0:
+                # Slice the array up to the first -1 value
+                trimmed_connectivity.append(cell[: first_negative_index[0]])
+            else:
+                # No -1 values, append the whole cell
+                trimmed_connectivity.append(cell)
+        trimmed_connectivity = np.array(trimmed_connectivity, dtype="int32").flatten()
+
+        # MOAB meshes supports tet elements only so we know it has 4 points per cell
+        points_per_cell = 4
+
+        # offsets are the indices of the first point of each cell in the array of points
+        offsets = np.arange(0, self.n_elements * points_per_cell + 1, points_per_cell)
+
+        for name, data in datasets.items():
+            if data.shape != self.dimension:
+                raise ValueError(
+                    f'Cannot apply dataset "{name}" with '
+                    f"shape {data.shape} to mesh {self.id} "
+                    f"with dimensions {self.dimension}"
+                )
+
+        with h5py.File(filename, "w") as f:
+
+            root = f.create_group("VTKHDF")
+            vtk_file_format_version = (2, 1)
+            root.attrs["Version"] = vtk_file_format_version
+            ascii_type = "UnstructuredGrid".encode("ascii")
+            root.attrs.create(
+                "Type",
+                ascii_type,
+                dtype=h5py.string_dtype("ascii", len(ascii_type)),
+            )
+
+            # create hdf5 file structure
+            root.create_dataset("NumberOfPoints", (0,), maxshape=(None,), dtype="i8")
+            root.create_dataset("Types", (0,), maxshape=(None,), dtype="uint8")
+            root.create_dataset("Points", (0, 3), maxshape=(None, 3), dtype="f")
+            root.create_dataset(
+                "NumberOfConnectivityIds", (0,), maxshape=(None,), dtype="i8"
+            )
+            root.create_dataset("NumberOfCells", (0,), maxshape=(None,), dtype="i8")
+            root.create_dataset("Offsets", (0,), maxshape=(None,), dtype="i8")
+            root.create_dataset("Connectivity", (0,), maxshape=(None,), dtype="i8")
+
+            append_dataset(root["NumberOfPoints"], np.array([len(self.vertices)]))
+            append_dataset(root["Points"], self.vertices)
+            append_dataset(
+                root["NumberOfConnectivityIds"],
+                np.array([len(trimmed_connectivity)]),
+            )
+            append_dataset(root["Connectivity"], trimmed_connectivity)
+            append_dataset(root["NumberOfCells"], np.array([self.n_elements]))
+            append_dataset(root["Offsets"], offsets)
+
+            append_dataset(
+                root["Types"], np.full(self.n_elements, self._VTK_TETRA, dtype="uint8")
+            )
+
+            cell_data_group = root.create_group("CellData")
+
+            for name, data in datasets.items():
+
+                cell_data_group.create_dataset(
+                    name, (0,), maxshape=(None,), dtype="float64", chunks=True
+                )
+
+                if volume_normalization:
+                    data /= self.volumes
+                append_dataset(cell_data_group[name], data)
+
     @classmethod
     def from_hdf5(cls, group: h5py.Group, mesh_id: int, name: str):
-        filename = group['filename'][()].decode()
-        library = group['library'][()].decode()
-        if 'options' in group.attrs:
+        filename = group["filename"][()].decode()
+        library = group["library"][()].decode()
+        if "options" in group.attrs:
             options = group.attrs['options'].decode()
         else:
             options = None
 
-        mesh = cls(filename=filename, library=library, mesh_id=mesh_id, name=name, options=options)
+        mesh = cls(
+            filename=filename,
+            library=library,
+            mesh_id=mesh_id,
+            name=name,
+            options=options,
+        )
         mesh._has_statepoint_data = True
-        vol_data = group['volumes'][()]
+        vol_data = group["volumes"][()]
         mesh.volumes = np.reshape(vol_data, (vol_data.shape[0],))
         mesh.n_elements = mesh.volumes.size
 
-        vertices = group['vertices'][()]
+        vertices = group["vertices"][()]
         mesh._vertices = vertices.reshape((-1, 3))
-        connectivity = group['connectivity'][()]
+        connectivity = group["connectivity"][()]
         mesh._connectivity = connectivity.reshape((-1, 8))
-        mesh._element_types = group['element_types'][()]
+        mesh._element_types = group["element_types"][()]
 
-        if 'length_multiplier' in group:
-            mesh.length_multiplier = group['length_multiplier'][()]
+        if "length_multiplier" in group:
+            mesh.length_multiplier = group["length_multiplier"][()]
 
         return mesh
 
@@ -2812,7 +2942,7 @@ class UnstructuredMesh(MeshBase):
 
         element.set("library", self._library)
         if self.options is not None:
-            element.set('options', self.options)
+            element.set("options", self.options)
         subelement = ET.SubElement(element, "filename")
         subelement.text = str(self.filename)
 
diff --git a/tests/regression_tests/unstructured_mesh/test_mesh_dagmc_tets.vtk b/tests/regression_tests/unstructured_mesh/test_mesh_dagmc_tets.vtk
new file mode 100644
index 000000000..2ddd228cf
--- /dev/null
+++ b/tests/regression_tests/unstructured_mesh/test_mesh_dagmc_tets.vtk
@@ -0,0 +1,159 @@
+# vtk DataFile Version 2.0
+made_with_cad_to_dagmc_package, Created by Gmsh 4.12.1 
+ASCII
+DATASET UNSTRUCTURED_GRID
+POINTS 14 double
+-0.5 -0.5 0.5
+-0.5 -0.5 -0.5
+-0.5 0.5 0.5
+-0.5 0.5 -0.5
+0.5 -0.5 0.5
+0.5 -0.5 -0.5
+0.5 0.5 0.5
+0.5 0.5 -0.5
+-0.5 0 0
+0.5 0 0
+0 -0.5 0
+0 0.5 0
+0 0 -0.5
+0 0 0.5
+
+CELLS 68 268
+1 0
+1 1
+1 2
+1 3
+1 4
+1 5
+1 6
+1 7
+2 1 0
+2 0 2
+2 3 2
+2 1 3
+2 5 4
+2 4 6
+2 7 6
+2 5 7
+2 1 5
+2 0 4
+2 3 7
+2 2 6
+3 1 0 8
+3 0 2 8
+3 3 1 8
+3 2 3 8
+3 5 9 4
+3 4 9 6
+3 7 9 5
+3 6 9 7
+3 0 1 10
+3 4 0 10
+3 1 5 10
+3 5 4 10
+3 2 11 3
+3 6 11 2
+3 3 11 7
+3 7 11 6
+3 1 3 12
+3 5 1 12
+3 3 7 12
+3 7 5 12
+3 0 13 2
+3 4 13 0
+3 2 13 6
+3 6 13 4
+4 13 8 12 10
+4 11 8 12 13
+4 12 11 13 9
+4 10 12 13 9
+4 12 3 11 7
+4 13 2 8 0
+4 8 12 1 3
+4 11 3 8 2
+4 10 8 1 0
+4 0 10 13 4
+4 1 12 10 5
+4 11 2 13 6
+4 4 9 13 6
+4 6 9 11 7
+4 10 9 4 5
+4 7 9 12 5
+4 3 8 12 11
+4 1 12 8 10
+4 8 11 2 13
+4 10 13 8 0
+4 13 10 9 4
+4 11 13 9 6
+4 12 11 9 7
+4 9 10 12 5
+
+CELL_TYPES 68
+1
+1
+1
+1
+1
+1
+1
+1
+3
+3
+3
+3
+3
+3
+3
+3
+3
+3
+3
+3
+5
+5
+5
+5
+5
+5
+5
+5
+5
+5
+5
+5
+5
+5
+5
+5
+5
+5
+5
+5
+5
+5
+5
+5
+10
+10
+10
+10
+10
+10
+10
+10
+10
+10
+10
+10
+10
+10
+10
+10
+10
+10
+10
+10
+10
+10
+10
+10
diff --git a/tests/unit_tests/test_mesh.py b/tests/unit_tests/test_mesh.py
index f0f289408..9aca8b596 100644
--- a/tests/unit_tests/test_mesh.py
+++ b/tests/unit_tests/test_mesh.py
@@ -2,6 +2,7 @@ from math import pi
 from tempfile import TemporaryDirectory
 from pathlib import Path
 
+import h5py
 import numpy as np
 from scipy.stats import chi2
 import pytest
@@ -486,6 +487,74 @@ def test_umesh(run_in_tmpdir, simple_umesh, export_type):
     with pytest.raises(ValueError, match='Cannot apply dataset "mean"'):
         simple_umesh.write_data_to_vtk(datasets={'mean': ref_data[:-2]}, filename=filename)
 
+
+@pytest.mark.skipif(not openmc.lib._dagmc_enabled(), reason="DAGMC not enabled.")
+def test_write_vtkhdf(request, run_in_tmpdir):
+    """Performs a minimal UnstructuredMesh simulation, reads in the resulting
+    statepoint file and writes the mesh data to vtk and vtkhdf files. It is
+    necessary to read in the unstructured mesh from a statepoint file to ensure
+    it has all the required attributes
+    """
+    model = openmc.Model()
+
+    surf1 = openmc.Sphere(r=1000.0, boundary_type="vacuum")
+    cell1 = openmc.Cell(region=-surf1)
+    model.geometry = openmc.Geometry([cell1])
+
+    umesh = openmc.UnstructuredMesh(
+        request.path.parent / "test_mesh_dagmc_tets.vtk",
+        "moab",
+        mesh_id = 1
+    )
+    mesh_filter = openmc.MeshFilter(umesh)
+
+    # Create flux mesh tally to score alpha production
+    mesh_tally = openmc.Tally(name="test_tally")
+    mesh_tally.filters = [mesh_filter]
+    mesh_tally.scores = ["flux"]
+
+    model.tallies = [mesh_tally]
+
+    model.settings.run_mode = "fixed source"
+    model.settings.batches = 2
+    model.settings.particles = 10
+
+    statepoint_file = model.run()
+
+    with openmc.StatePoint(statepoint_file) as statepoint:
+        my_tally = statepoint.get_tally(name="test_tally")
+
+    umesh_from_sp = statepoint.meshes[umesh.id]
+
+    datasets={
+        "mean": my_tally.mean.flatten(),
+        "std_dev": my_tally.std_dev.flatten()
+    }
+
+    umesh_from_sp.write_data_to_vtk(datasets=datasets, filename="test_mesh.vtkhdf")
+    umesh_from_sp.write_data_to_vtk(datasets=datasets, filename="test_mesh.vtk")
+
+    with pytest.raises(ValueError, match="Unsupported file extension"):
+        # Supported file extensions are vtk or vtkhdf, not hdf5, so this should raise an error
+        umesh_from_sp.write_data_to_vtk(
+            datasets=datasets,
+            filename="test_mesh.hdf5",
+        )
+    with pytest.raises(ValueError, match="Cannot apply dataset"):
+        # The shape of the data should match the shape of the mesh, so this should raise an error
+        umesh_from_sp.write_data_to_vtk(
+            datasets={'incorrectly_shaped_data': np.array(([1,2,3]))},
+            filename="test_mesh_incorrect_shape.vtkhdf",
+        )
+
+    assert Path("test_mesh.vtk").exists()
+    assert Path("test_mesh.vtkhdf").exists()
+
+    # just ensure we can open the file without error
+    with h5py.File("test_mesh.vtkhdf", "r"):
+        ...
+
+
 def test_mesh_get_homogenized_materials():
     """Test the get_homogenized_materials method"""
     # Simple model with 1 cm of Fe56 next to 1 cm of H1
diff --git a/tests/unit_tests/test_mesh_dagmc_tets.vtk b/tests/unit_tests/test_mesh_dagmc_tets.vtk
new file mode 120000
index 000000000..9f7000175
--- /dev/null
+++ b/tests/unit_tests/test_mesh_dagmc_tets.vtk
@@ -0,0 +1 @@
+../regression_tests/unstructured_mesh/test_mesh_dagmc_tets.vtk
\ No newline at end of file

From c0f302db6845e2d303625317430b6ee26ff2cec7 Mon Sep 17 00:00:00 2001
From: Perry <100789850+yrrepy@users.noreply.github.com>
Date: Fri, 7 Nov 2025 08:58:40 -0800
Subject: [PATCH 150/203] Add energy group structure: SCALE-999 (#3564)

---
 openmc/mgxs/__init__.py | 208 +++++++++++++++++++++++++++++++++++++++-
 1 file changed, 205 insertions(+), 3 deletions(-)

diff --git a/openmc/mgxs/__init__.py b/openmc/mgxs/__init__.py
index 5de85afb0..682b5d550 100644
--- a/openmc/mgxs/__init__.py
+++ b/openmc/mgxs/__init__.py
@@ -13,8 +13,8 @@ GROUP_STRUCTURES = {}
 - "XMAS-172_" designed for LWR analysis ([SAR1990]_, [SAN2004]_)
 - "SHEM-361_" designed for LWR analysis to eliminate self-shielding calculations
   of thermal resonances ([HFA2005]_, [SAN2007]_, [HEB2008]_)
-- "SCALE-X" (where X is 44 which is designed for criticality analysis
-  and 252 is designed for thermal reactors) for the SCALE code suite
+- "SCALE-X" (where X is 44 which is designed for criticality analysis, 252 is designed
+  for thermal reactors and 999 for multipurpose activation) for the SCALE code suite
   ([ZAL1999]_ and [REARDEN2013]_)
 - "MPACT-X" (where X is 51 (PWR), 60 (BWR), 69 (Magnox)) from the MPACT_ reactor
   physics code ([KIM2019]_ and [KIM2020]_)
@@ -29,6 +29,7 @@ GROUP_STRUCTURES = {}
 .. _SCALE44: https://www-nds.iaea.org/publications/indc/indc-czr-0001.pdf
 .. _ECCO-33: https://serpent.vtt.fi/mediawiki/index.php/ECCO_33-group_structure
 .. _SCALE252: https://oecd-nea.org/science/wpncs/amct/workingarea/meeting2013/EGAMCT2013_08.pdf
+.. _SCALE999: https://info.ornl.gov/sites/publications/Files/Pub67728.pdf, https://www.nrc.gov/docs/ML1218/ML12184A002.pdf
 .. _MPACT: https://vera.ornl.gov/mpact/
 .. _XMAS-172: https://www-nds.iaea.org/wimsd/energy.htm
 .. _SHEM-361: http://merlin.polymtl.ca/downloads/FP214.pdf
@@ -593,7 +594,208 @@ GROUP_STRUCTURES['CCFE-709'] = np.array([
     2.4000e8, 2.8000e8, 3.2000e8, 3.6000e8, 4.0000e8,
     4.4000e8, 4.8000e8, 5.2000e8, 5.6000e8, 6.0000e8,
     6.4000e8, 6.8000e8, 7.2000e8, 7.6000e8, 8.0000e8,
-    8.4000e8, 8.8000e8, 9.2000e8, 9.6000e8, 1.0000e9,])
+    8.4000e8, 8.8000e8, 9.2000e8, 9.6000e8, 1.0000e9])
+GROUP_STRUCTURES['SCALE-999'] = np.array([
+    1.000e-5, 1.000e-4, 5.000e-4, 7.500e-4, 1.000e-3,
+    1.200e-3, 1.500e-3, 2.000e-3, 2.500e-3, 3.000e-3,
+    4.000e-3, 5.000e-3, 7.500e-3, 1.000e-2, 1.450e-2,
+    1.850e-2, 2.100e-2, 2.530e-2, 3.000e-2, 4.000e-2,
+    5.000e-2, 6.000e-2, 7.000e-2, 8.000e-2, 9.000e-2,
+    1.000e-1, 1.250e-1, 1.500e-1, 1.750e-1, 1.840e-1,
+    2.000e-1, 2.250e-1, 2.500e-1, 2.750e-1, 3.000e-1,
+    3.250e-1, 3.500e-1, 3.668e-1, 3.750e-1, 4.000e-1,
+    4.140e-1, 4.500e-1, 5.000e-1, 5.316e-1, 5.500e-1,
+    6.000e-1, 6.250e-1, 6.500e-1, 6.826e-1, 7.000e-1,
+    7.500e-1, 8.000e-1, 8.500e-1, 8.764e-1, 9.000e-1,
+    9.250e-1, 9.500e-1, 9.750e-1, 1.000e+0, 1.010e+0,
+    1.020e+0, 1.030e+0, 1.040e+0, 1.050e+0, 1.060e+0,
+    1.070e+0, 1.080e+0, 1.090e+0, 1.100e+0, 1.110e+0,
+    1.120e+0, 1.130e+0, 1.140e+0, 1.150e+0, 1.175e+0,
+    1.200e+0, 1.225e+0, 1.250e+0, 1.300e+0, 1.350e+0,
+    1.400e+0, 1.450e+0, 1.500e+0, 1.545e+0, 1.590e+0,
+    1.635e+0, 1.680e+0, 1.725e+0, 1.770e+0, 1.815e+0,
+    1.860e+0, 1.900e+0, 1.940e+0, 1.970e+0, 2.000e+0,
+    2.060e+0, 2.120e+0, 2.165e+0, 2.210e+0, 2.255e+0,
+    2.300e+0, 2.340e+0, 2.380e+0, 2.425e+0, 2.470e+0,
+    2.520e+0, 2.570e+0, 2.620e+0, 2.670e+0, 2.720e+0,
+    2.770e+0, 2.820e+0, 2.870e+0, 2.920e+0, 2.970e+0,
+    3.000e+0, 3.100e+0, 3.200e+0, 3.300e+0, 3.500e+0,
+    3.620e+0, 3.730e+0, 3.830e+0, 3.928e+0, 4.000e+0,
+    4.100e+0, 4.300e+0, 4.500e+0, 4.750e+0, 4.875e+0,
+    5.000e+0, 5.044e+0, 5.250e+0, 5.400e+0, 5.550e+0,
+    5.700e+0, 5.850e+0, 6.000e+0, 6.250e+0, 6.375e+0,
+    6.500e+0, 6.625e+0, 6.750e+0, 6.875e+0, 7.000e+0,
+    7.075e+0, 7.150e+0, 7.625e+0, 8.100e+0, 8.208e+0,
+    8.315e+0, 8.708e+0, 9.100e+0, 9.550e+0, 1.000e+1,
+    1.034e+1, 1.068e+1, 1.109e+1, 1.150e+1, 1.170e+1,
+    1.190e+1, 1.240e+1, 1.290e+1, 1.333e+1, 1.375e+1,
+    1.408e+1, 1.440e+1, 1.475e+1, 1.510e+1, 1.555e+1,
+    1.600e+1, 1.650e+1, 1.700e+1, 1.730e+1, 1.760e+1,
+    1.805e+1, 1.850e+1, 1.875e+1, 1.900e+1, 1.940e+1,
+    2.000e+1, 2.050e+1, 2.100e+1, 2.175e+1, 2.250e+1,
+    2.375e+1, 2.500e+1, 2.625e+1, 2.750e+1, 2.826e+1,
+    2.902e+1, 2.951e+1, 3.000e+1, 3.063e+1, 3.125e+1,
+    3.150e+1, 3.175e+1, 3.250e+1, 3.325e+1, 3.350e+1,
+    3.375e+1, 3.418e+1, 3.460e+1, 3.500e+1, 3.550e+1,
+    3.600e+1, 3.700e+1, 3.713e+1, 3.727e+1, 3.763e+1,
+    3.800e+1, 3.855e+1, 3.910e+1, 3.935e+1, 3.960e+1,
+    4.030e+1, 4.100e+1, 4.170e+1, 4.240e+1, 4.320e+1,
+    4.400e+1, 4.460e+1, 4.520e+1, 4.610e+1, 4.700e+1,
+    4.743e+1, 4.785e+1, 4.808e+1, 4.830e+1, 4.875e+1,
+    4.920e+1, 4.990e+1, 5.060e+1, 5.130e+1, 5.200e+1,
+    5.270e+1, 5.340e+1, 5.620e+1, 5.800e+1, 6.000e+1,
+    6.100e+1, 6.122e+1, 6.144e+1, 6.300e+1, 6.500e+1,
+    6.625e+1, 6.750e+1, 6.975e+1, 7.200e+1, 7.400e+1,
+    7.600e+1, 7.745e+1, 7.889e+1, 7.945e+1, 8.000e+1,
+    8.170e+1, 8.200e+1, 8.400e+1, 8.600e+1, 8.800e+1,
+    9.000e+1, 9.250e+1, 9.500e+1, 9.700e+1, 1.000e+2,
+    1.012e+2, 1.038e+2, 1.050e+2, 1.080e+2, 1.105e+2,
+    1.130e+2, 1.160e+2, 1.175e+2, 1.190e+2, 1.205e+2,
+    1.220e+2, 1.240e+2, 1.260e+2, 1.280e+2, 1.301e+2,
+    1.325e+2, 1.350e+2, 1.375e+2, 1.400e+2, 1.430e+2,
+    1.450e+2, 1.475e+2, 1.500e+2, 1.525e+2, 1.550e+2,
+    1.575e+2, 1.600e+2, 1.625e+2, 1.650e+2, 1.670e+2,
+    1.700e+2, 1.716e+2, 1.739e+2, 1.763e+2, 1.786e+2,
+    1.800e+2, 1.877e+2, 1.885e+2, 1.915e+2, 1.930e+2,
+    1.962e+2, 1.999e+2, 2.020e+2, 2.074e+2, 2.088e+2,
+    2.095e+2, 2.122e+2, 2.145e+2, 2.175e+2, 2.200e+2,
+    2.237e+2, 2.269e+2, 2.301e+2, 2.333e+2, 2.367e+2,
+    2.400e+2, 2.442e+2, 2.484e+2, 2.527e+2, 2.571e+2,
+    2.615e+2, 2.661e+2, 2.707e+2, 2.754e+2, 2.801e+2,
+    2.850e+2, 2.899e+2, 2.948e+2, 2.999e+2, 3.050e+2,
+    3.107e+2, 3.165e+2, 3.224e+2, 3.284e+2, 3.345e+2,
+    3.408e+2, 3.471e+2, 3.536e+2, 3.591e+2, 3.648e+2,
+    3.705e+2, 3.764e+2, 3.823e+2, 3.883e+2, 3.944e+2,
+    4.007e+2, 4.070e+2, 4.134e+2, 4.199e+2, 4.265e+2,
+    4.332e+2, 4.400e+2, 4.470e+2, 4.540e+2, 4.595e+2,
+    4.650e+2, 4.706e+2, 4.763e+2, 4.821e+2, 4.879e+2,
+    4.937e+2, 4.997e+2, 5.057e+2, 5.118e+2, 5.180e+2,
+    5.243e+2, 5.306e+2, 5.370e+2, 5.435e+2, 5.500e+2,
+    5.581e+2, 5.662e+2, 5.745e+2, 5.830e+2, 5.932e+2,
+    6.036e+2, 6.142e+2, 6.250e+2, 6.359e+2, 6.471e+2,
+    6.585e+2, 6.700e+2, 6.765e+2, 6.830e+2, 6.909e+2,
+    6.988e+2, 7.069e+2, 7.150e+2, 7.232e+2, 7.316e+2,
+    7.400e+2, 7.485e+2, 7.598e+2, 7.712e+2, 7.827e+2,
+    7.945e+2, 8.064e+2, 8.185e+2, 8.308e+2, 8.433e+2,
+    8.559e+2, 8.688e+2, 8.818e+2, 8.950e+2, 9.085e+2,
+    9.221e+2, 9.360e+2, 9.500e+2, 9.555e+2, 9.611e+2,
+    9.720e+2, 9.829e+2, 9.940e+2, 1.005e+3, 1.017e+3,
+    1.028e+3, 1.040e+3, 1.051e+3, 1.063e+3, 1.075e+3,
+    1.087e+3, 1.100e+3, 1.112e+3, 1.125e+3, 1.137e+3,
+    1.150e+3, 1.171e+3, 1.191e+3, 1.213e+3, 1.234e+3,
+    1.249e+3, 1.265e+3, 1.280e+3, 1.296e+3, 1.312e+3,
+    1.328e+3, 1.344e+3, 1.361e+3, 1.377e+3, 1.394e+3,
+    1.411e+3, 1.429e+3, 1.446e+3, 1.464e+3, 1.482e+3,
+    1.500e+3, 1.525e+3, 1.550e+3, 1.585e+3, 1.610e+3,
+    1.636e+3, 1.662e+3, 1.689e+3, 1.716e+3, 1.744e+3,
+    1.772e+3, 1.800e+3, 1.828e+3, 1.856e+3, 1.885e+3,
+    1.914e+3, 1.943e+3, 1.973e+3, 2.004e+3, 2.035e+3,
+    2.075e+3, 2.116e+3, 2.158e+3, 2.200e+3, 2.250e+3,
+    2.290e+3, 2.337e+3, 2.386e+3, 2.435e+3, 2.500e+3,
+    2.532e+3, 2.580e+3, 2.613e+3, 2.679e+3, 2.747e+3,
+    2.808e+3, 2.871e+3, 2.935e+3, 3.000e+3, 3.035e+3,
+    3.112e+3, 3.191e+3, 3.272e+3, 3.355e+3, 3.440e+3,
+    3.527e+3, 3.616e+3, 3.707e+3, 3.740e+3, 3.819e+3,
+    3.900e+3, 3.998e+3, 4.099e+3, 4.202e+3, 4.307e+3,
+    4.400e+3, 4.500e+3, 4.620e+3, 4.740e+3, 4.850e+3,
+    4.960e+3, 5.100e+3, 5.250e+3, 5.400e+3, 5.531e+3,
+    5.645e+3, 5.700e+3, 5.879e+3, 6.000e+3, 6.128e+3,
+    6.258e+3, 6.392e+3, 6.528e+3, 6.667e+3, 6.809e+3,
+    6.954e+3, 7.102e+3, 7.212e+3, 7.323e+3, 7.437e+3,
+    7.552e+3, 7.669e+3, 7.787e+3, 7.908e+3, 8.030e+3,
+    8.159e+3, 8.289e+3, 8.422e+3, 8.557e+3, 8.694e+3,
+    8.834e+3, 8.975e+3, 9.119e+3, 9.307e+3, 9.500e+3,
+    9.763e+3, 1.003e+4, 1.031e+4, 1.060e+4, 1.086e+4,
+    1.114e+4, 1.142e+4, 1.171e+4, 1.202e+4, 1.234e+4,
+    1.266e+4, 1.300e+4, 1.324e+4, 1.348e+4, 1.373e+4,
+    1.398e+4, 1.424e+4, 1.450e+4, 1.476e+4, 1.503e+4,
+    1.527e+4, 1.550e+4, 1.574e+4, 1.599e+4, 1.623e+4,
+    1.649e+4, 1.674e+4, 1.700e+4, 1.727e+4, 1.755e+4,
+    1.783e+4, 1.812e+4, 1.841e+4, 1.870e+4, 1.900e+4,
+    1.931e+4, 1.965e+4, 2.000e+4, 2.045e+4, 2.092e+4,
+    2.139e+4, 2.188e+4, 2.229e+4, 2.271e+4, 2.314e+4,
+    2.358e+4, 2.388e+4, 2.418e+4, 2.450e+4, 2.479e+4,
+    2.500e+4, 2.520e+4, 2.552e+4, 2.580e+4, 2.606e+4,
+    2.653e+4, 2.700e+4, 2.737e+4, 2.774e+4, 2.812e+4,
+    2.850e+4, 2.887e+4, 2.924e+4, 2.962e+4, 3.000e+4,
+    3.045e+4, 3.090e+4, 3.136e+4, 3.183e+4, 3.243e+4,
+    3.304e+4, 3.367e+4, 3.431e+4, 3.468e+4, 3.507e+4,
+    3.545e+4, 3.584e+4, 3.624e+4, 3.663e+4, 3.704e+4,
+    3.744e+4, 3.786e+4, 3.827e+4, 3.869e+4, 3.912e+4,
+    3.955e+4, 3.998e+4, 4.042e+4, 4.087e+4, 4.136e+4,
+    4.186e+4, 4.237e+4, 4.288e+4, 4.340e+4, 4.393e+4,
+    4.446e+4, 4.500e+4, 4.565e+4, 4.631e+4, 4.721e+4,
+    4.812e+4, 4.905e+4, 5.000e+4, 5.099e+4, 5.200e+4,
+    5.248e+4, 5.347e+4, 5.448e+4, 5.551e+4, 5.656e+4,
+    5.740e+4, 5.826e+4, 5.912e+4, 6.000e+4, 6.088e+4,
+    6.177e+4, 6.267e+4, 6.358e+4, 6.451e+4, 6.545e+4,
+    6.641e+4, 6.738e+4, 6.851e+4, 6.965e+4, 7.081e+4,
+    7.200e+4, 7.300e+4, 7.399e+4, 7.500e+4, 7.610e+4,
+    7.722e+4, 7.835e+4, 7.950e+4, 8.074e+4, 8.200e+4,
+    8.250e+4, 8.374e+4, 8.500e+4, 8.652e+4, 8.788e+4,
+    8.926e+4, 9.067e+4, 9.210e+4, 9.355e+4, 9.502e+4,
+    9.652e+4, 9.804e+4, 1.000e+5, 1.013e+5, 1.027e+5,
+    1.040e+5, 1.054e+5, 1.068e+5, 1.082e+5, 1.096e+5,
+    1.111e+5, 1.125e+5, 1.139e+5, 1.153e+5, 1.168e+5,
+    1.183e+5, 1.197e+5, 1.213e+5, 1.228e+5, 1.241e+5,
+    1.255e+5, 1.269e+5, 1.283e+5, 1.291e+5, 1.307e+5,
+    1.323e+5, 1.340e+5, 1.357e+5, 1.374e+5, 1.391e+5,
+    1.409e+5, 1.426e+5, 1.445e+5, 1.463e+5, 1.481e+5,
+    1.490e+5, 1.519e+5, 1.538e+5, 1.557e+5, 1.576e+5,
+    1.596e+5, 1.616e+5, 1.637e+5, 1.657e+5, 1.678e+5,
+    1.699e+5, 1.721e+5, 1.742e+5, 1.764e+5, 1.786e+5,
+    1.809e+5, 1.832e+5, 1.855e+5, 1.878e+5, 1.902e+5,
+    1.926e+5, 1.962e+5, 2.000e+5, 2.024e+5, 2.050e+5,
+    2.076e+5, 2.102e+5, 2.128e+5, 2.155e+5, 2.182e+5,
+    2.209e+5, 2.237e+5, 2.265e+5, 2.294e+5, 2.323e+5,
+    2.352e+5, 2.381e+5, 2.411e+5, 2.442e+5, 2.472e+5,
+    2.500e+5, 2.527e+5, 2.555e+5, 2.584e+5, 2.612e+5,
+    2.641e+5, 2.670e+5, 2.700e+5, 2.732e+5, 2.767e+5,
+    2.802e+5, 2.837e+5, 2.873e+5, 2.909e+5, 2.945e+5,
+    2.972e+5, 2.985e+5, 3.020e+5, 3.053e+5, 3.088e+5,
+    3.122e+5, 3.157e+5, 3.192e+5, 3.228e+5, 3.264e+5,
+    3.300e+5, 3.337e+5, 3.379e+5, 3.422e+5, 3.465e+5,
+    3.508e+5, 3.553e+5, 3.597e+5, 3.643e+5, 3.688e+5,
+    3.735e+5, 3.782e+5, 3.829e+5, 3.877e+5, 3.938e+5,
+    4.000e+5, 4.076e+5, 4.138e+5, 4.200e+5, 4.249e+5,
+    4.299e+5, 4.349e+5, 4.400e+5, 4.452e+5, 4.505e+5,
+    4.553e+5, 4.601e+5, 4.650e+5, 4.700e+5, 4.772e+5,
+    4.845e+5, 4.920e+5, 4.995e+5, 5.054e+5, 5.113e+5,
+    5.173e+5, 5.234e+5, 5.299e+5, 5.365e+5, 5.432e+5,
+    5.500e+5, 5.557e+5, 5.614e+5, 5.672e+5, 5.730e+5,
+    5.784e+5, 5.891e+5, 6.000e+5, 6.081e+5, 6.158e+5,
+    6.235e+5, 6.313e+5, 6.393e+5, 6.468e+5, 6.545e+5,
+    6.622e+5, 6.700e+5, 6.790e+5, 6.926e+5, 7.065e+5,
+    7.154e+5, 7.244e+5, 7.335e+5, 7.427e+5, 7.500e+5,
+    7.576e+5, 7.653e+5, 7.730e+5, 7.808e+5, 7.904e+5,
+    8.002e+5, 8.100e+5, 8.200e+5, 8.301e+5, 8.403e+5,
+    8.506e+5, 8.611e+5, 8.750e+5, 8.874e+5, 9.000e+5,
+    9.072e+5, 9.200e+5, 9.400e+5, 9.616e+5, 9.800e+5,
+    1.003e+6, 1.010e+6, 1.040e+6, 1.070e+6, 1.100e+6,
+    1.108e+6, 1.136e+6, 1.165e+6, 1.200e+6, 1.225e+6,
+    1.250e+6, 1.287e+6, 1.317e+6, 1.356e+6, 1.400e+6,
+    1.423e+6, 1.461e+6, 1.500e+6, 1.536e+6, 1.572e+6,
+    1.612e+6, 1.653e+6, 1.695e+6, 1.738e+6, 1.782e+6,
+    1.827e+6, 1.850e+6, 1.921e+6, 1.969e+6, 2.019e+6,
+    2.070e+6, 2.123e+6, 2.176e+6, 2.231e+6, 2.307e+6,
+    2.354e+6, 2.365e+6, 2.385e+6, 2.466e+6, 2.479e+6,
+    2.535e+6, 2.592e+6, 2.658e+6, 2.725e+6, 2.794e+6,
+    2.865e+6, 2.932e+6, 3.000e+6, 3.080e+6, 3.166e+6,
+    3.247e+6, 3.329e+6, 3.413e+6, 3.499e+6, 3.588e+6,
+    3.679e+6, 3.772e+6, 3.867e+6, 3.965e+6, 4.066e+6,
+    4.183e+6, 4.304e+6, 4.398e+6, 4.493e+6, 4.607e+6,
+    4.724e+6, 4.800e+6, 4.882e+6, 4.966e+6, 5.092e+6,
+    5.221e+6, 5.353e+6, 5.488e+6, 5.627e+6, 5.770e+6,
+    5.916e+6, 6.065e+6, 6.219e+6, 6.376e+6, 6.434e+6,
+    6.592e+6, 6.703e+6, 6.873e+6, 7.047e+6, 7.225e+6,
+    7.408e+6, 7.596e+6, 7.788e+6, 7.985e+6, 8.187e+6,
+    8.395e+6, 8.607e+6, 8.825e+6, 9.048e+6, 9.278e+6,
+    9.512e+6, 9.753e+6, 1.000e+7, 1.025e+7, 1.051e+7,
+    1.078e+7, 1.105e+7, 1.133e+7, 1.162e+7, 1.191e+7,
+    1.221e+7, 1.252e+7, 1.284e+7, 1.317e+7, 1.350e+7,
+    1.384e+7, 1.419e+7, 1.455e+7, 1.492e+7, 1.530e+7,
+    1.568e+7, 1.608e+7, 1.649e+7, 1.691e+7, 1.733e+7,
+    1.790e+7, 1.845e+7, 1.900e+7, 1.964e+7, 2.000e+7])
 GROUP_STRUCTURES['UKAEA-1102'] = np.array([
     1.0000e-5, 1.0471e-5, 1.0965e-5, 1.1482e-5, 1.2023e-5,
     1.2589e-5, 1.3183e-5, 1.3804e-5, 1.4454e-5, 1.5136e-5,

From 8cd3911cbe0fa277b889effa1c5c1566b0683f55 Mon Sep 17 00:00:00 2001
From: Patrick Shriwise <pshriwise@gmail.com>
Date: Wed, 12 Nov 2025 00:01:18 -0600
Subject: [PATCH 151/203] Reset DAGMC history when reviving from source.
 (#3601)

Co-authored-by: Paul Romano <paul.k.romano@gmail.com>
---
 src/particle.cpp                              |   3 +
 .../weightwindows/dagmc/__init__.py           |   0
 .../dagmc/nested_shell_geometry.h5m           | Bin 0 -> 58680 bytes
 tests/unit_tests/weightwindows/dagmc/test.py  |  98 ++++++++++++++++++
 4 files changed, 101 insertions(+)
 create mode 100644 tests/unit_tests/weightwindows/dagmc/__init__.py
 create mode 100644 tests/unit_tests/weightwindows/dagmc/nested_shell_geometry.h5m
 create mode 100644 tests/unit_tests/weightwindows/dagmc/test.py

diff --git a/src/particle.cpp b/src/particle.cpp
index 6b4c332a8..6ba8ebf12 100644
--- a/src/particle.cpp
+++ b/src/particle.cpp
@@ -121,6 +121,9 @@ void Particle::from_source(const SourceSite* src)
   fission() = false;
   zero_flux_derivs();
   lifetime() = 0.0;
+#ifdef OPENMC_DAGMC_ENABLED
+  history().reset();
+#endif
 
   // Copy attributes from source bank site
   type() = src->particle;
diff --git a/tests/unit_tests/weightwindows/dagmc/__init__.py b/tests/unit_tests/weightwindows/dagmc/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/unit_tests/weightwindows/dagmc/nested_shell_geometry.h5m b/tests/unit_tests/weightwindows/dagmc/nested_shell_geometry.h5m
new file mode 100644
index 0000000000000000000000000000000000000000..af1d5563d9255b518d42b551b7527cdf45eeaaf3
GIT binary patch
literal 58680
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
ZKJ@mkzRs4Wo;}NVH#PV5?Swso{}1hu%5MMw

literal 0
HcmV?d00001

diff --git a/tests/unit_tests/weightwindows/dagmc/test.py b/tests/unit_tests/weightwindows/dagmc/test.py
new file mode 100644
index 000000000..ed01a93ed
--- /dev/null
+++ b/tests/unit_tests/weightwindows/dagmc/test.py
@@ -0,0 +1,98 @@
+import pytest
+
+import openmc
+import openmc.lib
+
+pytestmark = pytest.mark.skipif(
+    not openmc.lib._dagmc_enabled(),
+    reason="DAGMC CAD geometry is not enabled.",
+)
+
+
+def test_dagmc_weight_windows_near_boundary(run_in_tmpdir, request):
+    """Ensure splitting near a boundary doesn't lose particles due to
+    a stale DAGMC history on the particle object."""
+
+    # DAGMC model overview:
+    # * Three nested cubes; innermost cube contains a fusion neutron source.
+    # * Two outer cubes filled with tungsten. Weight windows defined on a mesh
+    # cause particles to split moving outward.
+    # Outer cubes are similar in size (outer slightly larger) so particles
+    # frequently cross the problem boundary immediately after splitting. No lost
+    # particles are allowed to the correct DAGMC history after splitting is used.
+    model = openmc.Model()
+
+    dagmc_file = request.path.parent / 'nested_shell_geometry.h5m'
+    dagmc_univ = openmc.DAGMCUniverse(dagmc_file)
+    model.geometry = openmc.Geometry(dagmc_univ)
+
+    tungsten = openmc.Material(name='shell')
+    tungsten.add_element('W', 1.0)
+    tungsten.set_density('g/cm3', 7.8)
+    materials = openmc.Materials([tungsten])
+    model.materials = materials
+
+    settings = openmc.Settings()
+    settings.output = {'tallies': False, 'summary': False}
+
+    source = openmc.IndependentSource()
+    source.space = openmc.stats.Point((0.0, 0.0, 0.0))
+    source.angle = openmc.stats.Isotropic()
+    source.energy = openmc.stats.Discrete([14.1e6], [1.0])
+    settings.source = source
+
+    settings.batches = 2
+    settings.particles = 500
+    settings.run_mode = 'fixed source'
+    settings.survival_biasing = False
+    settings.max_lost_particles = 1
+    settings.max_history_splits = 10_000_000
+
+    settings.weight_window_checkpoints = {
+        'surface': True,
+        'collision': True,
+    }
+
+    mesh = openmc.RegularMesh()
+    mesh.lower_left = (-60.0, -60.0, -60.0)
+    mesh.upper_right = (60.0, 60.0, 60.0)
+    mesh.dimension = (24, 1, 1)
+
+    weight_windows_lower = [
+        0.030750733294361156,
+        0.056110505674355333,
+        0.08187875047968339,
+        0.1101743496347699,
+        0.13982370013053508,
+        0.17443799246829372,
+        0.21576286623367483,
+        0.26416659508033646,
+        0.318574932646899,
+        0.3804031702117963,
+        0.42899359749256355,
+        0.4954283294279403,
+        0.49999999999999994,
+        0.43432341070872266,
+        0.38302303850488206,
+        0.32148375935490886,
+        0.2637416945702018,
+        0.21498369367288853,
+        0.17163611765361744,
+        0.13832102142074995,
+        0.10717772257151495,
+        0.07986176041282561,
+        0.05499644859408233,
+        0.03058023506703803,
+    ]
+
+    weight_windows = openmc.WeightWindows(
+        mesh,
+        lower_ww_bounds=weight_windows_lower,
+        upper_bound_ratio=5.0,
+    )
+    weight_windows.max_lower_bound_ratio = 1.0
+    settings.weight_windows = weight_windows
+    settings.weight_windows_on = True
+    model.settings = settings
+
+    model.run()
\ No newline at end of file

From 5c2bfe771eb94c759923c63be5ba3eb01a6b3ec9 Mon Sep 17 00:00:00 2001
From: Patrick Shriwise <pshriwise@gmail.com>
Date: Wed, 12 Nov 2025 00:29:19 -0600
Subject: [PATCH 152/203] Write particle states as separate lines in track VTK
 files. (#3628)

---
 openmc/tracks.py | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/openmc/tracks.py b/openmc/tracks.py
index 61e5a7244..81646e7d2 100644
--- a/openmc/tracks.py
+++ b/openmc/tracks.py
@@ -296,16 +296,16 @@ class Tracks(list):
                 for state in pt.states:
                     points.InsertNextPoint(state['r'])
 
-            # Create VTK line and assign points to line.
-            n = pt.states.size
-            line = vtk.vtkPolyLine()
-            line.GetPointIds().SetNumberOfIds(n)
-            for i in range(n):
-                line.GetPointIds().SetId(i, point_offset + i)
-            point_offset += n
+                # Create VTK line and assign points to line.
+                n = pt.states.size
+                line = vtk.vtkPolyLine()
+                line.GetPointIds().SetNumberOfIds(n)
+                for i in range(n):
+                    line.GetPointIds().SetId(i, point_offset + i)
+                point_offset += n
 
-            # Add line to cell array
-            cells.InsertNextCell(line)
+                # Add line to cell array
+                cells.InsertNextCell(line)
 
         data = vtk.vtkPolyData()
         data.SetPoints(points)

From e5348d3f62a821f84513a026977eef0f8bef01ad Mon Sep 17 00:00:00 2001
From: Marco De Pietri <marco.deppo@hotmail.it>
Date: Wed, 12 Nov 2025 05:35:07 -0500
Subject: [PATCH 153/203] Avoid divide-by-zero in `from_multigroup_flux` when
 flux is zero (#3624)

Co-authored-by: Paul Romano <paul.k.romano@gmail.com>
---
 openmc/deplete/microxs.py                | 12 ++++++++----
 tests/unit_tests/test_deplete_microxs.py | 13 +++++++++++++
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/openmc/deplete/microxs.py b/openmc/deplete/microxs.py
index e351c923d..d7624955e 100644
--- a/openmc/deplete/microxs.py
+++ b/openmc/deplete/microxs.py
@@ -356,13 +356,17 @@ class MicroXS:
             reactions = chain.reactions
         mts = [REACTION_MT[name] for name in reactions]
 
-        # Normalize multigroup flux
-        multigroup_flux = np.array(multigroup_flux)
-        multigroup_flux /= multigroup_flux.sum()
-
         # Create 3D array for microscopic cross sections
         microxs_arr = np.zeros((len(nuclides), len(mts), 1))
 
+        # If flux is zero, safely return zero cross sections
+        multigroup_flux = np.array(multigroup_flux)
+        if (flux_sum := multigroup_flux.sum()) == 0.0:
+            return cls(microxs_arr, nuclides, reactions)
+
+        # Normalize multigroup flux
+        multigroup_flux /= flux_sum
+
         # Compute microscopic cross sections within a temporary session
         with openmc.lib.TemporarySession(**init_kwargs):
             # For each nuclide and reaction, compute the flux-averaged xs
diff --git a/tests/unit_tests/test_deplete_microxs.py b/tests/unit_tests/test_deplete_microxs.py
index 073b3f162..5762a8511 100644
--- a/tests/unit_tests/test_deplete_microxs.py
+++ b/tests/unit_tests/test_deplete_microxs.py
@@ -111,3 +111,16 @@ def test_multigroup_flux_same():
         energies=energies, multigroup_flux=flux, chain_file=chain_file)
 
     assert microxs_4g.data == pytest.approx(microxs_2g.data)
+
+
+def test_microxs_zero_flux():
+    chain_file = Path(__file__).parents[1] / 'chain_simple.xml'
+
+    # Generate micro XS based on zero flux
+    energies = [0., 6.25e-1, 5.53e3, 8.21e5, 2.e7]
+    flux = [0.0, 0.0, 0.0, 0.0]
+    microxs = MicroXS.from_multigroup_flux(
+        energies=energies, multigroup_flux=flux, chain_file=chain_file)
+
+    # All microscopic cross sections should be zero
+    assert np.all(microxs.data == 0.0)

From 2d77544b0c045f7e693146dc466e5cc290fbdc49 Mon Sep 17 00:00:00 2001
From: Gregoire Biot <grego01@mit.edu>
Date: Wed, 12 Nov 2025 11:41:37 -0500
Subject: [PATCH 154/203] Adding variance of variance and normality tests for
 tally statistics (#3454)

Co-authored-by: Ethan Peterson <eepeterson3@gmail.com>
Co-authored-by: Paul Romano <paul.k.romano@gmail.com>
---
 docs/source/io_formats/statepoint.rst |   2 +
 docs/source/methods/tallies.rst       | 107 +++++-
 include/openmc/constants.h            |   2 +-
 include/openmc/hdf5_interface.h       |  10 +-
 include/openmc/tallies/tally.h        |   5 +
 openmc/statepoint.py                  |   4 +
 openmc/tallies.py                     | 524 +++++++++++++++++++++++++-
 src/hdf5_interface.cpp                |  16 +-
 src/state_point.cpp                   |  17 +-
 src/tallies/tally.cpp                 |  42 ++-
 src/weight_windows.cpp                |   8 +-
 tests/unit_tests/test_tallies.py      | 213 +++++++++++
 12 files changed, 915 insertions(+), 35 deletions(-)

diff --git a/docs/source/io_formats/statepoint.rst b/docs/source/io_formats/statepoint.rst
index 3b1031769..2309643dc 100644
--- a/docs/source/io_formats/statepoint.rst
+++ b/docs/source/io_formats/statepoint.rst
@@ -149,6 +149,8 @@ The current version of the statepoint file format is 18.1.
                tallies will have a value of 0 unless otherwise instructed.
              - **multiply_density** (*int*) -- Flag indicating whether reaction
                rates should be multiplied by atom density (1) or not (0).
+             - **higher_moments** (*int*) -- Flag indicating whether
+               higher-order tally moments are enabled (1) or not (0).
 
 :Datasets: - **n_realizations** (*int*) -- Number of realizations.
            - **n_filters** (*int*) -- Number of filters used.
diff --git a/docs/source/methods/tallies.rst b/docs/source/methods/tallies.rst
index 79a63fbdd..27a3f873a 100644
--- a/docs/source/methods/tallies.rst
+++ b/docs/source/methods/tallies.rst
@@ -387,6 +387,101 @@ of this is that the longer you run a simulation, the better you know your
 results. Therefore, by running a simulation long enough, it is possible to
 reduce the stochastic uncertainty to arbitrarily low levels.
 
+Skewness
+++++++++
+
+The `skewness`_ of a population quantifies the asymmetry of the probability
+distribution around its mean. Positive and negative skewness indicate a
+longer/heavier right and left tail respectively. Let :math:`x_1,\ldots,x_n` be
+the per-realization values for a bin, with sample mean :math:`\bar{x}` and
+sample central moments:
+
+.. math::
+
+   m_k \;=\; \frac{1}{n}\sum_{i=1}^{n}\bigl(x_i-\bar{x}\bigr)^k.
+
+OpenMC reports the *adjusted Fisher-Pearson skewness* (defined for :math:`n \ge
+3`), which is commonly used in many statistical packages:
+
+.. math::
+
+   G_1 \;=\; \frac{\sqrt{n \cdot (n-1)}}{\,n-2\,}\cdot\frac{m_3}{m_2^{3/2}}.
+
+where :math:`m_2` and :math:`m_3` correspond to the biased sample second and
+third central moment respectively.
+
+Kurtosis
+++++++++
+
+The `kurtosis`_ of a population quantifies tail weight (also called tailedness)
+of the probability distribution relative to a normal distribution. Positive
+excess kurtosis indicates *heavier tails* whereas negative excess kurtosis
+indicates *lighter tails*. Kurtosis is especially useful for identifying bins
+where occasional extreme scores dominate uncertainty. OpenMC reports the
+*adjusted excess kurtosis* (defined for :math:`n \ge 4`):
+
+.. math::
+
+   G_2 \;=\; \frac{(n-1)}{(n-2)(n-3)}
+             \left[(n+1)\,\frac{m_4}{m_2^{2}} \;-\; 3(n-1)\right].
+
+where :math:`m_2` and :math:`m_4` correspond to the biased sample second and
+fourth central moment respectively. For a perfectly normal distribution, the
+excess kurtosis is :math:`0`.
+
+Variance of Variance
+++++++++++++++++++++
+
+The variance of the variance (also known as the coefficient of variation
+squared) measures *stability of the sample variance* :math:`s^2` and, by
+extension, the reliability of reported relative errors. High VOV means that
+error bars themselves are noisy—often due to heavy tails, skewness, or too few
+realizations.
+
+.. math::
+
+    VOV = \frac{s^2(s_{\bar{X}}^2)}{s_{\bar{X}}^4 } = \frac{m_4}{m_2^2} - \frac{1}{n}
+
+where :math:`s_{\bar{X}}^2` is the estimated variance of the mean and
+:math:`s^2(s_{\bar{X}}^2)` is the estimated variance in :math:`s_{\bar{X}}^2`.
+The MCNP manual suggests a hard threshold such that :math:`VOV < 0.1` to improve
+the probability of forming a reliable confidence interval. However, OpenMC does
+not enforce an universal cut-off because the suitability of any single threshold
+depends strongly on problem specifics (estimator choice, variance-reduction
+settings, tally binning, or even effective sample size).
+
+
+Normality Tests (D'Agostino-Pearson)
+++++++++++++++++++++++++++++++++++++
+
+These normality test verify the hypothesis that fluctuations are *approximately
+normal*, a working assumption behind many Monte Carlo diagnostics and
+`confidence-interval heuristics`_. Tests are provided for: (i) skewness-only,
+(ii) kurtosis-only, and (iii) the *omnibus* combination. OpenMC uses the
+finite-sample-adjusted skewness :math:`G_1` and excess kurtosis :math:`G_2`
+above to construct standardized normal scores :math:`Z_1` (from :math:`G_1`) and
+:math:`Z_2` (from :math:`G_2`) via the D'Agostino-Pearson transformations. The
+omnibus statistic is
+
+.. math::
+
+   K^2 \;=\; Z_1^{\,2} \;+\; Z_2^{\,2}
+   \;\sim\; \chi^2_{(2)} \quad \text{under } H_0:\ \text{normality}.
+
+OpenMC reports :math:`Z_1`, :math:`Z_2`, :math:`K^2`, and their p-values when
+prerequisites are met (skewness for :math:`n\ge 3`, kurtosis and omnibus for
+:math:`n\ge 4`). Given a user-chosen significance level :math:`\alpha` (default
+is :math:`0.05`), reject :math:`H_0` if :math:`\text{p-value}<\alpha`; otherwise
+fail to reject. OpenMC leaves the interpretation to the user, who should
+consider VOV together with skewness, kurtosis, and normality tests results when
+judging whether reported confidence intervals are credible for their application
+[#norm-tests]_.
+
+.. [#norm-tests]
+   Higher-moments accumulation must be enabled with ``higher_moments = True``
+   for running these diagnostics including the skewness, kurtosis, and normality
+   tests.
+
 Figure of Merit
 +++++++++++++++
 
@@ -405,14 +500,16 @@ defined as
 .. math::
     :label: relative_error
 
-    r = \frac{s_\bar{X}}{\bar{x}}.
+    r = \frac{s_{\bar{X}}}{\bar{x}}.
 
 Based on this definition, one can see that a higher FOM is desirable. The FOM is
 useful as a comparative tool. For example, if a variance reduction technique is
 being applied to a simulation, the FOM with variance reduction can be compared
 to the FOM without variance reduction to ascertain whether the reduction in
 variance outweighs the potential increase in execution time (e.g., due to
-particle splitting).
+particle splitting). It is important to note that MCNP reports the FOM using CPU
+time (wall-clock time multiplied by the number of threads/cores), whereas OpenMC
+reports the FOM using only the wall-clock time :math:`t`.
 
 Confidence Intervals
 ++++++++++++++++++++
@@ -521,6 +618,8 @@ improve the estimate of the percentile.
 
    .. rubric:: References
 
+.. _confidence-interval heuristics: https://doi.org/10.1080/00031305.1990.10475751
+
 .. _following approximation: https://doi.org/10.1080/03610918708812641
 
 .. _Bessel's correction: https://en.wikipedia.org/wiki/Bessel's_correction
@@ -541,6 +640,10 @@ improve the estimate of the percentile.
 
 .. _converges in distribution: https://en.wikipedia.org/wiki/Convergence_of_random_variables#Convergence_in_distribution
 
+.. _skewness: https://en.wikipedia.org/wiki/Skewness
+
+.. _kurtosis: https://en.wikipedia.org/wiki/Kurtosis
+
 .. _confidence intervals: https://en.wikipedia.org/wiki/Confidence_interval
 
 .. _Student's t-distribution: https://en.wikipedia.org/wiki/Student%27s_t-distribution
diff --git a/include/openmc/constants.h b/include/openmc/constants.h
index a0d164613..b66193481 100644
--- a/include/openmc/constants.h
+++ b/include/openmc/constants.h
@@ -291,7 +291,7 @@ enum class MgxsType {
 // ============================================================================
 // TALLY-RELATED CONSTANTS
 
-enum class TallyResult { VALUE, SUM, SUM_SQ, SIZE };
+enum class TallyResult { VALUE, SUM, SUM_SQ, SUM_THIRD, SUM_FOURTH };
 
 enum class TallyType { VOLUME, MESH_SURFACE, SURFACE, PULSE_HEIGHT };
 
diff --git a/include/openmc/hdf5_interface.h b/include/openmc/hdf5_interface.h
index 0092c08f8..28b0d2b11 100644
--- a/include/openmc/hdf5_interface.h
+++ b/include/openmc/hdf5_interface.h
@@ -100,8 +100,8 @@ void read_llong(hid_t obj_id, const char* name, long long* buffer, bool indep);
 void read_string(
   hid_t obj_id, const char* name, size_t slen, char* buffer, bool indep);
 
-void read_tally_results(
-  hid_t group_id, hsize_t n_filter, hsize_t n_score, double* results);
+void read_tally_results(hid_t group_id, hsize_t n_filter, hsize_t n_score,
+  hsize_t n_results, double* results);
 void write_attr_double(hid_t obj_id, int ndim, const hsize_t* dims,
   const char* name, const double* buffer);
 void write_attr_int(hid_t obj_id, int ndim, const hsize_t* dims,
@@ -114,9 +114,9 @@ void write_int(hid_t group_id, int ndim, const hsize_t* dims, const char* name,
 void write_llong(hid_t group_id, int ndim, const hsize_t* dims,
   const char* name, const long long* buffer, bool indep);
 void write_string(hid_t group_id, int ndim, const hsize_t* dims, size_t slen,
-  const char* name, char const* buffer, bool indep);
-void write_tally_results(
-  hid_t group_id, hsize_t n_filter, hsize_t n_score, const double* results);
+  const char* name, const char* buffer, bool indep);
+void write_tally_results(hid_t group_id, hsize_t n_filter, hsize_t n_score,
+  hsize_t n_results, const double* results);
 } // extern "C"
 
 //==============================================================================
diff --git a/include/openmc/tallies/tally.h b/include/openmc/tallies/tally.h
index 3beeb9d5a..374daff92 100644
--- a/include/openmc/tallies/tally.h
+++ b/include/openmc/tallies/tally.h
@@ -106,6 +106,8 @@ public:
 
   bool writable() const { return writable_; }
 
+  bool higher_moments() const { return higher_moments_; }
+
   //----------------------------------------------------------------------------
   // Other methods.
 
@@ -190,6 +192,9 @@ private:
   //! Whether to multiply by atom density for reaction rates
   bool multiply_density_ {true};
 
+  //! Whether to accumulate higher moments (third and fourth)
+  bool higher_moments_ {false};
+
   int64_t index_;
 };
 
diff --git a/openmc/statepoint.py b/openmc/statepoint.py
index a763db397..11986841f 100644
--- a/openmc/statepoint.py
+++ b/openmc/statepoint.py
@@ -434,6 +434,10 @@ class StatePoint:
                     if "multiply_density" in group.attrs:
                         tally.multiply_density = group.attrs["multiply_density"].item() > 0
 
+                    # Check if tally has higher_moments attribute
+                    if 'higher_moments' in group.attrs:
+                        tally.higher_moments = bool(group.attrs['higher_moments'][()])
+
                     # Read the number of realizations
                     n_realizations = group['n_realizations'][()]
 
diff --git a/openmc/tallies.py b/openmc/tallies.py
index 075b1e991..25ec29a58 100644
--- a/openmc/tallies.py
+++ b/openmc/tallies.py
@@ -3,6 +3,7 @@ from collections.abc import Iterable, MutableSequence
 import copy
 from functools import partial, reduce, wraps
 from itertools import product
+from math import sqrt, log
 from numbers import Integral, Real
 import operator
 from pathlib import Path
@@ -12,6 +13,7 @@ import h5py
 import numpy as np
 import pandas as pd
 import scipy.sparse as sps
+from scipy.stats import chi2, norm
 
 import openmc
 import openmc.checkvalue as cv
@@ -91,10 +93,20 @@ class Tally(IDManagerMixin):
     sum_sq : numpy.ndarray
         An array containing the sum of each independent realization squared for
         each bin
+    sum_third : numpy.ndarray
+        An array containing the sum of each independent realization to the third power for
+        each bin
+    sum_fourth : numpy.ndarray
+        An array containing the sum of each independent realization to the fourth power for
+        each bin
     mean : numpy.ndarray
         An array containing the sample mean for each bin
     std_dev : numpy.ndarray
         An array containing the sample standard deviation for each bin
+    vov : numpy.ndarray
+        An array containing the variance of the variance for each tally bin
+    higher_moments : bool
+        Whether or not the tally accumulates the sums third and fourth to compute higher-order moments
     figure_of_merit : numpy.ndarray
         An array containing the figure of merit for each bin
 
@@ -129,8 +141,12 @@ class Tally(IDManagerMixin):
 
         self._sum = None
         self._sum_sq = None
+        self._sum_third = None
+        self._sum_fourth = None
         self._mean = None
         self._std_dev = None
+        self._vov = None
+        self._higher_moments = False
         self._simulation_time = None
         self._with_batch_statistics = False
         self._derived = False
@@ -221,6 +237,15 @@ class Tally(IDManagerMixin):
         cv.check_type('multiply density', value, bool)
         self._multiply_density = value
 
+    @property
+    def higher_moments(self) -> bool:
+        return self._higher_moments
+
+    @higher_moments.setter
+    def higher_moments(self, value):
+        cv.check_type("higher_moments", value, bool)
+        self._higher_moments = value
+
     @property
     def filters(self):
         return self._filters
@@ -371,6 +396,11 @@ class Tally(IDManagerMixin):
             # Update nuclides
             nuclide_names = group['nuclides'][()]
             self._nuclides = [name.decode().strip() for name in nuclide_names]
+            # Check for higher_moments attribute
+            if "higher_moments" in group.attrs:
+                self._higher_moments = bool(group.attrs["higher_moments"][()])
+            else:
+                self._higher_moments = False
 
             # Extract Tally data from the file
             data = group['results']
@@ -385,10 +415,25 @@ class Tally(IDManagerMixin):
             self._sum = sum_
             self._sum_sq = sum_sq
 
+            if self._higher_moments:
+                # Extract additional Tally data when higher moments enabled
+                sum_third = data[:, :, 2]
+                sum_fourth = data[:, :, 3]
+
+                # Reshape the results arrays
+                sum_third = np.reshape(sum_third, self.shape)
+                sum_fourth = np.reshape(sum_fourth, self.shape)
+
+                # Set the additional data for this Tally
+                self._sum_third = sum_third
+                self._sum_fourth = sum_fourth
+
             # Convert NumPy arrays to SciPy sparse LIL matrices
             if self.sparse:
                 self._sum = sps.lil_matrix(self._sum.flatten(), self._sum.shape)
                 self._sum_sq = sps.lil_matrix(self._sum_sq.flatten(), self._sum_sq.shape)
+                self._sum_third = sps.lil_matrix(self._sum_third.flatten(), self._sum_third.shape)
+                self._sum_fourth = sps.lil_matrix(self.sum_fourth.flatten(), self._sum_fourth.shape)
 
             # Read simulation time (needed for figure of merit)
             self._simulation_time = f["runtime"]["simulation"][()]
@@ -428,6 +473,52 @@ class Tally(IDManagerMixin):
         cv.check_type('sum_sq', sum_sq, Iterable)
         self._sum_sq = sum_sq
 
+    @property
+    @ensure_results
+    def sum_third(self):
+        if not self._higher_moments:
+            raise ValueError(
+                "Higher moments have not been enabled for this tally. To make "
+                "higher moments available, set the higher_moments attribute to "
+                "True before running a simulation."
+            )
+
+        if not self._sp_filename or self.derived:
+            return None
+
+        if self.sparse:
+            return np.reshape(self._sum_third.toarray(), self.shape)
+        else:
+            return self._sum_third
+
+    @sum_third.setter
+    def sum_third(self, sum_third):
+        cv.check_type("sum_third", sum_third, Iterable)
+        self._sum_third = sum_third
+
+    @property
+    @ensure_results
+    def sum_fourth(self):
+        if not self._higher_moments:
+            raise ValueError(
+                "Higher moments have not been enabled for this tally. To make "
+                "higher moments available, set the higher_moments attribute to "
+                "True before running a simulation."
+            )
+
+        if not self._sp_filename or self.derived:
+            return None
+
+        if self.sparse:
+            return np.reshape(self._sum_fourth.toarray(), self.shape)
+        else:
+            return self._sum_fourth
+
+    @sum_fourth.setter
+    def sum_fourth(self, sum_fourth):
+        cv.check_type("sum_fourth", sum_fourth, Iterable)
+        self._sum_fourth = sum_fourth
+
     @property
     def mean(self):
         if self._mean is None:
@@ -470,14 +561,370 @@ class Tally(IDManagerMixin):
         else:
             return self._std_dev
 
+    @property
+    def vov(self):
+        if self._vov is None:
+            n = self.num_realizations
+            sum1 = self.sum
+            sum2 = self.sum_sq
+            sum3 = self.sum_third
+            sum4 = self.sum_fourth
+            self._vov = np.zeros_like(sum1, dtype=float)
+
+            # Calculate the variance of the variance (Eq. 2.232 in
+            # https://doi.org/10.2172/2372634)
+            numerator = (sum4 - (4.0*sum3*sum1)/n
+                        + (6.0*sum2*(sum1**2))/(n**2)
+                        - (3.0*(sum1)**4)/(n**3))
+            denominator = (sum2 - (1.0/n)*(sum1**2))**2
+
+            mask = denominator > 0.0
+
+            self._vov[mask] = numerator[mask]/denominator[mask] - 1.0/n
+
+            if self.sparse:
+                self._vov = sps.lil_matrix(self._vov.flatten(), self._vov.shape)
+
+        if self.sparse:
+            return np.reshape(self._vov.toarray(), self.shape)
+        else:
+            return self._vov
+
+    @property
+    def m2(self):
+        n = self.num_realizations
+        return self.sum_sq/n - self.mean**2
+
+    @property
+    def m3(self):
+        n = self.num_realizations
+        mean = self.mean
+        sum2 = self.sum_sq/n
+        sum3 = self.sum_third/n
+
+        return sum3 - 3.0*mean*sum2 + 2.0*mean**3
+
+    @property
+    def m4(self):
+        n = self.num_realizations
+        mean = self.mean
+        sum2 = self.sum_sq/n
+        sum3 = self.sum_third/n
+        sum4 = self.sum_fourth/n
+
+        return sum4 - 4.0*mean*sum3 + 6.0*(mean**2)*sum2 - 3.0*mean**4
+
+    def skew(self, bias=False) -> np.ndarray:
+        """Return the sample skewness of each tally bin.
+
+        This method computes and returns the unadjusted or adjusted
+        Fisher-Pearson coefficient of skewness.
+
+        Parameters
+        ----------
+        bias : bool
+            If False, calculations are corrected for bias and the adjusted
+            Fisher-Pearson skewness (:math:`G_1`) is returned. If True,
+            calculations are not corrected for bias and the unadjusted skewness
+            (:math:`g_1`) is returned.
+
+        Returns
+        -------
+        float
+            The skewness of each tally bin
+        """
+        n = self.num_realizations
+        m2 = self.m2
+        m3 = self.m3
+
+        with np.errstate(divide="ignore", invalid="ignore"):
+            g1 = np.where(m2 > 0.0, m3/(m2**1.5), 0.0)
+
+        if bias:
+            return g1
+        else:
+            if n <= 2:
+                raise ValueError("Insufficient number of independent realizations"
+                                 f"for bias-corrected skewness: need n >= 3, got {n=}.")
+            else:
+                return sqrt(n*(n - 1))/(n - 2)*g1
+
+    def kurtosis(self, fisher=True, bias=False) -> np.ndarray:
+        r"""Return the sample kurtosis of each tally bin.
+
+        This method computes and returns the sample kurtosis using either
+        Pearson's or Fisher's definition, with or without finite-sample bias
+        correction. The value returned depends on the `bias` and `fisher`
+        arguments as follows:
+
+        - **bias=True, fisher=False**: Returns :math:`b_2` (Pearson's kurtosis)
+          This is the raw fourth standardized moment: :math:`m_4/m_2^2`. For a
+          normal distribution, :math:`b_2\approx 3`.
+
+        - **bias=True, fisher=True**: Returns :math:`g_2` (excess kurtosis) This
+          is :math:`b_2 - 3`, centered at 0 for normal distributions. Positive
+          values indicate heavier tails, negative values lighter tails.
+
+        - **bias=False, fisher=True** (default): Returns :math:`G_2` (adjusted
+          excess kurtosis). This applies finite-sample bias correction to
+          :math:`g_2`. This is the recommended estimator for statistical
+          inference.
+
+        - **bias=False, fisher=False**: Returns bias-corrected Pearson's
+          kurtosis. This is :math:`G_2 + 3`.
+
+        Parameters
+        ----------
+        fisher : bool, optional
+            If True (default), Fisher's definition is used (excess kurtosis). If
+            False, Pearson's definition is used.
+        bias : bool, optional
+            If False (default), calculations are corrected for statistical bias
+            using finite-sample adjustments. If True, calculations use the
+            biased estimator (population formulas).
+
+        Returns
+        -------
+        numpy.ndarray
+            The kurtosis of each tally bin
+
+        """
+        n = self.num_realizations
+        m2 = self.m2
+        m4 = self.m4
+
+        with np.errstate(divide="ignore", invalid="ignore"):
+            b2 = np.where(m2 > 0.0, m4/(m2**2), 0.0)
+        g2 = b2 - 3.0
+
+        if bias:
+            # Biased estimator (g2 or b2)
+            return g2 if fisher else b2
+        else:
+            # Unbiased estimator with finite-sample correction
+            if n <= 3:
+                raise ValueError("Insufficient number of independent realizations"
+                                 f"for bias-corrected kurtosis: need n >= 4, got {n=}.")
+            else:
+                G2 = ((n - 1)/((n - 2)*(n - 3)))*((n + 1)*g2 + 6.0)
+                return G2 if fisher else G2 + 3.0
+
+    def skewtest(self, alternative: str = "two-sided"):
+        """Perform D'Agostino and Pearson's test for skewness.
+
+        This method tests the null hypothesis that the skewness of the
+        population that the sample was drawn from is the same as that of a
+        corresponding normal distribution.
+
+        Parameters
+        ----------
+        alternative : {'two-sided', 'less', 'greater'}, optional
+            Defines the alternative hypothesis. The following options are
+            available:
+
+            * 'two-sided': the skewness of the distribution is different from
+              that of the normal distribution (i.e., non-zero)
+            * 'less': the skewness of the distribution is less than that of the
+              normal distribution
+            * 'greater': the skewness of the distribution is greater than that
+              of the normal distribution
+
+        Returns
+        -------
+        statistic : np.ndarray
+            The computed z-score for the skewness test for each tally bin
+        pvalue : np.ndarray
+            The p-value for the hypothesis test for each tally bin
+
+        Notes
+        -----
+        This test is based on D'Agostino and Pearson's test [1]_. The test
+        requires at least 8 realizations to produce valid results.
+
+        References
+        ----------
+        .. [1] D'Agostino, R. B. (1971), "An omnibus test of normality for
+               moderate and large sample size", Biometrika, 58, 341-348
+
+        """
+        n = self.num_realizations
+        if n < 8:
+            raise ValueError("Skewness test is not well-defined for n < 8.")
+
+        g1 = self.skew(bias=True)
+
+        # --- Z1 (skewness) ---
+        y = g1 * sqrt(((n + 1.0)*(n + 3.0))/(6.0*(n - 2.0)))
+        beta2 = (3.0*(n**2 + 27.0*n - 70.0)*(n + 1.0)*(n + 3.0)
+                )/((n - 2.0)*(n + 5.0)*(n + 7.0)*(n + 9.0))
+        W2 = -1.0 + sqrt(2.0*(beta2 - 1.0))
+        delta = 1.0 / sqrt(log(sqrt(W2)))
+        alpha = sqrt(2.0 / (W2 - 1.0))
+        Zb1 = np.where(
+            y >= 0.0,
+            delta*np.log((y/alpha) + np.sqrt((y/alpha)**2 + 1.0)),
+            -delta*np.log((-y/alpha) + np.sqrt((y/alpha)**2 + 1.0))
+        )
+
+        # p-value
+        if alternative == "two-sided":
+            p = 2.0 * (1.0 - norm.cdf(np.abs(Zb1)))
+        elif alternative == "greater":
+            p = 1.0 - norm.cdf(Zb1)
+        elif alternative == "less":
+            p = norm.cdf(Zb1)
+        else:
+            raise ValueError("alternative must be 'two-sided', 'greater', or 'less'")
+
+        return Zb1, p
+
+    def kurtosistest(self, alternative: str = "two-sided"):
+        """Perform D'Agostino and Pearson's test for kurtosis.
+
+        This method tests the null hypothesis that the kurtosis of the
+        population that the sample was drawn from is the same as that of a
+        corresponding normal distribution.
+
+        Parameters
+        ----------
+        alternative : {'two-sided', 'less', 'greater'}, optional
+            Defines the alternative hypothesis. Default is 'two-sided'.
+            The following options are available:
+
+            * 'two-sided': the kurtosis of the distribution is different from
+              that of the normal distribution
+            * 'less': the kurtosis of the distribution is less than that of the
+              normal distribution
+            * 'greater': the kurtosis of the distribution is greater than that
+              of the normal distribution
+
+        Returns
+        -------
+        statistic : np.ndarray
+            The computed z-score for the kurtosis test for each tally bin
+        pvalue : np.ndarray
+            The p-value for the hypothesis test for each tally bin
+
+        Raises
+        ------
+        ValueError
+            If the number of realizations is less than 20, or if an invalid
+            alternative hypothesis is specified.
+
+        Notes
+        -----
+        This test is based on D'Agostino and Pearson's test [1]_. The test
+        is typically recommended for at least 20 realizations to produce
+        valid results.
+
+        References
+        ----------
+        .. [1] D'Agostino, R. B. (1971), "An omnibus test of normality for
+               moderate and large sample size", Biometrika, 58, 341-348
+
+        """
+        n = self.num_realizations
+        if n < 20:
+            raise ValueError("Kurtosis test is typically recommended for n >= 20.")
+
+        b2 = self.kurtosis(bias=True, fisher=False)
+
+        # --- Z2 (kurtosis) ---
+        mean_b2 = 3.0 * (n - 1.0) / (n + 1.0)
+        var_b2 = (24.0*n*(n - 2.0)*(n - 3.0)/(
+                    (n + 1.0)**2*(n + 3.0)*(n + 5.0)))
+        x = (b2 - mean_b2)/np.sqrt(var_b2)
+        moment = ((6.0*(n**2 - 5.0*n + 2.0))/((n + 7.0)*(n + 9.0))
+                    )*sqrt((6.0*(n + 3.0)*(n + 5.0))/(n*(n - 2.0)*(n - 3.0)))
+        A = 6.0 + (8.0/moment)*((2.0/moment) + sqrt(1.0 + 4.0/(moment**2)))
+        Zb2 = (1.0- 2.0/(9.0*A) - ((1.0 - 2.0/A) / (1.0 + (x
+                )*sqrt(2.0/(A - 4.0))))**(1.0/3.0)) / sqrt(2.0/(9.0*A))
+
+        # p-value
+        if alternative == "two-sided":
+            p = 2.0 * (1.0 - norm.cdf(np.abs(Zb2)))
+        elif alternative == "greater":
+            p = 1.0 - norm.cdf(Zb2)
+        elif alternative == "less":
+            p = norm.cdf(Zb2)
+        else:
+            raise ValueError("alternative must be 'two-sided', 'greater', or 'less'")
+
+        return Zb2, p
+
+    def normaltest(self, alternative: str = "two-sided"):
+        """Perform D'Agostino and Pearson's omnibus test for normality.
+
+        This method tests the null hypothesis that a sample comes from a
+        normal distribution. It combines skewness and kurtosis to produce an
+        omnibus test of normality.
+
+        Parameters
+        ----------
+        alternative : {'two-sided', 'less', 'greater'}, optional
+            Defines the alternative hypothesis used for the component skewness
+            and kurtosis tests. Default is 'two-sided'. The following options
+            are available:
+
+            * 'two-sided': the distribution is different from normal
+            * 'less': used for the component tests
+            * 'greater': used for the component tests
+
+        Returns
+        -------
+        statistic : np.ndarray
+            The computed z-score for the normality test for each tally bin
+        pvalue : np.ndarray
+            The p-value for the hypothesis test for each tally bin
+
+        Raises
+        ------
+        ValueError
+            If the number of realizations is less than 20, or if an invalid
+            alternative hypothesis is specified.
+
+        Notes
+        -----
+        This test combines a test for skewness and a test for kurtosis to
+        produce an omnibus test [1]_. The test statistic is:
+
+        .. math::
+
+            K^2 = Z_1^2 + Z_2^2
+
+        where :math:`Z_1` is the z-score from the skewness test and
+        :math:`Z_2` is the z-score from the kurtosis test. This statistic
+        follows a chi-square distribution with 2 degrees of freedom.
+
+        The test requires at least 20 realizations to produce valid results.
+
+        References
+        ----------
+        .. [1] D'Agostino, R. B. and Pearson, E. S. (1973), "Tests for
+               departure from normality", Biometrika, 60, 613-622
+
+        """
+        n = self.num_realizations
+        if n < 20:
+            raise ValueError("normaltest requires n >= 20 (per D'Agostino-Pearson).")
+
+        # Use the component tests
+        Z1, _ = self.skewtest(alternative)
+        Z2, _ = self.kurtosistest(alternative)
+
+        # Combine as chi-square with df=2 since we have skewness and kurtosis
+        K2 = Z1*Z1 + Z2*Z2
+        p = chi2.sf(K2, df=2)
+        return K2, p
+
     @property
     def figure_of_merit(self):
         mean = self.mean
         std_dev = self.std_dev
         fom = np.zeros_like(mean)
         nonzero = np.abs(mean) > 0
-        fom[nonzero] = 1.0 / (
-            (std_dev[nonzero] / mean[nonzero])**2 * self._simulation_time)
+        rel_err = std_dev[nonzero] / mean[nonzero]
+        fom[nonzero] = 1.0 / (rel_err**2 * self._simulation_time)
         return fom
 
     @property
@@ -528,6 +975,12 @@ class Tally(IDManagerMixin):
             if self._sum_sq is not None:
                 self._sum_sq = sps.lil_matrix(self._sum_sq.flatten(),
                                               self._sum_sq.shape)
+            if self._sum_third is not None:
+                self._sum_third = sps.lil_matrix(self._sum_third.flatten(),
+                                                 self._sum_third.shape)
+            if self._sum_fourth is not None:
+                self._sum_fourth = sps.lil_matrix(self._sum_fourth.flatten(),
+                                                  self._sum_fourth.shape)
             if self._mean is not None:
                 self._mean = sps.lil_matrix(self._mean.flatten(),
                                             self._mean.shape)
@@ -543,6 +996,10 @@ class Tally(IDManagerMixin):
                 self._sum = np.reshape(self._sum.toarray(), self.shape)
             if self._sum_sq is not None:
                 self._sum_sq = np.reshape(self._sum_sq.toarray(), self.shape)
+            if self._sum_third is not None:
+                self._sum_third = np.reshape(self._sum_third.toarray(), self.shape)
+            if self._sum_fourth is not None:
+                self._sum_fourth = np.reshape(self._sum_fourth.toarray(), self.shape)
             if self._mean is not None:
                 self._mean = np.reshape(self._mean.toarray(), self.shape)
             if self._std_dev is not None:
@@ -869,6 +1326,34 @@ class Tally(IDManagerMixin):
 
             merged_tally._sum_sq = np.reshape(merged_sum_sq, merged_tally.shape)
 
+        # Concatenate sum_third arrays if present in both tallies
+        if self._sum_third is not None and other._sum_third is not None:
+            self_sum_third = self.get_reshaped_data(value="sum_third")
+            other_sum_third = other_copy.get_reshaped_data(value="sum_third")
+
+            if join_right:
+                merged_sum_third = np.concatenate((self_sum_third, other_sum_third),
+                                                  axis=merge_axis)
+            else:
+                merged_sum_third = np.concatenate((other_sum_third, self_sum_third),
+                                                  axis=merge_axis)
+
+            merged_tally._sum_third = np.reshape(merged_sum_third, merged_tally.shape)
+
+        # Concatenate sum_fourth arrays if present in both tallies
+        if self._sum_fourth is not None and other._sum_fourth is not None:
+            self_sum_fourth = self.get_reshaped_data(value="sum_fourth")
+            other_sum_fourth = other_copy.get_reshaped_data(value="sum_fourth")
+
+            if join_right:
+                merged_sum_fourth = np.concatenate((self_sum_fourth, other_sum_fourth),
+                                                   axis=merge_axis)
+            else:
+                merged_sum_fourth = np.concatenate((other_sum_fourth, self_sum_fourth),
+                                                   axis=merge_axis)
+
+            merged_tally._sum_fourth = np.reshape(merged_sum_fourth, merged_tally.shape)
+
         # Concatenate mean arrays if present in both tallies
         if self.mean is not None and other.mean is not None:
             self_mean = self.get_reshaped_data(value='mean')
@@ -958,6 +1443,11 @@ class Tally(IDManagerMixin):
             subelement = ET.SubElement(element, "derivative")
             subelement.text = str(self.derivative.id)
 
+        # Optional higher moments accumulation
+        if self.higher_moments:
+            subelement = ET.SubElement(element, "higher_moments")
+            subelement.text = str(self.higher_moments).lower()
+
         return element
 
     def add_results(self, statepoint: cv.PathLike | openmc.StatePoint):
@@ -984,8 +1474,12 @@ class Tally(IDManagerMixin):
         # point are based on the current statepoint file
         self._sum = None
         self._sum_sq = None
+        self._sum_third = None
+        self._sum_fourth = None
         self._mean = None
         self._std_dev = None
+        self._vov = None
+        self._higher_moments = False
         self._num_realizations = 0
         self._results_read = False
 
@@ -1355,7 +1849,9 @@ class Tally(IDManagerMixin):
            (value == 'std_dev' and self.std_dev is None) or \
            (value == 'rel_err' and self.mean is None) or \
            (value == 'sum' and self.sum is None) or \
-           (value == 'sum_sq' and self.sum_sq is None):
+           (value == 'sum_sq' and self.sum_sq is None) or \
+           (value == "sum_third" and self.sum_third is None) or \
+           (value == "sum_fourth" and self.sum_fourth is None):
             msg = f'The Tally ID="{self.id}" has no data to return'
             raise ValueError(msg)
 
@@ -1378,10 +1874,14 @@ class Tally(IDManagerMixin):
             data = self.sum[indices]
         elif value == 'sum_sq':
             data = self.sum_sq[indices]
+        elif value == "sum_third":
+            data = self.sum_third[indices]
+        elif value == "sum_fourth":
+            data = self.sum_fourth[indices]
         else:
             msg = f'Unable to return results from Tally ID="{value}" since ' \
                   f'the requested value "{self.id}" is not \'mean\', ' \
-                  '\'std_dev\', \'rel_err\', \'sum\', or \'sum_sq\''
+                  '\'std_dev\', \'rel_err\', \'sum\', \'sum_sq\', \'sum_third\' or \'sum_fourth\''
             raise LookupError(msg)
 
         return data
@@ -2711,6 +3211,16 @@ class Tally(IDManagerMixin):
             new_sum_sq = self.get_values(scores, filters, filter_bins,
                                          nuclides, 'sum_sq')
             new_tally.sum_sq = new_sum_sq
+        if not self.derived and self._sum_third is not None:
+            new_sum_third = self.get_values(
+                scores, filters, filter_bins, nuclides, "sum_third"
+            )
+            new_tally._sum_third = new_sum_third
+        if not self.derived and self._sum_fourth is not None:
+            new_sum_fourth = self.get_values(
+                scores, filters, filter_bins, nuclides, "sum_fourth"
+            )
+            new_tally._sum_fourth = new_sum_fourth
         if self.mean is not None:
             new_mean = self.get_values(scores, filters, filter_bins,
                                        nuclides, 'mean')
@@ -3151,6 +3661,12 @@ class Tally(IDManagerMixin):
         if not self.derived and self.sum_sq is not None:
             new_tally._sum_sq = np.zeros(new_tally.shape, dtype=np.float64)
             new_tally._sum_sq[diag_indices, :, :] = self.sum_sq
+        if not self.derived and self._sum_third is not None:
+            new_tally._sum_third = np.zeros(new_tally.shape, dtype=np.float64)
+            new_tally._sum_third[diag_indices, :, :] = self.sum_third
+        if not self.derived and self._sum_fourth is not None:
+            new_tally._sum_fourth = np.zeros(new_tally.shape, dtype=np.float64)
+            new_tally._sum_fourth[diag_indices, :, :] = self.sum_fourth
         if self.mean is not None:
             new_tally._mean = np.zeros(new_tally.shape, dtype=np.float64)
             new_tally._mean[diag_indices, :, :] = self.mean
diff --git a/src/hdf5_interface.cpp b/src/hdf5_interface.cpp
index bf1f79549..c56d485e2 100644
--- a/src/hdf5_interface.cpp
+++ b/src/hdf5_interface.cpp
@@ -536,14 +536,14 @@ void read_complex(
   H5Tclose(complex_id);
 }
 
-void read_tally_results(
-  hid_t group_id, hsize_t n_filter, hsize_t n_score, double* results)
+void read_tally_results(hid_t group_id, hsize_t n_filter, hsize_t n_score,
+  hsize_t n_results, double* results)
 {
   // Create dataspace for hyperslab in memory
   constexpr int ndim = 3;
-  hsize_t dims[ndim] {n_filter, n_score, 3};
+  hsize_t dims[ndim] {n_filter, n_score, n_results};
   hsize_t start[ndim] {0, 0, 1};
-  hsize_t count[ndim] {n_filter, n_score, 2};
+  hsize_t count[ndim] {n_filter, n_score, n_results - 1};
   hid_t memspace = H5Screate_simple(ndim, dims, nullptr);
   H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, nullptr, count, nullptr);
 
@@ -686,15 +686,15 @@ void write_string(
     group_id, 0, nullptr, buffer.length(), name, buffer.c_str(), indep);
 }
 
-void write_tally_results(
-  hid_t group_id, hsize_t n_filter, hsize_t n_score, const double* results)
+void write_tally_results(hid_t group_id, hsize_t n_filter, hsize_t n_score,
+  hsize_t n_results, const double* results)
 {
   // Set dimensions of sum/sum_sq hyperslab to store
   constexpr int ndim = 3;
-  hsize_t count[ndim] {n_filter, n_score, 2};
+  hsize_t count[ndim] {n_filter, n_score, n_results - 1};
 
   // Set dimensions of results array
-  hsize_t dims[ndim] {n_filter, n_score, 3};
+  hsize_t dims[ndim] {n_filter, n_score, n_results};
   hsize_t start[ndim] {0, 0, 1};
   hid_t memspace = H5Screate_simple(ndim, dims, nullptr);
   H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, nullptr, count, nullptr);
diff --git a/src/state_point.cpp b/src/state_point.cpp
index 8195c4865..0b0fed132 100644
--- a/src/state_point.cpp
+++ b/src/state_point.cpp
@@ -201,6 +201,12 @@ extern "C" int openmc_statepoint_write(const char* filename, bool* write_source)
           write_attribute(tally_group, "multiply_density", 0);
         }
 
+        if (tally->higher_moments()) {
+          write_attribute(tally_group, "higher_moments", 1);
+        } else {
+          write_attribute(tally_group, "higher_moments", 0);
+        }
+
         if (tally->estimator_ == TallyEstimator::ANALOG) {
           write_dataset(tally_group, "estimator", "analog");
         } else if (tally->estimator_ == TallyEstimator::TRACKLENGTH) {
@@ -264,12 +270,13 @@ extern "C" int openmc_statepoint_write(const char* filename, bool* write_source)
         for (const auto& tally : model::tallies) {
           if (!tally->writable_)
             continue;
-          // Write sum and sum_sq for each bin
+
+          // Write results for each bin
           std::string name = "tally " + std::to_string(tally->id_);
           hid_t tally_group = open_group(tallies_group, name.c_str());
           auto& results = tally->results_;
           write_tally_results(tally_group, results.shape()[0],
-            results.shape()[1], results.data());
+            results.shape()[1], results.shape()[2], results.data());
           close_group(tally_group);
         }
       } else {
@@ -509,7 +516,8 @@ extern "C" int openmc_statepoint_load(const char* filename)
         } else {
           auto& results = tally->results_;
           read_tally_results(tally_group, results.shape()[0],
-            results.shape()[1], results.data());
+            results.shape()[1], results.shape()[2], results.data());
+
           read_dataset(tally_group, "n_realizations", tally->n_realizations_);
           close_group(tally_group);
         }
@@ -1001,7 +1009,8 @@ void write_tally_results_nr(hid_t file_id)
 
       // Write reduced tally results to file
       auto shape = results_copy.shape();
-      write_tally_results(tally_group, shape[0], shape[1], results_copy.data());
+      write_tally_results(
+        tally_group, shape[0], shape[1], shape[2], results_copy.data());
 
       close_group(tally_group);
     } else {
diff --git a/src/tallies/tally.cpp b/src/tallies/tally.cpp
index 12ee3427e..9daeb1d69 100644
--- a/src/tallies/tally.cpp
+++ b/src/tallies/tally.cpp
@@ -107,6 +107,9 @@ Tally::Tally(pugi::xml_node node)
     multiply_density_ = get_node_value_bool(node, "multiply_density");
   }
 
+  if (check_for_node(node, "higher_moments")) {
+    higher_moments_ = get_node_value_bool(node, "higher_moments");
+  }
   // =======================================================================
   // READ DATA FOR FILTERS
 
@@ -800,7 +803,11 @@ void Tally::init_triggers(pugi::xml_node node)
 void Tally::init_results()
 {
   int n_scores = scores_.size() * nuclides_.size();
-  results_ = xt::empty<double>({n_filter_bins_, n_scores, 3});
+  if (higher_moments_) {
+    results_ = xt::empty<double>({n_filter_bins_, n_scores, 5});
+  } else {
+    results_ = xt::empty<double>({n_filter_bins_, n_scores, 3});
+  }
 }
 
 void Tally::reset()
@@ -838,14 +845,33 @@ void Tally::accumulate()
       norm = 1.0;
     }
 
-// Accumulate each result
+    // Accumulate each result
+    if (higher_moments_) {
 #pragma omp parallel for
-    for (int i = 0; i < results_.shape()[0]; ++i) {
-      for (int j = 0; j < results_.shape()[1]; ++j) {
-        double val = results_(i, j, TallyResult::VALUE) * norm;
-        results_(i, j, TallyResult::VALUE) = 0.0;
-        results_(i, j, TallyResult::SUM) += val;
-        results_(i, j, TallyResult::SUM_SQ) += val * val;
+      // filter bins (specific cell, energy bins)
+      for (int i = 0; i < results_.shape()[0]; ++i) {
+        // score bins (flux, total reaction rate, fission reaction rate, etc.)
+        for (int j = 0; j < results_.shape()[1]; ++j) {
+          double val = results_(i, j, TallyResult::VALUE) * norm;
+          double val2 = val * val;
+          results_(i, j, TallyResult::VALUE) = 0.0;
+          results_(i, j, TallyResult::SUM) += val;
+          results_(i, j, TallyResult::SUM_SQ) += val2;
+          results_(i, j, TallyResult::SUM_THIRD) += val2 * val;
+          results_(i, j, TallyResult::SUM_FOURTH) += val2 * val2;
+        }
+      }
+    } else {
+#pragma omp parallel for
+      // filter bins (specific cell, energy bins)
+      for (int i = 0; i < results_.shape()[0]; ++i) {
+        // score bins (flux, total reaction rate, fission reaction rate, etc.)
+        for (int j = 0; j < results_.shape()[1]; ++j) {
+          double val = results_(i, j, TallyResult::VALUE) * norm;
+          results_(i, j, TallyResult::VALUE) = 0.0;
+          results_(i, j, TallyResult::SUM) += val;
+          results_(i, j, TallyResult::SUM_SQ) += val * val;
+        }
       }
     }
   }
diff --git a/src/weight_windows.cpp b/src/weight_windows.cpp
index 674fae49c..9333800bc 100644
--- a/src/weight_windows.cpp
+++ b/src/weight_windows.cpp
@@ -547,8 +547,10 @@ void WeightWindows::update_weights(const Tally* tally, const std::string& value,
 
   // build a shape for a view of the tally results, this will always be
   // dimension 5 (3 filter dimensions, 1 score dimension, 1 results dimension)
-  std::array<int, 5> shape = {
-    1, 1, 1, tally->n_scores(), static_cast<int>(TallyResult::SIZE)};
+  // Look for the size of the last dimension of the results array
+  const auto& results_arr = tally->results();
+  const int results_dim = static_cast<int>(results_arr.shape()[2]);
+  std::array<int, 5> shape = {1, 1, 1, tally->n_scores(), results_dim};
 
   // set the shape for the filters applied on the tally
   for (int i = 0; i < tally->filters().size(); i++) {
@@ -586,7 +588,7 @@ void WeightWindows::update_weights(const Tally* tally, const std::string& value,
 
   // get a fully reshaped view of the tally according to tally ordering of
   // filters
-  auto tally_values = xt::reshape_view(tally->results(), shape);
+  auto tally_values = xt::reshape_view(results_arr, shape);
 
   // get a that is (particle, energy, mesh, scores, values)
   auto transposed_view = xt::transpose(tally_values, transpose);
diff --git a/tests/unit_tests/test_tallies.py b/tests/unit_tests/test_tallies.py
index c38f067d5..7b1bf0a2f 100644
--- a/tests/unit_tests/test_tallies.py
+++ b/tests/unit_tests/test_tallies.py
@@ -1,6 +1,8 @@
+from math import sqrt
 import numpy as np
 import pytest
 import openmc
+import scipy.stats as sps
 
 
 def test_xml_roundtrip(run_in_tmpdir):
@@ -163,3 +165,214 @@ def test_tally_application(sphere_model, run_in_tmpdir):
     assert (sp_tally.std_dev == tally.std_dev).all()
     assert (sp_tally.mean == tally.mean).all()
     assert sp_tally.nuclides == tally.nuclides
+
+def _tally_from_data(x, *, higher_moments=True, normality=True):
+    t = openmc.Tally()
+    t.scores = ["flux"]  # 1 score
+    t.nuclides = [openmc.Nuclide("H1")]  # 1 nuclide
+    t._sp_filename = "dummy.h5"  # mark "results available"
+    t._results_read = True  # don't try to read from disk
+    t._num_realizations = int(len(x))  # n
+    t.higher_moments = bool(higher_moments)
+
+    x = np.asarray(x, dtype=float)
+    # (num_filter_bins=1, num_nuclides=1, num_scores=1) -> (1,1,1) arrays
+    t._sum = np.array([[[np.sum(x)]]], dtype=float)
+    t._sum_sq = np.array([[[np.sum(x**2)]]], dtype=float)
+    if higher_moments:
+        t._sum_third = np.array([[[np.sum(x**3)]]], dtype=float)
+        t._sum_fourth = np.array([[[np.sum(x**4)]]], dtype=float)
+    return t
+
+@pytest.mark.parametrize(
+    "x, skew_true, kurt_true",
+    [   # Rademacher distribution
+        (np.array([1.0, -1.0] * 200), 0.0, 1.0),
+        # Two-point {0,3} with p(0)=3/4, p(3)=1/4
+        (np.concatenate([np.zeros(600), np.full(200, 3.0)]), 2.0 / sqrt(3.0), 7.0 / 3.0),
+        # Bernoulli distribution
+        (np.concatenate([np.ones(300), np.zeros(700)]), (1 - 2 * 0.3) / sqrt(0.3 * 0.7), (1 - 3 * 0.3 + 3 * 0.3**2) / (0.3 * 0.7)),
+    ],
+)
+def test_b1_b2_analytical_against_tally(x, skew_true, kurt_true):
+    t = _tally_from_data(x, higher_moments=True, normality=False)
+
+    g1 = t.skew(bias=True)[0, 0, 0]
+    b2 = t.kurtosis(bias=True, fisher=False)[0, 0, 0]
+
+    assert np.isclose(g1, skew_true, rtol=0, atol=1e-12)
+    assert np.isclose(b2, kurt_true, rtol=0, atol=1e-12)
+
+@pytest.mark.parametrize(
+    "draw, skew_true, kurt_true",
+    [(lambda rng, n: rng.normal(0, 1, n), 0.0, 3.0),  # Normal
+     (lambda rng, n: rng.random(n), 0.0, 1.8),  # Uniform(0,1)
+     (lambda rng, n: rng.exponential(1.0, n), 2.0, 9.0),  # Exp(1)
+     (lambda rng, n: (rng.random(n) < 0.3).astype(float),
+            (1 - 2 * 0.3) / sqrt(0.3 * 0.7),
+            (1 - 3 * 0.3 + 3 * 0.3**2) / (0.3 * 0.7),),],)
+
+def test_b1_b2_scipy_and_theory(draw, skew_true, kurt_true):
+    rng = np.random.default_rng(12345)
+    N = 200_000
+    x = draw(rng, N)
+
+    # Tally outputs
+    t = _tally_from_data(x, higher_moments=True, normality=False)
+    g1_t = t.skew(bias=True)[0, 0, 0]
+    b2_t = t.kurtosis(bias=True, fisher=False)[0, 0, 0]
+
+    # SciPy (population, bias=True to match population-moment style)
+    skew_sp = sps.skew(x, bias=True)
+    kurt_sp = sps.kurtosis(x, fisher=False, bias=True)
+
+    # Compare to SciPy numerically
+    assert np.isclose(g1_t, skew_sp, rtol=0, atol=5e-3)
+    assert np.isclose(b2_t, kurt_sp, rtol=0, atol=5e-3)
+
+    # Compare to analytical targets with size-dependent tolerances
+    tol_skew = 0.02 if abs(skew_true) < 0.5 else 0.05
+    tol_kurt = 0.03 if kurt_true < 4 else 0.1
+    assert abs(g1_t - skew_true) < tol_skew
+    assert abs(b2_t - kurt_true) < tol_kurt
+
+
+def test_kurtosis_bias_fisher_combinations():
+    """Test that all combinations of bias and fisher match scipy.stats.kurtosis"""
+    rng = np.random.default_rng(42)
+    x = rng.normal(0, 1, 10000)
+
+    t = _tally_from_data(x, higher_moments=True, normality=False)    # Test all four combinations
+    # 1. bias=True, fisher=False (Pearson's kurtosis, b2)
+    b2_tally = t.kurtosis(bias=True, fisher=False)[0, 0, 0]
+    b2_scipy = sps.kurtosis(x, fisher=False, bias=True)
+    assert np.isclose(b2_tally, b2_scipy, rtol=0, atol=1e-10)
+    assert np.isclose(b2_tally, 3.0, rtol=0.05, atol=0.1)  # Should be ~3 for normal
+
+    # 2. bias=True, fisher=True (excess kurtosis, g2)
+    g2_tally = t.kurtosis(bias=True, fisher=True)[0, 0, 0]
+    g2_scipy = sps.kurtosis(x, fisher=True, bias=True)
+    assert np.isclose(g2_tally, g2_scipy, rtol=0, atol=1e-10)
+    assert np.isclose(g2_tally, 0.0, rtol=0, atol=0.1)  # Should be ~0 for normal
+    assert np.isclose(g2_tally, b2_tally - 3.0, rtol=0, atol=1e-10)  # g2 = b2 - 3
+
+    # 3. bias=False, fisher=True (adjusted excess kurtosis, G2)
+    G2_tally = t.kurtosis(bias=False, fisher=True)[0, 0, 0]
+    G2_tally_default = t.kurtosis()[0, 0, 0]  # Should be same as default
+    G2_scipy = sps.kurtosis(x, fisher=True, bias=False)
+    assert np.isclose(G2_tally, G2_tally_default, rtol=0, atol=1e-10)
+    assert np.isclose(G2_tally, G2_scipy, rtol=0, atol=1e-10)
+    assert np.isclose(G2_tally, 0.0, rtol=0, atol=0.1)  # Should be ~0 for normal
+
+    # 4. bias=False, fisher=False (adjusted Pearson's kurtosis)
+    adj_b2_tally = t.kurtosis(bias=False, fisher=False)[0, 0, 0]
+    adj_b2_scipy = sps.kurtosis(x, fisher=False, bias=False)
+    assert np.isclose(adj_b2_tally, adj_b2_scipy, rtol=0, atol=1e-10)
+    assert np.isclose(adj_b2_tally, 3.0, rtol=0.05, atol=0.1)  # Should be ~3 for normal
+    assert np.isclose(adj_b2_tally, G2_tally + 3.0, rtol=0, atol=1e-10)  # adj_b2 = G2 + 3
+
+
+def test_ztests_scipy_comparison():
+    rng = np.random.default_rng(987)
+    x_norm = rng.normal(size=50_000)
+    x_exp = rng.exponential(size=50_000)
+
+    # -------- Normal dataset (should not reject) --------
+    t0 = _tally_from_data(x_norm, higher_moments=True, normality=True)
+    Zb1_0, p_skew_0 = t0.skewtest(alternative="two-sided")
+    Zb2_0, p_kurt_0 = t0.kurtosistest(alternative="two-sided")
+    K2_0, p_omni_0 = t0.normaltest(alternative="two-sided")
+
+    Zb1_0 = Zb1_0.ravel()[0]
+    p_skew_0 = p_skew_0.ravel()[0]
+    Zb2_0 = Zb2_0.ravel()[0]
+    p_kurt_0 = p_kurt_0.ravel()[0]
+    K2_0 = K2_0.ravel()[0]
+    p_omni_0 = p_omni_0.ravel()[0]
+
+    z_skew_sp0, p_skew_sp0 = sps.skewtest(x_norm)
+    z_kurt_sp0, p_kurt_sp0 = sps.kurtosistest(x_norm)
+    k2_sp0, p_omni_sp0 = sps.normaltest(x_norm)
+
+    assert np.isclose(Zb1_0, z_skew_sp0, atol=0.15)
+    assert np.isclose(Zb2_0, z_kurt_sp0, atol=0.15)
+    assert np.isclose(K2_0, k2_sp0, atol=0.30)
+    assert np.isclose(p_skew_0, p_skew_sp0, atol=5e-3)
+    assert np.isclose(p_kurt_0, p_kurt_sp0, atol=5e-3)
+    assert np.isclose(p_omni_0, p_omni_sp0, atol=5e-3)
+
+    # -------- Exponential dataset (should strongly reject) --------
+    t1 = _tally_from_data(x_exp, higher_moments=True, normality=True)
+
+    Zb1_1, p_skew_1 = t1.skewtest(alternative="two-sided")
+    Zb2_1, p_kurt_1 = t1.kurtosistest(alternative="two-sided")
+    K2_1, p_omni_1 = t1.normaltest(alternative="two-sided")
+
+    Zb1_1 = Zb1_1.ravel()[0]
+    p_skew_1 = p_skew_1.ravel()[0]
+    Zb2_1 = Zb2_1.ravel()[0]
+    p_kurt_1 = p_kurt_1.ravel()[0]
+    K2_1 = K2_1.ravel()[0]
+    p_omni_1 = p_omni_1.ravel()[0]
+
+    z_skew_sp1, p_skew_sp1 = sps.skewtest(x_exp)
+    z_kurt_sp1, p_kurt_sp1 = sps.kurtosistest(x_exp)
+    k2_sp1, p_omni_sp1 = sps.normaltest(x_exp)
+
+    # Both pipelines should reject very strongly
+    assert p_skew_1 < 1e-6 and p_skew_sp1 < 1e-6
+    assert p_kurt_1 < 1e-6 and p_kurt_sp1 < 1e-6
+    assert p_omni_1 < 1e-6 and p_omni_sp1 < 1e-6
+
+    # Right-skewed and heavy-tailed → large positive Z-statistics
+    assert Zb1_1 > 30 and z_skew_sp1 > 30
+    assert Zb2_1 > 30 and z_kurt_sp1 > 30
+    assert K2_1 > 2000 and k2_sp1 > 2000
+
+def test_vov_stochastic(sphere_model, run_in_tmpdir):
+    tally = openmc.Tally(name="test tally")
+    ef = openmc.EnergyFilter([0.0, 0.1, 1.0, 10.0e6])
+    mesh = openmc.RegularMesh.from_domain(sphere_model.geometry, (2, 2, 2))
+    mf = openmc.MeshFilter(mesh)
+    tally.filters = [ef, mf]
+    tally.scores = ["flux", "absorption", "fission", "scatter"]
+    tally.higher_moments = True
+    sphere_model.tallies = [tally]
+
+    sp_file = sphere_model.run(apply_tally_results=True)
+
+    assert tally._mean is None
+    assert tally._std_dev is None
+    assert tally._sum is None
+    assert tally._sum_sq is None
+    assert tally._sum_third is None
+    assert tally._sum_fourth is None
+    assert tally._num_realizations == 0
+    assert tally._sp_filename == sp_file
+
+    with openmc.StatePoint(sp_file) as sp:
+        assert tally in sp.tallies.values()
+        sp_tally = sp.tallies[tally.id]
+
+    assert np.all(sp_tally.std_dev == tally.std_dev)
+    assert np.all(sp_tally.mean == tally.mean)
+    assert np.all(sp_tally.vov == tally.vov)
+    assert sp_tally.nuclides == tally.nuclides
+
+    n = sp_tally.num_realizations
+    mean = sp_tally.mean
+    sum_ = sp_tally._sum
+    sum_sq = sp_tally._sum_sq
+    sum_third = sp_tally._sum_third
+    sum_fourth = sp_tally._sum_fourth
+
+    expected_vov = np.zeros_like(mean)
+    nonzero = np.abs(mean) > 0
+
+    num = (sum_fourth - (4.0*sum_third*sum_)/n + (6.0*sum_sq*sum_**2)/(n**2)
+           - (3.0*sum_**4)/(n**3))
+    den = (sum_sq - (1.0/n)*sum_**2)**2
+
+    expected_vov[nonzero] = num[nonzero]/den[nonzero] - 1.0/n
+
+    assert np.allclose(expected_vov, sp_tally.vov, rtol=1e-7, atol=0.0)

From 4e24c2d933dcf92b4ddb51dfca362a20ef82f2f6 Mon Sep 17 00:00:00 2001
From: April Novak <novak@berkeley.edu>
Date: Wed, 12 Nov 2025 15:59:45 -0600
Subject: [PATCH 155/203] Update documentation for particle tracks (#3627)

Co-authored-by: Paul Romano <paul.k.romano@gmail.com>
---
 docs/source/usersguide/processing.rst | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/docs/source/usersguide/processing.rst b/docs/source/usersguide/processing.rst
index 8b5ae53fa..fe6ab0826 100644
--- a/docs/source/usersguide/processing.rst
+++ b/docs/source/usersguide/processing.rst
@@ -68,17 +68,17 @@ generation, and particle number of the desired particle. For example, to create
 a track file for particle 4 of batch 1 and generation 2::
 
   settings = openmc.Settings()
-  settings.track = (1, 2, 4)
+  settings.track = [(1, 2, 4)]
 
-To specify multiple particles, the length of the iterable should be a multiple
-of three, e.g., if we wanted particles 3 and 4 from batch 1 and generation 2::
+To specify multiple particles, specify a list of tuples, e.g., if we wanted
+particles 3 and 4 from batch 1 and generation 2::
 
-  settings.track = (1, 2, 3, 1, 2, 4)
+  settings.track = [(1, 2, 3), (1, 2, 4)]
 
-After running OpenMC, the working directory will contain a file of the form
-"track_(batch #)_(generation #)_(particle #).h5" for each particle tracked.
-These track files can be converted into VTK poly data files with the
-:class:`openmc.Tracks` class.
+After running OpenMC (now, without the ``-t`` argument), the working directory
+will contain a file named `tracks.h5`, which contains a collection of particle
+tracks. These track files can be converted into VTK poly data files or
+matplotlib plots with the :class:`openmc.Tracks` class.
 
 ----------------------
 Source Site Processing

From 50bb0df191053e6fc58b9d779022402ac159115e Mon Sep 17 00:00:00 2001
From: Lorenzo Chierici <l.chierici89@gmail.com>
Date: Wed, 12 Nov 2025 23:45:48 +0100
Subject: [PATCH 156/203] depletion-thermochemistry: Redox control transfer
 rates (#2783)

Co-authored-by: Gavin Ridley <gavin.keith.ridley@gmail.com>
Co-authored-by: Paul Romano <paul.k.romano@gmail.com>
---
 openmc/deplete/abc.py                         |  30 ++++++++++
 openmc/deplete/chain.py                       |  54 ++++++++++++++++++
 openmc/deplete/pool.py                        |  13 +++++
 openmc/deplete/transfer_rates.py              |  43 +++++++++++++-
 .../ref_depletion_with_ext_source.h5          | Bin 37328 -> 37328 bytes
 .../ref_depletion_with_feed.h5                | Bin 37328 -> 37328 bytes
 .../ref_depletion_with_redox.h5               | Bin 0 -> 37328 bytes
 .../ref_depletion_with_removal.h5             | Bin 37328 -> 37328 bytes
 .../ref_depletion_with_removal_and_redox.h5   | Bin 0 -> 37328 bytes
 .../ref_depletion_with_transfer.h5            | Bin 37328 -> 37328 bytes
 .../ref_depletion_with_transfer_and_redox.h5  | Bin 0 -> 37328 bytes
 .../ref_no_depletion_only_feed.h5             | Bin 37328 -> 37328 bytes
 .../ref_no_depletion_only_removal.h5          | Bin 37328 -> 37328 bytes
 .../ref_no_depletion_with_ext_source.h5       | Bin 37328 -> 37328 bytes
 .../ref_no_depletion_with_transfer.h5         | Bin 37328 -> 37328 bytes
 .../deplete_with_transfer_rates/test.py       |  22 ++++---
 .../unit_tests/test_deplete_transfer_rates.py |  32 +++++++++++
 17 files changed, 185 insertions(+), 9 deletions(-)
 create mode 100644 tests/regression_tests/deplete_with_transfer_rates/ref_depletion_with_redox.h5
 create mode 100644 tests/regression_tests/deplete_with_transfer_rates/ref_depletion_with_removal_and_redox.h5
 create mode 100644 tests/regression_tests/deplete_with_transfer_rates/ref_depletion_with_transfer_and_redox.h5

diff --git a/openmc/deplete/abc.py b/openmc/deplete/abc.py
index c5a6219c7..fb18d86af 100644
--- a/openmc/deplete/abc.py
+++ b/openmc/deplete/abc.py
@@ -1013,6 +1013,36 @@ class Integrator(ABC):
             material, composition, rate, rate_units, timesteps)
 
 
+    def add_redox(self, material, buffer, oxidation_states, timesteps=None):
+        """Add redox control to depletable material.
+
+        Parameters
+        ----------
+        material : openmc.Material or str or int
+            Depletable material
+        buffer : dict
+            Dictionary of buffer nuclides used to maintain redox balance. Keys
+            are nuclide names (strings) and values are their respective
+            fractions (float) that collectively sum to 1.
+        oxidation_states : dict
+            User-defined oxidation states for elements. Keys are element symbols
+            (e.g., 'H', 'He'), and values are their corresponding oxidation
+            states as integers (e.g., +1, 0).
+        timesteps : list of int, optional
+            List of timestep indices where to set external source rates.
+            Defaults to None, which means the external source rate is set for
+            all timesteps.
+        """
+        if self.transfer_rates is None:
+            if hasattr(self.operator, 'model'):
+                materials = self.operator.model.materials
+            elif hasattr(self.operator, 'materials'):
+                materials = self.operator.materials
+            self.transfer_rates = TransferRates(
+                self.operator, materials, len(self.timesteps))
+
+        self.transfer_rates.set_redox(material, buffer, oxidation_states, timesteps)
+
 @add_params
 class SIIntegrator(Integrator):
     r"""Abstract class for the Stochastic Implicit Euler integrators
diff --git a/openmc/deplete/chain.py b/openmc/deplete/chain.py
index ac5c02aa5..f34416d56 100644
--- a/openmc/deplete/chain.py
+++ b/openmc/deplete/chain.py
@@ -7,6 +7,7 @@ loaded from an .xml file and all the nuclides are linked together.
 from io import StringIO
 from itertools import chain
 import math
+import numpy as np
 import re
 from collections import defaultdict, namedtuple
 from collections.abc import Mapping, Iterable
@@ -714,6 +715,59 @@ class Chain:
         # Return CSC representation instead of DOK
         return sp.csc_matrix((vals, (rows, cols)), shape=(n, n))
 
+    def add_redox_term(self, matrix, buffer, oxidation_states):
+        """Adds a redox term to the depletion matrix from data contained in
+        the matrix itself and a few user-inputs.
+
+        The redox term to add to the buffer nuclide :math:`N_j` can be written
+        as: :math:`\frac{dN_j(t)}{dt} =
+                \cdots - \frac{1}{OS_j}\sum_i N_i a_{ij} \cdot OS_i `
+
+        where :math:`OS` is the oxidation states vector and `a_{ij}` the
+        corresponding term in the Bateman matrix.
+
+        Parameters
+        ----------
+        matrix : scipy.sparse.csc_matrix
+            Sparse matrix representing depletion
+        buffer : dict
+            Dictionary of buffer nuclides used to maintain anoins net balance.
+            Keys are nuclide names (strings) and values are their respective
+            fractions (float) that collectively sum to 1.
+        oxidation_states : dict
+            User-defined oxidation states for elements. Keys are element symbols
+            (e.g., 'H', 'He'), and values are their corresponding oxidation
+            states as integers (e.g., +1, 0).
+        Returns
+        -------
+        matrix : scipy.sparse.csc_matrix
+            Sparse matrix with redox term added
+        """
+        # Elements list with the same size as self.nuclides
+        elements = [re.split(r'\d+', nuc.name)[0] for nuc in self.nuclides]
+
+        # Match oxidation states with all elements and add 0 if not data
+        os = np.array([oxidation_states[elm] if elm in oxidation_states else 0
+                       for elm in elements])
+
+        # Buffer idx with nuclide index as value
+        buffer_idx = {nuc: self.nuclide_dict[nuc] for nuc in buffer}
+        array = matrix.toarray()
+        redox_change = np.array([])
+
+        # calculate the redox array
+        for i in range(len(self)):
+            # Net redox impact of reaction: multiply the i-th column of the
+            # depletion matrix by the oxidation states
+            redox_change = np.append(redox_change, sum(array[:, i]*os))
+
+        # Subtract redox vector to the buffer nuclides in the matrix scaling by
+        # their respective oxidation states
+        for nuc, idx in buffer_idx.items():
+            array[idx] -= redox_change * buffer[nuc] / os[idx]
+
+        return sp.csc_matrix(array)
+
     def form_rr_term(self, tr_rates, current_timestep, mats):
         """Function to form the transfer rate term matrices.
 
diff --git a/openmc/deplete/pool.py b/openmc/deplete/pool.py
index 03b050af3..aa348c02a 100644
--- a/openmc/deplete/pool.py
+++ b/openmc/deplete/pool.py
@@ -109,6 +109,13 @@ def deplete(func, chain, n, rates, dt, current_timestep=None, matrix_func=None,
         matrices = [matrix - transfer for (matrix, transfer) in zip(matrices,
                                                                     transfers)]
 
+        if transfer_rates.redox:
+            for mat_idx, mat_id in enumerate(transfer_rates.local_mats):
+                if mat_id in transfer_rates.redox:
+                    matrices[mat_idx] = chain.add_redox_term(matrices[mat_idx],
+                                                transfer_rates.redox[mat_id][0],
+                                                transfer_rates.redox[mat_id][1])
+
         if current_timestep in transfer_rates.index_transfer:
             # Gather all on comm.rank 0
             matrices = comm.gather(matrices)
@@ -125,6 +132,12 @@ def deplete(func, chain, n, rates, dt, current_timestep=None, matrix_func=None,
                     transfer_matrix = chain.form_rr_term(transfer_rates,
                                                          current_timestep,
                                                          mat_pair)
+
+                    # check if destination material has a redox control
+                    if mat_pair[0] in transfer_rates.redox:
+                        transfer_matrix = chain.add_redox_term(transfer_matrix,
+                                          transfer_rates.redox[mat_pair[0]][0],
+                                          transfer_rates.redox[mat_pair[0]][1])
                     transfer_pair[mat_pair] = transfer_matrix
 
                 # Combine all matrices together in a single matrix of matrices
diff --git a/openmc/deplete/transfer_rates.py b/openmc/deplete/transfer_rates.py
index 4f2b9aba5..ea9fc9185 100644
--- a/openmc/deplete/transfer_rates.py
+++ b/openmc/deplete/transfer_rates.py
@@ -49,9 +49,10 @@ class ExternalRates:
         self.local_mats = operator.local_mats
         self.number_of_timesteps = number_of_timesteps
 
-        # initialize transfer rates container dict
+        #initialize transfer rates container dict
         self.external_rates = {mat: defaultdict(list) for mat in self.burnable_mats}
         self.external_timesteps = []
+        self.redox = {}
 
     def _get_material_id(self, val):
         """Helper method for getting material id from Material obj or name.
@@ -300,6 +301,46 @@ class TransferRates(ExternalRates):
             self.external_timesteps = np.unique(np.concatenate(
                     [self.external_timesteps, timesteps]))
 
+    def set_redox(self, material, buffer, oxidation_states, timesteps=None):
+        """Add redox control to depletable material.
+
+        Parameters
+        ----------
+        material : openmc.Material or str or int
+            Depletable material
+        buffer : dict
+            Dictionary of buffer nuclides used to maintain redox balance.
+            Keys are nuclide names (strings) and values are their respective
+            fractions (float) that collectively sum to 1.
+        oxidation_states : dict
+            User-defined oxidation states for elements.
+            Keys are element symbols (e.g., 'H', 'He'), and values are their
+            corresponding oxidation states as integers (e.g., +1, 0).
+        timesteps : list of int, optional
+            List of timestep indices where to set external source rates.
+            Defaults to None, which means the external source rate is set for
+            all timesteps.
+
+        """
+        material_id = self._get_material_id(material)
+        if timesteps is not None:
+            for timestep in timesteps:
+                check_value('timestep', timestep, range(self.number_of_timesteps))
+            timesteps = np.array(timesteps)
+        else:
+            timesteps = np.arange(self.number_of_timesteps)
+        #Check nuclides in buffer exist
+        for nuc in buffer:
+            if nuc not in self.chain_nuclides:
+                raise ValueError(f'{nuc} is not a valid nuclide.')
+        # Checks element in oxidation states exist
+        for elm in oxidation_states:
+            if elm not in ELEMENT_SYMBOL.values():
+                raise ValueError(f'{elm} is not a valid element.')
+
+        self.redox[material_id] =  (buffer, oxidation_states)
+        self.external_timesteps = np.unique(np.concatenate(
+                    [self.external_timesteps, timesteps]))
 
 class ExternalSourceRates(ExternalRates):
     """Class for defining external source rates.
diff --git a/tests/regression_tests/deplete_with_transfer_rates/ref_depletion_with_ext_source.h5 b/tests/regression_tests/deplete_with_transfer_rates/ref_depletion_with_ext_source.h5
index 3ed38f3d6ce3973fd63e7967b1246c8012ebf063..2f9951a42aaa0613c0b4a20351ae2c0df985b0bc 100644
GIT binary patch
delta 569
zcmcbxnCZe|rVS2#j53oQ`{L`jC9l$uo6Bd%00mo5bLh;i`vB*6-8Fg^a<bnRCVwb+
z3QPT3Ik<dkgZ+%?JImmF?wyBs-L}zy^98ahKkeURV^_FS=ghzL|7^{t7k_d4pkX)X
z11IC;<Bs)qLBR_xe;oX88`@@_bYRjo+dBrwq9g1T;0EyJ=SXj@W44DmfMfNCf7%8M
z;0_Yl=J|R53Vpcxj^DfzHuv_y`AIIh(ig9r!uc~9--mji^Mvws7#Lc1Yj1rw!4j?@
zV2@6}agGU`@66pTD1YID{gaQAPxUML97#Q9zgf=0(DLsl=g*H7EqIPCajy8;YE`g#
zhx7WPr0M6j%y53VZ<nF&gE;5+`;)%ZpU-s;(l2<S9~R*9`@yUSzuzBlSsC=epzy1q
z>%@Z|^%tzWFI=h?g8OIAU8Q+5L;d0Wiy{t}+<kx9!2F-_N&L<2C24T^OBdE%SN}c{
z&j0VhAFjvH1m|C~<P)7x+-Up!h4bNwo(;B-j<>CheB5fg=BG-o^RH!sw#G-cKV@?+
lvt52=hS{y(9<~z?PT;!2+W+$S!`t>#eokIBQHcfQX8^fN!^Qvr

delta 569
zcmcbxnCZe|rVS2#jIxs*`{L_&C$G|wo6Bd%00p~FbLh;i`vB+9zH9U><Yd1sO#X84
z6qfq6a&Y<32KyP&cb38VoI4Nix^1HY=QC$je%ims#x8NE&Y6Gf|Jh1SFaF~8LBnp|
z2TsPx#~thKLW37t{y6yG*00Sv>A<9GwvP;sMMu~xzzyKY&yn6*$7~OC!0S~X{%IR5
zfIH~(R?pA-SLnmlFa6CcVRLUEoFD6wD}C|0DV%?T@qMWGIZr5Ghk>DNxAxX|6D;8h
z!uRO(8|Rq7`3BtGg7OzW*zbHj`BcA>Pr~V`_9Ai?hL(RfIj?-IXu)%AiL?06R;z-|
zJDfKbB~3rKWrnlezFmg858|97_9uO*KcDM-K)2w9eprA@^!-^6e!oB9@-E<kLE%?J
z*NF!`>ZjXwU$|5)1ozM82TJp1hWf+#f#MFA+<kx9!2Cb`i};({OVZ%-J(t#9SN}c{
z&OhYEAFjvH1n0L{^NCI<ZnQ0b<$QReXM^pJlWi*_AGg{*{jHMg{A-z@ZOF0hPuZNy
lZ27LwFuV2J!*=4q30%)v`(GY^c-vn0*W^_bl~_Q21^_L7z<K}x

diff --git a/tests/regression_tests/deplete_with_transfer_rates/ref_depletion_with_feed.h5 b/tests/regression_tests/deplete_with_transfer_rates/ref_depletion_with_feed.h5
index a147022322a1887615f9000e41992c5c48d74b2a..25ab31041c44c0235b70cd855d10e9d6e93195f2 100644
GIT binary patch
delta 688
zcmcbxnCZe|rVS2#j53oQ`{L`5B(Ktto6Bd%00mo5bLh;i`vB+9ziad?<Yd1sO#Vvn
z6qfq6a&Y;i2KyP&cb38V$~zD5x^1HY=ksM%e%ims#x8oN&Y6Gf|JiC!FaF~8LBnp=
z2TsPx#~thK{DK!+{y6yGHnYt->A<9Gwl@uqMMu~xzztx@&yn6*$7~OC0RQR_|FjJj
zz#SyJ&GYmA75Z@X7k=|f*xcI(=U2MqN?*Kg3g_=&d>`t4&J)VlVPL4(t-bZ#1WULA
z?L9jE#yKW%zAtyTp!|go_8VVMKGm;eYMy)4p7roO@nbax&i1Xxp0O+IIp?XaT-X2G
z-&si`evf9Gw)3wSZ=X!ra>~idzshk<{vD^2lNBe#*FWgkJSnRZ5!7DGvL?Kcc@MWp
zd+k@Q#?^?R{&hwBn8;rdxct>wS&HXgE{F3E1^K6nY*B*qt=xn)Z+)<~W1IU>{{7^C
zw(F$#N!OoJx4W+YZrzO+z@S!>jLbeY@4xMJnS~F(zr1SurDjo);Q>Xs0cWOPU+YrE
z4iD;j&zaoGrw~D1U8cVxayP=ly?f^ssVzJN*YBUTQRZ1TBB)g*n)PzcgQ4=kptjt2
mSHW(N1zbbsbFtQv79%*n?DLVpyHy|US4U4?HBpHL6x0C2(a??n

delta 688
zcmcbxnCZe|rVS2#jIxs*`{L{8C9l$uo6Bd%00nDKbLh;i`vB+fxNGz*<Yd1sOn!0j
z6qfq6a&US72KyP&cb38VLOT!dx^1HY=Zj=je%ims#x8lM&Y6Gf|JgE3FaF~8LBnqT
z2TsPx#~thKB7zrM{y6yG*0;?%>A<9Gw&x6vMMu~xzzyKc&yn6*$7~OCz|~bB{%IR5
zfIH~sR?pA-SLnmlXaDAvu(`Jn&Np<)mA-i06wW`*_&(J8oF|m8!@$tGTYKxf36^jL
zA$xTCjdM)kd~fb<LHP?G?2BJbKGm;e`r-9tdyd2R#E;b&I6Jo<d&aJ;=Ul3~a$Wy#
ze`i&V_&u6!+RkrYynQld%PA*q|0>5d`FEVoPga}|Uw^G*^Q5dwL{Jwl%bM^)<~`gZ
z$F*O%8doEN`oR_LV<LY=;PUrpWhtI}xg5^F66BvMvPB8bS9TNDy!FA_?#`Tt^6w}A
zvpp=mPrCk;y4_{{ck6Dv00y<PWMuZKdH-$S$}D{N{pD5L3pI<13=b&64cI>Y`dXJN
zc6d-1dCufcK7|PCiZcBbk-HHV?%q4ENNwRExPHH^jWW-&5kW03(X5wi9t@QS2DQt^
ny9#!DEZ`c-pNqAYv>3tp)t`?9-mUs*?+`Y5)kGy0P*4K^K)BOB

diff --git a/tests/regression_tests/deplete_with_transfer_rates/ref_depletion_with_redox.h5 b/tests/regression_tests/deplete_with_transfer_rates/ref_depletion_with_redox.h5
new file mode 100644
index 0000000000000000000000000000000000000000..c7f002ba14a29133887bb7b7d06cc0a6378a71ec
GIT binary patch
literal 37328
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

literal 0
HcmV?d00001

diff --git a/tests/regression_tests/deplete_with_transfer_rates/ref_depletion_with_removal.h5 b/tests/regression_tests/deplete_with_transfer_rates/ref_depletion_with_removal.h5
index 3d48105d7b444cc16f5b6438f97f897d2c1657fd..c3121a9535097cbd3bc2457b664ff774ca654e2c 100644
GIT binary patch
delta 670
zcmcbxnCZe|rVS2#j53oQ`{L_&B(Ktto6Bd%00o;)bLh;i`vB)Jx@+_-<Yd1sO#X22
z6qfq6a&Y;i2KyP&cb38ViaQVQx^1HY=bL9$e%ims#;$0m&Y6Gf|Jh1UFaF~8LBnpw
z2TsPx#~thKoP!ry{y6yGwy4cI>A<9Gws#GVMMu~xzzyKa&yn6*$7~OC0Qc$-|FjJj
zz#a5utLNwaEA-*&zy9Wxu(`Jn&i8Q1mA-i06wcqn_&(J8oF|m8!@y9!TYKxf36^jL
zv3qp-jdM)k{BZ7WLHP?G>`y$Ke5zl`luz@NJ<H*H;>T(XoTCHz?k32oIA3}(<C5ho
zE9bDovw2UrsW|_8@%G7-EvKC9{i__;<lk{RIazT+e0`McS*Z>w0l2|Vr!&ni1-^&#
z&9=`ztNUUC+-Db=>$Yl5mx9ZGh{~C^=j3uYKVa88i<R8kaDLpAXN)b|t?e3DL~2a(
z`fDrLs=L$ksD@qL>=i7=GEVh&%zk>SYbyTR{^~xxdBVvnwgz4i2di9_;0BcayLV^9
zOg4B>Uv^^fW6N3ycTl?2aigtQRpIItk4CJtQ920cPht(=UOL|j&gV63vJXBP0_6)c
fFhrcY#JKz_BB<piPn;;u^h;#&s)<T0pnwGcacae7

delta 670
zcmcbxnCZe|rVS2#jIxs*`{L`*C9l$uo6Bd%00jq6bLh;i`vB)}xoh++<Yd1sO#XiG
z6qfq6a&Y<l2KyP&cb38V@;eXjx^1HY=ksP&e%ims#;#<i&Y6Gf|JmwIFaF~8LBnp|
z2TsPx#~thKDuNeU{y6yGHlWQq>A<9GwjT_RMMu~xzztx@&yn6*$7~OCz^7Fo{%IR5
zfIH~;R?pA-SLnmlxBupqu(`Jn&JTCVmA-i06wZIk_&(J8oF|m8!@#g;xAxX|6D;8h
zTK4Gl8|Rq7`L^8Mg7OzW*!Mr0e5zl`bi>_A_H2jmi65&maE=b-yPF`V;(YJLj7yfU
zteis+&*nYhrsDkO#oH%Sww!V@@UL=QlYhtQ{A9%m@%8btXQeu%1mFhioX#}66!;#_
zSKmJStnP~maG%{{uG^|LT?#ILEh=Z)o|DVre3M=8ELL)B!}+yOo-wv;x3-(OB2r_L
z*I(N|ExJ2Bk80S}&0fJ`EaOyf$LFWFx~Ag4?eFf>n<t#SV(Z`)aj?o&32wm2fA{We
zn8^kY>OD>jer#C_;SOq-I&QS}sw!N)=+TIkHcAKK`~ubh?xpjs;Cwa1Ci~!%AyB?B
f1B1r7ON`5}B7!=0^2CYaO#D)lS4~u60R=1or!~mt

diff --git a/tests/regression_tests/deplete_with_transfer_rates/ref_depletion_with_removal_and_redox.h5 b/tests/regression_tests/deplete_with_transfer_rates/ref_depletion_with_removal_and_redox.h5
new file mode 100644
index 0000000000000000000000000000000000000000..80ce771fceae774cd606fef7888c325128b7462f
GIT binary patch
literal 37328
zcmeHPeQ;D)6~Avcp$h~EErk?n`cj#8O;Xu>&?bc4Y}gPJ93>E_tL?O#k1eE=FOw_=
zMa)R6adafK&NSlSq|TtBEp7VcfOPCu`jOfW6Dn3lfr(>Bqr=oy+YzgP@4b7@d)b?P
zyX+%NxAg2Ed*8YD+;h+Uz4JTo-nZ}VcWSF^=FM3;hp8WjgJrO6?GV2%!e@LBuR$5x
z18^WgIRNE|jUPygMYSyl>a)SVZ08lDP`_#8+O>??7~01Yn%UqiepCh(^@_Io325K+
zb+sc<ySA!cog>Bz##z9d+L<qec*XHBuCrLJHn7ATEK7;*ZNcuI*3J%=?NDf>wQ$EI
zi8BM}phP(TAYZV|VxZ4vEBzhpzSg#2@Aj@BsI%)7#f6H1`YpjOML`)+?hf{Z+Io9H
zQBpKi9poGOe-8MT13cn<lT7(G#501B4bU4ZuXY5GZ+@64##0%@56-^`4vL|~`1GPe
zl4Zl^*H=p{ll4JAZ*_bFT2fF{va90jaZWNe4m?0VMPA@M!wa}Q)SCp^aV@VegW<fM
z_~U+9t!CHViMiaPL2!)c0cM&9J}m!f-1I;|%mc_HFI*qcOXLai5$mm%JP+95TFThT
zYq%vG2ODJJI@OgGtv3Ynq4`!l`DpjU>%WLs7ISG6lh`a}{o-J)9W6mM=T2L{2-DAE
zJo8EH8n#I3x2>}+)UK>j7Rr?{gqM}hWu+H|JlnjZsqXlZKUSLMB^TsZ%1Z*^B*sL*
zEH9lDc#ipErt%W<Nz5zB@(KO2%BQym7T<l~{BsJQVz2kb^-7}swfA}svkYkW!Gf+f
zCi+x)wIP6f8ik1=U&dg8Zx&};OL>QZ+j%K5d({3D@Apis;_YY`hEa55-ya%S%r!<p
zk=Ch*7?rUQ!1(n;Bd${?7e#Ah-WB68TI<p!zD~`+<rV9P{UMGs0`eI6kqxF@OZWlm
z`9bcxf!F7N-q6x$y)eiVH}ZNJ^jL1Ro)hF+T>%x-v&8GFh?j9+>{@M|+SuFKE_a05
zn}Xdku36O?nXOx48LIU4Y7>`~Rjaz*?G83J^V?^Qy}>D#64^1!R}naGl&>_H=_>&O
zX8CFe;t0EAewe9zg*+4UjlmCVJj(=!4LjC&hIY(&=KlmAh<Jt(LS;Mz%y`Bij<9d4
zcqU%24SrbTSq3<4*s;blv}4Azu*?S{o?(Pg84m$7o^6$*d!>qJ;(FKMhc%v|*M=Qy
zJVQHXJaaDR8pJb1ipqEhnDK1<lhM6W#k0XYKF%nNXYj)s&+zAD!;Uqcp&c`x4c^NA
zCZ0vd2}!XLFymPn#1ZyN70=GWbs-1FGx%YRXYljsW#0!uJ7zpPm(P(Qo?(Pg84m$7
zo()4BVc%5oEa2oL^uu_U%QFW!Y}m1OJwrQYJPUl94@5k}2%$0_0%kmOKpbJ;RPk)A
zfR8YF8!ruhSi7E~pN1W4JVQHXJPVg_e~D)pAymdgz>H^I_@FFw#<-iQ`}*jUucxSF
zr6PQ$rD&!4le}8qp_FyJnr$vF(SEU4N>xpjwFkQVL9U>dYCrTZpem){gU|Uo!S>cX
zet_eO`%D+;jl;Sa^~7~De>#n^GBAvK;&t8&_J$!Zp`MthYC+Gjf*+us3*>s?yn^}_
zEAaOm(H|o(TFbBao`PY=T7E@43Ewv;=aAv=-d7Aj8YnFg5c8%CUX8$WMd+lnqi{=O
zdwb)jpyIyP9__sw<R$VS^%Ir!Tu~x~KHlwOTsi;_FXSsk2jg$1uIJ+O@AblSMNGY@
zD<4_No3098kN)^U?sN0{kJ~q1A4R;9eO?!FGkd-<0{G(jr@VrQQ5g#Xv%E4S@DzEB
zaTUu}GIhuYF)t*`2lPvQS5G^J3JKqf&EOTd{zH9~XM@xDp0`=MU3rsLZ8LknBvW~o
zPi?o^ZJG%OlQqkBTjo%WcBD0HDvGEM3n_f25aom5_jEk`T9cHixi{_oUl9+K6XAk-
z$>YN}Mt0k*iA~&T)v>AgsHX8UryM4`qT)uy?{?)e%kI|3HhfRHBh=j1+7d)je;yMn
z_#>W7ua~<O14?7CbxW{gTVq=Yy7soJZyzz%(;4b+4&JM3X+s<DM{^C1K4X0LqIZTo
z{rvIyOZNEZ&+L39e|}`m8M`gR#b*)~zf;ajz;HT+N7M1(2uhr8dOTx1A`U1gKmQz<
zzrE|rd|nuvF!#O`&Ni{>OT`1@4e>zvGVmDrnt_LEE=}>^=TH3K1H{4l{B08t8uOpR
zgMq{+?Fwq(`v6`Tv%WI^;7(|E3hR6Ey_&6{=kmq37l3AYO?<s{Z&laNQjGtD8BEgg
z?C<jq*bjM_$V_B+v<CLW67w6bW2OXTbVrg10YZQfAOr{jLVyq;1PB2_fDj-At_T8V
z`$!o#a!GnI4Ess!pRAdF+=#-s*dI%AUx_m9FOxh`q)rGB0)zk|KnM^5ga9Ex2oM5<
z03kpKTm}MW_Y<-&(PkKaS4Mr@_nUPe-V@z|`dHHafoOb4A_NElLVyq;1PB2_fDj-A
z(g^{p`-kyM+&7Gx>=$UCkWNuRz7PV003kpK5CVh%A&?jWvvp&l=fWmn-H3X4-&h<m
zY_e`dee5sxBbg8&1PB2_fDj-A2mwMMy%0!t-8h+Gy*OsFPNel=dYyOjh7ceG2mwNX
z5J)8gHy-Re@Z_z>eb1G)c<wmwu0Fq|<(1*zK2SYVW1en)%$d7yz6b5S^oFBw-_D3G
zkDf06^QPB#>;IZ~qTvS_-#D17w>S4!4&8O?r@HJpeDoK8Snbs1)%S1z=Zi0__H-XE
zeDlIn7u-dU^t@LSae96jnJqp1T9v1%;nDJQFI{wZeygG>{LtI(f4E+~%U>z${cq@O
zTlV};yZ$dviyn_$C~yty{#^I-x_`YmvO?E??Z5MKR-gH$F7K&sUv~U=D|Pv-^!Lr5
zJyxg7Uq4dt{JVqYx?KK3;qH>QQeAGJ``v{%jYlerCZCz8IPzoN4-K!J_q|#f4r=AH
zidQP_N6##Ib%)F6-!T7lAa}X%<mAv><$qh{+jR6t^TukH``#}I-!t&1M}6+~U#)tg
z^VFKxk4bgAl=JI&`ah=*|Jz+X`oX&EADO}PyZO%T%Ql{!r_X2a{&i=5zxJ#yKRHo-
zXz7_j9nZ0X-Z=~M7whf23O0OjVAp<K9{g*5e#f3$bou^6>uxSSzs7TCaKk(6pSkGX
zdwVFa>T#!MZ`p(Y``M8y&zExZpKUnCJO|(TitpvWyzTx?z9*~ni#O~2Z`t0I_v<CI
zbX>zbj#Uk?pXmO0pZ!AM+Z&DX)-3JnoL}@Sz5h+`<(2Gn7VC29yDck1HJ{VvhVrb6
r6H6*|x&K7To8Nn5l`e-o3%<F(DpI+5ZsE%h?Cj@$;CaPz%K802BSuDn

literal 0
HcmV?d00001

diff --git a/tests/regression_tests/deplete_with_transfer_rates/ref_depletion_with_transfer.h5 b/tests/regression_tests/deplete_with_transfer_rates/ref_depletion_with_transfer.h5
index 97855478ca4d73ff5c858121166ffe22c63962f4..2a4c227bb656bcd631e26dca5b32ce8d124d7922 100644
GIT binary patch
delta 709
zcmcbxnCZe|rVS2#j53oQ`{L`5B(Ktto6Bd%00jq6bLh;i`vB)}ziad?<Yd1sO#V*r
z6qfq6a&Y;g2KyP&cb38VGCL3Nx^1HY=Nn~Je%ims#;$s&&Y6Gf|JmwJFaF~8LBnq5
z2TsPx#~thK@`4vy{y6yGHn+_>>A<9Gwl55hMMu~xzzq<{&yn6*$7~OCfZFO0|FjJj
zz#ZhZ&GYmA75Z@X8-Mdk*xcI(=TCFVmA-i06wd$6_&(J8oF|m8&A?E&TYKxf36^jL
z!FzQ2jdM)kd_V4PLHP?G?4M6Q*{^JxAW&`3eE6RDu^I#C@Ib!1334jVH(t!RWckX<
zIrQ*s-V<&r&VOFKeKKXsDJLucD#tbXcbra6R-7O&m>}J^Zs&pTPPN${3vX`Man_w2
zI6=SO<xln|<6r!6+n&WWDaFl2guhbVuIG#!C&0ZstFUC@XLV7y`Z+Is;|^U|0p~Ni
znKXGVSBLYNvzEtB4)U^7?&jx<)A?&#C4IlspiaXsd5&V$BY&rQyVUS2esUInZM{q0
zs9j!m*)~>J>FEg%MYsX17rIU?4rhUff8Ci)C;mT2gum`8`#JKgT5$F2L_>AAg&&0T
zw`t!p_?Br5=if<`KCk~K5X#qKU@%&myZ1l^BK)o8?kKz}H-u|=wB~g4EP;>qYmQD{
KHBpHL6afHS{MF3>

delta 709
zcmcbxnCZe|rVS2#jIxs*`{L`DC9l$uo6Bd%00p~FbLh;i`vB)}x@+_-<Yd1sOn!Ut
z6qfq6a&Y;W2KyP&cb38V3Of()x^1HY=YPwr{Iq|Mja}VNoiqQ||Fe~uUi`)FgNEJQ
z51fpXk2}`er3Wvx{BiKVZA_bW(t%0WY#$gLi;l2YfE&P;pCi4sj@cgOfKRJF{L?mA
z0C&)zt)8Fvuh569pY@wp!sgySI6u=RSNh_0Q#k(?<NHwWbDmJXHUq<=-P&8<O|XP3
z$lasUZ=7QS=R0wC3(8;kVE=0J$$n+ihK1qwY=`fOAFDBNjtS(un;@s+eB;H8OO~&!
zoFfj;<~`x2;{4&o+b2`DoN}`8uX0?If5++kWW@>cf;rNC>vkUa?o^xYvGC@09cPot
zffMxWo&RKSGXBL6x9x6RlTzGVMEEP$?Rw6*aRS`C^9xHBepVNStKam}H}24d6>z?w
zn@N+`a&<VLC2M)?<RC9Qqi%k_IGw+?lceu=8q{gnCC*W-dgSj^Z&w_C#ZS)SuWeAt
z8@0>JF5Ax5ReE~DLlJJkhVxw~7KgLI!@u~<rW604Bf>v!mHixfRxP;thoYgn+rkgR
z`75+<8GOq$hV%C&N}tz%6A0z&Ffc?c&E0#T0ulbMa(5J7l^en}JY93Td6vLOdxH~`
LS4~u60Yv}+O6u9M

diff --git a/tests/regression_tests/deplete_with_transfer_rates/ref_depletion_with_transfer_and_redox.h5 b/tests/regression_tests/deplete_with_transfer_rates/ref_depletion_with_transfer_and_redox.h5
new file mode 100644
index 0000000000000000000000000000000000000000..6847fd7dfe6960da89a0e4fdf0be9f35eb56d7f4
GIT binary patch
literal 37328
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
YN#<bA^xOSYzWdT%?gy?bmP6L}f6h)@j{pDw

literal 0
HcmV?d00001

diff --git a/tests/regression_tests/deplete_with_transfer_rates/ref_no_depletion_only_feed.h5 b/tests/regression_tests/deplete_with_transfer_rates/ref_no_depletion_only_feed.h5
index 70a4a3d67a513287b449b1afb36556bf48bbff7b..af673334065815b809fe7cb023a1f705030d6e66 100644
GIT binary patch
delta 37
scmcbxnCZe|rVS2#j53=Y`&KhD+ZElMoaib)@q*B1g$ZjIS%7?d040VF=Kufz

delta 37
scmcbxnCZe|rVS2#jIx^@`&KhDKUg+ta-ysJ#0x^36(+1<WC8N+0W-Z21^@s6

diff --git a/tests/regression_tests/deplete_with_transfer_rates/ref_no_depletion_only_removal.h5 b/tests/regression_tests/deplete_with_transfer_rates/ref_no_depletion_only_removal.h5
index b41218a9b295a14f08c076e026adb858b4cb5b0b..59c65427c010e18721f37fde0743a214e478e5dc 100644
GIT binary patch
delta 37
scmcbxnCZe|rVS2#j53=Y`&KhDy9yndoaib)@q*B1g$ZjIS%7?d031pV3jhEB

delta 37
scmcbxnCZe|rVS2#jIx^@`&KhDdwiWVInh;q;sv423KP~avH<z^04zrjbN~PV

diff --git a/tests/regression_tests/deplete_with_transfer_rates/ref_no_depletion_with_ext_source.h5 b/tests/regression_tests/deplete_with_transfer_rates/ref_no_depletion_with_ext_source.h5
index 71bfdae11234c73d8c7e38e2f6883813cf73f85e..cceb7fc780afa342f0ffb926eb72c2657d64f73c 100644
GIT binary patch
delta 37
scmcbxnCZe|rVS2#j53=Y`&KhDZ&x}xInh;q;sv423KP~avH<z^04Qz`5dZ)H

delta 37
scmcbxnCZe|rVS2#jIx^@`&KhDXXH+qoaib)@q*B1g$ZjIS%7?d03*K+r~m)}

diff --git a/tests/regression_tests/deplete_with_transfer_rates/ref_no_depletion_with_transfer.h5 b/tests/regression_tests/deplete_with_transfer_rates/ref_no_depletion_with_transfer.h5
index ccf92b39915aa425b0a6746905f23038985196fe..a1c0e5b41578910c4f5146f00a665e52580d417d 100644
GIT binary patch
delta 37
scmcbxnCZe|rVS2#j53=Y`&KhDCuo#SPIQ%@ctL2h!h|)9EI__J02-bR(EtDd

delta 37
scmcbxnCZe|rVS2#jIx^@`&KhDGh{_hPIQ%@ctL2h!h|)9EI__J02Lt(TmS$7

diff --git a/tests/regression_tests/deplete_with_transfer_rates/test.py b/tests/regression_tests/deplete_with_transfer_rates/test.py
index 9784a07f6..461287f6e 100644
--- a/tests/regression_tests/deplete_with_transfer_rates/test.py
+++ b/tests/regression_tests/deplete_with_transfer_rates/test.py
@@ -12,7 +12,6 @@ from openmc.deplete import CoupledOperator
 from tests.regression_tests import config, assert_reaction_rates_equal, \
     assert_atoms_equal
 
-
 @pytest.fixture
 def model():
     openmc.reset_auto_ids()
@@ -54,6 +53,9 @@ def model():
     (-1e-5, None, 174.0, 'depletion_with_feed'),
     (-1e-5, 'w', 0.0, 'no_depletion_with_transfer'),
     (1e-5, 'w', 174.0, 'depletion_with_transfer'),
+    (0.0, None, 174.0, 'depletion_with_redox'),
+    (1e-5, None, 174.0, 'depletion_with_removal_and_redox'),
+    (1e-5, 'w', 174.0, 'depletion_with_transfer_and_redox'),
     ])
 def test_transfer_rates(run_in_tmpdir, model, rate, dest_mat, power, ref_result):
     """Tests transfer_rates depletion class with transfer rates"""
@@ -61,13 +63,18 @@ def test_transfer_rates(run_in_tmpdir, model, rate, dest_mat, power, ref_result)
     chain_file = Path(__file__).parents[2] / 'chain_simple.xml'
 
     transfer_elements = ['Xe']
+    os = {'I': -1, 'Xe':0, 'Cs': 1, 'Gd': 3, 'U': 4}
 
     op = CoupledOperator(model, chain_file)
     op.round_number = True
     integrator = openmc.deplete.PredictorIntegrator(
         op, [1], power, timestep_units = 'd')
-    integrator.add_transfer_rate('f', transfer_elements, rate,
-                                 destination_material=dest_mat)
+    if rate != 0.0:
+        integrator.add_transfer_rate('f', transfer_elements, rate,
+                                    destination_material=dest_mat)
+    if 'redox' in ref_result.split('_'):
+        integrator.add_redox('f', {'Gd157':1}, os)
+
     integrator.integrate()
 
     # Get path to test and reference results
@@ -83,9 +90,8 @@ def test_transfer_rates(run_in_tmpdir, model, rate, dest_mat, power, ref_result)
     res_ref = openmc.deplete.Results(path_reference)
     res_test = openmc.deplete.Results(path_test)
 
-    assert_atoms_equal(res_ref, res_test)
-    assert_reaction_rates_equal(res_ref, res_test)
-
+    assert_atoms_equal(res_ref, res_test, tol=1e-3)
+    assert_reaction_rates_equal(res_ref, res_test, tol=1e-3)
 
 @pytest.mark.parametrize("rate, power, ref_result", [
     (1e-1, 0.0, 'no_depletion_with_ext_source'),
@@ -118,5 +124,5 @@ def test_external_source_rates(run_in_tmpdir, model, rate, power, ref_result):
     res_ref = openmc.deplete.Results(path_reference)
     res_test = openmc.deplete.Results(path_test)
 
-    assert_atoms_equal(res_ref, res_test)
-    assert_reaction_rates_equal(res_ref, res_test)
+    assert_atoms_equal(res_ref, res_test, tol=1e-3)
+    assert_reaction_rates_equal(res_ref, res_test, tol=1e-3)
diff --git a/tests/unit_tests/test_deplete_transfer_rates.py b/tests/unit_tests/test_deplete_transfer_rates.py
index a3228e9fb..a6dcb2b27 100644
--- a/tests/unit_tests/test_deplete_transfer_rates.py
+++ b/tests/unit_tests/test_deplete_transfer_rates.py
@@ -198,3 +198,35 @@ def test_transfer(run_in_tmpdir, model):
     # Ensure number of atoms equal transfer decay
     assert atoms[1] == pytest.approx(atoms[0]*exp(-transfer_rate*3600*24))
     assert atoms[2] == pytest.approx(atoms[1]*exp(-transfer_rate*3600*24))
+
+@pytest.mark.parametrize("case_name, buffer, ox", [
+    ('redox', {'Gd157':1}, {'Gd': 3, 'U': 4}),
+    ('buffer_invalid', {'Gd158':1}, {'Gd': 3, 'U': 4}),
+    ('elm_invalid', {'Gd157':1}, {'Gb': 3, 'U': 4}),
+    ])
+def test_redox(case_name, buffer, ox, model):
+    op = CoupledOperator(model, CHAIN_PATH)
+    number_of_timesteps = 2
+    transfer = TransferRates(op, model.materials, number_of_timesteps)
+
+    # Test by Openmc material, material name and material id
+    material, dest_material, dest_material2 = [m for m in model.materials
+                                               if m.depletable]
+    for material_input in [material, material.name, material.id]:
+        for dest_material_input in [dest_material, dest_material.name,
+                                    dest_material.id]:
+
+            if case_name == 'buffer_invalid':
+                with pytest.raises(ValueError, match='Gd158 is not a valid '
+                                   'nuclide.'):
+                    transfer.set_redox(material_input, buffer, ox)
+
+            elif case_name == 'elm_invalid':
+                with pytest.raises(ValueError, match='Gb is not a valid '
+                                   'element.'):
+                    transfer.set_redox(material_input, buffer, ox)
+            else:
+                transfer.set_redox(material_input, buffer, ox)
+                mat_id = transfer._get_material_id(material_input)
+                assert transfer.redox[mat_id][0] == buffer
+                assert transfer.redox[mat_id][1] == ox

From cd5cd35ad9ff9e0e011b9b85c2bb978ba978ed49 Mon Sep 17 00:00:00 2001
From: Michel Saliba <168624841+saliba170499@users.noreply.github.com>
Date: Thu, 13 Nov 2025 21:35:33 +0100
Subject: [PATCH 157/203] Addition of a collision tracking feature (#3417)

Co-authored-by: Paul Romano <paul.k.romano@gmail.com>
---
 CMakeLists.txt                                |   1 +
 docs/source/io_formats/collision_track.rst    |  46 ++++
 docs/source/io_formats/index.rst              |   1 +
 docs/source/io_formats/settings.rst           |  79 ++++++
 docs/source/pythonapi/base.rst                |   3 +
 docs/source/usersguide/settings.rst           |  56 ++++
 include/openmc/bank.h                         |   2 +
 include/openmc/bank_io.h                      | 103 +++++++
 include/openmc/collision_track.h              |  23 ++
 include/openmc/constants.h                    |   1 +
 include/openmc/mcpl_interface.h               |  15 ++
 include/openmc/message_passing.h              |   1 +
 include/openmc/particle_data.h                |  19 ++
 include/openmc/settings.h                     |  20 ++
 include/openmc/simulation.h                   |   1 +
 include/openmc/urr.h                          |   8 +-
 openmc/settings.py                            | 246 ++++++++++++++---
 openmc/source.py                              | 175 ++++++++++--
 src/bank.cpp                                  |   3 +
 src/collision_track.cpp                       | 238 ++++++++++++++++
 src/finalize.cpp                              |   5 +
 src/initialize.cpp                            |  31 +++
 src/mcpl_interface.cpp                        | 155 +++++++++++
 src/message_passing.cpp                       |   1 +
 src/particle.cpp                              |   6 +
 src/physics.cpp                               |   5 +-
 src/settings.cpp                              |  76 +++++-
 src/simulation.cpp                            |  13 +-
 src/state_point.cpp                           |  90 +------
 .../collision_track/__init__.py               |   0
 .../case_1_Reactions/inputs_true.dat          |  58 ++++
 .../case_1_Reactions/results_true.dat         |   2 +
 .../case_2_Cell_ID/inputs_true.dat            |  58 ++++
 .../case_2_Cell_ID/results_true.dat           |   2 +
 .../case_3_Material_ID/inputs_true.dat        |  58 ++++
 .../case_3_Material_ID/results_true.dat       |   2 +
 .../case_4_Nuclide_ID/inputs_true.dat         |  58 ++++
 .../case_4_Nuclide_ID/results_true.dat        |   2 +
 .../case_5_Universe_ID/inputs_true.dat        |  59 ++++
 .../case_5_Universe_ID/results_true.dat       |   2 +
 .../inputs_true.dat                           |  58 ++++
 .../results_true.dat                          |   2 +
 .../inputs_true.dat                           |  63 +++++
 .../results_true.dat                          |   2 +
 .../case_8_2threads/inputs_true.dat           |  57 ++++
 .../case_8_2threads/results_true.dat          |   2 +
 .../regression_tests/collision_track/test.py  | 255 ++++++++++++++++++
 tests/testing_harness.py                      | 126 ++++++++-
 tests/unit_tests/test_collision_track.py      | 127 +++++++++
 49 files changed, 2268 insertions(+), 148 deletions(-)
 create mode 100644 docs/source/io_formats/collision_track.rst
 create mode 100644 include/openmc/bank_io.h
 create mode 100644 include/openmc/collision_track.h
 create mode 100644 src/collision_track.cpp
 create mode 100644 tests/regression_tests/collision_track/__init__.py
 create mode 100644 tests/regression_tests/collision_track/case_1_Reactions/inputs_true.dat
 create mode 100644 tests/regression_tests/collision_track/case_1_Reactions/results_true.dat
 create mode 100644 tests/regression_tests/collision_track/case_2_Cell_ID/inputs_true.dat
 create mode 100644 tests/regression_tests/collision_track/case_2_Cell_ID/results_true.dat
 create mode 100644 tests/regression_tests/collision_track/case_3_Material_ID/inputs_true.dat
 create mode 100644 tests/regression_tests/collision_track/case_3_Material_ID/results_true.dat
 create mode 100644 tests/regression_tests/collision_track/case_4_Nuclide_ID/inputs_true.dat
 create mode 100644 tests/regression_tests/collision_track/case_4_Nuclide_ID/results_true.dat
 create mode 100644 tests/regression_tests/collision_track/case_5_Universe_ID/inputs_true.dat
 create mode 100644 tests/regression_tests/collision_track/case_5_Universe_ID/results_true.dat
 create mode 100644 tests/regression_tests/collision_track/case_6_deposited_energy_threshold/inputs_true.dat
 create mode 100644 tests/regression_tests/collision_track/case_6_deposited_energy_threshold/results_true.dat
 create mode 100644 tests/regression_tests/collision_track/case_7_all_parameters_used_together/inputs_true.dat
 create mode 100644 tests/regression_tests/collision_track/case_7_all_parameters_used_together/results_true.dat
 create mode 100644 tests/regression_tests/collision_track/case_8_2threads/inputs_true.dat
 create mode 100644 tests/regression_tests/collision_track/case_8_2threads/results_true.dat
 create mode 100644 tests/regression_tests/collision_track/test.py
 create mode 100644 tests/unit_tests/test_collision_track.py

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 474451c8a..87b8789d1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -338,6 +338,7 @@ list(APPEND libopenmc_SOURCES
   src/cell.cpp
   src/chain.cpp
   src/cmfd_solver.cpp
+  src/collision_track.cpp
   src/cross_sections.cpp
   src/dagmc.cpp
   src/distribution.cpp
diff --git a/docs/source/io_formats/collision_track.rst b/docs/source/io_formats/collision_track.rst
new file mode 100644
index 000000000..a36459754
--- /dev/null
+++ b/docs/source/io_formats/collision_track.rst
@@ -0,0 +1,46 @@
+.. _io_collision_track:
+
+===========================
+Collision Track File Format
+===========================
+
+When collision tracking is enabled with ``mcpl=false`` (the default), OpenMC
+writes binary data to an HDF5 file named ``collision_track.h5``. The same data
+may also be written after each batch when multiple files are requested
+(``collision_track.N.h5``) or when the run is performed in parallel. The file
+contains the information needed to reconstruct each recorded collision.
+
+The current revision of the collision track file format is 1.0.
+
+**/**
+
+:Attributes:
+            - **filetype** (*char[]*) -- String indicating the type of file.
+              For collision-track files the value is ``"collision_track"``.
+
+:Datasets:
+
+          - **collision_track_bank** (Compound type) -- Collision information
+            for each stored event. Each entry in the dataset corresponds to one
+            collision and contains the following fields:
+
+              - ``r`` (*double[3]*) -- Position of the collision in [cm].
+              - ``u`` (*double[3]*) -- Direction unit vector immediately after the collision.
+              - ``E`` (*double*) -- Incident particle energy before the collision in [eV].
+              - ``dE`` (*double*) -- Energy loss over the collision (:math:`E_\text{before} - E_\text{after}`) in [eV].
+              - ``time`` (*double*) -- Time of the collision in [s].
+              - ``wgt`` (*double*) -- Particle weight at the collision.
+              - ``event_mt`` (*int*) -- ENDF MT number identifying the reaction.
+              - ``delayed_group`` (*int*) -- Delayed neutron group index (non-zero for delayed events).
+              - ``cell_id`` (*int*) -- ID of the cell in which the collision occurred.
+              - ``nuclide_id`` (*int*) -- ZA identifier of the nuclide (ZZZAAAM format).
+              - ``material_id`` (*int*) -- ID of the material containing the collision site.
+              - ``universe_id`` (*int*) -- ID of the universe containing the collision site.
+              - ``n_collision`` (*int*) -- Collision counter for the particle history.
+              - ``particle`` (*int*) -- Particle type (0=neutron, 1=photon, 2=electron, 3=positron).
+              - ``parent_id`` (*int64*) -- Unique ID of the parent particle.
+              - ``progeny_id`` (*int64*) -- Progeny ID of the particle.
+
+In an MPI run, OpenMC writes the combined dataset by gathering collision-track
+entries from all ranks before flushing them to disk, so the final file appears
+as though it were produced serially.
diff --git a/docs/source/io_formats/index.rst b/docs/source/io_formats/index.rst
index 4bbaa961a..5b4efea66 100644
--- a/docs/source/io_formats/index.rst
+++ b/docs/source/io_formats/index.rst
@@ -44,6 +44,7 @@ Output Files
 
    statepoint
    source
+   collision_track
    summary
    properties
    depletion_results
diff --git a/docs/source/io_formats/settings.rst b/docs/source/io_formats/settings.rst
index 720846c85..b7874fcf2 100644
--- a/docs/source/io_formats/settings.rst
+++ b/docs/source/io_formats/settings.rst
@@ -20,6 +20,85 @@ source neutrons.
 
   *Default*: None
 
+-----------------------------
+``<collision_track>`` Element
+-----------------------------
+
+The ``<collision_track>`` element indicates to track information about particle
+collisions based on a set of criteria and store these events in a file named
+``collision_track.h5``. This file records details such as the position of the
+interaction, direction of the incoming particle, incident energy and deposited
+energy, weight, time of the interaction, and the delayed neutron group (0 for
+prompt neutrons). Additional information such as the cell ID, material ID,
+universe ID, nuclide ZAID, particle type, and event MT number are also stored.
+Users can specify one or more criterion to filter collisions. If no criteria are
+specified, it defaults to tracking all collisions across the model.
+
+.. warning::
+    Storing all collisions can be very memory intensive. For more targeted
+    tracking, users can employ a variety of parameters such as ``cell_ids``,
+    ``reactions``, ``universe_ids``, ``material_ids``, ``nuclides``, and
+    ``deposited_E_threshold`` to refine the selection of particle interactions
+    to be banked.
+
+This element can contain one or more of the following attributes or
+sub-elements:
+
+  :max_collisions:
+    An integer indicating the maximum number of collisions to be banked per file.
+
+    *Default*: 1000
+
+  :max_collision_track_files:
+    An integer indicating the number of collision_track files to be used.
+
+    *Default*: 1
+
+  :mcpl:
+    An optional boolean to enable MCPL_-format instead of the native HDF5-based
+    format. If activated, the output file name and type is changed to
+    ``collision_track.mcpl``.
+
+    *Default*: false
+
+    .. _MCPL: https://mctools.github.io/mcpl/mcpl.pdf
+
+  :cell_ids:
+    A list of integers representing cell IDs to define specific cells in which
+    collisions are to be banked.
+
+    *Default*: None
+
+  :universe_ids:
+    A list of integers representing the universe IDs to define specific
+    universes in which collisions are to be banked.
+
+    *Default*: None
+
+  :material_ids:
+    A list of integers representing the material IDs to define specific
+    materials in which collisions are to be banked.
+
+    *Default*: None
+
+  :nuclides:
+    A list of strings representing the nuclide, to define specific
+    define specific target nuclide collisions to be banked.
+
+    *Default*: None
+
+  :reactions:
+    A list of integers representing the ENDF-6 format MT numbers or strings
+    (e.g. (n,fission)) to define specific reaction types to be banked.
+
+    *Default*: None
+
+  :deposited_E_threshold:
+    A float defining the minimum deposited energy per collision (in eV) to
+    trigger banking.
+
+    *Default*: 0.0
+
 ----------------------------------
 ``<confidence_intervals>`` Element
 ----------------------------------
diff --git a/docs/source/pythonapi/base.rst b/docs/source/pythonapi/base.rst
index 2a9d0876c..ce2f6f0f8 100644
--- a/docs/source/pythonapi/base.rst
+++ b/docs/source/pythonapi/base.rst
@@ -216,6 +216,9 @@ Post-processing
    :nosignatures:
    :template: myfunction.rst
 
+   openmc.read_collision_track_file
+   openmc.read_collision_track_hdf5
+   openmc.read_collision_track_mcpl
    openmc.voxel_to_vtk
 
 The following classes and functions are used for functional expansion reconstruction.
diff --git a/docs/source/usersguide/settings.rst b/docs/source/usersguide/settings.rst
index 1b2d4bc1a..f973f1465 100644
--- a/docs/source/usersguide/settings.rst
+++ b/docs/source/usersguide/settings.rst
@@ -756,6 +756,62 @@ instance, whereas the :meth:`openmc.Track.filter` method returns a new
             track_files = [f"tracks_p{rank}.h5" for rank in range(32)]
             openmc.Tracks.combine(track_files, "tracks.h5")
 
+Collision Track File
+---------------------
+
+OpenMC can generate a collision track file that contains detailed collision
+information (position, direction, energy, deposited energy, time, weight, cell
+ID, material ID, universe ID, nuclide ZAID, particle type, particle delayed
+group and particle ID) for each particle collision depending on user-defined
+parameters. To invoke this feature, set the
+:attr:`~openmc.Settings.collision_track` attribute as shown in this example::
+
+  settings.collision_track = {
+      "max_collisions": 300,
+      "reactions": ["(n,fission)", "(n,2n)"],
+      "material_ids": [1,2],
+      "nuclides": ["U238", "O16"],
+      "cell_ids": [5, 12]
+  }
+
+In this example, collision track information is written to the
+collision_track.h5 file at the end of the simulation. The file contains
+300 recorded collisions that occurred in materials with IDs 1 or 2, involving
+fission or (n,2n) reactions on the nuclides U-238 or O-16, within cells
+with IDs 5 and 12.
+The file can be read using :func:`openmc.read_collision_track_file`.
+The example below shows how to extract the data from the collision_track
+feature and displays the fields stored in the file:
+
+>>> data = openmc.read_collision_track_file('collision_track.h5')
+>>> data.dtype
+    dtype([('r', [('x', '<f8'), ('y', '<f8'), ('z', '<f8')]),
+    ('u', [('x', '<f8'), ('y', '<f8'), ('z', '<f8')]), ('E', '<f8'),
+    ('dE', '<f8'), ('time', '<f8'), ('wgt', '<f8'), ('event_mt', '<i4'),
+    ('delayed_group', '<i4'), ('cell_id', '<i4'), ('nuclide_id', '<i4'),
+    ('material_id', '<i4'), ('universe_id', '<i4'), ('n_collision', '<i4'),
+    ('particle', '<i4'), ('parent_id', '<i8'), ('progeny_id', '<i8')])
+
+
+The full list of fields is as follows:
+
+  :r: Position (each direction in [cm])
+  :u: Direction
+  :E: Energy in [eV]
+  :dE: Energy deposited during collision in [eV]
+  :time: Time in [s]
+  :wgt: Weight of the particle
+  :event_mt: Reaction MT number
+  :delayed_group: Delayed group of the particle
+  :cell_id: Cell ID
+  :nuclide_id: Nuclide ID (10000×Z + 10×A + M)
+  :material_id: Material ID
+  :universe_id: Universe ID
+  :n_collision: Number of collision suffered by the particle
+  :particle: Particle type
+  :parent_id: Source particle ID
+  :progeny_id: Progeny ID
+
 -----------------------
 Restarting a Simulation
 -----------------------
diff --git a/include/openmc/bank.h b/include/openmc/bank.h
index fd8fbd73e..c4e940bc8 100644
--- a/include/openmc/bank.h
+++ b/include/openmc/bank.h
@@ -20,6 +20,8 @@ extern vector<SourceSite> source_bank;
 
 extern SharedArray<SourceSite> surf_source_bank;
 
+extern SharedArray<CollisionTrackSite> collision_track_bank;
+
 extern SharedArray<SourceSite> fission_bank;
 
 extern vector<vector<int>> ifp_source_delayed_group_bank;
diff --git a/include/openmc/bank_io.h b/include/openmc/bank_io.h
new file mode 100644
index 000000000..90ffd820f
--- /dev/null
+++ b/include/openmc/bank_io.h
@@ -0,0 +1,103 @@
+#ifndef OPENMC_BANK_IO_H
+#define OPENMC_BANK_IO_H
+
+#include "hdf5.h"
+
+#include "openmc/message_passing.h"
+#include "openmc/span.h"
+#include "openmc/vector.h"
+
+#include <algorithm>
+
+#ifdef OPENMC_MPI
+#include <mpi.h>
+#endif
+
+namespace openmc {
+
+template<typename SiteType>
+void write_bank_dataset(const char* dataset_name, hid_t group_id,
+  span<SiteType> bank, const vector<int64_t>& bank_index, hid_t banktype
+#ifdef OPENMC_MPI
+  ,
+  MPI_Datatype mpi_dtype
+#endif
+)
+{
+  int64_t dims_size = bank_index.back();
+  int64_t count_size = bank_index[mpi::rank + 1] - bank_index[mpi::rank];
+
+#ifdef PHDF5
+  hsize_t dims[] {static_cast<hsize_t>(dims_size)};
+  hid_t dspace = H5Screate_simple(1, dims, nullptr);
+  hid_t dset = H5Dcreate(group_id, dataset_name, banktype, dspace, H5P_DEFAULT,
+    H5P_DEFAULT, H5P_DEFAULT);
+
+  hsize_t count[] {static_cast<hsize_t>(count_size)};
+  hid_t memspace = H5Screate_simple(1, count, nullptr);
+
+  hsize_t start[] {static_cast<hsize_t>(bank_index[mpi::rank])};
+  H5Sselect_hyperslab(dspace, H5S_SELECT_SET, start, nullptr, count, nullptr);
+
+  hid_t plist = H5Pcreate(H5P_DATASET_XFER);
+  H5Pset_dxpl_mpio(plist, H5FD_MPIO_COLLECTIVE);
+
+  H5Dwrite(dset, banktype, memspace, dspace, plist, bank.data());
+
+  H5Sclose(dspace);
+  H5Sclose(memspace);
+  H5Dclose(dset);
+  H5Pclose(plist);
+#else
+  if (mpi::master) {
+    hsize_t dims[] {static_cast<hsize_t>(dims_size)};
+    hid_t dspace = H5Screate_simple(1, dims, nullptr);
+    hid_t dset = H5Dcreate(group_id, dataset_name, banktype, dspace,
+      H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+
+#ifdef OPENMC_MPI
+    vector<SiteType> temp_bank {bank.begin(), bank.end()};
+#endif
+
+    for (int i = 0; i < mpi::n_procs; ++i) {
+      hsize_t count[] {static_cast<hsize_t>(bank_index[i + 1] - bank_index[i])};
+      hid_t memspace = H5Screate_simple(1, count, nullptr);
+
+#ifdef OPENMC_MPI
+      if (i > 0) {
+        MPI_Recv(bank.data(), count[0], mpi_dtype, i, i, mpi::intracomm,
+          MPI_STATUS_IGNORE);
+      }
+#endif
+
+      hid_t dspace_rank = H5Dget_space(dset);
+      hsize_t start[] {static_cast<hsize_t>(bank_index[i])};
+      H5Sselect_hyperslab(
+        dspace_rank, H5S_SELECT_SET, start, nullptr, count, nullptr);
+
+      H5Dwrite(dset, banktype, memspace, dspace_rank, H5P_DEFAULT, bank.data());
+
+      H5Sclose(memspace);
+      H5Sclose(dspace_rank);
+    }
+
+    H5Dclose(dset);
+
+#ifdef OPENMC_MPI
+    std::copy(temp_bank.begin(), temp_bank.end(), bank.begin());
+#endif
+  }
+#ifdef OPENMC_MPI
+  else {
+    if (!bank.empty()) {
+      MPI_Send(
+        bank.data(), bank.size(), mpi_dtype, 0, mpi::rank, mpi::intracomm);
+    }
+  }
+#endif
+#endif
+}
+
+} // namespace openmc
+
+#endif // OPENMC_BANK_IO_H
diff --git a/include/openmc/collision_track.h b/include/openmc/collision_track.h
new file mode 100644
index 000000000..208b8f6e1
--- /dev/null
+++ b/include/openmc/collision_track.h
@@ -0,0 +1,23 @@
+#ifndef OPENMC_COLLISION_TRACK_H
+#define OPENMC_COLLISION_TRACK_H
+
+#include <string>
+
+namespace openmc {
+
+class Particle;
+
+//! Reserve space in the collision track bank according to user settings.
+void collision_track_reserve_bank();
+
+//! Write collision track data to disk when the bank is full or the batch ends.
+void collision_track_flush_bank();
+
+//! Record the current particle as a collision-track entry when applicable.
+//!
+//! \param particle Particle whose collision should be recorded if eligible
+void collision_track_record(Particle& particle);
+
+} // namespace openmc
+
+#endif // OPENMC_COLLISION_TRACK_H
diff --git a/include/openmc/constants.h b/include/openmc/constants.h
index b66193481..bba260c3a 100644
--- a/include/openmc/constants.h
+++ b/include/openmc/constants.h
@@ -34,6 +34,7 @@ constexpr array<int, 2> VERSION_VOXEL {2, 0};
 constexpr array<int, 2> VERSION_MGXS_LIBRARY {1, 0};
 constexpr array<int, 2> VERSION_PROPERTIES {1, 1};
 constexpr array<int, 2> VERSION_WEIGHT_WINDOWS {1, 0};
+constexpr array<int, 2> VERSION_COLLISION_TRACK {1, 0};
 
 // ============================================================================
 // ADJUSTABLE PARAMETERS
diff --git a/include/openmc/mcpl_interface.h b/include/openmc/mcpl_interface.h
index a76d72e64..a9cce3e69 100644
--- a/include/openmc/mcpl_interface.h
+++ b/include/openmc/mcpl_interface.h
@@ -38,6 +38,21 @@ vector<SourceSite> mcpl_source_sites(std::string path);
 void write_mcpl_source_point(const char* filename, span<SourceSite> source_bank,
   const vector<int64_t>& bank_index);
 
+//! Write an MCPL collision track file
+//!
+//! This function writes collision track data to an MCPL file. Additional
+//! collision-specific metadata (such as energy deposition, material info, etc.)
+//! is stored in the file header as blob data.
+//!
+//! \param[in] filename     Path to MCPL file
+//! \param[in] collision_track_bank  Vector of CollisionTrackSites to write to
+//!                         file for this MPI rank.
+//! \param[in] bank_index   Pointer to vector of site index ranges over all
+//!                         MPI ranks.
+void write_mcpl_collision_track(const char* filename,
+  span<CollisionTrackSite> collision_track_bank,
+  const vector<int64_t>& bank_index);
+
 //! Check if MCPL functionality is available
 bool is_mcpl_interface_available();
 
diff --git a/include/openmc/message_passing.h b/include/openmc/message_passing.h
index a1641a906..ce993776b 100644
--- a/include/openmc/message_passing.h
+++ b/include/openmc/message_passing.h
@@ -18,6 +18,7 @@ extern bool master;
 
 #ifdef OPENMC_MPI
 extern MPI_Datatype source_site;
+extern MPI_Datatype collision_track_site;
 extern MPI_Comm intracomm;
 #endif
 
diff --git a/include/openmc/particle_data.h b/include/openmc/particle_data.h
index 5383487d4..fdacfa765 100644
--- a/include/openmc/particle_data.h
+++ b/include/openmc/particle_data.h
@@ -56,6 +56,25 @@ struct SourceSite {
   int64_t progeny_id;
 };
 
+struct CollisionTrackSite {
+  Position r;
+  Direction u;
+  double E;
+  double dE;
+  double time {0.0};
+  double wgt {1.0};
+  int event_mt {0};
+  int delayed_group {0};
+  int cell_id {0};
+  int nuclide_id;
+  int material_id {0};
+  int universe_id {0};
+  int n_collision {0};
+  ParticleType particle;
+  int64_t parent_id;
+  int64_t progeny_id;
+};
+
 //! State of a particle used for particle track files
 struct TrackState {
   Position r;           //!< Position in [cm]
diff --git a/include/openmc/settings.h b/include/openmc/settings.h
index 78bfa088e..b369c99fe 100644
--- a/include/openmc/settings.h
+++ b/include/openmc/settings.h
@@ -32,6 +32,24 @@ enum class IFPParameter {
   GenerationTime,
 };
 
+struct CollisionTrackConfig {
+  bool mcpl_write {false}; //!< Write collision tracks using MCPL?
+  std::unordered_set<int>
+    cell_ids; //!< Cell ids where collisions will be written
+  std::unordered_set<int>
+    mt_numbers; //!< MT Numbers where collisions will be written
+  std::unordered_set<int>
+    universe_ids; //!< Universe IDs where collisions will be written
+  std::unordered_set<int>
+    material_ids; //!< Material IDs where collisions will be written
+  std::unordered_set<std::string>
+    nuclides; //!< Nuclides where collisions will be written
+  double deposited_energy_threshold {0.0}; //!< Minimum deposited energy [eV]
+  int64_t max_collisions {
+    1000};               //!< Maximum events recorded per collision track file
+  int64_t max_files {1}; //!< Maximum number of collision track files
+};
+
 //==============================================================================
 // Global variable declarations
 //==============================================================================
@@ -41,6 +59,7 @@ namespace settings {
 // Boolean flags
 extern bool assume_separate;      //!< assume tallies are spatially separate?
 extern bool check_overlaps;       //!< check overlaps in geometry?
+extern bool collision_track;      //!< flag to use collision track feature?
 extern bool confidence_intervals; //!< use confidence intervals for results?
 extern bool
   create_fission_neutrons; //!< create fission neutrons (fixed source)?
@@ -145,6 +164,7 @@ extern std::unordered_set<int>
   statepoint_batch; //!< Batches when state should be written
 extern std::unordered_set<int>
   source_write_surf_id; //!< Surface ids where sources will be written
+extern CollisionTrackConfig collision_track_config;
 extern double source_rejection_fraction; //!< Minimum fraction of source sites
                                          //!< that must be accepted
 extern double free_gas_threshold;        //!< Threshold multiplier for free gas
diff --git a/include/openmc/simulation.h b/include/openmc/simulation.h
index 3e4e24e1d..9a6cf1b21 100644
--- a/include/openmc/simulation.h
+++ b/include/openmc/simulation.h
@@ -22,6 +22,7 @@ constexpr int STATUS_EXIT_ON_TRIGGER {2};
 
 namespace simulation {
 
+extern int ct_current_file;   //!< current collision track file index
 extern "C" int current_batch; //!< current batch
 extern "C" int current_gen;   //!< current fission generation
 extern "C" bool initialized;  //!< has simulation been initialized?
diff --git a/include/openmc/urr.h b/include/openmc/urr.h
index 3978c7b86..1e6037158 100644
--- a/include/openmc/urr.h
+++ b/include/openmc/urr.h
@@ -27,10 +27,10 @@ public:
     double heating;
   };
 
-  Interpolation interp_;          //!< interpolation type
-  int inelastic_flag_;            //!< inelastic competition flag
-  int absorption_flag_;           //!< other absorption flag
-  bool multiply_smooth_;          //!< multiply by smooth cross section?
+  Interpolation interp_; //!< interpolation type
+  int inelastic_flag_;   //!< inelastic competition flag
+  int absorption_flag_;  //!< other absorption flag
+  bool multiply_smooth_; //!< multiply by smooth cross section?
 
   vector<double> energy_; //!< incident energies
   auto n_energy() const { return energy_.size(); }
diff --git a/openmc/settings.py b/openmc/settings.py
index 2f8a2b124..43c1fe069 100644
--- a/openmc/settings.py
+++ b/openmc/settings.py
@@ -6,7 +6,7 @@ from numbers import Integral, Real
 from pathlib import Path
 
 import lxml.etree as ET
-
+import warnings
 import openmc
 import openmc.checkvalue as cv
 from openmc.checkvalue import PathLike
@@ -47,6 +47,21 @@ class Settings:
         half-width of the 95% two-sided confidence interval. If False,
         uncertainties on tally results will be reported as the sample standard
         deviation.
+    collision_track : dict
+        Options for writing collision information. Acceptable keys are:
+
+        :max_collisions: Maximum number of collisions to be banked per file. (int)
+        :max_collision_track_files: Maximum number of collision_track files. (int)
+        :mcpl: Output in the form of an MCPL-file. (bool)
+        :cell_ids: List of cell IDs to define cells in which collisions should be banked. (list of int)
+        :universe_ids: List of universe IDs to define universes in which collisions should be banked. (list of int)
+        :material_ids: List of material IDs to define materials in which collisions should be banked. (list of int)
+        :nuclides: List of nuclides to define nuclides in which collisions should be banked.
+                    (ex: ["I135m", "U233"] ). (list of str)
+        :reactions: List of reaction to define specific reactions that should be banked
+                    (ex: ["(n,fission)", 2, "(n,2n)"] ). (list of str or int)
+        :deposited_E_threshold: Number to define the minimum deposited energy during
+                     per collision to trigger banking. (float)
     create_fission_neutrons : bool
         Indicate whether fission neutrons should be created or not.
     cutoff : dict
@@ -395,6 +410,9 @@ class Settings:
         # Iterated Fission Probability
         self._ifp_n_generation = None
 
+        # Collision track feature
+        self._collision_track = {}
+
         # Output options
         self._statepoint = {}
         self._sourcepoint = {}
@@ -434,7 +452,8 @@ class Settings:
         self._max_particle_events = None
         self._write_initial_source = None
         self._weight_windows = WeightWindowsList()
-        self._weight_window_generators = cv.CheckedList(WeightWindowGenerator, 'weight window generators')
+        self._weight_window_generators = cv.CheckedList(
+            WeightWindowGenerator, 'weight window generators')
         self._weight_windows_on = None
         self._weight_windows_file = None
         self._weight_window_checkpoints = {}
@@ -475,8 +494,9 @@ class Settings:
 
     @generations_per_batch.setter
     def generations_per_batch(self, generations_per_batch: int):
-        cv.check_type('generations per patch', generations_per_batch, Integral)
-        cv.check_greater_than('generations per batch', generations_per_batch, 0)
+        cv.check_type('generations per batch', generations_per_batch, Integral)
+        cv.check_greater_than('generations per batch',
+                              generations_per_batch, 0)
         self._generations_per_batch = generations_per_batch
 
     @property
@@ -506,7 +526,8 @@ class Settings:
     @rel_max_lost_particles.setter
     def rel_max_lost_particles(self, rel_max_lost_particles: float):
         cv.check_type('rel_max_lost_particles', rel_max_lost_particles, Real)
-        cv.check_greater_than('rel_max_lost_particles', rel_max_lost_particles, 0)
+        cv.check_greater_than('rel_max_lost_particles',
+                              rel_max_lost_particles, 0)
         cv.check_less_than('rel_max_lost_particles', rel_max_lost_particles, 1)
         self._rel_max_lost_particles = rel_max_lost_particles
 
@@ -516,8 +537,10 @@ class Settings:
 
     @max_write_lost_particles.setter
     def max_write_lost_particles(self, max_write_lost_particles: int):
-        cv.check_type('max_write_lost_particles', max_write_lost_particles, Integral)
-        cv.check_greater_than('max_write_lost_particles', max_write_lost_particles, 0)
+        cv.check_type('max_write_lost_particles',
+                      max_write_lost_particles, Integral)
+        cv.check_greater_than('max_write_lost_particles',
+                              max_write_lost_particles, 0)
         self._max_write_lost_particles = max_write_lost_particles
 
     @property
@@ -538,12 +561,12 @@ class Settings:
     def keff_trigger(self, keff_trigger: dict):
         if not isinstance(keff_trigger, dict):
             msg = f'Unable to set a trigger on keff from "{keff_trigger}" ' \
-                  'which is not a Python dictionary'
+                'which is not a Python dictionary'
             raise ValueError(msg)
 
         elif 'type' not in keff_trigger:
             msg = f'Unable to set a trigger on keff from "{keff_trigger}" ' \
-                  'which does not have a "type" key'
+                'which does not have a "type" key'
             raise ValueError(msg)
 
         elif keff_trigger['type'] not in ['variance', 'std_dev', 'rel_err']:
@@ -553,7 +576,7 @@ class Settings:
 
         elif 'threshold' not in keff_trigger:
             msg = f'Unable to set a trigger on keff from "{keff_trigger}" ' \
-                  'which does not have a "threshold" key'
+                'which does not have a "threshold" key'
             raise ValueError(msg)
 
         elif not isinstance(keff_trigger['threshold'], Real):
@@ -570,7 +593,7 @@ class Settings:
     @energy_mode.setter
     def energy_mode(self, energy_mode: str):
         cv.check_value('energy mode', energy_mode,
-                    ['continuous-energy', 'multi-group'])
+                       ['continuous-energy', 'multi-group'])
         self._energy_mode = energy_mode
 
     @property
@@ -593,7 +616,8 @@ class Settings:
     def source(self, source: SourceBase | Iterable[SourceBase]):
         if not isinstance(source, MutableSequence):
             source = [source]
-        self._source = cv.CheckedList(SourceBase, 'source distributions', source)
+        self._source = cv.CheckedList(
+            SourceBase, 'source distributions', source)
 
     @property
     def confidence_intervals(self) -> bool:
@@ -610,7 +634,8 @@ class Settings:
 
     @electron_treatment.setter
     def electron_treatment(self, electron_treatment: str):
-        cv.check_value('electron treatment', electron_treatment, ['led', 'ttb'])
+        cv.check_value('electron treatment',
+                       electron_treatment, ['led', 'ttb'])
         self._electron_treatment = electron_treatment
 
     @property
@@ -704,7 +729,8 @@ class Settings:
     @trigger_max_batches.setter
     def trigger_max_batches(self, trigger_max_batches: int):
         cv.check_type('trigger maximum batches', trigger_max_batches, Integral)
-        cv.check_greater_than('trigger maximum batches', trigger_max_batches, 0)
+        cv.check_greater_than('trigger maximum batches',
+                              trigger_max_batches, 0)
         self._trigger_max_batches = trigger_max_batches
 
     @property
@@ -713,8 +739,10 @@ class Settings:
 
     @trigger_batch_interval.setter
     def trigger_batch_interval(self, trigger_batch_interval: int):
-        cv.check_type('trigger batch interval', trigger_batch_interval, Integral)
-        cv.check_greater_than('trigger batch interval', trigger_batch_interval, 0)
+        cv.check_type('trigger batch interval',
+                      trigger_batch_interval, Integral)
+        cv.check_greater_than('trigger batch interval',
+                              trigger_batch_interval, 0)
         self._trigger_batch_interval = trigger_batch_interval
 
     @property
@@ -798,19 +826,22 @@ class Settings:
 
     @surf_source_write.setter
     def surf_source_write(self, surf_source_write: dict):
-        cv.check_type("surface source writing options", surf_source_write, Mapping)
+        cv.check_type("surface source writing options",
+                      surf_source_write, Mapping)
         for key, value in surf_source_write.items():
             cv.check_value(
                 "surface source writing key",
                 key,
-                ("surface_ids", "max_particles", "max_source_files", "mcpl", "cell", "cellfrom", "cellto"),
+                ("surface_ids", "max_particles", "max_source_files",
+                 "mcpl", "cell", "cellfrom", "cellto"),
             )
             if key == "surface_ids":
                 cv.check_type(
                     "surface ids for source banking", value, Iterable, Integral
                 )
                 for surf_id in value:
-                    cv.check_greater_than("surface id for source banking", surf_id, 0)
+                    cv.check_greater_than(
+                        "surface id for source banking", surf_id, 0)
 
             elif key == "mcpl":
                 cv.check_type("write to an MCPL-format file", value, bool)
@@ -827,6 +858,79 @@ class Settings:
 
         self._surf_source_write = surf_source_write
 
+    @property
+    def collision_track(self) -> dict:
+        return self._collision_track
+
+    @collision_track.setter
+    def collision_track(self, collision_track: dict):
+        cv.check_type('Collision tracking options', collision_track, Mapping)
+        for key, value in collision_track.items():
+            cv.check_value('collision_track key', key,
+                           ('cell_ids', 'reactions', 'universe_ids', 'material_ids', 'nuclides',
+                            'deposited_E_threshold', 'max_collisions', 'max_collision_track_files', 'mcpl'))
+            if key == 'cell_ids':
+                cv.check_type('cell ids for collision tracking data banking', value,
+                              Iterable, Integral)
+                for cell_id in value:
+                    cv.check_greater_than('cell id for collision tracking data banking',
+                                          cell_id, 0)
+            elif key == 'reactions':
+                cv.check_type('MT numbers for collision tracking data banking', value,
+                              Iterable)
+                for reaction in value:
+                    if isinstance(reaction, int):
+                        cv.check_greater_than(
+                            'MT number for collision tracking data banking', reaction, 0
+                        )
+                    elif isinstance(reaction, str):
+                        # check against allowed strings? so far let C++ code handle it
+                        pass
+                    else:
+                        raise TypeError(
+                            f"MT number for collision tracking data banking must be a positive int or string, "
+                            f"got {type(reaction).__name__}")
+            elif key == 'universe_ids':
+                cv.check_type('universe ids for collision tracking data banking', value,
+                              Iterable, Integral)
+                for universe_id in value:
+                    cv.check_greater_than('universe id for collision tracking data banking',
+                                          universe_id, 0)
+            elif key == 'material_ids':
+                cv.check_type('material ids for collision tracking data banking', value,
+                              Iterable, Integral)
+                for material_id in value:
+                    cv.check_greater_than('material id for collision tracking data banking',
+                                          material_id, 0)
+            elif key == 'nuclides':
+                cv.check_type('nuclides for collision tracking data banking', value,
+                              Iterable, str)
+                for nuclide in value:
+                    # If nuclide name doesn't look valid, give a warning
+                    try:
+                        openmc.data.zam(nuclide)
+                    except ValueError:
+                        warnings.warn(f"Nuclide {nuclide} is not valid")
+            elif key == 'deposited_E_threshold':
+                cv.check_type('Deposited Energy Threshold for collision tracking data banking',
+                              value, Real)
+                cv.check_greater_than('Deposited Energy Threshold for collision tracking data banking',
+                                      value, 0)
+            elif key == 'max_collisions':
+                cv.check_type('maximum collisions banks per file',
+                              value, Integral)
+                cv.check_greater_than('maximum collisions banks in collision tracking',
+                                      value, 0)
+            elif key == 'max_collision_track_files':
+                cv.check_type('maximum collisions banks',
+                              value, Integral)
+                cv.check_greater_than('maximum number of collision_track files ',
+                                      value, 0)
+            elif key == 'mcpl':
+                cv.check_type('write to an MCPL-format file', value, bool)
+
+        self._collision_track = collision_track
+
     @property
     def no_reduce(self) -> bool:
         return self._no_reduce
@@ -943,7 +1047,7 @@ class Settings:
     def cutoff(self, cutoff: dict):
         if not isinstance(cutoff, Mapping):
             msg = f'Unable to set cutoff from "{cutoff}" which is not a '\
-                  'Python dictionary'
+                'Python dictionary'
             raise ValueError(msg)
         for key in cutoff:
             if key == 'weight':
@@ -961,7 +1065,7 @@ class Settings:
                 cv.check_greater_than('energy cutoff', cutoff[key], 0.0)
             else:
                 msg = f'Unable to set cutoff to "{key}" which is unsupported ' \
-                      'by OpenMC'
+                    'by OpenMC'
 
         self._cutoff = cutoff
 
@@ -1130,12 +1234,14 @@ class Settings:
     @weight_window_checkpoints.setter
     def weight_window_checkpoints(self, weight_window_checkpoints: dict):
         for key in weight_window_checkpoints.keys():
-            cv.check_value('weight_window_checkpoints', key, ('collision', 'surface'))
+            cv.check_value('weight_window_checkpoints',
+                           key, ('collision', 'surface'))
         self._weight_window_checkpoints = weight_window_checkpoints
 
     @property
     def max_splits(self):
-        raise AttributeError('max_splits has been deprecated. Please use max_history_splits instead')
+        raise AttributeError(
+            'max_splits has been deprecated. Please use max_history_splits instead')
 
     @property
     def max_history_splits(self) -> int:
@@ -1184,7 +1290,8 @@ class Settings:
     def weight_window_generators(self, wwgs):
         if not isinstance(wwgs, MutableSequence):
             wwgs = [wwgs]
-        self._weight_window_generators = cv.CheckedList(WeightWindowGenerator, 'weight window generators', wwgs)
+        self._weight_window_generators = cv.CheckedList(
+            WeightWindowGenerator, 'weight window generators', wwgs)
 
     @property
     def random_ray(self) -> dict:
@@ -1221,7 +1328,8 @@ class Settings:
                 for mesh, domains in value:
                     cv.check_type('mesh', mesh, MeshBase)
                     cv.check_type('domains', domains, Iterable)
-                    valid_types = (openmc.Material, openmc.Cell, openmc.Universe)
+                    valid_types = (openmc.Material,
+                                   openmc.Cell, openmc.Universe)
                     for domain in domains:
                         if not isinstance(domain, valid_types):
                             raise ValueError(
@@ -1255,9 +1363,12 @@ class Settings:
 
     @source_rejection_fraction.setter
     def source_rejection_fraction(self, source_rejection_fraction: float):
-        cv.check_type('source_rejection_fraction', source_rejection_fraction, Real)
-        cv.check_greater_than('source_rejection_fraction', source_rejection_fraction, 0)
-        cv.check_less_than('source_rejection_fraction', source_rejection_fraction, 1)
+        cv.check_type('source_rejection_fraction',
+                      source_rejection_fraction, Real)
+        cv.check_greater_than('source_rejection_fraction',
+                              source_rejection_fraction, 0)
+        cv.check_less_than('source_rejection_fraction',
+                           source_rejection_fraction, 1)
         self._source_rejection_fraction = source_rejection_fraction
 
     @property
@@ -1422,6 +1533,45 @@ class Settings:
                     subelement = ET.SubElement(element, key)
                     subelement.text = str(self._surf_source_write[key])
 
+    def _create_collision_track_subelement(self, root):
+        if self._collision_track:
+            element = ET.SubElement(root, "collision_track")
+            if 'cell_ids' in self._collision_track:
+                subelement = ET.SubElement(element, "cell_ids")
+                subelement.text = ' '.join(
+                    str(x) for x in self._collision_track['cell_ids'])
+            if 'reactions' in self._collision_track:
+                subelement = ET.SubElement(element, "reactions")
+                subelement.text = ' '.join(
+                    str(x) for x in self._collision_track['reactions'])
+            if 'universe_ids' in self._collision_track:
+                subelement = ET.SubElement(element, "universe_ids")
+                subelement.text = ' '.join(
+                    str(x) for x in self._collision_track['universe_ids'])
+            if 'material_ids' in self._collision_track:
+                subelement = ET.SubElement(element, "material_ids")
+                subelement.text = ' '.join(
+                    str(x) for x in self._collision_track['material_ids'])
+            if 'nuclides' in self._collision_track:
+                subelement = ET.SubElement(element, "nuclides")
+                subelement.text = ' '.join(
+                    str(x) for x in self._collision_track['nuclides'])
+            if 'deposited_E_threshold' in self._collision_track:
+                subelement = ET.SubElement(element, "deposited_E_threshold")
+                subelement.text = str(
+                    self._collision_track['deposited_E_threshold'])
+            if 'max_collisions' in self._collision_track:
+                subelement = ET.SubElement(element, "max_collisions")
+                subelement.text = str(self._collision_track['max_collisions'])
+            if 'max_collision_track_files' in self._collision_track:
+                subelement = ET.SubElement(
+                    element, "max_collision_track_files")
+                subelement.text = str(
+                    self._collision_track['max_collision_track_files'])
+            if 'mcpl' in self._collision_track:
+                subelement = ET.SubElement(element, "mcpl")
+                subelement.text = str(self._collision_track['mcpl']).lower()
+
     def _create_confidence_intervals(self, root):
         if self._confidence_intervals is not None:
             element = ET.SubElement(root, "confidence_intervals")
@@ -1477,8 +1627,8 @@ class Settings:
         # use default heuristic for entropy mesh if not set by user
         if self.entropy_mesh.dimension is None:
             if self.particles is None:
-                raise RuntimeError("Number of particles must be set in order to " \
-                    "use entropy mesh dimension heuristic")
+                raise RuntimeError("Number of particles must be set in order to "
+                                   "use entropy mesh dimension heuristic")
             else:
                 n = ceil((self.particles / 20.0)**(1.0 / 3.0))
                 d = len(self.entropy_mesh.lower_left)
@@ -1568,7 +1718,8 @@ class Settings:
         path = f"./mesh[@id='{self.ufs_mesh.id}']"
         if root.find(path) is None:
             root.append(self.ufs_mesh.to_xml_element())
-            if mesh_memo is not None: mesh_memo.add(self.ufs_mesh.id)
+            if mesh_memo is not None:
+                mesh_memo.add(self.ufs_mesh.id)
 
     def _create_use_decay_photons_subelement(self, root):
         if self._use_decay_photons is not None:
@@ -1694,11 +1845,13 @@ class Settings:
 
         if 'collision' in self._weight_window_checkpoints:
             subelement = ET.SubElement(element, "collision")
-            subelement.text = str(self._weight_window_checkpoints['collision']).lower()
+            subelement.text = str(
+                self._weight_window_checkpoints['collision']).lower()
 
         if 'surface' in self._weight_window_checkpoints:
             subelement = ET.SubElement(element, "surface")
-            subelement.text = str(self._weight_window_checkpoints['surface']).lower()
+            subelement.text = str(
+                self._weight_window_checkpoints['surface']).lower()
 
     def _create_max_history_splits_subelement(self, root):
         if self._max_history_splits is not None:
@@ -1730,6 +1883,9 @@ class Settings:
                         for domain in domains:
                             domain_elem = ET.SubElement(mesh_elem, 'domain')
                             domain_elem.set('id', str(domain.id))
+                            domain_elem.set(
+                                'type', domain.__class__.__name__.lower())
+                        if mesh_memo is not None and mesh.id not in mesh_memo:
                             domain_elem.set('type', domain.__class__.__name__.lower())
                         # See if a <mesh> element already exists -- if not, add it
                         path = f"./mesh[@id='{mesh.id}']"
@@ -1881,6 +2037,25 @@ class Settings:
                     value = int(value)
                 self.surf_source_write[key] = value
 
+    def _collision_track_from_xml_element(self, root):
+        elem = root.find('collision_track')
+        if elem is not None:
+            for key in ('cell_ids', 'reactions', 'universe_ids', 'material_ids', 'nuclides',
+                        'deposited_E_threshold', 'max_collisions', "max_collision_track_files", 'mcpl'):
+                value = get_text(elem, key)
+                if value is not None:
+                    if key in ('cell_ids', 'universe_ids', 'material_ids'):
+                        value = [int(x) for x in value.split()]
+                    elif key in ('reactions', 'nuclides'):
+                        value = value.split()
+                    elif key in ('max_collisions', 'max_collision_track_files'):
+                        value = int(value)
+                    elif key == 'deposited_E_threshold':
+                        value = float(value)
+                    elif key == 'mcpl':
+                        value = value in ('true', '1')
+                    self.collision_track[key] = value
+
     def _confidence_intervals_from_xml_element(self, root):
         text = get_text(root, 'confidence_intervals')
         if text is not None:
@@ -2180,7 +2355,8 @@ class Settings:
                             elif domain_type == 'universe':
                                 domain = openmc.Universe(domain_id)
                             domains.append(domain)
-                        self.random_ray['source_region_meshes'].append((mesh, domains))
+                        self.random_ray['source_region_meshes'].append(
+                            (mesh, domains))
 
     def _use_decay_photons_from_xml_element(self, root):
         text = get_text(root, 'use_decay_photons')
@@ -2223,6 +2399,7 @@ class Settings:
         self._create_sourcepoint_subelement(element)
         self._create_surf_source_read_subelement(element)
         self._create_surf_source_write_subelement(element)
+        self._create_collision_track_subelement(element)
         self._create_confidence_intervals(element)
         self._create_electron_treatment_subelement(element)
         self._create_energy_mode_subelement(element)
@@ -2336,6 +2513,7 @@ class Settings:
         settings._sourcepoint_from_xml_element(elem)
         settings._surf_source_read_from_xml_element(elem)
         settings._surf_source_write_from_xml_element(elem)
+        settings._collision_track_from_xml_element(elem)
         settings._confidence_intervals_from_xml_element(elem)
         settings._electron_treatment_from_xml_element(elem)
         settings._energy_mode_from_xml_element(elem)
diff --git a/openmc/source.py b/openmc/source.py
index 9b730cf1d..84d8a9619 100644
--- a/openmc/source.py
+++ b/openmc/source.py
@@ -6,7 +6,6 @@ from numbers import Real
 from pathlib import Path
 import warnings
 from typing import Any
-from pathlib import Path
 
 import lxml.etree as ET
 import numpy as np
@@ -107,10 +106,12 @@ class SourceBase(ABC):
                 cv.check_type('fissionable', value, bool)
                 self._constraints['fissionable'] = value
             elif key == 'rejection_strategy':
-                cv.check_value('rejection strategy', value, ('resample', 'kill'))
+                cv.check_value('rejection strategy',
+                               value, ('resample', 'kill'))
                 self._constraints['rejection_strategy'] = value
             else:
-                raise ValueError(f'Unknown key in constraints dictionary: {key}')
+                raise ValueError(
+                    f'Unknown key in constraints dictionary: {key}')
 
     @abstractmethod
     def populate_xml_element(self, element):
@@ -144,13 +145,16 @@ class SourceBase(ABC):
                 dt_elem = ET.SubElement(constraints_elem, "domain_type")
                 dt_elem.text = constraints["domain_type"]
                 id_elem = ET.SubElement(constraints_elem, "domain_ids")
-                id_elem.text = ' '.join(str(uid) for uid in constraints["domain_ids"])
+                id_elem.text = ' '.join(str(uid)
+                                        for uid in constraints["domain_ids"])
             if "time_bounds" in constraints:
                 dt_elem = ET.SubElement(constraints_elem, "time_bounds")
-                dt_elem.text = ' '.join(str(t) for t in constraints["time_bounds"])
+                dt_elem.text = ' '.join(str(t)
+                                        for t in constraints["time_bounds"])
             if "energy_bounds" in constraints:
                 dt_elem = ET.SubElement(constraints_elem, "energy_bounds")
-                dt_elem.text = ' '.join(str(E) for E in constraints["energy_bounds"])
+                dt_elem.text = ' '.join(str(E)
+                                        for E in constraints["energy_bounds"])
             if "fissionable" in constraints:
                 dt_elem = ET.SubElement(constraints_elem, "fissionable")
                 dt_elem.text = str(constraints["fissionable"]).lower()
@@ -199,7 +203,8 @@ class SourceBase(ABC):
             elif source_type == 'mesh':
                 return MeshSource.from_xml_element(elem, meshes)
             else:
-                raise ValueError(f'Source type {source_type} is not recognized')
+                raise ValueError(
+                    f'Source type {source_type} is not recognized')
 
     @staticmethod
     def _get_constraints(elem: ET.Element) -> dict[str, Any]:
@@ -316,7 +321,8 @@ class IndependentSource(SourceBase):
         time: openmc.stats.Univariate | None = None,
         strength: float = 1.0,
         particle: str = 'neutron',
-        domains: Sequence[openmc.Cell | openmc.Material | openmc.Universe] | None = None,
+        domains: Sequence[openmc.Cell | openmc.Material |
+                          openmc.Universe] | None = None,
         constraints: dict[str, Any] | None = None
     ):
         if domains is not None:
@@ -527,11 +533,12 @@ class MeshSource(SourceBase):
         'fissionable', and 'rejection_strategy'.
 
     """
+
     def __init__(
             self,
             mesh: MeshBase,
             sources: Sequence[SourceBase],
-            constraints: dict[str, Any] | None  = None,
+            constraints: dict[str, Any] | None = None,
     ):
         super().__init__(strength=None, constraints=constraints)
         self.mesh = mesh
@@ -577,7 +584,8 @@ class MeshSource(SourceBase):
 
         elif isinstance(self.mesh, UnstructuredMesh):
             if s.ndim > 1:
-                raise ValueError('Sources must be a 1-D array for unstructured mesh')
+                raise ValueError(
+                    'Sources must be a 1-D array for unstructured mesh')
 
         self._sources = s
         for src in self._sources:
@@ -646,7 +654,8 @@ class MeshSource(SourceBase):
         mesh_id = int(get_text(elem, 'mesh'))
         mesh = meshes[mesh_id]
 
-        sources = [SourceBase.from_xml_element(e) for e in elem.iterchildren('source')]
+        sources = [SourceBase.from_xml_element(
+            e) for e in elem.iterchildren('source')]
         constraints = cls._get_constraints(elem)
         return cls(mesh, sources, constraints=constraints)
 
@@ -656,7 +665,8 @@ def Source(*args, **kwargs):
     A function for backward compatibility of sources. Will be removed in the
     future. Please update to IndependentSource.
     """
-    warnings.warn("This class is deprecated in favor of 'IndependentSource'", FutureWarning)
+    warnings.warn(
+        "This class is deprecated in favor of 'IndependentSource'", FutureWarning)
     return openmc.IndependentSource(*args, **kwargs)
 
 
@@ -703,6 +713,7 @@ class CompiledSource(SourceBase):
         'fissionable', and 'rejection_strategy'.
 
     """
+
     def __init__(
         self,
         library: PathLike,
@@ -914,7 +925,8 @@ class ParticleType(IntEnum):
         try:
             return cls[value.upper()]
         except KeyError:
-            raise ValueError(f"Invalid string for creation of {cls.__name__}: {value}")
+            raise ValueError(
+                f"Invalid string for creation of {cls.__name__}: {value}")
 
     @classmethod
     def from_pdg_number(cls, pdg_number: int) -> ParticleType:
@@ -984,6 +996,7 @@ class SourceParticle:
         Type of the particle
 
     """
+
     def __init__(
         self,
         r: Iterable[float] = (0., 0., 0.),
@@ -1042,7 +1055,8 @@ def write_source_file(
     openmc.SourceParticle
 
     """
-    cv.check_iterable_type("source particles", source_particles, SourceParticle)
+    cv.check_iterable_type(
+        "source particles", source_particles, SourceParticle)
     pl = ParticleList(source_particles)
     pl.export_to_hdf5(filename, **kwargs)
 
@@ -1104,7 +1118,8 @@ class ParticleList(list):
             for particle in f.particles:
                 # Determine particle type based on the PDG number
                 try:
-                    particle_type = ParticleType.from_pdg_number(particle.pdgcode)
+                    particle_type = ParticleType.from_pdg_number(
+                        particle.pdgcode)
                 except ValueError:
                     particle_type = "UNKNOWN"
 
@@ -1241,3 +1256,133 @@ def read_source_file(filename: PathLike) -> ParticleList:
         return ParticleList.from_hdf5(filename)
     else:
         return ParticleList.from_mcpl(filename)
+
+
+def read_collision_track_hdf5(filename):
+    """Read a collision track file in HDF5 format.
+
+    Parameters
+    ----------
+    filename : str or path-like
+        Path to the HDF5 collision track file.
+
+    Returns
+    -------
+    numpy.ndarray
+        Structured array containing collision track data.
+
+    See Also
+    --------
+    read_collision_track_mcpl
+    read_collision_track_file
+    """
+
+    with h5py.File(filename, 'r') as file:
+        data = file['collision_track_bank'][:]
+
+    return data
+
+
+def read_collision_track_mcpl(file_path):
+    """Read a collision track file in MCPL format.
+
+    Parameters
+    ----------
+    file_path : str or path-like
+        Path to the MCPL collision track file.
+
+    Returns
+    -------
+    numpy.ndarray
+        Structured array of particle collision track information, including
+        position, direction, energy, weight, reaction data, and identifiers.
+
+    See Also
+    --------
+    read_collision_track_hdf5
+    read_collision_track_file
+    """
+    import mcpl
+    myfile = mcpl.MCPLFile(file_path)
+    data = {
+        'r': [],  # for position (x, y, z)
+        'u': [],  # for direction (ux, uy, uz)
+        'E': [], 'dE': [], 'time': [],
+        'wgt': [], 'event_mt': [], 'delayed_group': [],
+        'cell_id': [], 'nuclide_id': [], 'material_id': [],
+        'universe_id': [], 'n_collision': [], 'particle': [],
+        'parent_id': [], 'progeny_id': []
+    }
+
+    # Read and collect data from the MCPL file
+    for i, p in enumerate(myfile.particles):
+        if f'blob_{i}' in myfile.blobs:
+            blob_data = myfile.blobs[f'blob_{i}']
+            decoded_str = blob_data.decode('utf-8')
+            pairs = decoded_str.split(';')
+            values_dict = {k.strip(): v.strip()
+                           for k, v in (pair.split(':') for pair in pairs if pair.strip())}
+
+            data['r'].append((p.x, p.y, p.z))  # Append as tuple
+            data['u'].append((p.ux, p.uy, p.uz))  # Append as tuple
+            data['E'].append(p.ekin * 1e6)
+            data['dE'].append(float(values_dict.get('dE', 0)))
+            data['time'].append(p.time * 1e-3)
+            data['wgt'].append(p.weight)
+            data['event_mt'].append(int(values_dict.get('event_mt', 0)))
+            data['delayed_group'].append(
+                int(values_dict.get('delayed_group', 0)))
+            data['cell_id'].append(int(values_dict.get('cell_id', 0)))
+            data['nuclide_id'].append(int(values_dict.get('nuclide_id', 0)))
+            data['material_id'].append(int(values_dict.get('material_id', 0)))
+            data['universe_id'].append(int(values_dict.get('universe_id', 0)))
+            data['n_collision'].append(int(values_dict.get('n_collision', 0)))
+            data['particle'].append(ParticleType.from_pdg_number(p.pdgcode))
+            data['parent_id'].append(int(values_dict.get('parent_id', 0)))
+            data['progeny_id'].append(int(values_dict.get('progeny_id', 0)))
+
+    dtypes = [
+        ('r', [('x', 'f8'), ('y', 'f8'), ('z', 'f8')]),
+        ('u', [('x', 'f8'), ('y', 'f8'), ('z', 'f8')]),
+        ('E', 'f8'), ('dE', 'f8'), ('time', 'f8'), ('wgt', 'f8'),
+        ('event_mt', 'f8'), ('delayed_group', 'i4'), ('cell_id', 'i4'),
+        ('nuclide_id', 'i4'), ('material_id', 'i4'), ('universe_id', 'i4'),
+        ('n_collision', 'i4'), ('particle', 'i4'),
+        ('parent_id', 'i8'), ('progeny_id', 'i8')
+    ]
+
+    structured_array = np.zeros(len(data['r']), dtype=dtypes)
+    for key in data:
+        structured_array[key] = data[key]  # Assign data
+
+    return structured_array
+
+
+def read_collision_track_file(filename):
+    """Read a collision track file (HDF5 or MCPL) and return its data.
+
+    Parameters
+    ----------
+    filename : str or path-like
+        Path to the collision track file to read. Must end with
+        ``.h5`` or ``.mcpl``.
+
+    Returns
+    -------
+    numpy.ndarray
+        Structured array containing collision track data.
+
+    See Also
+    --------
+    read_collision_track_hdf5
+    read_collision_track_mcpl
+    """
+
+    filename = Path(filename)
+    if filename.suffix not in ('.h5', '.mcpl'):
+        raise ValueError('Collision track file must have a .h5 or .mcpl extension.')
+
+    if filename.suffix == '.h5':
+        return read_collision_track_hdf5(filename)
+    else:
+        return read_collision_track_mcpl(filename)
diff --git a/src/bank.cpp b/src/bank.cpp
index 3e806b3c0..33790379b 100644
--- a/src/bank.cpp
+++ b/src/bank.cpp
@@ -20,6 +20,8 @@ vector<SourceSite> source_bank;
 
 SharedArray<SourceSite> surf_source_bank;
 
+SharedArray<CollisionTrackSite> collision_track_bank;
+
 // The fission bank is allocated as a SharedArray, rather than a vector, as it
 // will be shared by all threads in the simulation. It will be allocated to a
 // fixed maximum capacity in the init_fission_bank() function. Then, Elements
@@ -50,6 +52,7 @@ void free_memory_bank()
 {
   simulation::source_bank.clear();
   simulation::surf_source_bank.clear();
+  simulation::collision_track_bank.clear();
   simulation::fission_bank.clear();
   simulation::progeny_per_particle.clear();
   simulation::ifp_source_delayed_group_bank.clear();
diff --git a/src/collision_track.cpp b/src/collision_track.cpp
new file mode 100644
index 000000000..75e56574a
--- /dev/null
+++ b/src/collision_track.cpp
@@ -0,0 +1,238 @@
+#include "openmc/collision_track.h"
+
+#include <algorithm>
+#include <string>
+
+#include <fmt/format.h>
+
+#include "openmc/bank.h"
+#include "openmc/bank_io.h"
+#include "openmc/cell.h"
+#include "openmc/constants.h"
+#include "openmc/error.h"
+#include "openmc/file_utils.h"
+#include "openmc/hdf5_interface.h"
+#include "openmc/material.h"
+#include "openmc/mcpl_interface.h"
+#include "openmc/message_passing.h"
+#include "openmc/nuclide.h"
+#include "openmc/output.h"
+#include "openmc/particle.h"
+#include "openmc/settings.h"
+#include "openmc/simulation.h"
+#include "openmc/universe.h"
+
+#ifdef OPENMC_MPI
+#include <mpi.h>
+#endif
+
+namespace openmc {
+
+namespace {
+
+hid_t h5_collision_track_banktype()
+{
+  hid_t postype = H5Tcreate(H5T_COMPOUND, sizeof(Position));
+  H5Tinsert(postype, "x", HOFFSET(Position, x), H5T_NATIVE_DOUBLE);
+  H5Tinsert(postype, "y", HOFFSET(Position, y), H5T_NATIVE_DOUBLE);
+  H5Tinsert(postype, "z", HOFFSET(Position, z), H5T_NATIVE_DOUBLE);
+
+  hid_t banktype = H5Tcreate(H5T_COMPOUND, sizeof(CollisionTrackSite));
+
+  H5Tinsert(banktype, "r", HOFFSET(CollisionTrackSite, r), postype);
+  H5Tinsert(banktype, "u", HOFFSET(CollisionTrackSite, u), postype);
+  H5Tinsert(banktype, "E", HOFFSET(CollisionTrackSite, E), H5T_NATIVE_DOUBLE);
+  H5Tinsert(banktype, "dE", HOFFSET(CollisionTrackSite, dE), H5T_NATIVE_DOUBLE);
+  H5Tinsert(
+    banktype, "time", HOFFSET(CollisionTrackSite, time), H5T_NATIVE_DOUBLE);
+  H5Tinsert(
+    banktype, "wgt", HOFFSET(CollisionTrackSite, wgt), H5T_NATIVE_DOUBLE);
+  H5Tinsert(banktype, "event_mt", HOFFSET(CollisionTrackSite, event_mt),
+    H5T_NATIVE_INT);
+  H5Tinsert(banktype, "delayed_group",
+    HOFFSET(CollisionTrackSite, delayed_group), H5T_NATIVE_INT);
+  H5Tinsert(
+    banktype, "cell_id", HOFFSET(CollisionTrackSite, cell_id), H5T_NATIVE_INT);
+  H5Tinsert(banktype, "nuclide_id", HOFFSET(CollisionTrackSite, nuclide_id),
+    H5T_NATIVE_INT);
+  H5Tinsert(banktype, "material_id", HOFFSET(CollisionTrackSite, material_id),
+    H5T_NATIVE_INT);
+  H5Tinsert(banktype, "universe_id", HOFFSET(CollisionTrackSite, universe_id),
+    H5T_NATIVE_INT);
+  H5Tinsert(banktype, "n_collision", HOFFSET(CollisionTrackSite, n_collision),
+    H5T_NATIVE_INT);
+  H5Tinsert(banktype, "particle", HOFFSET(CollisionTrackSite, particle),
+    H5T_NATIVE_INT);
+  H5Tinsert(banktype, "parent_id", HOFFSET(CollisionTrackSite, parent_id),
+    H5T_NATIVE_INT64);
+  H5Tinsert(banktype, "progeny_id", HOFFSET(CollisionTrackSite, progeny_id),
+    H5T_NATIVE_INT64);
+  H5Tclose(postype);
+  return banktype;
+}
+
+void write_collision_track_bank(hid_t group_id,
+  openmc::span<CollisionTrackSite> collision_track_bank,
+  const openmc::vector<int64_t>& bank_index)
+{
+  hid_t banktype = h5_collision_track_banktype();
+#ifdef OPENMC_MPI
+  write_bank_dataset("collision_track_bank", group_id, collision_track_bank,
+    bank_index, banktype, mpi::collision_track_site);
+#else
+  write_bank_dataset("collision_track_bank", group_id, collision_track_bank,
+    bank_index, banktype);
+#endif
+
+  H5Tclose(banktype);
+}
+
+void write_h5_collision_track(const char* filename,
+  openmc::span<CollisionTrackSite> collision_track_bank,
+  const openmc::vector<int64_t>& bank_index)
+{
+#ifdef PHDF5
+  bool parallel = true;
+#else
+  bool parallel = false;
+#endif
+
+  if (!filename)
+    fatal_error("write_h5_collision_track filename needs a nonempty name.");
+
+  std::string filename_(filename);
+  const auto extension = get_file_extension(filename_);
+  if (extension.empty()) {
+    filename_.append(".h5");
+  } else if (extension != "h5") {
+    warning("write_h5_collision_track was passed a file extension differing "
+            "from .h5, but an hdf5 file will be written.");
+  }
+
+  hid_t file_id;
+  if (mpi::master || parallel) {
+    file_id = file_open(filename_.c_str(), 'w', true);
+
+    // Write filetype and version info
+    write_attribute(file_id, "filetype", "collision_track");
+    write_attribute(file_id, "version", VERSION_COLLISION_TRACK);
+  }
+
+  write_collision_track_bank(file_id, collision_track_bank, bank_index);
+
+  if (mpi::master || parallel)
+    file_close(file_id);
+}
+
+} // namespace
+
+bool should_record_event(int id_cell, int mt_event, const std::string& nuclide,
+  int id_universe, int id_material, double energy_loss)
+{
+  auto matches_filter = [](const auto& filter_set, const auto& value) {
+    return filter_set.empty() || filter_set.count(value) > 0;
+  };
+
+  const auto& cfg = settings::collision_track_config;
+  return simulation::current_batch > settings::n_inactive &&
+         !simulation::collision_track_bank.full() &&
+         matches_filter(cfg.cell_ids, id_cell) &&
+         matches_filter(cfg.mt_numbers, mt_event) &&
+         matches_filter(cfg.universe_ids, id_universe) &&
+         matches_filter(cfg.material_ids, id_material) &&
+         matches_filter(cfg.nuclides, nuclide) &&
+         (cfg.deposited_energy_threshold == 0 ||
+           cfg.deposited_energy_threshold < energy_loss);
+}
+
+void collision_track_reserve_bank()
+{
+  simulation::collision_track_bank.reserve(
+    settings::collision_track_config.max_collisions);
+}
+
+void collision_track_flush_bank()
+{
+  const auto& cfg = settings::collision_track_config;
+  if (simulation::ct_current_file > cfg.max_files)
+    return;
+
+  bool last_batch = (simulation::current_batch == settings::n_batches);
+  if (!simulation::collision_track_bank.full() && !last_batch)
+    return;
+
+  auto size = simulation::collision_track_bank.size();
+  if (size == 0 && !last_batch)
+    return;
+
+  auto collision_track_work_index = mpi::calculate_parallel_index_vector(size);
+  openmc::span<CollisionTrackSite> collisiontrackbankspan(
+    simulation::collision_track_bank.begin(), size);
+
+  std::string ext = cfg.mcpl_write ? "mcpl" : "h5";
+  auto filename = fmt::format("{}collision_track.{}.{}", settings::path_output,
+    simulation::ct_current_file, ext);
+
+  if (cfg.max_files == 1 || (simulation::ct_current_file == 1 && last_batch)) {
+    filename = settings::path_output + "collision_track." + ext;
+  }
+  write_message("Creating {}...", filename, 4);
+
+  if (cfg.mcpl_write) {
+    write_mcpl_collision_track(
+      filename.c_str(), collisiontrackbankspan, collision_track_work_index);
+  } else {
+    write_h5_collision_track(
+      filename.c_str(), collisiontrackbankspan, collision_track_work_index);
+  }
+
+  simulation::collision_track_bank.clear();
+  if (!last_batch && cfg.max_files >= 1) {
+    collision_track_reserve_bank();
+  }
+  ++simulation::ct_current_file;
+}
+
+void collision_track_record(Particle& particle)
+{
+  int cell_index = particle.lowest_coord().cell();
+  if (cell_index == C_NONE)
+    return;
+
+  int cell_id = model::cells[cell_index]->id_;
+  const auto* nuclide_ptr = data::nuclides[particle.event_nuclide()].get();
+  std::string nuclide = nuclide_ptr->name_;
+  int universe_id = model::universes[particle.lowest_coord().universe()]->id_;
+  double delta_E = particle.E_last() - particle.E();
+  int material_index = particle.material();
+  if (material_index == C_NONE)
+    return;
+
+  int material_id = model::materials[material_index]->id_;
+
+  if (!should_record_event(cell_id, particle.event_mt(), nuclide, universe_id,
+        material_id, delta_E))
+    return;
+
+  CollisionTrackSite site;
+  site.r = particle.r();
+  site.u = particle.u();
+  site.E = particle.E_last();
+  site.dE = delta_E;
+  site.time = particle.time();
+  site.wgt = particle.wgt();
+  site.event_mt = particle.event_mt();
+  site.delayed_group = particle.delayed_group();
+  site.cell_id = cell_id;
+  site.nuclide_id =
+    10000 * nuclide_ptr->Z_ + 10 * nuclide_ptr->A_ + nuclide_ptr->metastable_;
+  site.material_id = material_id;
+  site.universe_id = universe_id;
+  site.n_collision = particle.n_collision();
+  site.particle = particle.type();
+  site.parent_id = particle.id();
+  site.progeny_id = particle.n_progeny();
+  simulation::collision_track_bank.thread_safe_append(site);
+}
+
+} // namespace openmc
diff --git a/src/finalize.cpp b/src/finalize.cpp
index 659f390b3..9ee943409 100644
--- a/src/finalize.cpp
+++ b/src/finalize.cpp
@@ -3,6 +3,7 @@
 #include "openmc/bank.h"
 #include "openmc/capi.h"
 #include "openmc/cmfd_solver.h"
+#include "openmc/collision_track.h"
 #include "openmc/constants.h"
 #include "openmc/cross_sections.h"
 #include "openmc/dagmc.h"
@@ -76,6 +77,7 @@ int openmc_finalize()
   // Reset global variables
   settings::assume_separate = false;
   settings::check_overlaps = false;
+  settings::collision_track_config = CollisionTrackConfig {};
   settings::confidence_intervals = false;
   settings::create_fission_neutrons = true;
   settings::create_delayed_neutrons = true;
@@ -177,6 +179,9 @@ int openmc_finalize()
   if (mpi::source_site != MPI_DATATYPE_NULL) {
     MPI_Type_free(&mpi::source_site);
   }
+  if (mpi::collision_track_site != MPI_DATATYPE_NULL) {
+    MPI_Type_free(&mpi::collision_track_site);
+  }
 #endif
 
   openmc_reset_random_ray();
diff --git a/src/initialize.cpp b/src/initialize.cpp
index 36f326116..e2a5b9743 100644
--- a/src/initialize.cpp
+++ b/src/initialize.cpp
@@ -178,6 +178,37 @@ void initialize_mpi(MPI_Comm intracomm)
     MPI_DOUBLE, MPI_INT, MPI_INT, MPI_INT, MPI_INT, MPI_LONG, MPI_LONG};
   MPI_Type_create_struct(11, blocks, disp, types, &mpi::source_site);
   MPI_Type_commit(&mpi::source_site);
+
+  CollisionTrackSite bc;
+  MPI_Aint dispc[16];
+  MPI_Get_address(&bc.r, &dispc[0]);             // double
+  MPI_Get_address(&bc.u, &dispc[1]);             // double
+  MPI_Get_address(&bc.E, &dispc[2]);             // double
+  MPI_Get_address(&bc.dE, &dispc[3]);            // double
+  MPI_Get_address(&bc.time, &dispc[4]);          // double
+  MPI_Get_address(&bc.wgt, &dispc[5]);           // double
+  MPI_Get_address(&bc.event_mt, &dispc[6]);      // int
+  MPI_Get_address(&bc.delayed_group, &dispc[7]); // int
+  MPI_Get_address(&bc.cell_id, &dispc[8]);       // int
+  MPI_Get_address(&bc.nuclide_id, &dispc[9]);    // int
+  MPI_Get_address(&bc.material_id, &dispc[10]);  // int
+  MPI_Get_address(&bc.universe_id, &dispc[11]);  // int
+  MPI_Get_address(&bc.n_collision, &dispc[12]);  // int
+  MPI_Get_address(&bc.particle, &dispc[13]);     // int
+  MPI_Get_address(&bc.parent_id, &dispc[14]);    // int64_t
+  MPI_Get_address(&bc.progeny_id, &dispc[15]);   // int64_t
+  for (int i = 15; i >= 0; --i) {
+    dispc[i] -= dispc[0];
+  }
+
+  int blocksc[] = {3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1};
+  MPI_Datatype typesc[] = {MPI_DOUBLE, MPI_DOUBLE, MPI_DOUBLE, MPI_DOUBLE,
+    MPI_DOUBLE, MPI_DOUBLE, MPI_INT, MPI_INT, MPI_INT, MPI_INT, MPI_INT,
+    MPI_INT, MPI_INT, MPI_INT, MPI_INT64_T, MPI_INT64_T};
+
+  MPI_Type_create_struct(
+    16, blocksc, dispc, typesc, &mpi::collision_track_site);
+  MPI_Type_commit(&mpi::collision_track_site);
 }
 #endif // OPENMC_MPI
 
diff --git a/src/mcpl_interface.cpp b/src/mcpl_interface.cpp
index b8e780710..129407301 100644
--- a/src/mcpl_interface.cpp
+++ b/src/mcpl_interface.cpp
@@ -18,6 +18,7 @@
 #include <cstring>
 #include <memory>
 #include <mutex>
+#include <sstream>
 #include <stdexcept>
 #include <string>
 
@@ -61,6 +62,8 @@ using mcpl_hdr_nparticles_fpt = uint64_t (*)(mcpl_file_t* file_handle);
 using mcpl_read_fpt = const mcpl_particle_repr_t* (*)(mcpl_file_t* file_handle);
 using mcpl_close_file_fpt = void (*)(mcpl_file_t* file_handle);
 
+using mcpl_hdr_add_data_fpt = void (*)(mcpl_outfile_t* file_handle,
+  const char* key, int32_t ldata, const char* data);
 using mcpl_create_outfile_fpt = mcpl_outfile_t* (*)(const char* filename);
 using mcpl_hdr_set_srcname_fpt = void (*)(
   mcpl_outfile_t* outfile_handle, const char* srcname);
@@ -110,6 +113,7 @@ struct McplApi {
   mcpl_close_file_fpt close_file;
   mcpl_create_outfile_fpt create_outfile;
   mcpl_hdr_set_srcname_fpt hdr_set_srcname;
+  mcpl_hdr_add_data_fpt hdr_add_data;
   mcpl_add_particle_fpt add_particle;
   mcpl_close_outfile_fpt close_outfile;
   mcpl_hdr_add_stat_sum_fpt hdr_add_stat_sum;
@@ -146,6 +150,8 @@ struct McplApi {
       load_symbol_platform("mcpl_create_outfile"));
     hdr_set_srcname = reinterpret_cast<mcpl_hdr_set_srcname_fpt>(
       load_symbol_platform("mcpl_hdr_set_srcname"));
+    hdr_add_data = reinterpret_cast<mcpl_hdr_add_data_fpt>(
+      load_symbol_platform("mcpl_hdr_add_data"));
     add_particle = reinterpret_cast<mcpl_add_particle_fpt>(
       load_symbol_platform("mcpl_add_particle"));
     close_outfile = reinterpret_cast<mcpl_close_outfile_fpt>(
@@ -545,4 +551,153 @@ void write_mcpl_source_point(const char* filename, span<SourceSite> source_bank,
   }
 }
 
+// Collision track feature with MCPL
+void write_mcpl_collision_track_internal(mcpl_outfile_t* file_id,
+  span<CollisionTrackSite> collision_track_bank,
+  const vector<int64_t>& bank_index_all_ranks)
+{
+  if (mpi::master) {
+    if (!file_id) {
+      fatal_error("MCPL: Internal error - master rank called "
+                  "write_mcpl_source_bank_internal with null file_id.");
+    }
+    vector<CollisionTrackSite> receive_buffer;
+    vector<CollisionTrackSite> all_sites;
+    all_sites.reserve(static_cast<size_t>(bank_index_all_ranks.back()));
+    vector<std::string> all_blobs;
+    all_blobs.reserve(static_cast<size_t>(bank_index_all_ranks.back()));
+
+    for (int rank_idx = 0; rank_idx < mpi::n_procs; ++rank_idx) {
+      size_t num_sites_on_rank = static_cast<size_t>(
+        bank_index_all_ranks[rank_idx + 1] - bank_index_all_ranks[rank_idx]);
+      if (num_sites_on_rank == 0)
+        continue;
+
+      span<const CollisionTrackSite> sites_to_process;
+#ifdef OPENMC_MPI
+      if (rank_idx == mpi::rank) {
+        sites_to_process = openmc::span<const CollisionTrackSite>(
+          collision_track_bank.data(), num_sites_on_rank);
+      } else {
+        receive_buffer.resize(num_sites_on_rank);
+        MPI_Recv(receive_buffer.data(), num_sites_on_rank,
+          mpi::collision_track_site, rank_idx, rank_idx, mpi::intracomm,
+          MPI_STATUS_IGNORE);
+        sites_to_process = openmc::span<const CollisionTrackSite>(
+          receive_buffer.data(), num_sites_on_rank);
+      }
+#else
+      sites_to_process = openmc::span<const CollisionTrackSite>(
+        collision_track_bank.data(), num_sites_on_rank);
+#endif
+
+      for (const auto& site : sites_to_process) {
+        std::ostringstream custom_data_stream;
+        custom_data_stream << " dE : " << site.dE
+                           << " ; event_mt : " << site.event_mt
+                           << " ; delayed_group : " << site.delayed_group
+                           << " ; cell_id : " << site.cell_id
+                           << " ; nuclide_id : " << site.nuclide_id
+                           << " ; material_id : " << site.material_id
+                           << " ; universe_id : " << site.universe_id
+                           << " ; n_collision : " << site.n_collision
+                           << " ; parent_id : " << site.parent_id
+                           << " ; progeny_id : " << site.progeny_id;
+
+        all_blobs.push_back(custom_data_stream.str());
+        all_sites.push_back(site);
+      }
+    }
+
+    for (size_t idx = 0; idx < all_blobs.size(); ++idx) {
+      const auto& blob = all_blobs[idx];
+      std::string key = "blob_" + std::to_string(idx);
+      g_mcpl_api->hdr_add_data(file_id, key.c_str(), blob.size(), blob.c_str());
+    }
+
+    for (const auto& site : all_sites) {
+      mcpl_particle_repr_t p_repr {};
+      p_repr.position[0] = site.r.x;
+      p_repr.position[1] = site.r.y;
+      p_repr.position[2] = site.r.z;
+      p_repr.direction[0] = site.u.x;
+      p_repr.direction[1] = site.u.y;
+      p_repr.direction[2] = site.u.z;
+      p_repr.ekin = site.E * 1e-6;
+      p_repr.time = site.time * 1e3;
+      p_repr.weight = site.wgt;
+      switch (site.particle) {
+      case ParticleType::neutron:
+        p_repr.pdgcode = 2112;
+        break;
+      case ParticleType::photon:
+        p_repr.pdgcode = 22;
+        break;
+      case ParticleType::electron:
+        p_repr.pdgcode = 11;
+        break;
+      case ParticleType::positron:
+        p_repr.pdgcode = -11;
+        break;
+      default:
+        continue;
+      }
+      g_mcpl_api->add_particle(file_id, &p_repr);
+    }
+  } else {
+#ifdef OPENMC_MPI
+    if (!collision_track_bank.empty()) {
+      MPI_Send(collision_track_bank.data(), collision_track_bank.size(),
+        mpi::collision_track_site, 0, mpi::rank, mpi::intracomm);
+    }
+#endif
+  }
+}
+
+void write_mcpl_collision_track(const char* filename,
+  span<CollisionTrackSite> collision_track_bank,
+  const vector<int64_t>& bank_index)
+{
+  ensure_mcpl_ready_or_fatal();
+
+  std::string filename_(filename);
+  const auto extension = get_file_extension(filename_);
+  if (extension.empty()) {
+    filename_.append(".mcpl");
+  } else if (extension != "mcpl") {
+    warning(fmt::format("Specified filename '{}' has an extension '.{}', but "
+                        "an MCPL file (.mcpl) will be written using this name.",
+      filename, extension));
+  }
+
+  mcpl_outfile_t* file_id = nullptr;
+
+  if (mpi::master) {
+    file_id = g_mcpl_api->create_outfile(filename_.c_str());
+    if (!file_id) {
+      fatal_error(fmt::format(
+        "MCPL: Failed to create output file '{}'. Check permissions and path.",
+        filename_));
+    }
+    std::string src_line;
+    if (VERSION_DEV) {
+      src_line = fmt::format("OpenMC {}.{}.{}-dev{}", VERSION_MAJOR,
+        VERSION_MINOR, VERSION_RELEASE, VERSION_COMMIT_COUNT);
+    } else {
+      src_line = fmt::format(
+        "OpenMC {}.{}.{}", VERSION_MAJOR, VERSION_MINOR, VERSION_RELEASE);
+    }
+
+    g_mcpl_api->hdr_set_srcname(file_id, src_line.c_str());
+  }
+  write_mcpl_collision_track_internal(
+    file_id, collision_track_bank, bank_index);
+
+  if (mpi::master) {
+    if (file_id) {
+      g_mcpl_api->close_outfile(file_id);
+    }
+  }
+}
+
 } // namespace openmc
diff --git a/src/message_passing.cpp b/src/message_passing.cpp
index 374c1aa72..a160f6d73 100644
--- a/src/message_passing.cpp
+++ b/src/message_passing.cpp
@@ -10,6 +10,7 @@ bool master {true};
 #ifdef OPENMC_MPI
 MPI_Comm intracomm {MPI_COMM_NULL};
 MPI_Datatype source_site {MPI_DATATYPE_NULL};
+MPI_Datatype collision_track_site {MPI_DATATYPE_NULL};
 #endif
 
 extern "C" bool openmc_master()
diff --git a/src/particle.cpp b/src/particle.cpp
index 6ba8ebf12..2d70d715e 100644
--- a/src/particle.cpp
+++ b/src/particle.cpp
@@ -8,6 +8,7 @@
 #include "openmc/bank.h"
 #include "openmc/capi.h"
 #include "openmc/cell.h"
+#include "openmc/collision_track.h"
 #include "openmc/constants.h"
 #include "openmc/dagmc.h"
 #include "openmc/error.h"
@@ -351,6 +352,11 @@ void Particle::event_collide()
     collision_mg(*this);
   }
 
+  // Collision track feature to recording particle interaction
+  if (settings::collision_track) {
+    collision_track_record(*this);
+  }
+
   // Score collision estimator tallies -- this is done after a collision
   // has occurred rather than before because we need information on the
   // outgoing energy for any tallies with an outgoing energy filter
diff --git a/src/physics.cpp b/src/physics.cpp
index 3a17077b3..41509af97 100644
--- a/src/physics.cpp
+++ b/src/physics.cpp
@@ -122,6 +122,7 @@ void sample_neutron_reaction(Particle& p)
           "with k-effective close to or greater than one.");
       }
     }
+    p.event_mt() = rx.mt_;
   }
 
   // Create secondary photons
@@ -663,7 +664,9 @@ void absorption(Particle& p, int i_nuclide)
 
       p.wgt() = 0.0;
       p.event() = TallyEvent::ABSORB;
-      p.event_mt() = N_DISAPPEAR;
+      if (!p.fission()) {
+        p.event_mt() = N_DISAPPEAR;
+      }
     }
   }
 }
diff --git a/src/settings.cpp b/src/settings.cpp
index 13b91b0e4..9dcf7c8db 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -11,6 +11,7 @@
 #endif
 
 #include "openmc/capi.h"
+#include "openmc/collision_track.h"
 #include "openmc/constants.h"
 #include "openmc/container_util.h"
 #include "openmc/distribution.h"
@@ -26,6 +27,7 @@
 #include "openmc/plot.h"
 #include "openmc/random_lcg.h"
 #include "openmc/random_ray/random_ray.h"
+#include "openmc/reaction.h"
 #include "openmc/simulation.h"
 #include "openmc/source.h"
 #include "openmc/string_utils.h"
@@ -45,6 +47,7 @@ namespace settings {
 // Default values for boolean flags
 bool assume_separate {false};
 bool check_overlaps {false};
+bool collision_track {false};
 bool cmfd_run {false};
 bool confidence_intervals {false};
 bool create_delayed_neutrons {true};
@@ -128,6 +131,7 @@ std::unordered_set<int> statepoint_batch;
 double source_rejection_fraction {0.05};
 double free_gas_threshold {400.0};
 std::unordered_set<int> source_write_surf_id;
+CollisionTrackConfig collision_track_config {};
 int64_t ssw_max_particles;
 int64_t ssw_max_files;
 int64_t ssw_cell_id {C_NONE};
@@ -925,8 +929,72 @@ void read_settings_xml(pugi::xml_node root)
     }
   }
 
-  // If source is not separate and is to be written out in the statepoint file,
-  // make sure that the sourcepoint batch numbers are contained in the
+  // Check if the user has specified to write specific collisions
+  if (check_for_node(root, "collision_track")) {
+    settings::collision_track = true;
+    // Get collision track node
+    xml_node node_ct = root.child("collision_track");
+    collision_track_config = CollisionTrackConfig {};
+
+    // Determine cell ids at which crossing particles are to be banked
+    if (check_for_node(node_ct, "cell_ids")) {
+      auto temp = get_node_array<int>(node_ct, "cell_ids");
+      for (const auto& b : temp) {
+        collision_track_config.cell_ids.insert(b);
+      }
+    }
+    if (check_for_node(node_ct, "reactions")) {
+      auto temp = get_node_array<std::string>(node_ct, "reactions");
+      for (const auto& b : temp) {
+        int reaction_int = reaction_type(b);
+        if (reaction_int > 0) {
+          collision_track_config.mt_numbers.insert(reaction_int);
+        }
+      }
+    }
+    if (check_for_node(node_ct, "universe_ids")) {
+      auto temp = get_node_array<int>(node_ct, "universe_ids");
+      for (const auto& b : temp) {
+        collision_track_config.universe_ids.insert(b);
+      }
+    }
+    if (check_for_node(node_ct, "material_ids")) {
+      auto temp = get_node_array<int>(node_ct, "material_ids");
+      for (const auto& b : temp) {
+        collision_track_config.material_ids.insert(b);
+      }
+    }
+    if (check_for_node(node_ct, "nuclides")) {
+      auto temp = get_node_array<std::string>(node_ct, "nuclides");
+      for (const auto& b : temp) {
+        collision_track_config.nuclides.insert(b);
+      }
+    }
+    if (check_for_node(node_ct, "deposited_E_threshold")) {
+      collision_track_config.deposited_energy_threshold =
+        std::stod(get_node_value(node_ct, "deposited_E_threshold"));
+    }
+    // Get maximum number of particles to be banked per collision
+    if (check_for_node(node_ct, "max_collisions")) {
+      collision_track_config.max_collisions =
+        std::stoll(get_node_value(node_ct, "max_collisions"));
+    } else {
+      warning("A maximum number of collisions needs to be specified. "
+              "By default the code sets 'max_collisions' parameter equals to "
+              "1000.");
+    }
+    // Get maximum number of collision_track files to be created
+    if (check_for_node(node_ct, "max_collision_track_files")) {
+      collision_track_config.max_files =
+        std::stoll(get_node_value(node_ct, "max_collision_track_files"));
+    }
+    if (check_for_node(node_ct, "mcpl")) {
+      collision_track_config.mcpl_write = get_node_value_bool(node_ct, "mcpl");
+    }
+  }
+
+  // If source is not separate and is to be written out in the statepoint
+  // file, make sure that the sourcepoint batch numbers are contained in the
   // statepoint list
   if (!source_separate) {
     for (const auto& b : sourcepoint_batch) {
@@ -1171,8 +1239,8 @@ void read_settings_xml(pugi::xml_node root)
       variance_reduction::weight_windows_generators.emplace_back(
         std::make_unique<WeightWindowsGenerator>(node_wwg));
     }
-    // if any of the weight windows are intended to be generated otf, make sure
-    // they're applied
+    // if any of the weight windows are intended to be generated otf, make
+    // sure they're applied
     for (const auto& wwg : variance_reduction::weight_windows_generators) {
       if (wwg->on_the_fly_) {
         settings::weight_windows_on = true;
diff --git a/src/simulation.cpp b/src/simulation.cpp
index 05d554526..b536ae588 100644
--- a/src/simulation.cpp
+++ b/src/simulation.cpp
@@ -2,6 +2,7 @@
 
 #include "openmc/bank.h"
 #include "openmc/capi.h"
+#include "openmc/collision_track.h"
 #include "openmc/container_util.h"
 #include "openmc/eigenvalue.h"
 #include "openmc/error.h"
@@ -9,7 +10,6 @@
 #include "openmc/geometry_aux.h"
 #include "openmc/ifp.h"
 #include "openmc/material.h"
-#include "openmc/mcpl_interface.h"
 #include "openmc/message_passing.h"
 #include "openmc/nuclide.h"
 #include "openmc/output.h"
@@ -118,6 +118,7 @@ int openmc_simulation_init()
   // Reset global variables -- this is done before loading state point (as that
   // will potentially populate k_generation and entropy)
   simulation::current_batch = 0;
+  simulation::ct_current_file = 1;
   simulation::ssw_current_file = 1;
   simulation::k_generation.clear();
   simulation::entropy.clear();
@@ -297,6 +298,7 @@ namespace openmc {
 
 namespace simulation {
 
+int ct_current_file;
 int current_batch;
 int current_gen;
 bool initialized {false};
@@ -347,6 +349,11 @@ void allocate_banks()
     // Allocate surface source bank
     simulation::surf_source_bank.reserve(settings::ssw_max_particles);
   }
+
+  if (settings::collision_track) {
+    // Allocate collision track bank
+    collision_track_reserve_bank();
+  }
 }
 
 void initialize_batch()
@@ -490,6 +497,10 @@ void finalize_batch()
       ++simulation::ssw_current_file;
     }
   }
+  // Write collision track file if requested
+  if (settings::collision_track) {
+    collision_track_flush_bank();
+  }
 }
 
 void initialize_generation()
diff --git a/src/state_point.cpp b/src/state_point.cpp
index 0b0fed132..47296da3a 100644
--- a/src/state_point.cpp
+++ b/src/state_point.cpp
@@ -9,6 +9,7 @@
 #include <fmt/core.h>
 
 #include "openmc/bank.h"
+#include "openmc/bank_io.h"
 #include "openmc/capi.h"
 #include "openmc/constants.h"
 #include "openmc/eigenvalue.h"
@@ -642,91 +643,12 @@ void write_source_bank(hid_t group_id, span<SourceSite> source_bank,
 {
   hid_t banktype = h5banktype();
 
-  // Set total and individual process dataspace sizes for source bank
-  int64_t dims_size = bank_index.back();
-  int64_t count_size = bank_index[mpi::rank + 1] - bank_index[mpi::rank];
-
-#ifdef PHDF5
-  // Set size of total dataspace for all procs and rank
-  hsize_t dims[] {static_cast<hsize_t>(dims_size)};
-  hid_t dspace = H5Screate_simple(1, dims, nullptr);
-  hid_t dset = H5Dcreate(group_id, "source_bank", banktype, dspace, H5P_DEFAULT,
-    H5P_DEFAULT, H5P_DEFAULT);
-
-  // Create another data space but for each proc individually
-  hsize_t count[] {static_cast<hsize_t>(count_size)};
-  hid_t memspace = H5Screate_simple(1, count, nullptr);
-
-  // Select hyperslab for this dataspace
-  hsize_t start[] {static_cast<hsize_t>(bank_index[mpi::rank])};
-  H5Sselect_hyperslab(dspace, H5S_SELECT_SET, start, nullptr, count, nullptr);
-
-  // Set up the property list for parallel writing
-  hid_t plist = H5Pcreate(H5P_DATASET_XFER);
-  H5Pset_dxpl_mpio(plist, H5FD_MPIO_COLLECTIVE);
-
-  // Write data to file in parallel
-  H5Dwrite(dset, banktype, memspace, dspace, plist, source_bank.data());
-
-  // Free resources
-  H5Sclose(dspace);
-  H5Sclose(memspace);
-  H5Dclose(dset);
-  H5Pclose(plist);
-
+#ifdef OPENMC_MPI
+  write_bank_dataset("source_bank", group_id, source_bank, bank_index, banktype,
+    mpi::source_site);
 #else
-
-  if (mpi::master) {
-    // Create dataset big enough to hold all source sites
-    hsize_t dims[] {static_cast<hsize_t>(dims_size)};
-    hid_t dspace = H5Screate_simple(1, dims, nullptr);
-    hid_t dset = H5Dcreate(group_id, "source_bank", banktype, dspace,
-      H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-
-    // Save source bank sites since the array is overwritten below
-#ifdef OPENMC_MPI
-    vector<SourceSite> temp_source {source_bank.begin(), source_bank.end()};
-#endif
-
-    for (int i = 0; i < mpi::n_procs; ++i) {
-      // Create memory space
-      hsize_t count[] {static_cast<hsize_t>(bank_index[i + 1] - bank_index[i])};
-      hid_t memspace = H5Screate_simple(1, count, nullptr);
-
-#ifdef OPENMC_MPI
-      // Receive source sites from other processes
-      if (i > 0)
-        MPI_Recv(source_bank.data(), count[0], mpi::source_site, i, i,
-          mpi::intracomm, MPI_STATUS_IGNORE);
-#endif
-
-      // Select hyperslab for this dataspace
-      dspace = H5Dget_space(dset);
-      hsize_t start[] {static_cast<hsize_t>(bank_index[i])};
-      H5Sselect_hyperslab(
-        dspace, H5S_SELECT_SET, start, nullptr, count, nullptr);
-
-      // Write data to hyperslab
-      H5Dwrite(
-        dset, banktype, memspace, dspace, H5P_DEFAULT, source_bank.data());
-
-      H5Sclose(memspace);
-      H5Sclose(dspace);
-    }
-
-    // Close all ids
-    H5Dclose(dset);
-
-#ifdef OPENMC_MPI
-    // Restore state of source bank
-    std::copy(temp_source.begin(), temp_source.end(), source_bank.begin());
-#endif
-  } else {
-#ifdef OPENMC_MPI
-    MPI_Send(source_bank.data(), count_size, mpi::source_site, 0, mpi::rank,
-      mpi::intracomm);
-#endif
-  }
+  write_bank_dataset(
+    "source_bank", group_id, source_bank, bank_index, banktype);
 #endif
 
   H5Tclose(banktype);
diff --git a/tests/regression_tests/collision_track/__init__.py b/tests/regression_tests/collision_track/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/regression_tests/collision_track/case_1_Reactions/inputs_true.dat b/tests/regression_tests/collision_track/case_1_Reactions/inputs_true.dat
new file mode 100644
index 000000000..7533616c0
--- /dev/null
+++ b/tests/regression_tests/collision_track/case_1_Reactions/inputs_true.dat
@@ -0,0 +1,58 @@
+<?xml version='1.0' encoding='utf-8'?>
+<model>
+  <materials>
+    <material id="1" depletable="true">
+      <density value="11.0" units="g/cm3"/>
+      <nuclide name="U234" ao="0.0004524"/>
+      <nuclide name="U235" ao="0.0506068"/>
+      <nuclide name="U238" ao="0.948709"/>
+      <nuclide name="U236" ao="0.0002318"/>
+      <nuclide name="O16" ao="2.0"/>
+    </material>
+    <material id="11">
+      <density value="1.0" units="g/cm3"/>
+      <nuclide name="H1" ao="2.0"/>
+      <nuclide name="O16" ao="1.0"/>
+    </material>
+  </materials>
+  <geometry>
+    <cell id="5" fill="77" region="-5 4 -7 6 -9 8" universe="1"/>
+    <cell id="8" material="11" region="-11 10 -13 12 -15 14 (5 | -4 | 7 | -6 | 9 | -8)" universe="1"/>
+    <cell id="22" material="1" region="-1 2 -3" universe="77"/>
+    <cell id="33" material="11" region="1 | -2 | 3" universe="77"/>
+    <surface id="1" type="z-cylinder" coeffs="0.0 0.0 2.0"/>
+    <surface id="2" type="z-plane" coeffs="-2.0"/>
+    <surface id="3" type="z-plane" coeffs="2.0"/>
+    <surface id="4" type="x-plane" coeffs="-3.0"/>
+    <surface id="5" type="x-plane" coeffs="3.0"/>
+    <surface id="6" type="y-plane" coeffs="-3.0"/>
+    <surface id="7" type="y-plane" coeffs="3.0"/>
+    <surface id="8" type="z-plane" coeffs="-3.0"/>
+    <surface id="9" type="z-plane" coeffs="3.0"/>
+    <surface id="10" type="x-plane" boundary="vacuum" coeffs="-4.0"/>
+    <surface id="11" type="x-plane" boundary="vacuum" coeffs="4.0"/>
+    <surface id="12" type="y-plane" boundary="vacuum" coeffs="-4.0"/>
+    <surface id="13" type="y-plane" boundary="vacuum" coeffs="4.0"/>
+    <surface id="14" type="z-plane" boundary="vacuum" coeffs="-4.0"/>
+    <surface id="15" type="z-plane" boundary="vacuum" coeffs="4.0"/>
+  </geometry>
+  <settings>
+    <run_mode>eigenvalue</run_mode>
+    <particles>100</particles>
+    <batches>5</batches>
+    <inactive>1</inactive>
+    <source type="independent" strength="1.0" particle="neutron">
+      <space type="box">
+        <parameters>-2.0 -2.0 -2.0 2.0 2.0 2.0</parameters>
+      </space>
+      <constraints>
+        <fissionable>true</fissionable>
+      </constraints>
+    </source>
+    <collision_track>
+      <reactions>(n,fission) 101</reactions>
+      <max_collisions>300</max_collisions>
+    </collision_track>
+    <seed>1</seed>
+  </settings>
+  </model>
diff --git a/tests/regression_tests/collision_track/case_1_Reactions/results_true.dat b/tests/regression_tests/collision_track/case_1_Reactions/results_true.dat
new file mode 100644
index 000000000..d4d1d1e5a
--- /dev/null
+++ b/tests/regression_tests/collision_track/case_1_Reactions/results_true.dat
@@ -0,0 +1,2 @@
+k-combined:
+5.642735E-02 1.494035E-02
diff --git a/tests/regression_tests/collision_track/case_2_Cell_ID/inputs_true.dat b/tests/regression_tests/collision_track/case_2_Cell_ID/inputs_true.dat
new file mode 100644
index 000000000..55fb835de
--- /dev/null
+++ b/tests/regression_tests/collision_track/case_2_Cell_ID/inputs_true.dat
@@ -0,0 +1,58 @@
+<?xml version='1.0' encoding='utf-8'?>
+<model>
+  <materials>
+    <material id="1" depletable="true">
+      <density value="11.0" units="g/cm3"/>
+      <nuclide name="U234" ao="0.0004524"/>
+      <nuclide name="U235" ao="0.0506068"/>
+      <nuclide name="U238" ao="0.948709"/>
+      <nuclide name="U236" ao="0.0002318"/>
+      <nuclide name="O16" ao="2.0"/>
+    </material>
+    <material id="11">
+      <density value="1.0" units="g/cm3"/>
+      <nuclide name="H1" ao="2.0"/>
+      <nuclide name="O16" ao="1.0"/>
+    </material>
+  </materials>
+  <geometry>
+    <cell id="5" fill="77" region="-5 4 -7 6 -9 8" universe="1"/>
+    <cell id="8" material="11" region="-11 10 -13 12 -15 14 (5 | -4 | 7 | -6 | 9 | -8)" universe="1"/>
+    <cell id="22" material="1" region="-1 2 -3" universe="77"/>
+    <cell id="33" material="11" region="1 | -2 | 3" universe="77"/>
+    <surface id="1" type="z-cylinder" coeffs="0.0 0.0 2.0"/>
+    <surface id="2" type="z-plane" coeffs="-2.0"/>
+    <surface id="3" type="z-plane" coeffs="2.0"/>
+    <surface id="4" type="x-plane" coeffs="-3.0"/>
+    <surface id="5" type="x-plane" coeffs="3.0"/>
+    <surface id="6" type="y-plane" coeffs="-3.0"/>
+    <surface id="7" type="y-plane" coeffs="3.0"/>
+    <surface id="8" type="z-plane" coeffs="-3.0"/>
+    <surface id="9" type="z-plane" coeffs="3.0"/>
+    <surface id="10" type="x-plane" boundary="vacuum" coeffs="-4.0"/>
+    <surface id="11" type="x-plane" boundary="vacuum" coeffs="4.0"/>
+    <surface id="12" type="y-plane" boundary="vacuum" coeffs="-4.0"/>
+    <surface id="13" type="y-plane" boundary="vacuum" coeffs="4.0"/>
+    <surface id="14" type="z-plane" boundary="vacuum" coeffs="-4.0"/>
+    <surface id="15" type="z-plane" boundary="vacuum" coeffs="4.0"/>
+  </geometry>
+  <settings>
+    <run_mode>eigenvalue</run_mode>
+    <particles>100</particles>
+    <batches>5</batches>
+    <inactive>1</inactive>
+    <source type="independent" strength="1.0" particle="neutron">
+      <space type="box">
+        <parameters>-2.0 -2.0 -2.0 2.0 2.0 2.0</parameters>
+      </space>
+      <constraints>
+        <fissionable>true</fissionable>
+      </constraints>
+    </source>
+    <collision_track>
+      <cell_ids>22</cell_ids>
+      <max_collisions>300</max_collisions>
+    </collision_track>
+    <seed>1</seed>
+  </settings>
+  </model>
diff --git a/tests/regression_tests/collision_track/case_2_Cell_ID/results_true.dat b/tests/regression_tests/collision_track/case_2_Cell_ID/results_true.dat
new file mode 100644
index 000000000..d4d1d1e5a
--- /dev/null
+++ b/tests/regression_tests/collision_track/case_2_Cell_ID/results_true.dat
@@ -0,0 +1,2 @@
+k-combined:
+5.642735E-02 1.494035E-02
diff --git a/tests/regression_tests/collision_track/case_3_Material_ID/inputs_true.dat b/tests/regression_tests/collision_track/case_3_Material_ID/inputs_true.dat
new file mode 100644
index 000000000..61890414b
--- /dev/null
+++ b/tests/regression_tests/collision_track/case_3_Material_ID/inputs_true.dat
@@ -0,0 +1,58 @@
+<?xml version='1.0' encoding='utf-8'?>
+<model>
+  <materials>
+    <material id="1" depletable="true">
+      <density value="11.0" units="g/cm3"/>
+      <nuclide name="U234" ao="0.0004524"/>
+      <nuclide name="U235" ao="0.0506068"/>
+      <nuclide name="U238" ao="0.948709"/>
+      <nuclide name="U236" ao="0.0002318"/>
+      <nuclide name="O16" ao="2.0"/>
+    </material>
+    <material id="11">
+      <density value="1.0" units="g/cm3"/>
+      <nuclide name="H1" ao="2.0"/>
+      <nuclide name="O16" ao="1.0"/>
+    </material>
+  </materials>
+  <geometry>
+    <cell id="5" fill="77" region="-5 4 -7 6 -9 8" universe="1"/>
+    <cell id="8" material="11" region="-11 10 -13 12 -15 14 (5 | -4 | 7 | -6 | 9 | -8)" universe="1"/>
+    <cell id="22" material="1" region="-1 2 -3" universe="77"/>
+    <cell id="33" material="11" region="1 | -2 | 3" universe="77"/>
+    <surface id="1" type="z-cylinder" coeffs="0.0 0.0 2.0"/>
+    <surface id="2" type="z-plane" coeffs="-2.0"/>
+    <surface id="3" type="z-plane" coeffs="2.0"/>
+    <surface id="4" type="x-plane" coeffs="-3.0"/>
+    <surface id="5" type="x-plane" coeffs="3.0"/>
+    <surface id="6" type="y-plane" coeffs="-3.0"/>
+    <surface id="7" type="y-plane" coeffs="3.0"/>
+    <surface id="8" type="z-plane" coeffs="-3.0"/>
+    <surface id="9" type="z-plane" coeffs="3.0"/>
+    <surface id="10" type="x-plane" boundary="vacuum" coeffs="-4.0"/>
+    <surface id="11" type="x-plane" boundary="vacuum" coeffs="4.0"/>
+    <surface id="12" type="y-plane" boundary="vacuum" coeffs="-4.0"/>
+    <surface id="13" type="y-plane" boundary="vacuum" coeffs="4.0"/>
+    <surface id="14" type="z-plane" boundary="vacuum" coeffs="-4.0"/>
+    <surface id="15" type="z-plane" boundary="vacuum" coeffs="4.0"/>
+  </geometry>
+  <settings>
+    <run_mode>eigenvalue</run_mode>
+    <particles>100</particles>
+    <batches>5</batches>
+    <inactive>1</inactive>
+    <source type="independent" strength="1.0" particle="neutron">
+      <space type="box">
+        <parameters>-2.0 -2.0 -2.0 2.0 2.0 2.0</parameters>
+      </space>
+      <constraints>
+        <fissionable>true</fissionable>
+      </constraints>
+    </source>
+    <collision_track>
+      <material_ids>1</material_ids>
+      <max_collisions>300</max_collisions>
+    </collision_track>
+    <seed>1</seed>
+  </settings>
+  </model>
diff --git a/tests/regression_tests/collision_track/case_3_Material_ID/results_true.dat b/tests/regression_tests/collision_track/case_3_Material_ID/results_true.dat
new file mode 100644
index 000000000..d4d1d1e5a
--- /dev/null
+++ b/tests/regression_tests/collision_track/case_3_Material_ID/results_true.dat
@@ -0,0 +1,2 @@
+k-combined:
+5.642735E-02 1.494035E-02
diff --git a/tests/regression_tests/collision_track/case_4_Nuclide_ID/inputs_true.dat b/tests/regression_tests/collision_track/case_4_Nuclide_ID/inputs_true.dat
new file mode 100644
index 000000000..8960dde5c
--- /dev/null
+++ b/tests/regression_tests/collision_track/case_4_Nuclide_ID/inputs_true.dat
@@ -0,0 +1,58 @@
+<?xml version='1.0' encoding='utf-8'?>
+<model>
+  <materials>
+    <material id="1" depletable="true">
+      <density value="11.0" units="g/cm3"/>
+      <nuclide name="U234" ao="0.0004524"/>
+      <nuclide name="U235" ao="0.0506068"/>
+      <nuclide name="U238" ao="0.948709"/>
+      <nuclide name="U236" ao="0.0002318"/>
+      <nuclide name="O16" ao="2.0"/>
+    </material>
+    <material id="11">
+      <density value="1.0" units="g/cm3"/>
+      <nuclide name="H1" ao="2.0"/>
+      <nuclide name="O16" ao="1.0"/>
+    </material>
+  </materials>
+  <geometry>
+    <cell id="5" fill="77" region="-5 4 -7 6 -9 8" universe="1"/>
+    <cell id="8" material="11" region="-11 10 -13 12 -15 14 (5 | -4 | 7 | -6 | 9 | -8)" universe="1"/>
+    <cell id="22" material="1" region="-1 2 -3" universe="77"/>
+    <cell id="33" material="11" region="1 | -2 | 3" universe="77"/>
+    <surface id="1" type="z-cylinder" coeffs="0.0 0.0 2.0"/>
+    <surface id="2" type="z-plane" coeffs="-2.0"/>
+    <surface id="3" type="z-plane" coeffs="2.0"/>
+    <surface id="4" type="x-plane" coeffs="-3.0"/>
+    <surface id="5" type="x-plane" coeffs="3.0"/>
+    <surface id="6" type="y-plane" coeffs="-3.0"/>
+    <surface id="7" type="y-plane" coeffs="3.0"/>
+    <surface id="8" type="z-plane" coeffs="-3.0"/>
+    <surface id="9" type="z-plane" coeffs="3.0"/>
+    <surface id="10" type="x-plane" boundary="vacuum" coeffs="-4.0"/>
+    <surface id="11" type="x-plane" boundary="vacuum" coeffs="4.0"/>
+    <surface id="12" type="y-plane" boundary="vacuum" coeffs="-4.0"/>
+    <surface id="13" type="y-plane" boundary="vacuum" coeffs="4.0"/>
+    <surface id="14" type="z-plane" boundary="vacuum" coeffs="-4.0"/>
+    <surface id="15" type="z-plane" boundary="vacuum" coeffs="4.0"/>
+  </geometry>
+  <settings>
+    <run_mode>eigenvalue</run_mode>
+    <particles>100</particles>
+    <batches>5</batches>
+    <inactive>1</inactive>
+    <source type="independent" strength="1.0" particle="neutron">
+      <space type="box">
+        <parameters>-2.0 -2.0 -2.0 2.0 2.0 2.0</parameters>
+      </space>
+      <constraints>
+        <fissionable>true</fissionable>
+      </constraints>
+    </source>
+    <collision_track>
+      <nuclides>O16 U235</nuclides>
+      <max_collisions>300</max_collisions>
+    </collision_track>
+    <seed>1</seed>
+  </settings>
+  </model>
diff --git a/tests/regression_tests/collision_track/case_4_Nuclide_ID/results_true.dat b/tests/regression_tests/collision_track/case_4_Nuclide_ID/results_true.dat
new file mode 100644
index 000000000..d4d1d1e5a
--- /dev/null
+++ b/tests/regression_tests/collision_track/case_4_Nuclide_ID/results_true.dat
@@ -0,0 +1,2 @@
+k-combined:
+5.642735E-02 1.494035E-02
diff --git a/tests/regression_tests/collision_track/case_5_Universe_ID/inputs_true.dat b/tests/regression_tests/collision_track/case_5_Universe_ID/inputs_true.dat
new file mode 100644
index 000000000..8c0d7aa8e
--- /dev/null
+++ b/tests/regression_tests/collision_track/case_5_Universe_ID/inputs_true.dat
@@ -0,0 +1,59 @@
+<?xml version='1.0' encoding='utf-8'?>
+<model>
+  <materials>
+    <material id="1" depletable="true">
+      <density value="11.0" units="g/cm3"/>
+      <nuclide name="U234" ao="0.0004524"/>
+      <nuclide name="U235" ao="0.0506068"/>
+      <nuclide name="U238" ao="0.948709"/>
+      <nuclide name="U236" ao="0.0002318"/>
+      <nuclide name="O16" ao="2.0"/>
+    </material>
+    <material id="11">
+      <density value="1.0" units="g/cm3"/>
+      <nuclide name="H1" ao="2.0"/>
+      <nuclide name="O16" ao="1.0"/>
+    </material>
+  </materials>
+  <geometry>
+    <cell id="5" fill="77" region="-5 4 -7 6 -9 8" universe="1"/>
+    <cell id="8" material="11" region="-11 10 -13 12 -15 14 (5 | -4 | 7 | -6 | 9 | -8)" universe="1"/>
+    <cell id="22" material="1" region="-1 2 -3" universe="77"/>
+    <cell id="33" material="11" region="1 | -2 | 3" universe="77"/>
+    <surface id="1" type="z-cylinder" coeffs="0.0 0.0 2.0"/>
+    <surface id="2" type="z-plane" coeffs="-2.0"/>
+    <surface id="3" type="z-plane" coeffs="2.0"/>
+    <surface id="4" type="x-plane" coeffs="-3.0"/>
+    <surface id="5" type="x-plane" coeffs="3.0"/>
+    <surface id="6" type="y-plane" coeffs="-3.0"/>
+    <surface id="7" type="y-plane" coeffs="3.0"/>
+    <surface id="8" type="z-plane" coeffs="-3.0"/>
+    <surface id="9" type="z-plane" coeffs="3.0"/>
+    <surface id="10" type="x-plane" boundary="vacuum" coeffs="-4.0"/>
+    <surface id="11" type="x-plane" boundary="vacuum" coeffs="4.0"/>
+    <surface id="12" type="y-plane" boundary="vacuum" coeffs="-4.0"/>
+    <surface id="13" type="y-plane" boundary="vacuum" coeffs="4.0"/>
+    <surface id="14" type="z-plane" boundary="vacuum" coeffs="-4.0"/>
+    <surface id="15" type="z-plane" boundary="vacuum" coeffs="4.0"/>
+  </geometry>
+  <settings>
+    <run_mode>eigenvalue</run_mode>
+    <particles>100</particles>
+    <batches>5</batches>
+    <inactive>1</inactive>
+    <source type="independent" strength="1.0" particle="neutron">
+      <space type="box">
+        <parameters>-2.0 -2.0 -2.0 2.0 2.0 2.0</parameters>
+      </space>
+      <constraints>
+        <fissionable>true</fissionable>
+      </constraints>
+    </source>
+    <collision_track>
+      <cell_ids>22</cell_ids>
+      <universe_ids>77</universe_ids>
+      <max_collisions>300</max_collisions>
+    </collision_track>
+    <seed>1</seed>
+  </settings>
+  </model>
diff --git a/tests/regression_tests/collision_track/case_5_Universe_ID/results_true.dat b/tests/regression_tests/collision_track/case_5_Universe_ID/results_true.dat
new file mode 100644
index 000000000..d4d1d1e5a
--- /dev/null
+++ b/tests/regression_tests/collision_track/case_5_Universe_ID/results_true.dat
@@ -0,0 +1,2 @@
+k-combined:
+5.642735E-02 1.494035E-02
diff --git a/tests/regression_tests/collision_track/case_6_deposited_energy_threshold/inputs_true.dat b/tests/regression_tests/collision_track/case_6_deposited_energy_threshold/inputs_true.dat
new file mode 100644
index 000000000..5173dc35c
--- /dev/null
+++ b/tests/regression_tests/collision_track/case_6_deposited_energy_threshold/inputs_true.dat
@@ -0,0 +1,58 @@
+<?xml version='1.0' encoding='utf-8'?>
+<model>
+  <materials>
+    <material id="1" depletable="true">
+      <density value="11.0" units="g/cm3"/>
+      <nuclide name="U234" ao="0.0004524"/>
+      <nuclide name="U235" ao="0.0506068"/>
+      <nuclide name="U238" ao="0.948709"/>
+      <nuclide name="U236" ao="0.0002318"/>
+      <nuclide name="O16" ao="2.0"/>
+    </material>
+    <material id="11">
+      <density value="1.0" units="g/cm3"/>
+      <nuclide name="H1" ao="2.0"/>
+      <nuclide name="O16" ao="1.0"/>
+    </material>
+  </materials>
+  <geometry>
+    <cell id="5" fill="77" region="-5 4 -7 6 -9 8" universe="1"/>
+    <cell id="8" material="11" region="-11 10 -13 12 -15 14 (5 | -4 | 7 | -6 | 9 | -8)" universe="1"/>
+    <cell id="22" material="1" region="-1 2 -3" universe="77"/>
+    <cell id="33" material="11" region="1 | -2 | 3" universe="77"/>
+    <surface id="1" type="z-cylinder" coeffs="0.0 0.0 2.0"/>
+    <surface id="2" type="z-plane" coeffs="-2.0"/>
+    <surface id="3" type="z-plane" coeffs="2.0"/>
+    <surface id="4" type="x-plane" coeffs="-3.0"/>
+    <surface id="5" type="x-plane" coeffs="3.0"/>
+    <surface id="6" type="y-plane" coeffs="-3.0"/>
+    <surface id="7" type="y-plane" coeffs="3.0"/>
+    <surface id="8" type="z-plane" coeffs="-3.0"/>
+    <surface id="9" type="z-plane" coeffs="3.0"/>
+    <surface id="10" type="x-plane" boundary="vacuum" coeffs="-4.0"/>
+    <surface id="11" type="x-plane" boundary="vacuum" coeffs="4.0"/>
+    <surface id="12" type="y-plane" boundary="vacuum" coeffs="-4.0"/>
+    <surface id="13" type="y-plane" boundary="vacuum" coeffs="4.0"/>
+    <surface id="14" type="z-plane" boundary="vacuum" coeffs="-4.0"/>
+    <surface id="15" type="z-plane" boundary="vacuum" coeffs="4.0"/>
+  </geometry>
+  <settings>
+    <run_mode>eigenvalue</run_mode>
+    <particles>100</particles>
+    <batches>5</batches>
+    <inactive>1</inactive>
+    <source type="independent" strength="1.0" particle="neutron">
+      <space type="box">
+        <parameters>-2.0 -2.0 -2.0 2.0 2.0 2.0</parameters>
+      </space>
+      <constraints>
+        <fissionable>true</fissionable>
+      </constraints>
+    </source>
+    <collision_track>
+      <deposited_E_threshold>550000.0</deposited_E_threshold>
+      <max_collisions>300</max_collisions>
+    </collision_track>
+    <seed>1</seed>
+  </settings>
+  </model>
diff --git a/tests/regression_tests/collision_track/case_6_deposited_energy_threshold/results_true.dat b/tests/regression_tests/collision_track/case_6_deposited_energy_threshold/results_true.dat
new file mode 100644
index 000000000..d4d1d1e5a
--- /dev/null
+++ b/tests/regression_tests/collision_track/case_6_deposited_energy_threshold/results_true.dat
@@ -0,0 +1,2 @@
+k-combined:
+5.642735E-02 1.494035E-02
diff --git a/tests/regression_tests/collision_track/case_7_all_parameters_used_together/inputs_true.dat b/tests/regression_tests/collision_track/case_7_all_parameters_used_together/inputs_true.dat
new file mode 100644
index 000000000..005d9feb2
--- /dev/null
+++ b/tests/regression_tests/collision_track/case_7_all_parameters_used_together/inputs_true.dat
@@ -0,0 +1,63 @@
+<?xml version='1.0' encoding='utf-8'?>
+<model>
+  <materials>
+    <material id="1" depletable="true">
+      <density value="11.0" units="g/cm3"/>
+      <nuclide name="U234" ao="0.0004524"/>
+      <nuclide name="U235" ao="0.0506068"/>
+      <nuclide name="U238" ao="0.948709"/>
+      <nuclide name="U236" ao="0.0002318"/>
+      <nuclide name="O16" ao="2.0"/>
+    </material>
+    <material id="11">
+      <density value="1.0" units="g/cm3"/>
+      <nuclide name="H1" ao="2.0"/>
+      <nuclide name="O16" ao="1.0"/>
+    </material>
+  </materials>
+  <geometry>
+    <cell id="5" fill="77" region="-5 4 -7 6 -9 8" universe="1"/>
+    <cell id="8" material="11" region="-11 10 -13 12 -15 14 (5 | -4 | 7 | -6 | 9 | -8)" universe="1"/>
+    <cell id="22" material="1" region="-1 2 -3" universe="77"/>
+    <cell id="33" material="11" region="1 | -2 | 3" universe="77"/>
+    <surface id="1" type="z-cylinder" coeffs="0.0 0.0 2.0"/>
+    <surface id="2" type="z-plane" coeffs="-2.0"/>
+    <surface id="3" type="z-plane" coeffs="2.0"/>
+    <surface id="4" type="x-plane" coeffs="-3.0"/>
+    <surface id="5" type="x-plane" coeffs="3.0"/>
+    <surface id="6" type="y-plane" coeffs="-3.0"/>
+    <surface id="7" type="y-plane" coeffs="3.0"/>
+    <surface id="8" type="z-plane" coeffs="-3.0"/>
+    <surface id="9" type="z-plane" coeffs="3.0"/>
+    <surface id="10" type="x-plane" boundary="vacuum" coeffs="-4.0"/>
+    <surface id="11" type="x-plane" boundary="vacuum" coeffs="4.0"/>
+    <surface id="12" type="y-plane" boundary="vacuum" coeffs="-4.0"/>
+    <surface id="13" type="y-plane" boundary="vacuum" coeffs="4.0"/>
+    <surface id="14" type="z-plane" boundary="vacuum" coeffs="-4.0"/>
+    <surface id="15" type="z-plane" boundary="vacuum" coeffs="4.0"/>
+  </geometry>
+  <settings>
+    <run_mode>eigenvalue</run_mode>
+    <particles>100</particles>
+    <batches>5</batches>
+    <inactive>1</inactive>
+    <source type="independent" strength="1.0" particle="neutron">
+      <space type="box">
+        <parameters>-2.0 -2.0 -2.0 2.0 2.0 2.0</parameters>
+      </space>
+      <constraints>
+        <fissionable>true</fissionable>
+      </constraints>
+    </source>
+    <collision_track>
+      <cell_ids>22 33</cell_ids>
+      <reactions>elastic 18 (n,disappear)</reactions>
+      <universe_ids>77</universe_ids>
+      <material_ids>1 11</material_ids>
+      <nuclides>U238 U235 H1 U234</nuclides>
+      <deposited_E_threshold>100000.0</deposited_E_threshold>
+      <max_collisions>300</max_collisions>
+    </collision_track>
+    <seed>1</seed>
+  </settings>
+  </model>
diff --git a/tests/regression_tests/collision_track/case_7_all_parameters_used_together/results_true.dat b/tests/regression_tests/collision_track/case_7_all_parameters_used_together/results_true.dat
new file mode 100644
index 000000000..d4d1d1e5a
--- /dev/null
+++ b/tests/regression_tests/collision_track/case_7_all_parameters_used_together/results_true.dat
@@ -0,0 +1,2 @@
+k-combined:
+5.642735E-02 1.494035E-02
diff --git a/tests/regression_tests/collision_track/case_8_2threads/inputs_true.dat b/tests/regression_tests/collision_track/case_8_2threads/inputs_true.dat
new file mode 100644
index 000000000..514932c1a
--- /dev/null
+++ b/tests/regression_tests/collision_track/case_8_2threads/inputs_true.dat
@@ -0,0 +1,57 @@
+<?xml version='1.0' encoding='utf-8'?>
+<model>
+  <materials>
+    <material id="1" depletable="true">
+      <density value="11.0" units="g/cm3"/>
+      <nuclide name="U234" ao="0.0004524"/>
+      <nuclide name="U235" ao="0.0506068"/>
+      <nuclide name="U238" ao="0.948709"/>
+      <nuclide name="U236" ao="0.0002318"/>
+      <nuclide name="O16" ao="2.0"/>
+    </material>
+    <material id="11">
+      <density value="1.0" units="g/cm3"/>
+      <nuclide name="H1" ao="2.0"/>
+      <nuclide name="O16" ao="1.0"/>
+    </material>
+  </materials>
+  <geometry>
+    <cell id="5" fill="77" region="-5 4 -7 6 -9 8" universe="1"/>
+    <cell id="8" material="11" region="-11 10 -13 12 -15 14 (5 | -4 | 7 | -6 | 9 | -8)" universe="1"/>
+    <cell id="22" material="1" region="-1 2 -3" universe="77"/>
+    <cell id="33" material="11" region="1 | -2 | 3" universe="77"/>
+    <surface id="1" type="z-cylinder" coeffs="0.0 0.0 2.0"/>
+    <surface id="2" type="z-plane" coeffs="-2.0"/>
+    <surface id="3" type="z-plane" coeffs="2.0"/>
+    <surface id="4" type="x-plane" coeffs="-3.0"/>
+    <surface id="5" type="x-plane" coeffs="3.0"/>
+    <surface id="6" type="y-plane" coeffs="-3.0"/>
+    <surface id="7" type="y-plane" coeffs="3.0"/>
+    <surface id="8" type="z-plane" coeffs="-3.0"/>
+    <surface id="9" type="z-plane" coeffs="3.0"/>
+    <surface id="10" type="x-plane" boundary="vacuum" coeffs="-4.0"/>
+    <surface id="11" type="x-plane" boundary="vacuum" coeffs="4.0"/>
+    <surface id="12" type="y-plane" boundary="vacuum" coeffs="-4.0"/>
+    <surface id="13" type="y-plane" boundary="vacuum" coeffs="4.0"/>
+    <surface id="14" type="z-plane" boundary="vacuum" coeffs="-4.0"/>
+    <surface id="15" type="z-plane" boundary="vacuum" coeffs="4.0"/>
+  </geometry>
+  <settings>
+    <run_mode>eigenvalue</run_mode>
+    <particles>100</particles>
+    <batches>5</batches>
+    <inactive>1</inactive>
+    <source type="independent" strength="1.0" particle="neutron">
+      <space type="box">
+        <parameters>-2.0 -2.0 -2.0 2.0 2.0 2.0</parameters>
+      </space>
+      <constraints>
+        <fissionable>true</fissionable>
+      </constraints>
+    </source>
+    <collision_track>
+      <max_collisions>200</max_collisions>
+    </collision_track>
+    <seed>1</seed>
+  </settings>
+  </model>
diff --git a/tests/regression_tests/collision_track/case_8_2threads/results_true.dat b/tests/regression_tests/collision_track/case_8_2threads/results_true.dat
new file mode 100644
index 000000000..d4d1d1e5a
--- /dev/null
+++ b/tests/regression_tests/collision_track/case_8_2threads/results_true.dat
@@ -0,0 +1,2 @@
+k-combined:
+5.642735E-02 1.494035E-02
diff --git a/tests/regression_tests/collision_track/test.py b/tests/regression_tests/collision_track/test.py
new file mode 100644
index 000000000..00e1e3de4
--- /dev/null
+++ b/tests/regression_tests/collision_track/test.py
@@ -0,0 +1,255 @@
+"""Test the 'collision_track' setting.
+
+Results
+-------
+
+All results are generated using only 1 MPI process.
+
+All results are generated using 1 thread except for "test_consistency_low_realization_number".
+This specific test verifies that when the number of realization (i.e., point being candidate
+to be stored) is lower than the capacity, results are reproducible even with multiple
+threads (i.e., there is no potential thread competition that would produce different
+results in that case).
+
+All results are generated using the history-based mode except for cases e01 to e03.
+
+All results are visually verified using the '_visualize.py' script in the regression test folder.
+
+OpenMC models
+-------------
+
+Four OpenMC models with CSG-only geometries are used to cover the transmission, vacuum,
+reflective and periodic Boundary Conditions (BC):
+
+- model_1: cylindrical core in 2 boxes (vacuum and transmission BC),
+
+# Test cases for simulation parameters using CSG-only geometries
+# ============================================================
+# Each test case is defined by a combination of folder name, model name, and specific parameters.
+# Below is a summary of the parameters used in the test cases:
+#
+# - max_collisions: Maximum number of particles to track in the simulation.
+# - reactions: List of MT numbers (reaction types- 2 for scattering, 18 for fission, 101 for absorbtion).
+# - cell_ids: IDs of specific cells in the model.
+# - mat_ids: Material IDs for filtering particles.
+# - nuclides: Nuclides for filtering particles.
+# - univ_ids: Universe IDs for filtering particles.
+# - E_threshold: Energy threshold for filtering particles (optional).
+#
+# The test cases are designed to validate the behavior of the simulation under various configurations.
+
+*: BC stands for Boundary Conditions, T for Transmission, R for Reflective, and V for Vacuum.
+
+An additional case, called 'case-a01', is used to check that the results are comparable when
+the number of threads is set to 2 if the number of realization is lower than the capacity.
+
+
+*: BC stands for Boundary Conditions, T for Transmission, and V for Vacuum.
+
+Notes:
+
+- The test cases list is non-exhaustive compared to the number of possible combinations.
+  Test cases have been selected based on use and internal code logic.
+
+
+
+TODO:
+
+- Test with a lattice.
+
+"""
+
+import os
+
+import openmc
+import openmc.lib
+import pytest
+
+from tests.testing_harness import CollisionTrackTestHarness
+from tests.regression_tests import config
+
+
+@pytest.fixture(scope="function")
+def two_threads(monkeypatch):
+    """Set the number of OMP threads to 2 for the test."""
+    monkeypatch.setenv("OMP_NUM_THREADS", "2")
+
+
+@pytest.fixture(scope="function")
+def single_process(monkeypatch):
+    """Set the number of MPI process to 1 for the test."""
+    monkeypatch.setitem(config, "mpi_np", "1")
+
+
+@pytest.fixture(scope="module")
+def model_1():
+    """Cylindrical core contained in a first box which is contained in a larger box.
+    A lower universe is used to describe the interior of the first box which
+    contains the core and its surrounding space.
+
+    """
+    openmc.reset_auto_ids()
+    model = openmc.Model()
+
+    # =============================================================================
+    # Materials
+    # =============================================================================
+
+    fuel = openmc.Material(material_id=1)
+    fuel.add_nuclide("U234", 0.0004524)
+    fuel.add_nuclide("U235", 0.0506068)
+    fuel.add_nuclide("U238", 0.9487090)
+    fuel.add_nuclide("U236", 0.0002318)
+    fuel.add_nuclide("O16", 2.0)
+    fuel.set_density("g/cm3", 11.0)
+
+    water = openmc.Material(material_id=11)
+    water.add_nuclide("H1", 2.0)
+    water.add_nuclide("O16", 1.0)
+    water.set_density("g/cm3", 1.0)
+
+    # =============================================================================
+    # Geometry
+    # =============================================================================
+
+    # -----------------------------------------------------------------------------
+    # Cylindrical core
+    # -----------------------------------------------------------------------------
+
+    # Parameters
+    core_radius = 2.0
+    core_height = 4.0
+
+    # Surfaces
+    core_cylinder = openmc.ZCylinder(r=core_radius)
+    core_lower_plane = openmc.ZPlane(-core_height / 2.0)
+    core_upper_plane = openmc.ZPlane(core_height / 2.0)
+
+    # Region
+    core_region = -core_cylinder & +core_lower_plane & -core_upper_plane
+
+    # Cells
+    core = openmc.Cell(fill=fuel, region=core_region, cell_id=22)
+    outside_core_region = +core_cylinder | -core_lower_plane | +core_upper_plane
+    outside_core = openmc.Cell(
+        fill=water, region=outside_core_region, cell_id=33)
+
+    # Universe
+    inside_box1_universe = openmc.Universe(
+        cells=[core, outside_core], universe_id=77)
+
+    # -----------------------------------------------------------------------------
+    # Box 1
+    # -----------------------------------------------------------------------------
+
+    # Parameters
+    box1_size = 6.0
+
+    # Surfaces
+    box1_rpp = openmc.model.RectangularParallelepiped(
+        -box1_size / 2.0, box1_size / 2.0,
+        -box1_size / 2.0, box1_size / 2.0,
+        -box1_size / 2.0, box1_size / 2.0,
+    )
+
+    # Cell
+    box1 = openmc.Cell(fill=inside_box1_universe, region=-box1_rpp, cell_id=5)
+
+    # -----------------------------------------------------------------------------
+    # Box 2
+    # -----------------------------------------------------------------------------
+
+    # Parameters
+    box2_size = 8
+
+    # Surfaces
+    box2_rpp = openmc.model.RectangularParallelepiped(
+        -box2_size / 2.0, box2_size / 2.0,
+        -box2_size / 2.0, box2_size / 2.0,
+        -box2_size / 2.0, box2_size / 2.0,
+        boundary_type="vacuum"
+    )
+
+    # Cell
+    box2 = openmc.Cell(fill=water, region=-box2_rpp & +box1_rpp, cell_id=8)
+
+    # Register geometry
+    model.geometry = openmc.Geometry([box1, box2])
+
+    # =============================================================================
+    # Settings
+    # =============================================================================
+
+    model.settings = openmc.Settings()
+    model.settings.particles = 100
+    model.settings.batches = 5
+    model.settings.inactive = 1
+    model.settings.seed = 1
+
+    bounds = [
+        -core_radius,
+        -core_radius,
+        -core_height / 2.0,
+        core_radius,
+        core_radius,
+        core_height / 2.0,
+    ]
+    distribution = openmc.stats.Box(bounds[:3], bounds[3:])
+    model.settings.source = openmc.IndependentSource(
+        space=distribution, constraints={'fissionable': True})
+
+    return model
+
+
+@pytest.mark.parametrize(
+    "folder, model_name, parameter",
+    [("case_1_Reactions", "model_1", {"max_collisions": 300, "reactions": ["(n,fission)", 101]}),
+        ("case_2_Cell_ID", "model_1", {
+         "max_collisions": 300, "cell_ids": [22]}),
+        ("case_3_Material_ID", "model_1", {
+         "max_collisions": 300, "material_ids": [1]}),
+        ("case_4_Nuclide_ID", "model_1", {
+         "max_collisions": 300, "nuclides": ["O16", "U235"]}),
+        ("case_5_Universe_ID", "model_1", {
+         "max_collisions": 300, "cell_ids": [22], "universe_ids": [77]}),
+        ("case_6_deposited_energy_threshold", "model_1", {
+         "max_collisions": 300, "deposited_E_threshold": 5.5e5}),
+        ("case_7_all_parameters_used_together", "model_1", {
+            "max_collisions": 300,
+            "reactions": ["elastic", 18, "(n,disappear)"],
+            "material_ids": [1, 11],
+            "universe_ids": [77],
+            "nuclides": ["U238", "U235", "H1", "U234"],
+            "cell_ids": [22, 33],
+            "deposited_E_threshold": 1e5})
+     ],
+)
+def test_collision_track_several_cases(
+    folder, model_name, parameter, request
+):
+    # Since for these tests the actual number of collisions recorded is < max_collisions,
+    # we can run them with 1 or 2 threads, and in history or event mode.
+    model = request.getfixturevalue(model_name)
+    model.settings.collision_track = parameter
+    harness = CollisionTrackTestHarness(
+        "statepoint.5.h5", model=model, workdir=folder
+    )
+    harness.main()
+
+
+@pytest.mark.skipif(config["event"], reason="Results from history-based mode.")
+def test_collision_track_2threads(model_1, two_threads, single_process):
+    # This test checks that the `max_collisions` setting is honored:
+    # no collisions beyond the specified limit should be recorded.
+    #
+    # For the result to be reproducible, the number of threads and
+    # the transport mode (history vs. event) must remain fixed.
+    assert os.environ["OMP_NUM_THREADS"] == "2"
+    assert config["mpi_np"] == "1"
+    model_1.settings.collision_track = {
+        "max_collisions": 200
+    }
+    harness = CollisionTrackTestHarness(
+        "statepoint.5.h5", model=model_1, workdir="case_8_2threads"
+    )
+    harness.main()
diff --git a/tests/testing_harness.py b/tests/testing_harness.py
index 11ced5b38..1ad91b7a8 100644
--- a/tests/testing_harness.py
+++ b/tests/testing_harness.py
@@ -68,7 +68,7 @@ class TestHarness:
         if config['mpi']:
             mpi_args = [config['mpiexec'], '-n', config['mpi_np']]
             openmc.run(openmc_exec=config['exe'], mpi_args=mpi_args,
-              event_based=config['event'])
+                       event_based=config['event'])
         else:
             openmc.run(openmc_exec=config['exe'], event_based=config['event'])
 
@@ -305,9 +305,12 @@ class PyAPITestHarness(TestHarness):
         else:
             self.execute_test()
 
-    def execute_test(self):
+    def execute_test(self, change_dir=False):
         """Build input XMLs, run OpenMC, and verify correct results."""
+        base_dir = os.getcwd() if change_dir else None
         try:
+            if change_dir:
+                os.chdir(self.workdir)
             self._build_inputs()
             inputs = self._get_inputs()
             self._write_inputs(inputs)
@@ -319,10 +322,15 @@ class PyAPITestHarness(TestHarness):
             self._compare_results()
         finally:
             self._cleanup()
+            if base_dir:
+                os.chdir(base_dir)
 
-    def update_results(self):
+    def update_results(self, change_dir=False):
         """Update results_true.dat and inputs_true.dat"""
+        base_dir = os.getcwd() if change_dir else None
         try:
+            if change_dir:
+                os.chdir(self.workdir)
             self._build_inputs()
             inputs = self._get_inputs()
             self._write_inputs(inputs)
@@ -334,6 +342,8 @@ class PyAPITestHarness(TestHarness):
             self._overwrite_results()
         finally:
             self._cleanup()
+            if base_dir:
+                os.chdir(base_dir)
 
     def _build_inputs(self):
         """Write input XML files."""
@@ -371,7 +381,8 @@ class PyAPITestHarness(TestHarness):
         """Delete XMLs, statepoints, tally, and test files."""
         super()._cleanup()
         output = ['materials.xml', 'geometry.xml', 'settings.xml',
-                  'tallies.xml', 'plots.xml', 'inputs_test.dat', 'model.xml']
+                  'tallies.xml', 'plots.xml', 'inputs_test.dat', 'model.xml',
+                  'collision_track.h5', 'collision_track.mcpl']
         for f in output:
             if os.path.exists(f):
                 os.remove(f)
@@ -389,6 +400,7 @@ class TolerantPyAPITestHarness(PyAPITestHarness):
     due to single precision usage (e.g., as in the random ray solver).
 
     """
+
     def _are_files_equal(self, actual_path, expected_path, tolerance):
         def isfloat(value):
             try:
@@ -428,7 +440,8 @@ class TolerantPyAPITestHarness(PyAPITestHarness):
 
     def _compare_results(self):
         """Make sure the current results agree with the reference."""
-        compare = self._are_files_equal('results_test.dat', 'results_true.dat', 1e-6)
+        compare = self._are_files_equal(
+            'results_test.dat', 'results_true.dat', 1e-6)
         if not compare:
             expected = open('results_true.dat').readlines()
             actual = open('results_test.dat').readlines()
@@ -476,6 +489,7 @@ class WeightWindowPyAPITestHarness(PyAPITestHarness):
 
 class PlotTestHarness(TestHarness):
     """Specialized TestHarness for running OpenMC plotting tests."""
+
     def __init__(self, plot_names, voxel_convert_checks=[]):
         super().__init__(None)
         self._plot_names = plot_names
@@ -523,3 +537,105 @@ class PlotTestHarness(TestHarness):
         outstr = sha512.hexdigest()
 
         return outstr
+
+
+class CollisionTrackTestHarness(PyAPITestHarness):
+    def __init__(self, statepoint_name, model=None, inputs_true=None, workdir=None):
+        super().__init__(statepoint_name, model, inputs_true)
+        self.workdir = workdir
+
+    def _test_output_created(self):
+        """Make sure collision_track.h5 has also been created."""
+        super()._test_output_created()
+        if self._model.settings.collision_track:
+            assert os.path.exists(
+                "collision_track.h5"
+            ), "collision_track file has not been created."
+
+    def _compare_output(self):
+        """Compare collision_track.h5 files."""
+        if self._model.settings.collision_track:
+            collision_track_true = self._return_collision_track_data(
+                "collision_track_true.h5")
+            collision_track_test = self._return_collision_track_data(
+                "collision_track.h5")
+            np.testing.assert_allclose(
+                collision_track_true, collision_track_test, rtol=1e-07)
+
+    def main(self):
+        """Accept commandline arguments and either run or update tests."""
+        if config["build_inputs"]:
+            self.build_inputs()
+        elif config["update"]:
+            self.update_results(change_dir=True)
+        else:
+            self.execute_test(change_dir=True)
+
+    def build_inputs(self):
+        """Build inputs."""
+        base_dir = os.getcwd()
+        try:
+            os.chdir(self.workdir)
+            self._build_inputs()
+        finally:
+            os.chdir(base_dir)
+
+    def _overwrite_results(self):
+        """Also add the 'collision_track.h5' file during overwriting."""
+        super()._overwrite_results()
+        if os.path.exists("collision_track.h5"):
+            shutil.copyfile("collision_track.h5", "collision_track_true.h5")
+
+    @staticmethod
+    def _return_collision_track_data(filepath):
+        """
+        Read a collision_track file and return a sorted array composed
+        of flatten arrays of collision information.
+
+        Parameters
+        ----------
+        filepath : str
+            Path to the collision_track file
+
+        Returns
+        -------
+        data : np.array
+            Sorted array composed of flatten arrays of collision_track data for
+            each collision information
+        """
+        data = []
+        keys = []
+
+        # Read source file
+        source = openmc.read_collision_track_file(filepath)
+        for src in source:
+            r = src['r']
+            u = src['u']
+            e = src['E']
+            de = src['dE']
+            time = src['time']
+            wgt = src['wgt']
+            delayed_group = src['delayed_group']
+            cell_id = src['cell_id']
+            nuclide_id = src['nuclide_id']
+            material_id = src['material_id']
+            universe_id = src['universe_id']
+            n_collision = src['n_collision']
+            event_mt = src['event_mt']
+            key = (
+                f"{r[0]:.10e} {r[1]:.10e} {r[2]:.10e} {u[0]:.10e} {u[1]:.10e} {u[2]:.10e}"
+                f"{e:.10e} {de:.10e}  {time:.10e} {wgt:.10e} {event_mt} {delayed_group} {cell_id}"
+                f"{nuclide_id} {material_id} {universe_id} {n_collision} "
+            )
+            keys.append(key)
+            values = [*r, *u, e, de, time, wgt, event_mt,
+                      delayed_group, cell_id, nuclide_id, material_id,
+                      universe_id, n_collision]
+            assert len(values) == 17
+            data.append(values)
+
+        data = np.array(data)
+        keys = np.array(keys)
+        sorted_idx = np.argsort(keys, kind='stable')
+
+        return data[sorted_idx]
diff --git a/tests/unit_tests/test_collision_track.py b/tests/unit_tests/test_collision_track.py
new file mode 100644
index 000000000..9bc6a8c15
--- /dev/null
+++ b/tests/unit_tests/test_collision_track.py
@@ -0,0 +1,127 @@
+"""Test the 'collision_track' setting used to store particle information
+during specified collision conditions in a file for a given simulation."""
+
+import openmc
+import pytest
+import h5py
+import numpy as np
+
+from tests.testing_harness import CollisionTrackTestHarness as ctt
+
+
+@pytest.fixture(scope="module")
+def geometry():
+    """Simple hydrogen sphere geometry"""
+    openmc.reset_auto_ids()
+    material = openmc.Material(name="H1")
+    material.add_element("H", 1.0)
+    sphere = openmc.Sphere(r=1.0, boundary_type="vacuum")
+    cell = openmc.Cell(region=-sphere, fill=material)
+    return openmc.Geometry([cell])
+
+
+@pytest.mark.parametrize(
+    "parameter",
+    [
+        {"max_collisions": 200},
+        {"max_collisions": 200, "reactions": ["(n,disappear)"]},
+        {"max_collisions": 200, "cell_ids": [1]},
+        {"max_collisions": 200, "material_ids": [1]},
+        {"max_collisions": 200, "universe_ids": [1]},
+        {"max_collisions": 200, "nuclides": ["H1"]},
+        {"max_collisions": 200, "deposited_E_threshold": 200000.0},
+        {"max_collisions": 200, "mcpl": True}
+
+    ],
+)
+def test_xml_serialization(parameter, run_in_tmpdir):
+    """Check that the different use cases can be written and read in XML."""
+    settings = openmc.Settings()
+    settings.collision_track = parameter
+    settings.export_to_xml()
+
+    read_settings = openmc.Settings.from_xml()
+    assert read_settings.collision_track == parameter
+
+
+@pytest.fixture(scope="module")
+def model():
+    """Simple hydrogen sphere divided in two hemispheres
+    by a z-plane to form 2 cells."""
+    openmc.reset_auto_ids()
+    model = openmc.Model()
+
+    # Material
+    material = openmc.Material(name="H1")
+    material.add_element("H", 1.0)
+
+    # Geometry
+    radius = 1.0
+    sphere = openmc.Sphere(r=radius, boundary_type="reflective")
+    plane = openmc.ZPlane(0.0)
+    cell_1 = openmc.Cell(region=-sphere & -plane, fill=material, cell_id=1)
+    cell_2 = openmc.Cell(region=-sphere & +plane, fill=material, cell_id=2)
+    root = openmc.Universe(cells=[cell_1, cell_2])
+    model.geometry = openmc.Geometry(root)
+
+    # Settings
+    model.settings = openmc.Settings()
+    model.settings.run_mode = "fixed source"
+    model.settings.particles = 1
+    model.settings.batches = 1
+    model.settings.seed = 2
+
+    bounds = [-radius, -radius, -radius, radius, radius, radius]
+    distribution = openmc.stats.Box(bounds[:3], bounds[3:])
+    model.settings.source = openmc.IndependentSource(space=distribution)
+
+    return model
+
+
+def test_particle_location(run_in_tmpdir, model):
+    """Test the location of particles with respected to the "cell_ids"
+    and the location x, y, z of the particle itself. the upper sphere will
+    have positive z component and the bottom sphere a negative z compnent.
+
+    """
+    model.settings.collision_track = {
+        "max_collisions": 200,
+        "reactions": ["elastic"],
+        "cell_ids": [1, 2]
+    }
+    model.run()
+
+    with h5py.File("collision_track.h5", "r") as f:
+        source = f["collision_track_bank"]
+
+        assert len(source) == 60
+
+        # We want to verify that the collisions happenening are in the right cells
+        # and the position of the particle is either positive or negative relative
+        # to the z plane. In this case, we track the position of the particle
+        # relative to the cell_id already set.
+        for point in source:
+            if point['cell_id'] == 1:
+                assert point['r'][2] < 0.0  # z component negative
+            elif point['cell_id'] == 2:
+                assert point["r"][2] > 0.0  # z component positive
+            else:
+                assert False
+
+
+def test_format_similarity(run_in_tmpdir, model):
+    model.settings.collision_track = {"max_collisions": 200, "reactions": ['elastic'],
+                                      "cell_ids": [1, 2], "mcpl": False}
+    model.run()
+    data_h5 = ctt._return_collision_track_data('collision_track.h5')
+
+    model.settings.collision_track["mcpl"] = True
+    model.run()
+    data_mcpl = ctt._return_collision_track_data('collision_track.mcpl')
+
+    assert len(data_h5) == 60
+    assert len(data_mcpl) == 60
+
+    np.testing.assert_allclose(data_h5, data_mcpl, rtol=1e-05)
+    # tolerance not that low due to the strings that is saved in MCPL,
+    # not enough precision!

From 8d618716b55d92e892314d966ac75ffe5b19b7d7 Mon Sep 17 00:00:00 2001
From: Paul Romano <paul.k.romano@gmail.com>
Date: Thu, 13 Nov 2025 17:14:39 -0600
Subject: [PATCH 158/203] Avoid multiprocessing Pool when running depletion
 tests with MPI (#3633)

---
 tests/conftest.py                             | 21 +++++++++++++++++--
 .../deplete_no_transport/test.py              |  4 ++++
 .../deplete_with_transport/test.py            |  2 ++
 3 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/tests/conftest.py b/tests/conftest.py
index fa6718502..71dd5ebf5 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -29,12 +29,29 @@ def run_in_tmpdir(tmpdir):
         yield
     finally:
         orig.chdir()
-        
+
 @pytest.fixture(scope="module")
 def endf_data():
-    return os.environ['OPENMC_ENDF_DATA']        
+    return os.environ['OPENMC_ENDF_DATA']
 
 @pytest.fixture(scope='session', autouse=True)
 def resolve_paths():
     with openmc.config.patch('resolve_paths', False):
         yield
+
+
+@pytest.fixture(scope='session', autouse=True)
+def disable_depletion_multiprocessing_under_mpi():
+    """Fork-based depletion multiprocessing may deadlock if MPI is active."""
+    if not regression_config['mpi']:
+        yield
+        return
+
+    from openmc.deplete import pool
+
+    original_setting = pool.USE_MULTIPROCESSING
+    pool.USE_MULTIPROCESSING = False
+    try:
+        yield
+    finally:
+        pool.USE_MULTIPROCESSING = original_setting
diff --git a/tests/regression_tests/deplete_no_transport/test.py b/tests/regression_tests/deplete_no_transport/test.py
index 63ae584e1..5550ad048 100644
--- a/tests/regression_tests/deplete_no_transport/test.py
+++ b/tests/regression_tests/deplete_no_transport/test.py
@@ -76,6 +76,8 @@ def test_against_self(run_in_tmpdir,
     dt = [360]  # single step
 
     # Perform simulation using the predictor algorithm
+    if config['mpi'] and multiproc:
+        pytest.skip("Multiprocessing depletion is disabled when MPI is enabled.")
     openmc.deplete.pool.USE_MULTIPROCESSING = multiproc
     openmc.deplete.PredictorIntegrator(op,
                                        dt,
@@ -135,6 +137,8 @@ def test_against_coupled(run_in_tmpdir,
     dt = [dt]  # single step
 
     # Perform simulation using the predictor algorithm
+    if config['mpi'] and multiproc:
+        pytest.skip("Multiprocessing depletion is disabled when MPI is enabled.")
     openmc.deplete.pool.USE_MULTIPROCESSING = multiproc
     openmc.deplete.PredictorIntegrator(
         op, dt, power=174, timestep_units=time_units).integrate()
diff --git a/tests/regression_tests/deplete_with_transport/test.py b/tests/regression_tests/deplete_with_transport/test.py
index 0f7ebf00f..a2be22c56 100644
--- a/tests/regression_tests/deplete_with_transport/test.py
+++ b/tests/regression_tests/deplete_with_transport/test.py
@@ -65,6 +65,8 @@ def test_full(run_in_tmpdir, problem, multiproc):
     power = 2.337e15*4*JOULE_PER_EV*1e6  # MeV/second cm from CASMO
 
     # Perform simulation using the predictor algorithm
+    if config['mpi'] and multiproc:
+        pytest.skip("Multiprocessing depletion is disabled when MPI is enabled.")
     openmc.deplete.pool.USE_MULTIPROCESSING = multiproc
     openmc.deplete.PredictorIntegrator(op, dt, power).integrate()
 

From 7815d3a680de21362e7fec64c871ecbab1150421 Mon Sep 17 00:00:00 2001
From: Patrick Shriwise <pshriwise@gmail.com>
Date: Thu, 13 Nov 2025 23:27:17 -0600
Subject: [PATCH 159/203] Fix typo in DAGMC lost particle test (#3634)

---
 tests/unit_tests/dagmc/test_lost_particles.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/unit_tests/dagmc/test_lost_particles.py b/tests/unit_tests/dagmc/test_lost_particles.py
index 502bd795e..3a4166009 100644
--- a/tests/unit_tests/dagmc/test_lost_particles.py
+++ b/tests/unit_tests/dagmc/test_lost_particles.py
@@ -70,12 +70,12 @@ def test_lost_particles(run_in_tmpdir, broken_dagmc_model):
         openmc.run()
 
     # run this again, but with the dagmc universe as the root unvierse
+    # to ensure that lost particles are still caught in this case
     for univ in broken_dagmc_model.geometry.get_all_universes().values():
         if isinstance(univ, openmc.DAGMCUniverse):
-            broken_dagmc_model.geometry.root_unvierse = univ
+            broken_dagmc_model.geometry.root_universe = univ
             break
 
     broken_dagmc_model.export_to_xml()
     with pytest.raises(RuntimeError, match='Maximum number of lost particles has been reached.'):
         openmc.run()
-

From 5c63e0df21a25e2c9a25f8be6cfd23a09d6007b3 Mon Sep 17 00:00:00 2001
From: Paul Romano <paul.k.romano@gmail.com>
Date: Tue, 18 Nov 2025 17:57:12 -0600
Subject: [PATCH 160/203] Fix a few warnings, rename add_to_tallies_file
 (#3639)

---
 docs/source/usersguide/random_ray.rst         |  2 +-
 openmc/deplete/chain.py                       | 13 +++---
 openmc/mgxs/library.py                        | 18 +++++---
 openmc/mgxs/mgxs.py                           |  4 +-
 openmc/model/model.py                         |  6 +--
 openmc/tallies.py                             | 45 +++++++------------
 .../mgxs_library_ce_to_mg/test.py             |  2 +-
 .../mgxs_library_ce_to_mg_nuclides/test.py    |  2 +-
 .../mgxs_library_condense/test.py             |  2 +-
 .../mgxs_library_correction/test.py           |  2 +-
 .../mgxs_library_distribcell/test.py          |  2 +-
 .../mgxs_library_hdf5/test.py                 |  2 +-
 .../mgxs_library_histogram/test.py            |  2 +-
 .../mgxs_library_mesh/test.py                 |  2 +-
 .../mgxs_library_no_nuclides/test.py          |  2 +-
 .../mgxs_library_nuclides/test.py             |  2 +-
 .../mgxs_library_specific_nuclides/test.py    |  2 +-
 17 files changed, 54 insertions(+), 56 deletions(-)

diff --git a/docs/source/usersguide/random_ray.rst b/docs/source/usersguide/random_ray.rst
index 138ae910c..d5d752a83 100644
--- a/docs/source/usersguide/random_ray.rst
+++ b/docs/source/usersguide/random_ray.rst
@@ -765,7 +765,7 @@ energy decomposition::
 
   # Create a "tallies.xml" file for the MGXS Library
   tallies = openmc.Tallies()
-  mgxs_lib.add_to_tallies_file(tallies, merge=True)
+  mgxs_lib.add_to_tallies(tallies, merge=True)
 
   # Export
   tallies.export_to_xml()
diff --git a/openmc/deplete/chain.py b/openmc/deplete/chain.py
index f34416d56..873d7ca89 100644
--- a/openmc/deplete/chain.py
+++ b/openmc/deplete/chain.py
@@ -630,7 +630,7 @@ class Chain:
 
         n = len(self)
 
-        # we accumulate indices and value entries for everything and create the matrix 
+        # we accumulate indices and value entries for everything and create the matrix
         # in one step at the end to avoid expensive index checks scipy otherwise does.
         rows, cols, vals = [], [], []
         def setval(i, j, val):
@@ -716,14 +716,17 @@ class Chain:
         return sp.csc_matrix((vals, (rows, cols)), shape=(n, n))
 
     def add_redox_term(self, matrix, buffer, oxidation_states):
-        """Adds a redox term to the depletion matrix from data contained in
+        r"""Adds a redox term to the depletion matrix from data contained in
         the matrix itself and a few user-inputs.
 
         The redox term to add to the buffer nuclide :math:`N_j` can be written
-        as: :math:`\frac{dN_j(t)}{dt} =
-                \cdots - \frac{1}{OS_j}\sum_i N_i a_{ij} \cdot OS_i `
+        as:
 
-        where :math:`OS` is the oxidation states vector and `a_{ij}` the
+        .. math::
+            \frac{dN_j(t)}{dt} = \cdots - \frac{1}{OS_j}\sum_i N_i a_{ij}
+            \cdot OS_i
+
+        where :math:`OS` is the oxidation states vector and :math:`a_{ij}` the
         corresponding term in the Bateman matrix.
 
         Parameters
diff --git a/openmc/mgxs/library.py b/openmc/mgxs/library.py
index f782cbe9e..b476de902 100644
--- a/openmc/mgxs/library.py
+++ b/openmc/mgxs/library.py
@@ -556,14 +556,14 @@ class Library:
 
                 self.all_mgxs[domain.id][mgxs_type] = mgxs
 
-    def add_to_tallies_file(self, tallies_file, merge=True):
-        """Add all tallies from all MGXS objects to a tallies file.
+    def add_to_tallies(self, tallies, merge=True):
+        """Add tallies from all MGXS objects to a tallies object.
 
         NOTE: This assumes that :meth:`Library.build_library` has been called
 
         Parameters
         ----------
-        tallies_file : openmc.Tallies
+        tallies : openmc.Tallies
             A Tallies collection to add each MGXS' tallies to generate a
             'tallies.xml' input file for OpenMC
         merge : bool
@@ -572,7 +572,7 @@ class Library:
 
         """
 
-        cv.check_type('tallies_file', tallies_file, openmc.Tallies)
+        cv.check_type('tallies', tallies, openmc.Tallies)
 
         # Add tallies from each MGXS for each domain and mgxs type
         for domain in self.domains:
@@ -587,7 +587,15 @@ class Library:
                             = list(range(1, self.num_delayed_groups + 1))
 
                 for tally in mgxs.tallies.values():
-                    tallies_file.append(tally, merge=merge)
+                    tallies.append(tally, merge=merge)
+
+    def add_to_tallies_file(self, tallies_file, merge=True):
+        warn(
+            "The Library.add_to_tallies_file(...) method has been renamed to"
+            "add_to_tallies(...) and will be removed in a future version of "
+            "OpenMC.", FutureWarning
+        )
+        self.add_to_tallies(tallies_file, merge=merge)
 
     def load_from_statepoint(self, statepoint):
         """Extracts tallies in an OpenMC StatePoint with the data needed to
diff --git a/openmc/mgxs/mgxs.py b/openmc/mgxs/mgxs.py
index 533ab0ad3..f621db092 100644
--- a/openmc/mgxs/mgxs.py
+++ b/openmc/mgxs/mgxs.py
@@ -2127,8 +2127,8 @@ class MGXS:
             df['std. dev.'] /= np.tile(densities, tile_factor)
 
             # Replace NaNs by zeros (happens if nuclide density is zero)
-            df['mean'].replace(np.nan, 0.0, inplace=True)
-            df['std. dev.'].replace(np.nan, 0.0, inplace=True)
+            df['mean'] = df['mean'].replace(np.nan, 0.0)
+            df['std. dev.'] = df['std. dev.'].replace(np.nan, 0.0)
 
         # Sort the dataframe by domain type id (e.g., distribcell id) and
         # energy groups such that data is from fast to thermal
diff --git a/openmc/model/model.py b/openmc/model/model.py
index 64294c23c..10e5cbfc7 100644
--- a/openmc/model/model.py
+++ b/openmc/model/model.py
@@ -1791,7 +1791,7 @@ class Model:
             mgxs_lib.build_library()
 
             # Create a "tallies.xml" file for the MGXS Library
-            mgxs_lib.add_to_tallies_file(model.tallies, merge=True)
+            mgxs_lib.add_to_tallies(model.tallies, merge=True)
 
             # Run
             statepoint_filename = model.run(cwd=directory)
@@ -1980,7 +1980,7 @@ class Model:
         mgxs_lib.build_library()
 
         # Create a "tallies.xml" file for the MGXS Library
-        mgxs_lib.add_to_tallies_file(model.tallies, merge=True)
+        mgxs_lib.add_to_tallies(model.tallies, merge=True)
 
         # Run
         statepoint_filename = model.run(cwd=directory)
@@ -2075,7 +2075,7 @@ class Model:
         mgxs_lib.build_library()
 
         # Create a "tallies.xml" file for the MGXS Library
-        mgxs_lib.add_to_tallies_file(model.tallies, merge=True)
+        mgxs_lib.add_to_tallies(model.tallies, merge=True)
 
         # Run
         statepoint_filename = model.run(cwd=directory)
diff --git a/openmc/tallies.py b/openmc/tallies.py
index 25ec29a58..add356579 100644
--- a/openmc/tallies.py
+++ b/openmc/tallies.py
@@ -738,13 +738,9 @@ class Tally(IDManagerMixin):
 
         Notes
         -----
-        This test is based on D'Agostino and Pearson's test [1]_. The test
-        requires at least 8 realizations to produce valid results.
-
-        References
-        ----------
-        .. [1] D'Agostino, R. B. (1971), "An omnibus test of normality for
-               moderate and large sample size", Biometrika, 58, 341-348
+        This test is based on `D'Agostino and Pearson's test
+        <https://doi.org/10.1093/biomet/60.3.613>`_. The test requires at least
+        8 realizations to produce valid results.
 
         """
         n = self.num_realizations
@@ -788,8 +784,8 @@ class Tally(IDManagerMixin):
         Parameters
         ----------
         alternative : {'two-sided', 'less', 'greater'}, optional
-            Defines the alternative hypothesis. Default is 'two-sided'.
-            The following options are available:
+            Defines the alternative hypothesis. Default is 'two-sided'. The
+            following options are available:
 
             * 'two-sided': the kurtosis of the distribution is different from
               that of the normal distribution
@@ -813,14 +809,9 @@ class Tally(IDManagerMixin):
 
         Notes
         -----
-        This test is based on D'Agostino and Pearson's test [1]_. The test
-        is typically recommended for at least 20 realizations to produce
-        valid results.
-
-        References
-        ----------
-        .. [1] D'Agostino, R. B. (1971), "An omnibus test of normality for
-               moderate and large sample size", Biometrika, 58, 341-348
+        This test is based on `D'Agostino and Pearson's test
+        <https://doi.org/10.1093/biomet/60.3.613>`_. The test is typically
+        recommended for at least 20 realizations to produce valid results.
 
         """
         n = self.num_realizations
@@ -855,9 +846,9 @@ class Tally(IDManagerMixin):
     def normaltest(self, alternative: str = "two-sided"):
         """Perform D'Agostino and Pearson's omnibus test for normality.
 
-        This method tests the null hypothesis that a sample comes from a
-        normal distribution. It combines skewness and kurtosis to produce an
-        omnibus test of normality.
+        This method tests the null hypothesis that a sample comes from a normal
+        distribution. It combines skewness and kurtosis to produce an omnibus
+        test of normality.
 
         Parameters
         ----------
@@ -886,23 +877,19 @@ class Tally(IDManagerMixin):
         Notes
         -----
         This test combines a test for skewness and a test for kurtosis to
-        produce an omnibus test [1]_. The test statistic is:
+        produce an `omnibus test <https://doi.org/10.1093/biomet/60.3.613>`_.
+        The test statistic is:
 
         .. math::
 
             K^2 = Z_1^2 + Z_2^2
 
-        where :math:`Z_1` is the z-score from the skewness test and
-        :math:`Z_2` is the z-score from the kurtosis test. This statistic
-        follows a chi-square distribution with 2 degrees of freedom.
+        where :math:`Z_1` is the z-score from the skewness test and :math:`Z_2`
+        is the z-score from the kurtosis test. This statistic follows a
+        chi-square distribution with 2 degrees of freedom.
 
         The test requires at least 20 realizations to produce valid results.
 
-        References
-        ----------
-        .. [1] D'Agostino, R. B. and Pearson, E. S. (1973), "Tests for
-               departure from normality", Biometrika, 60, 613-622
-
         """
         n = self.num_realizations
         if n < 20:
diff --git a/tests/regression_tests/mgxs_library_ce_to_mg/test.py b/tests/regression_tests/mgxs_library_ce_to_mg/test.py
index 48a715997..075167f58 100644
--- a/tests/regression_tests/mgxs_library_ce_to_mg/test.py
+++ b/tests/regression_tests/mgxs_library_ce_to_mg/test.py
@@ -28,7 +28,7 @@ class MGXSTestHarness(PyAPITestHarness):
         self.mgxs_lib.build_library()
 
         # Initialize a tallies file
-        self.mgxs_lib.add_to_tallies_file(self._model.tallies, merge=False)
+        self.mgxs_lib.add_to_tallies(self._model.tallies, merge=False)
 
     def _run_openmc(self):
         # Initial run
diff --git a/tests/regression_tests/mgxs_library_ce_to_mg_nuclides/test.py b/tests/regression_tests/mgxs_library_ce_to_mg_nuclides/test.py
index a77ad2429..489105f8f 100644
--- a/tests/regression_tests/mgxs_library_ce_to_mg_nuclides/test.py
+++ b/tests/regression_tests/mgxs_library_ce_to_mg_nuclides/test.py
@@ -28,7 +28,7 @@ class MGXSTestHarness(PyAPITestHarness):
         self.mgxs_lib.build_library()
 
         # Initialize a tallies file
-        self.mgxs_lib.add_to_tallies_file(self._model.tallies, merge=False)
+        self.mgxs_lib.add_to_tallies(self._model.tallies, merge=False)
 
     def _run_openmc(self):
         # Initial run
diff --git a/tests/regression_tests/mgxs_library_condense/test.py b/tests/regression_tests/mgxs_library_condense/test.py
index a7e60617f..bbc4c11bf 100644
--- a/tests/regression_tests/mgxs_library_condense/test.py
+++ b/tests/regression_tests/mgxs_library_condense/test.py
@@ -36,7 +36,7 @@ class MGXSTestHarness(PyAPITestHarness):
         self.mgxs_lib.build_library()
 
         # Add tallies
-        self.mgxs_lib.add_to_tallies_file(self._model.tallies, merge=False)
+        self.mgxs_lib.add_to_tallies(self._model.tallies, merge=False)
 
     def _get_results(self, hash_output=False):
         """Digest info in the statepoint and return as a string."""
diff --git a/tests/regression_tests/mgxs_library_correction/test.py b/tests/regression_tests/mgxs_library_correction/test.py
index 05eedfef8..64e638e44 100644
--- a/tests/regression_tests/mgxs_library_correction/test.py
+++ b/tests/regression_tests/mgxs_library_correction/test.py
@@ -29,7 +29,7 @@ class MGXSTestHarness(PyAPITestHarness):
         self.mgxs_lib.build_library()
 
         # Add tallies
-        self.mgxs_lib.add_to_tallies_file(self._model.tallies, merge=False)
+        self.mgxs_lib.add_to_tallies(self._model.tallies, merge=False)
 
     def _get_results(self, hash_output=False):
         """Digest info in the statepoint and return as a string."""
diff --git a/tests/regression_tests/mgxs_library_distribcell/test.py b/tests/regression_tests/mgxs_library_distribcell/test.py
index fd6c8e938..464b309c0 100644
--- a/tests/regression_tests/mgxs_library_distribcell/test.py
+++ b/tests/regression_tests/mgxs_library_distribcell/test.py
@@ -36,7 +36,7 @@ class MGXSTestHarness(PyAPITestHarness):
         self.mgxs_lib.build_library()
 
         # Add tallies
-        self.mgxs_lib.add_to_tallies_file(self._model.tallies, merge=False)
+        self.mgxs_lib.add_to_tallies(self._model.tallies, merge=False)
         self._model.tallies.export_to_xml()
 
     def _get_results(self, hash_output=False):
diff --git a/tests/regression_tests/mgxs_library_hdf5/test.py b/tests/regression_tests/mgxs_library_hdf5/test.py
index 06625c25f..4fb4bf093 100644
--- a/tests/regression_tests/mgxs_library_hdf5/test.py
+++ b/tests/regression_tests/mgxs_library_hdf5/test.py
@@ -40,7 +40,7 @@ class MGXSTestHarness(PyAPITestHarness):
         self.mgxs_lib.build_library()
 
         # Add tallies
-        self.mgxs_lib.add_to_tallies_file(self._model.tallies, merge=False)
+        self.mgxs_lib.add_to_tallies(self._model.tallies, merge=False)
 
     def _get_results(self, hash_output=False):
         """Digest info in the statepoint and return as a string."""
diff --git a/tests/regression_tests/mgxs_library_histogram/test.py b/tests/regression_tests/mgxs_library_histogram/test.py
index b9905910a..42fc1957a 100644
--- a/tests/regression_tests/mgxs_library_histogram/test.py
+++ b/tests/regression_tests/mgxs_library_histogram/test.py
@@ -30,7 +30,7 @@ class MGXSTestHarness(PyAPITestHarness):
         self.mgxs_lib.build_library()
 
         # Add tallies
-        self.mgxs_lib.add_to_tallies_file(self._model.tallies, merge=False)
+        self.mgxs_lib.add_to_tallies(self._model.tallies, merge=False)
 
     def _get_results(self, hash_output=False):
         """Digest info in the statepoint and return as a string."""
diff --git a/tests/regression_tests/mgxs_library_mesh/test.py b/tests/regression_tests/mgxs_library_mesh/test.py
index 89c68a75a..c1a5980b5 100644
--- a/tests/regression_tests/mgxs_library_mesh/test.py
+++ b/tests/regression_tests/mgxs_library_mesh/test.py
@@ -57,7 +57,7 @@ def model():
     model.mgxs_lib.build_library()
 
     # Add tallies
-    model.mgxs_lib.add_to_tallies_file(model.tallies, merge=False)
+    model.mgxs_lib.add_to_tallies(model.tallies, merge=False)
 
     return model
 
diff --git a/tests/regression_tests/mgxs_library_no_nuclides/test.py b/tests/regression_tests/mgxs_library_no_nuclides/test.py
index af14a5dc8..a02086af3 100644
--- a/tests/regression_tests/mgxs_library_no_nuclides/test.py
+++ b/tests/regression_tests/mgxs_library_no_nuclides/test.py
@@ -39,7 +39,7 @@ class MGXSTestHarness(PyAPITestHarness):
         self.mgxs_lib.build_library()
 
         # Add tallies
-        self.mgxs_lib.add_to_tallies_file(self._model.tallies, merge=False)
+        self.mgxs_lib.add_to_tallies(self._model.tallies, merge=False)
 
     def _get_results(self, hash_output=False):
         """Digest info in the statepoint and return as a string."""
diff --git a/tests/regression_tests/mgxs_library_nuclides/test.py b/tests/regression_tests/mgxs_library_nuclides/test.py
index 8a7673565..a10070358 100644
--- a/tests/regression_tests/mgxs_library_nuclides/test.py
+++ b/tests/regression_tests/mgxs_library_nuclides/test.py
@@ -36,7 +36,7 @@ class MGXSTestHarness(PyAPITestHarness):
         self.mgxs_lib.build_library()
 
         # Add tallies
-        self.mgxs_lib.add_to_tallies_file(self._model.tallies, merge=False)
+        self.mgxs_lib.add_to_tallies(self._model.tallies, merge=False)
 
     def _get_results(self, hash_output=True):
         """Digest info in the statepoint and return as a string."""
diff --git a/tests/regression_tests/mgxs_library_specific_nuclides/test.py b/tests/regression_tests/mgxs_library_specific_nuclides/test.py
index 61910e539..0ccbb83bd 100644
--- a/tests/regression_tests/mgxs_library_specific_nuclides/test.py
+++ b/tests/regression_tests/mgxs_library_specific_nuclides/test.py
@@ -37,7 +37,7 @@ class MGXSTestHarness(PyAPITestHarness):
         self.mgxs_lib.build_library()
 
         # Add tallies
-        self.mgxs_lib.add_to_tallies_file(self._model.tallies, merge=True)
+        self.mgxs_lib.add_to_tallies(self._model.tallies, merge=True)
 
     def _get_results(self, hash_output=True):
         """Digest info in the statepoint and return as a string."""

From 028f4404485407b01a31c44f30249852601a29c8 Mon Sep 17 00:00:00 2001
From: Paul Romano <paul.k.romano@gmail.com>
Date: Wed, 19 Nov 2025 11:19:27 -0600
Subject: [PATCH 161/203] Support MPI parallelism in R2SManager (#3632)

---
 openmc/deplete/microxs.py | 31 +++++++++++++------------
 openmc/deplete/r2s.py     | 48 ++++++++++++++++++++++++---------------
 openmc/lib/core.py        | 45 ++++++++++++++++++++++++++++--------
 3 files changed, 82 insertions(+), 42 deletions(-)

diff --git a/openmc/deplete/microxs.py b/openmc/deplete/microxs.py
index d7624955e..f4bdc6795 100644
--- a/openmc/deplete/microxs.py
+++ b/openmc/deplete/microxs.py
@@ -170,13 +170,14 @@ def get_microxs_and_flux(
         # Reinitialize with tallies
         openmc.lib.init(intracomm=comm)
 
-    # create temporary run
     with TemporaryDirectory() as temp_dir:
-        if run_kwargs is None:
-            run_kwargs = {}
-        else:
-            run_kwargs = dict(run_kwargs)
-        run_kwargs.setdefault('cwd', temp_dir)
+        # Indicate to run in temporary directory unless being executed through
+        # openmc.lib, in which case we don't need to specify the cwd
+        run_kwargs = dict(run_kwargs) if run_kwargs else {}
+        if not openmc.lib.is_initialized:
+            run_kwargs.setdefault('cwd', temp_dir)
+
+        # Run transport simulation
         statepoint_path = model.run(**run_kwargs)
 
         if comm.rank == 0:
@@ -189,15 +190,18 @@ def get_microxs_and_flux(
             if path_input is not None:
                 model.export_to_model_xml(path_input)
 
-            with StatePoint(statepoint_path) as sp:
-                if reaction_rate_mode == 'direct':
-                    rr_tally = sp.tallies[rr_tally.id]
-                    rr_tally._read_results()
-                flux_tally = sp.tallies[flux_tally.id]
-                flux_tally._read_results()
+        # Broadcast updated statepoint path to all ranks
+        statepoint_path = comm.bcast(statepoint_path)
+
+        # Read in tally results (on all ranks)
+        with StatePoint(statepoint_path) as sp:
+            if reaction_rate_mode == 'direct':
+                rr_tally = sp.tallies[rr_tally.id]
+                rr_tally._read_results()
+            flux_tally = sp.tallies[flux_tally.id]
+            flux_tally._read_results()
 
     # Get flux values and make energy groups last dimension
-    flux_tally = comm.bcast(flux_tally)
     flux = flux_tally.get_reshaped_data()  # (domains, groups, 1, 1)
     flux = np.moveaxis(flux, 1, -1)  # (domains, 1, 1, groups)
 
@@ -206,7 +210,6 @@ def get_microxs_and_flux(
 
     if reaction_rate_mode == 'direct':
         # Get reaction rates
-        rr_tally = comm.bcast(rr_tally)
         reaction_rates = rr_tally.get_reshaped_data()  # (domains, groups, nuclides, reactions)
 
         # Make energy groups last dimension
diff --git a/openmc/deplete/r2s.py b/openmc/deplete/r2s.py
index 7b5deddc2..7f3e94edd 100644
--- a/openmc/deplete/r2s.py
+++ b/openmc/deplete/r2s.py
@@ -11,6 +11,9 @@ from . import IndependentOperator, PredictorIntegrator
 from .microxs import get_microxs_and_flux, write_microxs_hdf5, read_microxs_hdf5
 from .results import Results
 from ..checkvalue import PathLike
+from ..mpi import comm
+from openmc.lib import TemporarySession
+from openmc.utility_funcs import change_directory
 
 
 def get_activation_materials(
@@ -199,8 +202,10 @@ class R2SManager:
         """
 
         if output_dir is None:
+            # Create timestamped output directory and broadcast to all ranks for
+            # consistency (different ranks may have slightly different times)
             stamp = datetime.now().strftime('%Y-%m-%dT%H-%M-%S')
-            output_dir = Path(f'r2s_{stamp}')
+            output_dir = Path(comm.bcast(f'r2s_{stamp}'))
 
         # Set run_kwargs for the neutron transport step
         if micro_kwargs is None:
@@ -257,18 +262,19 @@ class R2SManager:
 
         """
 
-        output_dir = Path(output_dir)
+        output_dir = Path(output_dir).resolve()
         output_dir.mkdir(parents=True, exist_ok=True)
 
         if self.method == 'mesh-based':
             # Compute material volume fractions on the mesh
             if mat_vol_kwargs is None:
                 mat_vol_kwargs = {}
-            self.results['mesh_material_volumes'] = mmv = \
-                self.domains.material_volumes(self.neutron_model, **mat_vol_kwargs)
+            self.results['mesh_material_volumes'] = mmv = comm.bcast(
+                self.domains.material_volumes(self.neutron_model, **mat_vol_kwargs))
 
             # Save results to file
-            mmv.save(output_dir / 'mesh_material_volumes.npz')
+            if comm.rank == 0:
+                mmv.save(output_dir / 'mesh_material_volumes.npz')
 
             # Create mesh-material filter based on what combos were found
             domains = openmc.MeshMaterialFilter.from_volumes(self.domains, mmv)
@@ -299,13 +305,16 @@ class R2SManager:
         micro_kwargs.setdefault('path_statepoint', output_dir / 'statepoint.h5')
         micro_kwargs.setdefault('path_input', output_dir / 'model.xml')
 
-        # Run neutron transport and get fluxes and micros
-        self.results['fluxes'], self.results['micros'] = get_microxs_and_flux(
-            self.neutron_model, domains, **micro_kwargs)
+        # Run neutron transport and get fluxes and micros. Run via openmc.lib to
+        # maintain a consistent parallelism strategy with the activation step.
+        with TemporarySession():
+            self.results['fluxes'], self.results['micros'] = get_microxs_and_flux(
+                self.neutron_model, domains, **micro_kwargs)
 
         # Save flux and micros to file
-        np.save(output_dir / 'fluxes.npy', self.results['fluxes'])
-        write_microxs_hdf5(self.results['micros'], output_dir / 'micros.h5')
+        if comm.rank == 0:
+            np.save(output_dir / 'fluxes.npy', self.results['fluxes'])
+            write_microxs_hdf5(self.results['micros'], output_dir / 'micros.h5')
 
     def step2_activation(
         self,
@@ -457,15 +466,17 @@ class R2SManager:
         # photon model if it is different from the neutron model to account for
         # potential material changes
         if self.method == 'mesh-based' and different_photon_model:
-            self.results['mesh_material_volumes_photon'] = photon_mmv = \
-                self.domains.material_volumes(self.photon_model, **mat_vol_kwargs)
+            self.results['mesh_material_volumes_photon'] = photon_mmv = comm.bcast(
+                self.domains.material_volumes(self.photon_model, **mat_vol_kwargs))
 
             # Save photon MMV results to file
-            photon_mmv.save(output_dir / 'mesh_material_volumes.npz')
+            if comm.rank == 0:
+                photon_mmv.save(output_dir / 'mesh_material_volumes.npz')
 
-        tally_ids = [tally.id for tally in self.photon_model.tallies]
-        with open(output_dir / 'tally_ids.json', 'w') as f:
-            json.dump(tally_ids, f)
+        if comm.rank == 0:
+            tally_ids = [tally.id for tally in self.photon_model.tallies]
+            with open(output_dir / 'tally_ids.json', 'w') as f:
+                json.dump(tally_ids, f)
 
         self.results['photon_tallies'] = {}
 
@@ -514,8 +525,9 @@ class R2SManager:
                 time_index = len(self.results['depletion_results']) + time_index
 
             # Run photon transport calculation
-            run_kwargs['cwd'] = Path(output_dir) / f'time_{time_index}'
-            statepoint_path = self.photon_model.run(**run_kwargs)
+            photon_dir = Path(output_dir) / f'time_{time_index}'
+            with TemporarySession(self.photon_model, cwd=photon_dir):
+                statepoint_path = self.photon_model.run(**run_kwargs)
 
             # Store tally results
             with openmc.StatePoint(statepoint_path) as sp:
diff --git a/openmc/lib/core.py b/openmc/lib/core.py
index 9f8db69d5..cfccecef2 100644
--- a/openmc/lib/core.py
+++ b/openmc/lib/core.py
@@ -13,6 +13,7 @@ from numpy.ctypeslib import as_array
 
 from . import _dll
 from .error import _error_handler
+from ..mpi import comm
 from openmc.checkvalue import PathLike
 import openmc.lib
 import openmc
@@ -632,6 +633,9 @@ class TemporarySession:
     model : openmc.Model, optional
         OpenMC model to use for the session. If None, a minimal working model is
         created.
+    cwd : PathLike, optional
+        Working directory in which to run OpenMC. If None, a temporary directory
+        is created and deleted automatically.
     **init_kwargs
         Keyword arguments to pass to :func:`openmc.lib.init`.
 
@@ -639,10 +643,13 @@ class TemporarySession:
     ----------
     model : openmc.Model
         The OpenMC model used for the session.
+    comm : mpi4py.MPI.Intracomm
+        The MPI intracommunicator used for the session.
 
     """
-    def __init__(self, model=None, **init_kwargs):
-        self.init_kwargs = init_kwargs
+    def __init__(self, model=None, cwd=None, **init_kwargs):
+        self.init_kwargs = dict(init_kwargs)
+        self.cwd = cwd
         if model is None:
             surf = openmc.Sphere(boundary_type="vacuum")
             cell = openmc.Cell(region=-surf)
@@ -652,6 +659,10 @@ class TemporarySession:
                 particles=1, batches=1, output={'summary': False})
         self.model = model
 
+        # Determine MPI intercommunicator
+        self.init_kwargs.setdefault('intracomm', comm)
+        self.comm = self.init_kwargs['intracomm']
+
     def __enter__(self):
         """Initialize the OpenMC library in a temporary directory."""
         # If already initialized, the context manager is a no-op
@@ -662,14 +673,24 @@ class TemporarySession:
         # Store original working directory
         self.orig_dir = Path.cwd()
 
-        # Set up temporary directory
-        self.tmp_dir = TemporaryDirectory()
-        working_dir = Path(self.tmp_dir.name)
-        working_dir.mkdir(parents=True, exist_ok=True)
-        os.chdir(working_dir)
+        if self.cwd is None:
+            # Set up temporary directory on rank 0
+            if self.comm.rank == 0:
+                self._tmp_dir = TemporaryDirectory()
+                self.cwd = self._tmp_dir.name
 
-        # Export model and initialize OpenMC
-        self.model.export_to_model_xml()
+            # Broadcast the path so that all ranks use the same directory
+            self.cwd = self.comm.bcast(self.cwd)
+
+        # Create and change to specified directory
+        self.cwd = Path(self.cwd)
+        self.cwd.mkdir(parents=True, exist_ok=True)
+        os.chdir(self.cwd)
+
+        # Export model on first rank and initialize OpenMC
+        if self.comm.rank == 0:
+            self.model.export_to_model_xml()
+        self.comm.barrier()
         openmc.lib.init(**self.init_kwargs)
 
         return self
@@ -683,7 +704,11 @@ class TemporarySession:
             finalize()
         finally:
             os.chdir(self.orig_dir)
-            self.tmp_dir.cleanup()
+
+            # Make sure all ranks have finalized before deleting temporary dir
+            self.comm.barrier()
+            if hasattr(self, '_tmp_dir'):
+                self._tmp_dir.cleanup()
 
 
 class _DLLGlobal:

From f544d02e499248281050ef2272d042c4a7933858 Mon Sep 17 00:00:00 2001
From: Paul Romano <paul.k.romano@gmail.com>
Date: Wed, 19 Nov 2025 11:26:57 -0600
Subject: [PATCH 162/203] Don't write reaction rates in depletion results by
 default, remove per-stage data for multistage integrators (#3609)

---
 docs/source/io_formats/depletion_results.rst |  26 +--
 openmc/deplete/abc.py                        | 153 ++++++++-----
 openmc/deplete/integrators.py                |  85 +++----
 openmc/deplete/results.py                    |   8 +-
 openmc/deplete/stepresult.py                 | 222 +++++++++++--------
 tests/unit_tests/test_deplete_continue.py    |   8 +-
 tests/unit_tests/test_deplete_integrator.py  |  93 +++++---
 tests/unit_tests/test_deplete_restart.py     |  14 +-
 8 files changed, 336 insertions(+), 273 deletions(-)

diff --git a/docs/source/io_formats/depletion_results.rst b/docs/source/io_formats/depletion_results.rst
index 7035fc9c9..b2a726dad 100644
--- a/docs/source/io_formats/depletion_results.rst
+++ b/docs/source/io_formats/depletion_results.rst
@@ -4,7 +4,7 @@
 Depletion Results File Format
 =============================
 
-The current version of the depletion results file format is 1.1.
+The current version of the depletion results file format is 1.2.
 
 **/**
 
@@ -12,22 +12,20 @@ The current version of the depletion results file format is 1.1.
              - **version** (*int[2]*) -- Major and minor version of the
                statepoint file format.
 
-:Datasets: - **eigenvalues** (*double[][][2]*) -- k-eigenvalues at each
-             time/stage. This array has shape (number of timesteps, number of
-             stages, value). The last axis contains the eigenvalue and the
-             associated uncertainty
-           - **number** (*double[][][][]*) -- Total number of atoms. This array
-             has shape (number of timesteps, number of stages, number of
+:Datasets: - **eigenvalues** (*double[][2]*) -- k-eigenvalues at each timestep.
+             This array has shape (number of timesteps, 2). The second axis
+             contains the eigenvalue and its associated uncertainty.
+           - **number** (*double[][][]*) -- Total number of atoms at each
+             timestep. This array has shape (number of timesteps, number of
              materials, number of nuclides).
-           - **reaction rates** (*double[][][][][]*) -- Reaction rates used to
-             build depletion matrices. This array has shape (number of
-             timesteps, number of stages, number of materials, number of
-             nuclides, number of reactions).
+           - **reaction rates** (*double[][][][]*) -- Reaction rates at each
+             timestep. This array has shape (number of timesteps, number of
+             materials, number of nuclides, number of reactions). Only stored if
+             write_rates=True.
            - **time** (*double[][2]*) -- Time in [s] at beginning/end of each
              step.
-           - **source_rate** (*double[][]*) -- Power in [W] or source rate in
-             [neutron/sec]. This array has shape (number of timesteps, number
-             of stages).
+           - **source_rate** (*double[]*) -- Power in [W] or source rate in
+             [neutron/sec] for each timestep.
            - **depletion time** (*double[]*) -- Average process time in [s]
              spent depleting a material across all burnable materials and,
              if applicable, MPI processes.
diff --git a/openmc/deplete/abc.py b/openmc/deplete/abc.py
index fb18d86af..32f468306 100644
--- a/openmc/deplete/abc.py
+++ b/openmc/deplete/abc.py
@@ -631,17 +631,7 @@ class Integrator(ABC):
             solver: str = "cram48",
             continue_timesteps: bool = False,
         ):
-        # Check number of stages previously used
-        if operator.prev_res is not None:
-            res = operator.prev_res[-1]
-            if res.data.shape[0] != self._num_stages:
-                raise ValueError(
-                    "{} incompatible with previous restart calculation. "
-                    "Previous scheme used {} intermediate solutions, while "
-                    "this uses {}".format(
-                        self.__class__.__name__, res.data.shape[0],
-                        self._num_stages))
-        elif continue_timesteps:
+        if continue_timesteps and operator.prev_res is None:
             raise ValueError("Continuation run requires passing prev_results.")
         self.operator = operator
         self.chain = operator.chain
@@ -775,12 +765,8 @@ class Integrator(ABC):
         -------
         proc_time : float
             Time spent in CRAM routines for all materials in [s]
-        n_list : list of list of numpy.ndarray
-            Concentrations at each of the intermediate points with
-            the final concentration as the last element
-        op_results : list of openmc.deplete.OperatorResult
-            Eigenvalue and reaction rates from intermediate transport
-            simulations
+        n_end : list of numpy.ndarray
+            Concentrations at end of timestep
         """
 
     @property
@@ -811,9 +797,9 @@ class Integrator(ABC):
         """Get beginning of step concentrations, reaction rates from restart"""
         res = self.operator.prev_res[-1]
         # Depletion methods expect list of arrays
-        bos_conc = list(res.data[0])
-        rates = res.rates[0]
-        k = ufloat(res.k[0, 0], res.k[0, 1])
+        bos_conc = list(res.data)
+        rates = res.rates
+        k = ufloat(res.k[0], res.k[1])
 
         if res.source_rate != 0.0:
             # Scale reaction rates by ratio of source rates
@@ -855,7 +841,8 @@ class Integrator(ABC):
             self,
             final_step: bool = True,
             output: bool = True,
-            path: PathLike = 'depletion_results.h5'
+            path: PathLike = 'depletion_results.h5',
+            write_rates: bool = False
         ):
         """Perform the entire depletion process across all steps
 
@@ -874,6 +861,11 @@ class Integrator(ABC):
             Path to file to write. Defaults to 'depletion_results.h5'.
 
             .. versionadded:: 0.15.0
+        write_rates : bool, optional
+            Whether reaction rates should be written to the results file for
+            each step. Defaults to ``False`` to reduce file size.
+
+            .. versionadded:: 0.15.3
         """
         with change_directory(self.operator.output_dir):
             n = self.operator.initial_condition()
@@ -890,18 +882,22 @@ class Integrator(ABC):
                     n, res = self._get_bos_data_from_restart(source_rate, n)
 
                 # Solve Bateman equations over time interval
-                proc_time, n_list, res_list = self(n, res.rates, dt, source_rate, i)
+                proc_time, n_end = self(n, res.rates, dt, source_rate, i)
 
-                # Insert BOS concentration, transport results
-                n_list.insert(0, n)
-                res_list.insert(0, res)
-
-                # Remove actual EOS concentration for next step
-                n = n_list.pop()
-
-                StepResult.save(self.operator, n_list, res_list, [t, t + dt],
-                                source_rate, self._i_res + i, proc_time, path)
+                StepResult.save(
+                    self.operator,
+                    n,
+                    res,
+                    [t, t + dt],
+                    source_rate,
+                    self._i_res + i,
+                    proc_time,
+                    write_rates=write_rates,
+                    path=path
+                )
 
+                # Update for next step
+                n = n_end
                 t += dt
 
             # Final simulation -- in the case that final_step is False, a zero
@@ -910,9 +906,18 @@ class Integrator(ABC):
             # solve)
             if output and final_step and comm.rank == 0:
                 print(f"[openmc.deplete] t={t} (final operator evaluation)")
-            res_list = [self.operator(n, source_rate if final_step else 0.0)]
-            StepResult.save(self.operator, [n], res_list, [t, t],
-                         source_rate, self._i_res + len(self), proc_time, path)
+            res_final = self.operator(n, source_rate if final_step else 0.0)
+            StepResult.save(
+                self.operator,
+                n,
+                res_final,
+                [t, t],
+                source_rate,
+                self._i_res + len(self),
+                proc_time,
+                write_rates=write_rates,
+                path=path
+            )
             self.operator.write_bos_data(len(self) + self._i_res)
 
         self.operator.finalize()
@@ -1171,10 +1176,40 @@ class SIIntegrator(Integrator):
             self.operator.settings.particles //= self.n_steps
         return inherited
 
+    @abstractmethod
+    def __call__(self, n, rates, dt, source_rate, i):
+        """Perform the integration across one time step
+
+        Parameters
+        ----------
+        n : list of numpy.ndarray
+            List of atom number arrays for each material. Each array has
+            shape ``(n_nucs,)`` where ``n_nucs`` is the number of nuclides
+        rates : openmc.deplete.ReactionRates
+            Reaction rates (from transport operator)
+        dt : float
+            Time step in [s]
+        source_rate : float
+            Power in [W] or source rate in [neutron/sec]
+        i : int
+            Current time step index
+
+        Returns
+        -------
+        proc_time : float
+            Time spent in transport simulation
+        n_end : list of numpy.ndarray
+            Updated atom number densities for each material
+        op_result : OperatorResult
+            Eigenvalue and reaction rates resulting from transport simulation
+
+        """
+
     def integrate(
         self,
         output: bool = True,
-        path: PathLike = "depletion_results.h5"
+        path: PathLike = "depletion_results.h5",
+        write_rates: bool = False
     ):
         """Perform the entire depletion process across all steps
 
@@ -1186,11 +1221,17 @@ class SIIntegrator(Integrator):
             Path to file to write. Defaults to 'depletion_results.h5'.
 
             .. versionadded:: 0.15.0
+        write_rates : bool, optional
+            Whether reaction rates should be written to the results file for
+            each step. Defaults to ``False`` to reduce file size.
+
+            .. versionadded:: 0.15.3
         """
         with change_directory(self.operator.output_dir):
             n = self.operator.initial_condition()
             t, self._i_res = self._get_start_data()
 
+            res_end = None  # Will be set in first iteration
             for i, (dt, p) in enumerate(self):
                 if output:
                     print(f"[openmc.deplete] t={t} s, dt={dt} s, source={p}")
@@ -1200,28 +1241,38 @@ class SIIntegrator(Integrator):
                         n, res = self._get_bos_data_from_operator(i, p, n)
                     else:
                         n, res = self._get_bos_data_from_restart(p, n)
-                else:
-                    # Pull rates, k from previous iteration w/o
-                    # re-running transport
-                    res = res_list[-1]  # defined in previous i iteration
 
-                proc_time, n_list, res_list = self(n, res.rates, dt, p, i)
+                proc_time, n_end, res_end = self(n, res.rates, dt, p, i)
 
-                # Insert BOS concentration, transport results
-                n_list.insert(0, n)
-                res_list.insert(0, res)
-
-                # Remove actual EOS concentration for next step
-                n = n_list.pop()
-
-                StepResult.save(self.operator, n_list, res_list, [t, t + dt],
-                             p, self._i_res + i, proc_time, path)
+                StepResult.save(
+                    self.operator,
+                    n,
+                    res,
+                    [t, t + dt],
+                    p,
+                    self._i_res + i,
+                    proc_time,
+                    write_rates=write_rates,
+                    path=path
+                )
 
+                # Update for next step
+                n = n_end
+                res = res_end
                 t += dt
 
             # No final simulation for SIE, use last iteration results
-            StepResult.save(self.operator, [n], [res_list[-1]], [t, t],
-                         p, self._i_res + len(self), proc_time, path)
+            StepResult.save(
+                self.operator,
+                n,
+                res_end,
+                [t, t],
+                p,
+                self._i_res + len(self),
+                proc_time,
+                write_rates=write_rates,
+                path=path
+            )
             self.operator.write_bos_data(self._i_res + len(self))
 
         self.operator.finalize()
diff --git a/openmc/deplete/integrators.py b/openmc/deplete/integrators.py
index 7c543a6cb..25e64cb2e 100644
--- a/openmc/deplete/integrators.py
+++ b/openmc/deplete/integrators.py
@@ -46,15 +46,12 @@ class PredictorIntegrator(Integrator):
         -------
         proc_time : float
             Time spent in CRAM routines for all materials in [s]
-        n_list : list of list of numpy.ndarray
+        n_end : list of numpy.ndarray
             Concentrations at end of interval
-        op_results : empty list
-            Kept for consistency with API. No intermediate calls to operator
-            with predictor
 
         """
         proc_time, n_end = self._timed_deplete(n, rates, dt, _i)
-        return proc_time, [n_end], []
+        return proc_time, n_end
 
 
 @add_params
@@ -98,11 +95,8 @@ class CECMIntegrator(Integrator):
         -------
         proc_time : float
             Time spent in CRAM routines for all materials in [s]
-        n_list : list of list of numpy.ndarray
-            Concentrations at each of the intermediate points with
-            the final concentration as the last element
-        op_results : list of openmc.deplete.OperatorResult
-            Eigenvalue and reaction rates from transport simulations
+        n_end : list of numpy.ndarray
+            Concentrations at end of interval
         """
         # deplete across first half of interval
         time0, n_middle = self._timed_deplete(n, rates, dt / 2, _i)
@@ -112,7 +106,7 @@ class CECMIntegrator(Integrator):
         # MOS reaction rates
         time1, n_end = self._timed_deplete(n, res_middle.rates, dt, _i)
 
-        return time0 + time1, [n_middle, n_end], [res_middle]
+        return time0 + time1, n_end
 
 
 @add_params
@@ -162,12 +156,8 @@ class CF4Integrator(Integrator):
         -------
         proc_time : float
             Time spent in CRAM routines for all materials in [s]
-        n_list : list of numpy.ndarray
-            Concentrations at each of the intermediate points with
-            the final concentration as the last element
-        op_results : list of openmc.deplete.OperatorResult
-            Eigenvalue and reaction rates from intermediate transport
-            simulations
+        n_end : list of numpy.ndarray
+            Concentrations at end of interval
         """
         # Step 1: deplete with matrix 1/2*A(y0)
         time1, n_eos1 = self._timed_deplete(
@@ -192,9 +182,7 @@ class CF4Integrator(Integrator):
         time5, n_eos5 = self._timed_deplete(
             n_inter, list_rates, dt, _i, matrix_func=cf4_f4)
 
-        return (time1 + time2 + time3 + time4 + time5,
-                [n_eos1, n_eos2, n_eos3, n_eos5],
-                [res1, res2, res3])
+        return time1 + time2 + time3 + time4 + time5, n_eos5
 
 
 @add_params
@@ -240,12 +228,8 @@ class CELIIntegrator(Integrator):
         -------
         proc_time : float
             Time spent in CRAM routines for all materials in [s]
-        n_list : list of list of numpy.ndarray
-            Concentrations at each of the intermediate points with
-            the final concentration as the last element
-        op_results : list of openmc.deplete.OperatorResult
-            Eigenvalue and reaction rates from intermediate transport
-            simulation
+        n_end : list of numpy.ndarray
+            Concentrations at end of interval
         """
         # deplete to end using BOS rates
         proc_time, n_ce = self._timed_deplete(n_bos, rates, dt, _i)
@@ -260,7 +244,7 @@ class CELIIntegrator(Integrator):
         time_le2, n_end = self._timed_deplete(
             n_inter, list_rates, dt, _i, matrix_func=celi_f2)
 
-        return proc_time + time_le1 + time_le1, [n_ce, n_end], [res_ce]
+        return proc_time + time_le1 + time_le2, n_end
 
 
 @add_params
@@ -306,12 +290,8 @@ class EPCRK4Integrator(Integrator):
         -------
         proc_time : float
             Time spent in CRAM routines for all materials in [s]
-        n_list : list of list of numpy.ndarray
-            Concentrations at each of the intermediate points with
-            the final concentration as the last element
-        op_results : list of openmc.deplete.OperatorResult
-            Eigenvalue and reaction rates from intermediate transport
-            simulations
+        n_end : list of numpy.ndarray
+            Concentrations at end of interval
         """
 
         # Step 1: deplete with matrix A(y0) / 2
@@ -330,7 +310,7 @@ class EPCRK4Integrator(Integrator):
         list_rates = list(zip(rates, res1.rates, res2.rates, res3.rates))
         time4, n4 = self._timed_deplete(n, list_rates, dt, _i, matrix_func=rk4_f4)
 
-        return (time1 + time2 + time3 + time4, [n1, n2, n3, n4], [res1, res2, res3])
+        return time1 + time2 + time3 + time4, n4
 
 
 @add_params
@@ -388,12 +368,8 @@ class LEQIIntegrator(Integrator):
         -------
         proc_time : float
             Time spent in CRAM routines for all materials in [s]
-        n_list : list of list of numpy.ndarray
-            Concentrations at each of the intermediate points with
-            the final concentration as the last element
-        op_results : list of openmc.deplete.OperatorResult
-            Eigenvalue and reaction rates from intermediate transport
-            simulation
+        n_end : list of numpy.ndarray
+            Concentrations at end of interval
         """
         if i == 0:
             if self._i_res < 1:  # need at least previous transport solution
@@ -402,7 +378,7 @@ class LEQIIntegrator(Integrator):
                     self, n_bos, bos_rates, dt, source_rate, i)
             prev_res = self.operator.prev_res[-2]
             prev_dt = self.timesteps[i] - prev_res.time[0]
-            self._prev_rates = prev_res.rates[0]
+            self._prev_rates = prev_res.rates
         else:
             prev_dt = self.timesteps[i - 1]
 
@@ -431,9 +407,7 @@ class LEQIIntegrator(Integrator):
         # store updated rates
         self._prev_rates = copy.deepcopy(bos_res.rates)
 
-        return (
-            time1 + time2 + time3 + time4, [n_eos0, n_eos1],
-            [bos_res, res_inter])
+        return time1 + time2 + time3 + time4, n_eos1
 
 
 @add_params
@@ -470,10 +444,9 @@ class SICELIIntegrator(SIIntegrator):
         -------
         proc_time : float
             Time spent in CRAM routines for all materials in [s]
-        n_bos_list : list of list of numpy.ndarray
-            Concentrations at each of the intermediate points with
-            the final concentration as the last element
-        op_results : list of openmc.deplete.OperatorResult
+        n_end : list of numpy.ndarray
+            Concentrations at end of interval
+        op_result : openmc.deplete.OperatorResult
             Eigenvalue and reaction rates from intermediate transport
             simulations
         """
@@ -499,7 +472,7 @@ class SICELIIntegrator(SIIntegrator):
             proc_time += time1 + time2
 
         # end iteration
-        return proc_time, [n_eos, n_inter], [res_bar]
+        return proc_time, n_inter, res_bar
 
 
 @add_params
@@ -536,10 +509,9 @@ class SILEQIIntegrator(SIIntegrator):
         -------
         proc_time : float
             Time spent in CRAM routines for all materials in [s]
-        n_list : list of list of numpy.ndarray
-            Concentrations at each of the intermediate points with
-            the final concentration as the last element
-        op_results : list of openmc.deplete.OperatorResult
+        n_end : list of numpy.ndarray
+            Concentrations at end of interval
+        op_result : openmc.deplete.OperatorResult
             Eigenvalue and reaction rates from intermediate transport
             simulation
         """
@@ -551,7 +523,7 @@ class SILEQIIntegrator(SIIntegrator):
                     self, n_bos, bos_rates, dt, source_rate, i)
             prev_res = self.operator.prev_res[-2]
             prev_dt = self.timesteps[i] - prev_res.time[0]
-            self._prev_rates = prev_res.rates[0]
+            self._prev_rates = prev_res.rates
         else:
             prev_dt = self.timesteps[i - 1]
 
@@ -584,7 +556,10 @@ class SILEQIIntegrator(SIIntegrator):
                 n_inter, inputs, dt, i, matrix_func=leqi_f4)
             proc_time += time1 + time2
 
-        return proc_time, [n_eos, n_inter], [res_bar]
+        # Store updated rates for next step
+        self._prev_rates = copy.deepcopy(bos_rates)
+
+        return proc_time, n_inter, res_bar
 
 
 integrator_by_name = {
diff --git a/openmc/deplete/results.py b/openmc/deplete/results.py
index 7427abd73..e1fcb26b6 100644
--- a/openmc/deplete/results.py
+++ b/openmc/deplete/results.py
@@ -203,7 +203,7 @@ class Results(list):
         # Evaluate value in each region
         for i, result in enumerate(self):
             times[i] = result.time[0]
-            concentrations[i] = result[0, mat_id, nuc]
+            concentrations[i] = result[mat_id, nuc]
 
         # Unit conversions
         times = _get_time_as(times, time_units)
@@ -363,7 +363,7 @@ class Results(list):
         # Evaluate value in each region
         for i, result in enumerate(self):
             times[i] = result.time[0]
-            rates[i] = result.rates[0].get(mat_id, nuc, rx) * result[0, mat, nuc]
+            rates[i] = result.rates.get(mat_id, nuc, rx) * result[mat, nuc]
 
         return times, rates
 
@@ -397,7 +397,7 @@ class Results(list):
         # Get time/eigenvalue at each point
         for i, result in enumerate(self):
             times[i] = result.time[0]
-            eigenvalues[i] = result.k[0]
+            eigenvalues[i] = result.k
 
         # Convert time units if necessary
         times = _get_time_as(times, time_units)
@@ -630,7 +630,7 @@ class Results(list):
                 for nuc in result.index_nuc:
                     if nuc not in available_cross_sections:
                         continue
-                    atoms = result[0, mat_id, nuc]
+                    atoms = result[mat_id, nuc]
                     if atoms > 0.0:
                         atoms_per_barn_cm = 1e-24 * atoms / mat.volume
                         mat.remove_nuclide(nuc) # Replace if it's there
diff --git a/openmc/deplete/stepresult.py b/openmc/deplete/stepresult.py
index 1a26cbe34..ff39e9acb 100644
--- a/openmc/deplete/stepresult.py
+++ b/openmc/deplete/stepresult.py
@@ -16,7 +16,7 @@ from openmc.mpi import comm, MPI
 from openmc.checkvalue import PathLike
 from .reaction_rates import ReactionRates
 
-VERSION_RESULTS = (1, 1)
+VERSION_RESULTS = (1, 2)
 
 
 __all__ = ["StepResult"]
@@ -30,8 +30,8 @@ class StepResult:
 
     Attributes
     ----------
-    k : list of (float, float)
-        Eigenvalue and uncertainty for each substep.
+    k : tuple of (float, float)
+        Eigenvalue and uncertainty at end of step.
     time : list of float
         Time at beginning, end of step, in seconds.
     source_rate : float
@@ -40,8 +40,8 @@ class StepResult:
         Number of mats.
     n_nuc : int
         Number of nuclides.
-    rates : list of ReactionRates
-        The reaction rates for each substep.
+    rates : ReactionRates
+        The reaction rates at end of step.
     volume : dict of str to float
         Dictionary mapping mat id to volume.
     index_mat : dict of str to int
@@ -52,10 +52,8 @@ class StepResult:
         A dictionary mapping mat ID as string to global index.
     n_hdf5_mats : int
         Number of materials in entire geometry.
-    n_stages : int
-        Number of stages in simulation.
     data : numpy.ndarray
-        Atom quantity, stored by stage, mat, then by nuclide.
+        Atom quantity, stored by mat, then by nuclide.
     proc_time : int
         Average time spent depleting a material across all
         materials and processes
@@ -86,17 +84,17 @@ class StepResult:
         Parameters
         ----------
         pos : tuple
-            A three-length tuple containing a stage index, mat index and a nuc
-            index.  All can be integers or slices.  The second two can be
+            A two-length tuple containing a mat index and a nuc
+            index.  Both can be integers or slices, or can be
             strings corresponding to their respective dictionary.
 
         Returns
         -------
         float
-            The atoms for stage, mat, nuc
+            The atoms for mat, nuc
 
         """
-        stage, mat, nuc = pos
+        mat, nuc = pos
         if isinstance(mat, openmc.Material):
             mat = str(mat.id)
         if isinstance(mat, str):
@@ -104,7 +102,7 @@ class StepResult:
         if isinstance(nuc, str):
             nuc = self.index_nuc[nuc]
 
-        return self.data[stage, mat, nuc]
+        return self.data[mat, nuc]
 
     def __setitem__(self, pos, val):
         """Sets an item from results.
@@ -112,21 +110,21 @@ class StepResult:
         Parameters
         ----------
         pos : tuple
-            A three-length tuple containing a stage index, mat index and a nuc
-            index.  All can be integers or slices.  The second two can be
+            A two-length tuple containing a mat index and a nuc
+            index.  Both can be integers or slices, or can be
             strings corresponding to their respective dictionary.
 
         val : float
             The value to set data to.
 
         """
-        stage, mat, nuc = pos
+        mat, nuc = pos
         if isinstance(mat, str):
             mat = self.index_mat[mat]
         if isinstance(nuc, str):
             nuc = self.index_nuc[nuc]
 
-        self.data[stage, mat, nuc] = val
+        self.data[mat, nuc] = val
 
     @property
     def n_mat(self):
@@ -140,11 +138,7 @@ class StepResult:
     def n_hdf5_mats(self):
         return len(self.mat_to_hdf5_ind)
 
-    @property
-    def n_stages(self):
-        return self.data.shape[0]
-
-    def allocate(self, volume, nuc_list, burn_list, full_burn_list, stages):
+    def allocate(self, volume, nuc_list, burn_list, full_burn_list):
         """Allocate memory for depletion step data
 
         Parameters
@@ -157,8 +151,6 @@ class StepResult:
             A list of all mat IDs to be burned.  Used for sorting the simulation.
         full_burn_list : list of str
             List of all burnable material IDs
-        stages : int
-            Number of stages in simulation.
 
         """
         self.volume = copy.deepcopy(volume)
@@ -167,7 +159,7 @@ class StepResult:
         self.mat_to_hdf5_ind = {mat: i for i, mat in enumerate(full_burn_list)}
 
         # Create storage array
-        self.data = np.zeros((stages, self.n_mat, self.n_nuc))
+        self.data = np.zeros((self.n_mat, self.n_nuc))
 
     def distribute(self, local_materials, ranges):
         """Create a new object containing data for distributed materials
@@ -196,8 +188,8 @@ class StepResult:
         for attr in direct_attrs:
             setattr(new, attr, getattr(self, attr))
         # Get applicable slice of data
-        new.data = self.data[:, ranges]
-        new.rates = [r[ranges] for r in self.rates]
+        new.data = self.data[ranges]
+        new.rates = self.rates[ranges]
         return new
 
     def get_material(self, mat_id):
@@ -232,7 +224,7 @@ class StepResult:
                 f'values are {list(self.volume.keys())}'
             ) from e
         for nuc, _ in sorted(self.index_nuc.items(), key=lambda x: x[1]):
-            atoms = self[0, mat_id, nuc]
+            atoms = self[mat_id, nuc]
             if atoms <= 0.0:
                 continue
             atom_per_bcm = atoms / vol * 1e-24
@@ -240,7 +232,7 @@ class StepResult:
         material.volume = vol
         return material
 
-    def export_to_hdf5(self, filename, step):
+    def export_to_hdf5(self, filename, step, write_rates: bool = False):
         """Export results to an HDF5 file
 
         Parameters
@@ -249,6 +241,8 @@ class StepResult:
             The filename to write to
         step : int
             What step is this?
+        write_rates : bool, optional
+            Whether to include reaction rate datasets in the results file.
 
         """
         # Write new file if first time step, else add to existing file
@@ -259,7 +253,8 @@ class StepResult:
             kwargs['driver'] = 'mpio'
             kwargs['comm'] = comm
             with h5py.File(filename, **kwargs) as handle:
-                self._to_hdf5(handle, step, parallel=True)
+                self._to_hdf5(handle, step, parallel=True,
+                              write_rates=write_rates)
         else:
             # Gather results at root process
             all_results = comm.gather(self)
@@ -268,15 +263,18 @@ class StepResult:
             if comm.rank == 0:
                 with h5py.File(filename, **kwargs) as handle:
                     for res in all_results:
-                        res._to_hdf5(handle, step, parallel=False)
+                        res._to_hdf5(handle, step, parallel=False,
+                                     write_rates=write_rates)
 
-    def _write_hdf5_metadata(self, handle):
+    def _write_hdf5_metadata(self, handle, write_rates):
         """Writes result metadata in HDF5 file
 
         Parameters
         ----------
         handle : h5py.File or h5py.Group
             An hdf5 file or group type to store this in.
+        write_rates : bool
+            Whether reaction rate datasets are being written.
 
         """
         # Create and save the 5 dictionaries:
@@ -284,8 +282,8 @@ class StepResult:
         #   self.index_mat -> self.volume (TODO: support for changing volumes)
         #   self.index_nuc
         # reactions
-        #   self.rates[0].index_nuc (can be different from above, above is superset)
-        #   self.rates[0].index_rx
+        #   self.rates.index_nuc (can be different from above, above is superset)
+        #   self.rates.index_rx
         # these are shared by every step of the simulation, and should be deduplicated.
 
         # Store concentration mat and nuclide dictionaries (along with volumes)
@@ -295,13 +293,19 @@ class StepResult:
 
         mat_list = sorted(self.mat_to_hdf5_ind, key=int)
         nuc_list = sorted(self.index_nuc)
-        rxn_list = sorted(self.rates[0].index_rx)
+
+        include_rates = (
+            write_rates
+            and self.rates is not None
+            and bool(self.rates.index_nuc)
+            and bool(self.rates.index_rx)
+        )
+        rxn_list = sorted(self.rates.index_rx) if include_rates else []
 
         n_mats = self.n_hdf5_mats
         n_nuc_number = len(nuc_list)
-        n_nuc_rxn = len(self.rates[0].index_nuc)
+        n_nuc_rxn = len(self.rates.index_nuc) if include_rates else 0
         n_rxn = len(rxn_list)
-        n_stages = self.n_stages
 
         mat_group = handle.create_group("materials")
 
@@ -315,41 +319,44 @@ class StepResult:
         for nuc in nuc_list:
             nuc_single_group = nuc_group.create_group(nuc)
             nuc_single_group.attrs["atom number index"] = self.index_nuc[nuc]
-            if nuc in self.rates[0].index_nuc:
-                nuc_single_group.attrs["reaction rate index"] = self.rates[0].index_nuc[nuc]
+            if include_rates and nuc in self.rates.index_nuc:
+                nuc_single_group.attrs["reaction rate index"] = (
+                    self.rates.index_nuc[nuc])
 
-        rxn_group = handle.create_group("reactions")
+        if include_rates:
+            rxn_group = handle.create_group("reactions")
 
-        for rxn in rxn_list:
-            rxn_single_group = rxn_group.create_group(rxn)
-            rxn_single_group.attrs["index"] = self.rates[0].index_rx[rxn]
+            for rxn in rxn_list:
+                rxn_single_group = rxn_group.create_group(rxn)
+                rxn_single_group.attrs["index"] = (
+                    self.rates.index_rx[rxn])
 
         # Construct array storage
 
-        handle.create_dataset("number", (1, n_stages, n_mats, n_nuc_number),
-                              maxshape=(None, n_stages, n_mats, n_nuc_number),
+        handle.create_dataset("number", (1, n_mats, n_nuc_number),
+                              maxshape=(None, n_mats, n_nuc_number),
                               chunks=True,
                               dtype='float64')
 
-        if n_nuc_rxn > 0 and n_rxn > 0:
-            handle.create_dataset("reaction rates", (1, n_stages, n_mats, n_nuc_rxn, n_rxn),
-                                maxshape=(None, n_stages, n_mats, n_nuc_rxn, n_rxn),
-                                chunks=True,
-                                dtype='float64')
+        if include_rates and n_nuc_rxn > 0 and n_rxn > 0:
+            handle.create_dataset(
+                "reaction rates", (1, n_mats, n_nuc_rxn, n_rxn),
+                maxshape=(None, n_mats, n_nuc_rxn, n_rxn),
+                chunks=True, dtype='float64')
 
-        handle.create_dataset("eigenvalues", (1, n_stages, 2),
-                              maxshape=(None, n_stages, 2), dtype='float64')
+        handle.create_dataset("eigenvalues", (1, 2),
+                              maxshape=(None, 2), dtype='float64')
 
         handle.create_dataset("time", (1, 2), maxshape=(None, 2), dtype='float64')
 
-        handle.create_dataset("source_rate", (1, n_stages), maxshape=(None, n_stages),
+        handle.create_dataset("source_rate", (1,), maxshape=(None,),
                               dtype='float64')
 
         handle.create_dataset(
             "depletion time", (1,), maxshape=(None,),
             dtype="float64")
 
-    def _to_hdf5(self, handle, index, parallel=False):
+    def _to_hdf5(self, handle, index, parallel=False, write_rates: bool = False):
         """Converts results object into an hdf5 object.
 
         Parameters
@@ -360,12 +367,14 @@ class StepResult:
             What step is this?
         parallel : bool
             Being called with parallel HDF5?
+        write_rates : bool, optional
+            Whether reaction rate datasets are being written.
 
         """
         if "/number" not in handle:
             if parallel:
                 comm.barrier()
-            self._write_hdf5_metadata(handle)
+            self._write_hdf5_metadata(handle, write_rates)
 
         if parallel:
             comm.barrier()
@@ -417,18 +426,14 @@ class StepResult:
             return
 
         # Add data
-        # Note, for the last step, self.n_stages = 1, even if n_stages != 1.
-        n_stages = self.n_stages
         inds = [self.mat_to_hdf5_ind[mat] for mat in self.index_mat]
         low = min(inds)
         high = max(inds)
-        for i in range(n_stages):
-            number_dset[index, i, low:high+1] = self.data[i]
-            if has_reactions:
-                rxn_dset[index, i, low:high+1] = self.rates[i]
-            if comm.rank == 0:
-                eigenvalues_dset[index, i] = self.k[i]
+        number_dset[index, low:high+1] = self.data
+        if has_reactions:
+            rxn_dset[index, low:high+1] = self.rates
         if comm.rank == 0:
+            eigenvalues_dset[index] = self.k
             time_dset[index] = self.time
             source_rate_dset[index] = self.source_rate
             if self.proc_time is not None:
@@ -459,10 +464,24 @@ class StepResult:
             # Older versions used "power" instead of "source_rate"
             source_rate_dset = handle["/power"]
 
-        results.data = number_dset[step, :, :, :]
-        results.k = eigenvalues_dset[step, :]
+        # Check if this is an old format file (with stages dimension) or new format
+        # Old format: number has shape (n_steps, n_stages, n_mats, n_nucs)
+        # New format: number has shape (n_steps, n_mats, n_nucs)
+        has_stages = len(number_dset.shape) == 4
+
+        if has_stages:
+            # Old format - extract data from first stage (index 0)
+            results.data = number_dset[step, 0, :, :]
+            results.k = eigenvalues_dset[step, 0, :]
+            # source_rate had shape (n_steps, n_stages) in old format
+            results.source_rate = source_rate_dset[step, 0]
+        else:
+            # New format - no stages dimension
+            results.data = number_dset[step, :, :]
+            results.k = eigenvalues_dset[step, :]
+            results.source_rate = source_rate_dset[step]
+
         results.time = time_dset[step, :]
-        results.source_rate = source_rate_dset[step, 0]
 
         if "depletion time" in handle:
             proc_time_dset = handle["/depletion time"]
@@ -493,33 +512,45 @@ class StepResult:
             if "reaction rate index" in nuc_handle.attrs:
                 rxn_nuc_to_ind[nuc] = nuc_handle.attrs["reaction rate index"]
 
-        for rxn, rxn_handle in handle["/reactions"].items():
-            rxn_to_ind[rxn] = rxn_handle.attrs["index"]
+        if "reactions" in handle:
+            for rxn, rxn_handle in handle["/reactions"].items():
+                rxn_to_ind[rxn] = rxn_handle.attrs["index"]
 
-        results.rates = []
-        # Reconstruct reactions
-        for i in range(results.n_stages):
-            rate = ReactionRates(results.index_mat, rxn_nuc_to_ind, rxn_to_ind, True)
-
-            if "reaction rates" in handle:
-                rate[:] = handle["/reaction rates"][step, i, :, :, :]
-            results.rates.append(rate)
+        # Reconstruct reaction rates
+        rate = ReactionRates(results.index_mat, rxn_nuc_to_ind, rxn_to_ind, True)
+        if "reaction rates" in handle:
+            if has_stages:
+                # Old format: (n_steps, n_stages, n_mats, n_nucs, n_rxns)
+                rate[:] = handle["/reaction rates"][step, 0, :, :, :]
+            else:
+                # New format: (n_steps, n_mats, n_nucs, n_rxns)
+                rate[:] = handle["/reaction rates"][step, :, :, :]
+        results.rates = rate
 
         return results
 
     @staticmethod
-    def save(op, x, op_results, t, source_rate, step_ind, proc_time=None,
-             path: PathLike = "depletion_results.h5"):
+    def save(
+        op,
+        x,
+        op_results,
+        t,
+        source_rate,
+        step_ind,
+        proc_time=None,
+        write_rates: bool = False,
+        path: PathLike = "depletion_results.h5"
+    ):
         """Creates and writes depletion results to disk
 
         Parameters
         ----------
         op : openmc.deplete.abc.TransportOperator
             The operator used to generate these results.
-        x : list of list of numpy.array
-            The prior x vectors.  Indexed [i][cell] using the above equation.
-        op_results : list of openmc.deplete.OperatorResult
-            Results of applying transport operator
+        x : numpy.array
+            End-of-step concentrations for each material
+        op_results : openmc.deplete.OperatorResult
+            Result of applying transport operator at end of step
         t : list of float
             Time indices.
         source_rate : float
@@ -530,7 +561,8 @@ class StepResult:
             Total process time spent depleting materials. This may
             be process-dependent and will be reduced across MPI
             processes.
-
+        write_rates : bool, optional
+            Whether reaction rates should be written to the results file.
         path : PathLike
             Path to file to write. Defaults to 'depletion_results.h5'.
 
@@ -539,26 +571,20 @@ class StepResult:
         # Get indexing terms
         vol_dict, nuc_list, burn_list, full_burn_list = op.get_results_info()
 
-        stages = len(x)
-
         # Create results
         results = StepResult()
-        results.allocate(vol_dict, nuc_list, burn_list, full_burn_list, stages)
+        results.allocate(vol_dict, nuc_list, burn_list, full_burn_list)
 
         n_mat = len(burn_list)
 
-        for i in range(stages):
-            for mat_i in range(n_mat):
-                results[i, mat_i, :] = x[i][mat_i]
+        for mat_i in range(n_mat):
+            results[mat_i, :] = x[mat_i]
 
-        ks = []
-        for r in op_results:
-            if isinstance(r.k, type(None)):
-                ks += [(None, None)]
-            else:
-                ks += [(r.k.nominal_value, r.k.std_dev)]
-        results.k = ks
-        results.rates = [r.rates for r in op_results]
+        if isinstance(op_results.k, type(None)):
+            results.k = (None, None)
+        else:
+            results.k = (op_results.k.nominal_value, op_results.k.std_dev)
+        results.rates = op_results.rates
         results.time = t
         results.source_rate = source_rate
         results.proc_time = proc_time
@@ -567,7 +593,7 @@ class StepResult:
 
         if not Path(path).is_file():
             Path(path).parent.mkdir(parents=True, exist_ok=True)
-        results.export_to_hdf5(path, step_ind)
+        results.export_to_hdf5(path, step_ind, write_rates)
 
     def transfer_volumes(self, model):
         """Transfers volumes from depletion results to geometry
diff --git a/tests/unit_tests/test_deplete_continue.py b/tests/unit_tests/test_deplete_continue.py
index 637c9d5e4..1b6eac238 100644
--- a/tests/unit_tests/test_deplete_continue.py
+++ b/tests/unit_tests/test_deplete_continue.py
@@ -17,7 +17,7 @@ def test_continue(run_in_tmpdir):
     operator = dummy_operator.DummyOperator()
 
     # initial depletion
-    bundle.solver(operator, [1.0, 2.0], [1.0, 2.0]).integrate()
+    bundle.solver(operator, [1.0, 2.0], [1.0, 2.0]).integrate(write_rates=True)
 
     # set up continue run
     prev_res = openmc.deplete.Results(operator.output_dir / "depletion_results.h5")
@@ -25,7 +25,7 @@ def test_continue(run_in_tmpdir):
 
     # if continue run happens, test passes
     bundle.solver(operator, [1.0, 2.0, 3.0, 4.0], [1.0, 2.0, 3.0, 4.0],
-                  continue_timesteps=True).integrate()
+                  continue_timesteps=True).integrate(write_rates=True)
 
     final_res = openmc.deplete.Results(operator.output_dir / "depletion_results.h5")
 
@@ -42,7 +42,7 @@ def test_continue_continue(run_in_tmpdir):
     operator = dummy_operator.DummyOperator()
 
     # initial depletion
-    bundle.solver(operator, [1.0, 2.0], [1.0, 2.0]).integrate()
+    bundle.solver(operator, [1.0, 2.0], [1.0, 2.0]).integrate(write_rates=True)
 
     # set up continue run
     prev_res = openmc.deplete.Results(operator.output_dir / "depletion_results.h5")
@@ -50,7 +50,7 @@ def test_continue_continue(run_in_tmpdir):
 
     # first continue run
     bundle.solver(operator, [1.0, 2.0, 3.0, 4.0], [1.0, 2.0, 3.0, 4.0],
-                  continue_timesteps=True).integrate()
+                  continue_timesteps=True).integrate(write_rates=True)
 
     prev_res = openmc.deplete.Results(operator.output_dir / "depletion_results.h5")
     # second continue run
diff --git a/tests/unit_tests/test_deplete_integrator.py b/tests/unit_tests/test_deplete_integrator.py
index b1d2cb950..6463eaa20 100644
--- a/tests/unit_tests/test_deplete_integrator.py
+++ b/tests/unit_tests/test_deplete_integrator.py
@@ -10,6 +10,7 @@ import copy
 from random import uniform
 from unittest.mock import MagicMock
 
+import h5py
 import numpy as np
 from uncertainties import ufloat
 import pytest
@@ -38,8 +39,6 @@ INTEGRATORS = [
 def test_results_save(run_in_tmpdir):
     """Test data save module"""
 
-    stages = 3
-
     rng = np.random.RandomState(comm.rank)
 
     # Mock geometry
@@ -63,31 +62,22 @@ def test_results_save(run_in_tmpdir):
     op.get_results_info.return_value = (
         vol_dict, nuc_list, burn_list, full_burn_list)
 
-    # Construct x
-    x1 = []
-    x2 = []
+    # Construct end-of-step concentrations
+    x1 = [rng.random(2), rng.random(2)]
+    x2 = [rng.random(2), rng.random(2)]
 
-    for i in range(stages):
-        x1.append([rng.random(2), rng.random(2)])
-        x2.append([rng.random(2), rng.random(2)])
-
-    # Construct r
+    # Construct reaction rates
     r1 = ReactionRates(burn_list, ["na", "nb"], ["ra", "rb"])
     r1[:] = rng.random((2, 2, 2))
+    rate1 = copy.deepcopy(r1)
 
-    rate1 = []
-    rate2 = []
+    r2 = ReactionRates(burn_list, ["na", "nb"], ["ra", "rb"])
+    r2[:] = rng.random((2, 2, 2))
+    rate2 = copy.deepcopy(r2)
 
-    for i in range(stages):
-        rate1.append(copy.deepcopy(r1))
-        r1[:] = rng.random((2, 2, 2))
-        rate2.append(copy.deepcopy(r1))
-        r1[:] = rng.random((2, 2, 2))
-
-    # Create global terms
-    # Col 0: eig, Col 1: uncertainty
-    eigvl1 = rng.random((stages, 2))
-    eigvl2 = rng.random((stages, 2))
+    # Create global terms (eigenvalue and uncertainty)
+    eigvl1 = rng.random(2)
+    eigvl2 = rng.random(2)
 
     eigvl1 = comm.bcast(eigvl1, root=0)
     eigvl2 = comm.bcast(eigvl2, root=0)
@@ -95,29 +85,35 @@ def test_results_save(run_in_tmpdir):
     t1 = [0.0, 1.0]
     t2 = [1.0, 2.0]
 
-    op_result1 = [OperatorResult(ufloat(*k), rates)
-                  for k, rates in zip(eigvl1, rate1)]
-    op_result2 = [OperatorResult(ufloat(*k), rates)
-                  for k, rates in zip(eigvl2, rate2)]
+    op_result1 = OperatorResult(ufloat(*eigvl1), rate1)
+    op_result2 = OperatorResult(ufloat(*eigvl2), rate2)
 
     # saves within a subdirectory
-    StepResult.save(op, x1, op_result1, t1, 0, 0, path='out/put/depletion.h5')
+    StepResult.save(
+        op,
+        x1,
+        op_result1,
+        t1,
+        0,
+        0,
+        write_rates=True,
+        path='out/put/depletion.h5'
+    )
     res = Results('out/put/depletion.h5')
 
     # saves with default filename
-    StepResult.save(op, x1, op_result1, t1, 0, 0)
-    StepResult.save(op, x2, op_result2, t2, 0, 1)
+    StepResult.save(op, x1, op_result1, t1, 0, 0, write_rates=True)
+    StepResult.save(op, x2, op_result2, t2, 0, 1, write_rates=True)
 
     # Load the files
     res = Results("depletion_results.h5")
 
-    for i in range(stages):
-        for mat_i, mat in enumerate(burn_list):
-            for nuc_i, nuc in enumerate(nuc_list):
-                assert res[0][i, mat, nuc] == x1[i][mat_i][nuc_i]
-                assert res[1][i, mat, nuc] == x2[i][mat_i][nuc_i]
-        np.testing.assert_array_equal(res[0].rates[i], rate1[i])
-        np.testing.assert_array_equal(res[1].rates[i], rate2[i])
+    for mat_i, mat in enumerate(burn_list):
+        for nuc_i, nuc in enumerate(nuc_list):
+            assert res[0][mat, nuc] == x1[mat_i][nuc_i]
+            assert res[1][mat, nuc] == x2[mat_i][nuc_i]
+    np.testing.assert_array_equal(res[0].rates, rate1)
+    np.testing.assert_array_equal(res[1].rates, rate2)
 
     np.testing.assert_array_equal(res[0].k, eigvl1)
     np.testing.assert_array_equal(res[0].time, t1)
@@ -126,6 +122,31 @@ def test_results_save(run_in_tmpdir):
     np.testing.assert_array_equal(res[1].time, t2)
 
 
+def test_results_save_without_rates(run_in_tmpdir):
+    """StepResult.save skips reaction-rate datasets by default"""
+
+    op = MagicMock()
+    op.prev_res = None
+    vol_dict = {"0": 1.0}
+    nuc_list = ["na"]
+    burn_list = ["0"]
+    op.get_results_info.return_value = (vol_dict, nuc_list, burn_list, burn_list)
+
+    x = [np.array([1.0])]
+    rates = ReactionRates(burn_list, nuc_list, ["ra"])
+    rates[:] = np.array([[[2.0]]])
+    op_result = OperatorResult(ufloat(1.0, 0.1), rates)
+
+    StepResult.save(op, x, op_result, [0.0, 1.0], 0.0, 0)
+
+    with h5py.File('depletion_results.h5', 'r') as handle:
+        assert 'reaction rates' not in handle
+        assert 'reactions' not in handle
+
+    res = Results('depletion_results.h5')
+    assert res[0].rates.size == 0
+
+
 def test_bad_integrator_inputs():
     """Test failure modes for Integrator inputs"""
 
diff --git a/tests/unit_tests/test_deplete_restart.py b/tests/unit_tests/test_deplete_restart.py
index e8bfc062a..1cbff30a5 100644
--- a/tests/unit_tests/test_deplete_restart.py
+++ b/tests/unit_tests/test_deplete_restart.py
@@ -21,7 +21,7 @@ def test_restart_predictor_cecm(run_in_tmpdir):
     # Perform simulation using the predictor algorithm
     dt = [0.75]
     power = 1.0
-    openmc.deplete.PredictorIntegrator(op, dt, power).integrate()
+    openmc.deplete.PredictorIntegrator(op, dt, power).integrate(write_rates=True)
 
     # Load the files
     prev_res = openmc.deplete.Results(op.output_dir / "depletion_results.h5")
@@ -30,10 +30,6 @@ def test_restart_predictor_cecm(run_in_tmpdir):
     op = dummy_operator.DummyOperator(prev_res)
     op.output_dir = output_dir
 
-    # check ValueError is raised, indicating previous and current stages
-    with pytest.raises(ValueError, match="incompatible.* 1.*2"):
-        openmc.deplete.CECMIntegrator(op, dt, power)
-
 
 def test_restart_cecm_predictor(run_in_tmpdir):
     """Integral regression test of integrator algorithm using CE/CM for the
@@ -47,7 +43,7 @@ def test_restart_cecm_predictor(run_in_tmpdir):
     dt = [0.75]
     power = 1.0
     cecm = openmc.deplete.CECMIntegrator(op, dt, power)
-    cecm.integrate()
+    cecm.integrate(write_rates=True)
 
     # Load the files
     prev_res = openmc.deplete.Results(op.output_dir / "depletion_results.h5")
@@ -56,10 +52,6 @@ def test_restart_cecm_predictor(run_in_tmpdir):
     op = dummy_operator.DummyOperator(prev_res)
     op.output_dir = output_dir
 
-    # check ValueError is raised, indicating previous and current stages
-    with pytest.raises(ValueError, match="incompatible.* 2.*1"):
-        openmc.deplete.PredictorIntegrator(op, dt, power)
-
 
 @pytest.mark.parametrize("scheme", dummy_operator.SCHEMES)
 def test_restart(run_in_tmpdir, scheme):
@@ -70,7 +62,7 @@ def test_restart(run_in_tmpdir, scheme):
     operator = dummy_operator.DummyOperator()
 
     # take first step
-    bundle.solver(operator, [0.75], 1.0).integrate()
+    bundle.solver(operator, [0.75], 1.0).integrate(write_rates=True)
 
     # restart
     prev_res = openmc.deplete.Results(

From d217efa007760dbe927af25063ab6d68990779cc Mon Sep 17 00:00:00 2001
From: Paul Romano <paul.k.romano@gmail.com>
Date: Thu, 20 Nov 2025 12:10:04 -0600
Subject: [PATCH 163/203] Add two MPI barriers in R2S workflow (#3646)

---
 openmc/deplete/microxs.py |  3 ++-
 openmc/deplete/r2s.py     |  1 +
 openmc/lib/core.py        | 10 ++++++++++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/openmc/deplete/microxs.py b/openmc/deplete/microxs.py
index f4bdc6795..879a2d4ee 100644
--- a/openmc/deplete/microxs.py
+++ b/openmc/deplete/microxs.py
@@ -177,8 +177,9 @@ def get_microxs_and_flux(
         if not openmc.lib.is_initialized:
             run_kwargs.setdefault('cwd', temp_dir)
 
-        # Run transport simulation
+        # Run transport simulation and synchronize
         statepoint_path = model.run(**run_kwargs)
+        comm.barrier()
 
         if comm.rank == 0:
             # Move the statepoint file if it is being saved to a specific path
diff --git a/openmc/deplete/r2s.py b/openmc/deplete/r2s.py
index 7f3e94edd..97277cbda 100644
--- a/openmc/deplete/r2s.py
+++ b/openmc/deplete/r2s.py
@@ -392,6 +392,7 @@ class R2SManager:
         )
         output_path = output_dir / 'depletion_results.h5'
         integrator.integrate(final_step=False, path=output_path)
+        comm.barrier()
 
         # Get depletion results
         self.results['depletion_results'] = Results(output_path)
diff --git a/openmc/lib/core.py b/openmc/lib/core.py
index cfccecef2..02c7784d1 100644
--- a/openmc/lib/core.py
+++ b/openmc/lib/core.py
@@ -7,6 +7,7 @@ import os
 from pathlib import Path
 from random import getrandbits
 from tempfile import TemporaryDirectory
+import traceback as tb
 
 import numpy as np
 from numpy.ctypeslib import as_array
@@ -700,6 +701,15 @@ class TemporarySession:
         if self.already_initialized:
             return
 
+        # If an exception occurred, abort all ranks immediately
+        if exc_type is not None:
+            # Print exception info on the rank that failed
+            tb.print_exception(exc_type, exc_value, traceback)
+            sys.stdout.flush()
+
+            # Abort all MPI processes
+            self.comm.Abort(1)
+
         try:
             finalize()
         finally:

From 27e38e894697bb32a1dac7848d2618818b6b8daf Mon Sep 17 00:00:00 2001
From: Paul Romano <paul.k.romano@gmail.com>
Date: Sat, 22 Nov 2025 23:06:17 +0100
Subject: [PATCH 164/203] Add release notes for 0.15.3 (#3644)

---
 docs/source/releasenotes/0.15.3.rst           | 226 ++++++++++++++++++
 docs/source/releasenotes/index.rst            |   1 +
 docs/source/usersguide/variance_reduction.rst |   4 +-
 openmc/model/model.py                         |   6 +-
 openmc/settings.py                            |   9 +-
 5 files changed, 240 insertions(+), 6 deletions(-)
 create mode 100644 docs/source/releasenotes/0.15.3.rst

diff --git a/docs/source/releasenotes/0.15.3.rst b/docs/source/releasenotes/0.15.3.rst
new file mode 100644
index 000000000..c50958104
--- /dev/null
+++ b/docs/source/releasenotes/0.15.3.rst
@@ -0,0 +1,226 @@
+====================
+What's New in 0.15.3
+====================
+
+.. currentmodule:: openmc
+
+-------
+Summary
+-------
+
+This release of OpenMC includes many bug fixes, performance improvements, and
+several notable new features. The major highlights of this release include a new
+:class:`~openmc.deplete.R2SManager` class that automates the workflow for
+rigorous 2-step (R2S) shutdown dose rate calculations, the ability to collect
+higher moments for tally results that can be used to test normality, a new
+uncertainty-aware criticality search method, a new collision tracking feature
+that enables detailed tracking of particle interactions, support for distributed
+cell densities, and several new tally filters. The random ray solver also
+continues to receive significant updates, including automatic setup
+capabilities, improved geometry handling, and better weight window support.
+Depletion capabilities have been expanded with thermochemical redox control,
+external transfer rates, and improved performance.
+
+------------------------------------
+Compatibility Notes and Deprecations
+------------------------------------
+
+MCPL has been changed from a build-time dependency to a runtime optional
+dependency, which means OpenMC will attempt to load the MCPL library at
+runtime when needed rather than requiring it at build time.
+
+The ``openmc.mgxs.Library.add_to_tallies_file`` method has been renamed to
+:meth:`openmc.mgxs.Library.add_to_tallies`.
+
+------------
+New Features
+------------
+
+- A new collision tracking feature enables detailed tracking of particle
+  interactions (`#3417 <https://github.com/openmc-dev/openmc/pull/3417>`_)
+- Added :meth:`~openmc.model.Model.keff_search` method for automated criticality
+  searches (`#3569 <https://github.com/openmc-dev/openmc/pull/3569>`_)
+- Introduced automated workflow for mesh- or cell-based R2S calculations
+  (`#3508 <https://github.com/openmc-dev/openmc/pull/3508>`_)
+- Ability to source electron/positrons directly for charged particle
+  simulations (`#3404 <https://github.com/openmc-dev/openmc/pull/3404>`_)
+- Multi-group capability for kinetics parameter calculations with Iterated
+  Fission Probability (`#3425
+  <https://github.com/openmc-dev/openmc/pull/3425>`_)
+- Introduced a new :class:`openmc.MeshMaterialFilter` class (`#3406
+  <https://github.com/openmc-dev/openmc/pull/3406>`_)
+- Added support for distributed cell densities (`#3546
+  <https://github.com/openmc-dev/openmc/pull/3546>`_)
+- Implemented a :class:`openmc.WeightWindowsList` class that enables export to
+  HDF5 (`#3456 <https://github.com/openmc-dev/openmc/pull/3456>`_)
+- Added :meth:`openmc.Material.mean_free_path` method (`#3469
+  <https://github.com/openmc-dev/openmc/pull/3469>`_)
+- Introduced :func:`openmc.lib.TemporarySession` context manager (`#3475
+  <https://github.com/openmc-dev/openmc/pull/3475>`_)
+- Added material depletion function for tracking individual material depletion
+  (`#3420 <https://github.com/openmc-dev/openmc/pull/3420>`_)
+- Added methods on :class:`~openmc.Material` class for waste disposal rating /
+  classification (`#3366 <https://github.com/openmc-dev/openmc/pull/3366>`_,
+  `#3376 <https://github.com/openmc-dev/openmc/pull/3376>`_)
+- Support for thermochemical redox control transfer rates in depletion
+  (`#2783 <https://github.com/openmc-dev/openmc/pull/2783>`_)
+- Support for external transfer rates source term in depletion (`#3088
+  <https://github.com/openmc-dev/openmc/pull/3088>`_)
+- Added combing capability for fission site sampling and delayed neutron
+  emission time (`#2992 <https://github.com/openmc-dev/openmc/pull/2992>`_)
+- Ability to specify reference direction for azimuthal angle in
+  :class:`~openmc.stats.PolarAzimuthal` distribution (`#3582
+  <https://github.com/openmc-dev/openmc/pull/3582>`_)
+- Allow spatial constraints on element sources within
+  :class:`~openmc.MeshSource` (`#3431
+  <https://github.com/openmc-dev/openmc/pull/3431>`_)
+- Added VTK HDF (.vtkhdf) format support for writing VTK data (`#3252
+  <https://github.com/openmc-dev/openmc/pull/3252>`_)
+- Implemented filter weight capability (`#3345
+  <https://github.com/openmc-dev/openmc/pull/3345>`_)
+- Optionally collect higher moments for tallies (`#3363
+  <https://github.com/openmc-dev/openmc/pull/3363>`_)
+- Several random ray solver enhancements:
+
+  - Random Ray AutoMagic Setup for automatic configuration (`#3351 <https://github.com/openmc-dev/openmc/pull/3351>`_)
+  - Point source locator for random ray mode (`#3360 <https://github.com/openmc-dev/openmc/pull/3360>`_)
+  - Support for DAGMC geometries (`#3374 <https://github.com/openmc-dev/openmc/pull/3374>`_)
+  - Optimized mapping of source regions to tallies (`#3465 <https://github.com/openmc-dev/openmc/pull/3465>`_)
+  - Base source region refactor (`#3576 <https://github.com/openmc-dev/openmc/pull/3576>`_)
+
+---------------------------
+Bug Fixes and Small Changes
+---------------------------
+
+- Add two MPI barriers in R2S workflow (`#3646 <https://github.com/openmc-dev/openmc/pull/3646>`_)
+- Fix a few warnings, rename add_to_tallies_file (`#3639 <https://github.com/openmc-dev/openmc/pull/3639>`_)
+- Fix typo in DAGMC lost particle test (`#3634 <https://github.com/openmc-dev/openmc/pull/3634>`_)
+- Avoid multiprocessing Pool when running depletion tests with MPI (`#3633 <https://github.com/openmc-dev/openmc/pull/3633>`_)
+- Support MPI parallelism in R2SManager (`#3632 <https://github.com/openmc-dev/openmc/pull/3632>`_)
+- Update documentation for particle tracks (`#3627 <https://github.com/openmc-dev/openmc/pull/3627>`_)
+- Adding variance of variance and normality tests for tally statistics (`#3454 <https://github.com/openmc-dev/openmc/pull/3454>`_)
+- Avoid divide-by-zero in ``from_multigroup_flux`` when flux is zero (`#3624 <https://github.com/openmc-dev/openmc/pull/3624>`_)
+- Write particle states as separate lines in track VTK files (`#3628 <https://github.com/openmc-dev/openmc/pull/3628>`_)
+- Reset DAGMC history when reviving from source (`#3601 <https://github.com/openmc-dev/openmc/pull/3601>`_)
+- Add energy group structure: SCALE-999 (`#3564 <https://github.com/openmc-dev/openmc/pull/3564>`_)
+- Fix bug in normalization of tally results with no_reduce (`#3619 <https://github.com/openmc-dev/openmc/pull/3619>`_)
+- Enable nuclide filters with get_decay_photon_energy (`#3614 <https://github.com/openmc-dev/openmc/pull/3614>`_)
+- Update ``check_type`` calls to accept both ``str`` and ``os.PathLike`` objects (`#3618 <https://github.com/openmc-dev/openmc/pull/3618>`_)
+- Speed up ``apply_time_correction`` by reducing file I/O and deepcopies (`#3617 <https://github.com/openmc-dev/openmc/pull/3617>`_)
+- FW-CADIS Disregard Max Realizations Setting (`#3616 <https://github.com/openmc-dev/openmc/pull/3616>`_)
+- Random Ray Geometry Debug Mode Fix (`#3615 <https://github.com/openmc-dev/openmc/pull/3615>`_)
+- Don't write reaction rates in depletion results by default (`#3609 <https://github.com/openmc-dev/openmc/pull/3609>`_)
+- Allow Path objects in MGXSLibrary.export_to_hdf5 (`#3608 <https://github.com/openmc-dev/openmc/pull/3608>`_)
+- Clip mixture distributions based on mean times integral (`#3603 <https://github.com/openmc-dev/openmc/pull/3603>`_)
+- Allow V0 in atomic_mass function (for ENDF/B-VII.0 data) (`#3607 <https://github.com/openmc-dev/openmc/pull/3607>`_)
+- Re-run flaky tests when needed (`#3604 <https://github.com/openmc-dev/openmc/pull/3604>`_)
+- Ability to load mesh objects from weight_windows.h5 file (`#3598 <https://github.com/openmc-dev/openmc/pull/3598>`_)
+- Switch to using coveralls github action for reporting (`#3594 <https://github.com/openmc-dev/openmc/pull/3594>`_)
+- Add user setting for free gas threshold (`#3593 <https://github.com/openmc-dev/openmc/pull/3593>`_)
+- Speed up time correction factors (`#3592 <https://github.com/openmc-dev/openmc/pull/3592>`_)
+- Fix caching issue when using NCrystal materials (`#3538 <https://github.com/openmc-dev/openmc/pull/3538>`_)
+- Fix random ray source region mesh export when using model.export_to_xml() (`#3579 <https://github.com/openmc-dev/openmc/pull/3579>`_)
+- Ensure weight_windows_file information is read from XML (`#3587 <https://github.com/openmc-dev/openmc/pull/3587>`_)
+- Add missing documentation on <source> in depletion chain file format (`#3590 <https://github.com/openmc-dev/openmc/pull/3590>`_)
+- Adding tally filter type option to statepoint get_tally (`#3584 <https://github.com/openmc-dev/openmc/pull/3584>`_)
+- Optional separation of mesh-material-volume calc from get_homogenized_materials (`#3581 <https://github.com/openmc-dev/openmc/pull/3581>`_)
+- Fix IFP implementation (`#3580 <https://github.com/openmc-dev/openmc/pull/3580>`_)
+- Remove several TODOs related to C++17 support (`#3574 <https://github.com/openmc-dev/openmc/pull/3574>`_)
+- Fix performance regression in libMesh unstructured mesh tallies (`#3577 <https://github.com/openmc-dev/openmc/pull/3577>`_)
+- Update find_package calls in OpenMCConfig.cmake (`#3572 <https://github.com/openmc-dev/openmc/pull/3572>`_)
+- Ensure ``n_dimension_`` attribute is set for unstructured meshes (`#3575 <https://github.com/openmc-dev/openmc/pull/3575>`_)
+- Allow newer Sphinx version and fix docbuild warnings (`#3571 <https://github.com/openmc-dev/openmc/pull/3571>`_)
+- Fixed a bug when combining TimeFilter, MeshFilter, and tracklength estimator (`#3525 <https://github.com/openmc-dev/openmc/pull/3525>`_)
+- PowerLaw raises an error if sampling interval contains negative values (`#3542 <https://github.com/openmc-dev/openmc/pull/3542>`_)
+- depletion: fix performance of chain matrix construction (`#3567 <https://github.com/openmc-dev/openmc/pull/3567>`_)
+- Do not apply boundary conditions when initialized in volume calculation mode (`#3562 <https://github.com/openmc-dev/openmc/pull/3562>`_)
+- Bump up tolerance for flaky activation test (`#3560 <https://github.com/openmc-dev/openmc/pull/3560>`_)
+- Fixed a bug in plotting cross sections with S(a,b) data (`#3558 <https://github.com/openmc-dev/openmc/pull/3558>`_)
+- Change test order to run unit tests first (`#3533 <https://github.com/openmc-dev/openmc/pull/3533>`_)
+- adding ecco 33 (`#3556 <https://github.com/openmc-dev/openmc/pull/3556>`_)
+- Refactor endf_data to be a fixture (`#3539 <https://github.com/openmc-dev/openmc/pull/3539>`_)
+- Revert "fix broken CI" (`#3554 <https://github.com/openmc-dev/openmc/pull/3554>`_)
+- fix broken CI (`#3551 <https://github.com/openmc-dev/openmc/pull/3551>`_)
+- Leverage particle.move_distance in event advance (`#3544 <https://github.com/openmc-dev/openmc/pull/3544>`_)
+- fix tests that accidentaly got broken (`#3543 <https://github.com/openmc-dev/openmc/pull/3543>`_)
+- not printing nuclides with 0 percent to terminal (option 2 ) (`#3448 <https://github.com/openmc-dev/openmc/pull/3448>`_)
+- Fix a bug in time cutoff behavior (`#3526 <https://github.com/openmc-dev/openmc/pull/3526>`_)
+- Avoid duplicate materials written to XML (`#3536 <https://github.com/openmc-dev/openmc/pull/3536>`_)
+- Use cached property for openmc.data.Decay.sources (`#3535 <https://github.com/openmc-dev/openmc/pull/3535>`_)
+- more helpful error message for dose_coefficients (`#3534 <https://github.com/openmc-dev/openmc/pull/3534>`_)
+- Adding 616 group structure (`#3531 <https://github.com/openmc-dev/openmc/pull/3531>`_)
+- Remove unused special accessors for tallies (`#3527 <https://github.com/openmc-dev/openmc/pull/3527>`_)
+- Consistent XML parsing using functions from _xml module (`#3517 <https://github.com/openmc-dev/openmc/pull/3517>`_)
+- Add stat:sum field to MCPL files for proper weight normalization (`#3522 <https://github.com/openmc-dev/openmc/pull/3522>`_)
+- Remove reorder_attributes from openmc._xml (`#3519 <https://github.com/openmc-dev/openmc/pull/3519>`_)
+- fixed a bug in MeshMaterialFilter.from_volumes (`#3520 <https://github.com/openmc-dev/openmc/pull/3520>`_)
+- Fixed a bug in distribcell offsets logic (`#3424 <https://github.com/openmc-dev/openmc/pull/3424>`_)
+- Add test for FW-CADIS based WW generation on a DAGMC model (`#3504 <https://github.com/openmc-dev/openmc/pull/3504>`_)
+- Fix for Weight Window Scaling Bug (`#3511 <https://github.com/openmc-dev/openmc/pull/3511>`_)
+- Fix: ``materials``, ``plots``, and ``tallies`` cannot be passed as lists (`#3513 <https://github.com/openmc-dev/openmc/pull/3513>`_)
+- Allow already-initialized openmc.lib in TemporarySession (`#3505 <https://github.com/openmc-dev/openmc/pull/3505>`_)
+- Update DAGMC and libMesh precompiler definitions (`#3510 <https://github.com/openmc-dev/openmc/pull/3510>`_)
+- Avoid adding ParentNuclideFilter twice when calling prepare_tallies (`#3506 <https://github.com/openmc-dev/openmc/pull/3506>`_)
+- Enabling MCPL source files to be read when using surf_source_read (`#3472 <https://github.com/openmc-dev/openmc/pull/3472>`_)
+- Boundary info accessors (`#3496 <https://github.com/openmc-dev/openmc/pull/3496>`_)
+- automatically finding appropriate dimension when making regular mesh from domain (`#3468 <https://github.com/openmc-dev/openmc/pull/3468>`_)
+- Add accessor methods for LocalCoord (`#3494 <https://github.com/openmc-dev/openmc/pull/3494>`_)
+- Make MCPL a Runtime Optional Dependency (`#3429 <https://github.com/openmc-dev/openmc/pull/3429>`_)
+- Use auto-chunking for StepResult HDF5 writing (`#3498 <https://github.com/openmc-dev/openmc/pull/3498>`_)
+- Provide a way to get ID maps from plot parameters on the Model class (`#3481 <https://github.com/openmc-dev/openmc/pull/3481>`_)
+- Update OSX install instructions to point to x64 platform (`#3501 <https://github.com/openmc-dev/openmc/pull/3501>`_)
+- Update conda install instructions for macOS Apple silicon (`#3488 <https://github.com/openmc-dev/openmc/pull/3488>`_)
+- Only show warning if in restart mode (`#3478 <https://github.com/openmc-dev/openmc/pull/3478>`_)
+- Add flag to CMakeLists to use submodules instead of searching (`#3480 <https://github.com/openmc-dev/openmc/pull/3480>`_)
+- Added citation metadata file (`#3409 <https://github.com/openmc-dev/openmc/pull/3409>`_)
+- fix zam parsing (`#3484 <https://github.com/openmc-dev/openmc/pull/3484>`_)
+- Support flux collapse method in ``get_microxs_and_flux`` (`#3466 <https://github.com/openmc-dev/openmc/pull/3466>`_)
+- Stabilize Adjoint Source (`#3476 <https://github.com/openmc-dev/openmc/pull/3476>`_)
+- Refactor and Harden Configuration Management (`#3461 <https://github.com/openmc-dev/openmc/pull/3461>`_)
+- Updated Docs to Not Give Specific Python Version Requirement (`#3473 <https://github.com/openmc-dev/openmc/pull/3473>`_)
+- Parallelization of Weight Window Update (`#3467 <https://github.com/openmc-dev/openmc/pull/3467>`_)
+- Limit Random Ray Weight Window Generation to Final Batch (`#3464 <https://github.com/openmc-dev/openmc/pull/3464>`_)
+- Fix Dockerfile DAGMC build (`#3463 <https://github.com/openmc-dev/openmc/pull/3463>`_)
+- Fix Weight Window Infinite Loop Bug (`#3457 <https://github.com/openmc-dev/openmc/pull/3457>`_)
+- Weight Window Birth Scaling (`#3459 <https://github.com/openmc-dev/openmc/pull/3459>`_)
+- Adding checks to geometry.plot to avoid material name overlaps (`#3458 <https://github.com/openmc-dev/openmc/pull/3458>`_)
+- Fixing crash when calling Geometry.plot when DAGMCUniverse in geometry (`#3455 <https://github.com/openmc-dev/openmc/pull/3455>`_)
+- fixing expansion of elemental Ta bug (`#3443 <https://github.com/openmc-dev/openmc/pull/3443>`_)
+- Prevent Adjoint Sources from Trending towards Infinity (`#3449 <https://github.com/openmc-dev/openmc/pull/3449>`_)
+- adding plot function to DAGMCUnvierse (`#3451 <https://github.com/openmc-dev/openmc/pull/3451>`_)
+- Allow specifying number of equiprobable angles for thermal scattering data generation (`#3346 <https://github.com/openmc-dev/openmc/pull/3346>`_)
+- Change Dockerfile from debian:bookworm-slim to ubuntu:24.04 (`#3442 <https://github.com/openmc-dev/openmc/pull/3442>`_)
+- Fix Resetting of Auto IDs When Generating MGXS (`#3437 <https://github.com/openmc-dev/openmc/pull/3437>`_)
+- Allowing chain_file to be chain object to save reloading time (`#3436 <https://github.com/openmc-dev/openmc/pull/3436>`_)
+- update units for flux (`#3441 <https://github.com/openmc-dev/openmc/pull/3441>`_)
+- Fix raytrace infinite loop (`#3423 <https://github.com/openmc-dev/openmc/pull/3423>`_)
+- Apply Max Number of Events Check to Random Rays (`#3438 <https://github.com/openmc-dev/openmc/pull/3438>`_)
+- Add user setting for source rejection fraction (`#3433 <https://github.com/openmc-dev/openmc/pull/3433>`_)
+- Adding fix and tests for spherical mesh as spatial distribution (`#3428 <https://github.com/openmc-dev/openmc/pull/3428>`_)
+- Random Ray Missed Cell Policy Change for Adjoint Mode (`#3434 <https://github.com/openmc-dev/openmc/pull/3434>`_)
+- Random Ray External Source Plotting Fix (`#3430 <https://github.com/openmc-dev/openmc/pull/3430>`_)
+- Avoid negative heating values during pair production and bremsstrahlung (`#3426 <https://github.com/openmc-dev/openmc/pull/3426>`_)
+- Fix no serialization of periodic_surface_id bug (`#3421 <https://github.com/openmc-dev/openmc/pull/3421>`_)
+- Update _get_start_data to always grab the beginning of timestep time (`#3414 <https://github.com/openmc-dev/openmc/pull/3414>`_)
+- Fixed a bug in charged particle energy deposition (`#3416 <https://github.com/openmc-dev/openmc/pull/3416>`_)
+- Fix bug where the same mesh is written multiple times to settings.xml (`#3418 <https://github.com/openmc-dev/openmc/pull/3418>`_)
+- small typo - spelling of Debian (`#3411 <https://github.com/openmc-dev/openmc/pull/3411>`_)
+- added test for dagmc geometry plot (`#3375 <https://github.com/openmc-dev/openmc/pull/3375>`_)
+- Random Ray Misc Memory Error Fixes (`#3405 <https://github.com/openmc-dev/openmc/pull/3405>`_)
+- added type hints to model file (`#3399 <https://github.com/openmc-dev/openmc/pull/3399>`_)
+- Apply resolve paths to path values in ``config`` (`#3400 <https://github.com/openmc-dev/openmc/pull/3400>`_)
+- Fixing an incorrect computation of CDF of bremsstrahlung photons (`#3396 <https://github.com/openmc-dev/openmc/pull/3396>`_)
+- Fix weight modification for uniform source sampling (`#3395 <https://github.com/openmc-dev/openmc/pull/3395>`_)
+- Updates to VTK data checks (`#3371 <https://github.com/openmc-dev/openmc/pull/3371>`_)
+- Map Compton subshell data to atomic relaxation data (`#3392 <https://github.com/openmc-dev/openmc/pull/3392>`_)
+- Skip atomic relaxation if binding energy is larger than photon energy (`#3391 <https://github.com/openmc-dev/openmc/pull/3391>`_)
+- Fix extremely large yields from Bremsstrahlung (`#3386 <https://github.com/openmc-dev/openmc/pull/3386>`_)
+- corrected tally name in D1S example (`#3383 <https://github.com/openmc-dev/openmc/pull/3383>`_)
+- Install MCPL using same build type as OpenMC in CI (`#3388 <https://github.com/openmc-dev/openmc/pull/3388>`_)
+- using reduce chain level to remove need for reduce chain (`#3377 <https://github.com/openmc-dev/openmc/pull/3377>`_)
+- Fix negative distances from bins_crossed for CylindricalMesh (`#3370 <https://github.com/openmc-dev/openmc/pull/3370>`_)
+- Add check for equal value bins in an EnergyFilter (`#3372 <https://github.com/openmc-dev/openmc/pull/3372>`_)
+- Fix for Issue Loading MGXS Data Files with LLVM 20 or Newer (`#3368 <https://github.com/openmc-dev/openmc/pull/3368>`_)
+- Report plot ID instead of index for unsupported plot types in random ray mode (`#3361 <https://github.com/openmc-dev/openmc/pull/3361>`_)
+- Handle Missing Tags in Versioning by Setting Default to 0 (`#3359 <https://github.com/openmc-dev/openmc/pull/3359>`_)
+- added kg units to doc string in results class (`#3358 <https://github.com/openmc-dev/openmc/pull/3358>`_)
diff --git a/docs/source/releasenotes/index.rst b/docs/source/releasenotes/index.rst
index d24b83f9e..1292599ba 100644
--- a/docs/source/releasenotes/index.rst
+++ b/docs/source/releasenotes/index.rst
@@ -7,6 +7,7 @@ Release Notes
 .. toctree::
   :maxdepth: 1
 
+  0.15.3
   0.15.2
   0.15.1
   0.15.0
diff --git a/docs/source/usersguide/variance_reduction.rst b/docs/source/usersguide/variance_reduction.rst
index 5c2485158..93321e107 100644
--- a/docs/source/usersguide/variance_reduction.rst
+++ b/docs/source/usersguide/variance_reduction.rst
@@ -51,7 +51,7 @@ With the :class:`~openmc.WeightWindowGenerator` instance added to the
 :attr:`~openmc.Settings`, the rest of the problem can be defined as normal. When
 running, note that the second iteration and beyond may be several orders of
 magnitude slower than the first. As the weight windows are applied in each
-iteration, particles may be agressively split, resulting in a large number of
+iteration, particles may be aggressively split, resulting in a large number of
 secondary (split) particles being generated per initial source particle. This is
 not necessarily a bad thing, as the split particles are much more efficient at
 exploring low flux regions of phase space as compared to initial particles.
@@ -161,7 +161,7 @@ solver, the Python input just needs to load the h5 file::
 
     settings.weight_window_checkpoints = {'collision': True, 'surface': True}
     settings.survival_biasing = False
-    settings.weight_windows = openmc.WeightWindowsList.from_hdf5('weight_windows.h5')
+    settings.weight_windows_file = "weight_windows.h5"
     settings.weight_windows_on = True
 
 The :class:`~openmc.WeightWindowGenerator` instance is not needed to load an
diff --git a/openmc/model/model.py b/openmc/model/model.py
index 10e5cbfc7..48ae9f0b9 100644
--- a/openmc/model/model.py
+++ b/openmc/model/model.py
@@ -2112,8 +2112,12 @@ class Model:
         groups : openmc.mgxs.EnergyGroups or str, optional
             Energy group structure for the MGXS or the name of the group
             structure (based on keys from openmc.mgxs.GROUP_STRUCTURES).
+        nparticles : int, optional
+            Number of particles to simulate per batch when generating MGXS.
+        overwrite_mgxs_library : bool, optional
+            Whether to overwrite an existing MGXS library file.
         mgxs_path : str, optional
-            Filename of the mgxs.h5 library file.
+            Path to the mgxs.h5 library file.
         correction : str, optional
             Transport correction to apply to the MGXS. Options are None and
             "P0".
diff --git a/openmc/settings.py b/openmc/settings.py
index 43c1fe069..289fb35b7 100644
--- a/openmc/settings.py
+++ b/openmc/settings.py
@@ -1278,9 +1278,12 @@ class Settings:
         return self._weight_windows_file
 
     @weight_windows_file.setter
-    def weight_windows_file(self, value: PathLike):
-        cv.check_type('weight windows file', value, PathLike)
-        self._weight_windows_file = input_path(value)
+    def weight_windows_file(self, value: PathLike | None):
+        if value is None:
+            self._weight_windows_file = None
+        else:
+            cv.check_type('weight windows file', value, PathLike)
+            self._weight_windows_file = input_path(value)
 
     @property
     def weight_window_generators(self) -> list[WeightWindowGenerator]:

From dcb7443711a5ae761bcc686fdfa6703937d51ab1 Mon Sep 17 00:00:00 2001
From: Jonathan Shimwell <mail@jshimwell.com>
Date: Thu, 27 Nov 2025 17:03:38 +0100
Subject: [PATCH 165/203] added test to check dagmc name is in xml (#3657)

---
 openmc/dagmc.py                      | 2 ++
 tests/unit_tests/dagmc/test_model.py | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/openmc/dagmc.py b/openmc/dagmc.py
index d1265be26..3cb48ddf1 100644
--- a/openmc/dagmc.py
+++ b/openmc/dagmc.py
@@ -302,6 +302,8 @@ class DAGMCUniverse(openmc.UniverseBase):
         dagmc_element = ET.Element('dagmc_universe')
         dagmc_element.set('id', str(self.id))
 
+        if self.name:
+            dagmc_element.set('name', self.name)
         if self.auto_geom_ids:
             dagmc_element.set('auto_geom_ids', 'true')
         if self.auto_mat_ids:
diff --git a/tests/unit_tests/dagmc/test_model.py b/tests/unit_tests/dagmc/test_model.py
index 0de4f6092..0917f5b23 100644
--- a/tests/unit_tests/dagmc/test_model.py
+++ b/tests/unit_tests/dagmc/test_model.py
@@ -31,7 +31,7 @@ def model(request):
 
     p = Path(request.fspath).parent / "dagmc.h5m"
 
-    daguniv = openmc.DAGMCUniverse(p, auto_geom_ids=True)
+    daguniv = openmc.DAGMCUniverse(p, name='simple-dagmc', auto_geom_ids=True)
 
     lattice = openmc.RectLattice()
     lattice.dimension = [2, 2]
@@ -232,6 +232,7 @@ def test_dagmc_xml(model):
     dagmc_ele = root.find('dagmc_universe')
 
     assert dagmc_ele.get('id') == str(dag_univ.id)
+    assert dagmc_ele.get('name') == str(dag_univ.name)
     assert dagmc_ele.get('filename') == str(dag_univ.filename)
     assert dagmc_ele.get('auto_geom_ids') == str(dag_univ.auto_geom_ids).lower()
 

From 7ab92ec142470da4cc1f685f0434777772c5343a Mon Sep 17 00:00:00 2001
From: Paul Romano <paul.k.romano@gmail.com>
Date: Fri, 28 Nov 2025 16:39:08 +0100
Subject: [PATCH 166/203] Fix typo in description of distance_inactive for
 random ray setting (#3663)

---
 openmc/settings.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openmc/settings.py b/openmc/settings.py
index 289fb35b7..76e191c5e 100644
--- a/openmc/settings.py
+++ b/openmc/settings.py
@@ -182,7 +182,7 @@ class Settings:
         Options for configuring the random ray solver. Acceptable keys are:
 
         :distance_inactive:
-            Indicates the total active distance in [cm] a ray should travel
+            Indicates the total inactive distance in [cm] a ray should travel
         :distance_active:
             Indicates the total active distance in [cm] a ray should travel
         :ray_source:

From ef22558f4a037585c4fdd96a1a64dd2781a72c37 Mon Sep 17 00:00:00 2001
From: GuySten <62616591+GuySten@users.noreply.github.com>
Date: Sat, 29 Nov 2025 17:28:18 +0200
Subject: [PATCH 167/203] fix a bug in borated_water temperature assignment
 (#3662)

---
 openmc/model/funcs.py             | 9 +++------
 tests/unit_tests/test_material.py | 1 +
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/openmc/model/funcs.py b/openmc/model/funcs.py
index 41aa920ea..e076b080a 100644
--- a/openmc/model/funcs.py
+++ b/openmc/model/funcs.py
@@ -39,8 +39,8 @@ def borated_water(boron_ppm, temperature=293., pressure=0.1013, temp_unit='K',
     press_unit : {'MPa', 'psi'}
         The units used for the `pressure` argument.
     density : float
-        Water density in [g / cm^3].  If specified, this value overrides the
-        temperature and pressure arguments.
+        Water density in [g / cm^3].  If specified, this value overrides 
+        the value that is computed from the temperature and pressure arguments.
     **kwargs
         All keyword arguments are passed to the created Material object.
 
@@ -95,10 +95,7 @@ def borated_water(boron_ppm, temperature=293., pressure=0.1013, temp_unit='K',
     frac_B = boron_ppm * 1e-6 / M_B
 
     # Build the material.
-    if density is None:
-        out = openmc.Material(temperature=T, **kwargs)
-    else:
-        out = openmc.Material(**kwargs)
+    out = openmc.Material(temperature=T, **kwargs)
     out.add_element('H', frac_H, 'ao')
     out.add_element('O', frac_O, 'ao')
     out.add_element('B', frac_B, 'ao')
diff --git a/tests/unit_tests/test_material.py b/tests/unit_tests/test_material.py
index 2e3724272..ce58339d7 100644
--- a/tests/unit_tests/test_material.py
+++ b/tests/unit_tests/test_material.py
@@ -481,6 +481,7 @@ def test_borated_water():
     # Test the density override
     m = openmc.model.borated_water(975, 566.5, 15.51, density=0.9)
     assert m.density == pytest.approx(0.9, 1e-3)
+    assert m.temperature == pytest.approx(566.5)
 
 
 def test_from_xml(run_in_tmpdir):

From 9e9ab848337bc1ba208c72ecbb3fb548f19bb2a1 Mon Sep 17 00:00:00 2001
From: Paul Romano <paul.k.romano@gmail.com>
Date: Tue, 2 Dec 2025 10:11:56 -0600
Subject: [PATCH 168/203] Update C++/CMake policy based on Ubuntu 22.04 (#3666)

---
 docs/source/devguide/policies.rst | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/source/devguide/policies.rst b/docs/source/devguide/policies.rst
index 2cf319987..3644ae822 100644
--- a/docs/source/devguide/policies.rst
+++ b/docs/source/devguide/policies.rst
@@ -21,8 +21,8 @@ C++ code in OpenMC must conform to the most recent C++ standard that is fully
 supported in the `version of the gcc compiler
 <https://gcc.gnu.org/projects/cxx-status.html>`_ that is distributed with the
 oldest version of Ubuntu that is still within its `standard support period
-<https://ubuntu.com/about/release-cycle>`_. Ubuntu 20.04 LTS will be supported
-through April 2025 and is distributed with gcc 9.3.0, which fully supports the
+<https://ubuntu.com/about/release-cycle>`_. Ubuntu 22.04 LTS will be supported
+through April 2027 and is distributed with gcc 11.4.0, which fully supports the
 C++17 standard.
 
 --------------------
@@ -31,5 +31,5 @@ CMake Version Policy
 
 Similar to the C++ standard policy, the minimum supported version of CMake
 corresponds to whatever version is distributed with the oldest version of Ubuntu
-still within its standard support period. Ubuntu 20.04 LTS is distributed with
-CMake 3.16.
+still within its standard support period. Ubuntu 22.04 LTS is distributed with
+CMake 3.22.

From 10706510bfb7e89555bb89bccc849bfde36be409 Mon Sep 17 00:00:00 2001
From: John Tramm <john.tramm@gmail.com>
Date: Tue, 2 Dec 2025 22:00:32 -0600
Subject: [PATCH 169/203] Random Ray Eigenvalue Flux Normalization Change
 (#3595)

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
---
 .../openmc/random_ray/flat_source_domain.h    |   3 +
 src/eigenvalue.cpp                            |  10 +
 src/random_ray/flat_source_domain.cpp         |  32 +-
 src/random_ray/linear_source_domain.cpp       |   6 +-
 .../random_ray_adjoint_k_eff/results_true.dat | 244 +++++++--------
 .../infinite_medium/results_true.dat          |   2 +-
 .../material_wise/results_true.dat            |   2 +-
 .../stochastic_slab/results_true.dat          |   2 +-
 .../random_ray_auto_convert/test.py           |   2 +-
 .../results_true.dat                          |   2 +-
 .../random_ray_diagonal_stabilization/test.py |   2 +-
 .../results_true.dat                          | 280 ++++++++---------
 .../random_ray_k_eff/results_true.dat         | 282 +++++++++---------
 .../random_ray_k_eff_mesh/results_true.dat    | 280 ++++++++---------
 .../random_ray_linear/linear/results_true.dat | 280 ++++++++---------
 .../linear_xy/results_true.dat                | 280 ++++++++---------
 16 files changed, 874 insertions(+), 835 deletions(-)

diff --git a/include/openmc/random_ray/flat_source_domain.h b/include/openmc/random_ray/flat_source_domain.h
index d4e802734..4df4e5d8d 100644
--- a/include/openmc/random_ray/flat_source_domain.h
+++ b/include/openmc/random_ray/flat_source_domain.h
@@ -170,6 +170,9 @@ protected:
     simulation_volume_; // Total physical volume of the simulation domain, as
                         // defined by the 3D box of the random ray source
 
+  double
+    fission_rate_; // The system's fission rate (per cm^3), in eigenvalue mode
+
   // Volumes for each tally and bin/score combination. This intermediate data
   // structure is used when tallying quantities that must be normalized by
   // volume (i.e., flux). The vector is index by tally index, while the inner 2D
diff --git a/src/eigenvalue.cpp b/src/eigenvalue.cpp
index a2120a006..8412cbd3b 100644
--- a/src/eigenvalue.cpp
+++ b/src/eigenvalue.cpp
@@ -403,6 +403,16 @@ void calculate_average_keff()
         t_value *
         std::sqrt(
           (simulation::k_sum[1] / n - std::pow(simulation::keff, 2)) / (n - 1));
+
+      // In some cases (such as an infinite medium problem), random ray
+      // may estimate k exactly and in an unvarying manner between iterations.
+      // In this case, the floating point roundoff between the division and the
+      // power operations may cause an extremely small negative value to occur
+      // inside the sqrt operation, leading to NaN. If this occurs, we check for
+      // it and set the std dev to zero.
+      if (!std::isfinite(simulation::keff_std)) {
+        simulation::keff_std = 0.0;
+      }
     }
   }
 }
diff --git a/src/random_ray/flat_source_domain.cpp b/src/random_ray/flat_source_domain.cpp
index 1bf27e1ed..ec14795dd 100644
--- a/src/random_ray/flat_source_domain.cpp
+++ b/src/random_ray/flat_source_domain.cpp
@@ -124,7 +124,9 @@ void FlatSourceDomain::update_single_neutron_source(SourceRegionHandle& srh)
         double chi = chi_[material * negroups_ + g_out];
 
         scatter_source += sigma_s * scalar_flux;
-        fission_source += nu_sigma_f * scalar_flux * chi;
+        if (settings::create_fission_neutrons) {
+          fission_source += nu_sigma_f * scalar_flux * chi;
+        }
       }
       srh.source(g_out) =
         (scatter_source + fission_source * inverse_k_eff) / sigma_t;
@@ -369,6 +371,7 @@ void FlatSourceDomain::compute_k_eff()
   // Adds entropy value to shared entropy vector in openmc namespace.
   simulation::entropy.push_back(H);
 
+  fission_rate_ = fission_rate_new;
   k_eff_ = k_eff_new;
 }
 
@@ -519,12 +522,33 @@ void FlatSourceDomain::reset_tally_volumes()
 // simulation
 double FlatSourceDomain::compute_fixed_source_normalization_factor() const
 {
-  // If we are not in fixed source mode, then there are no external sources
-  // so no normalization is needed.
-  if (settings::run_mode != RunMode::FIXED_SOURCE || adjoint_) {
+  // Eigenvalue mode normalization
+  if (settings::run_mode == RunMode::EIGENVALUE) {
+    // Normalize fluxes by total number of fission neutrons produced. This
+    // ensures consistent scaling of the eigenvector such that its magnitude is
+    // comparable to the eigenvector produced by the Monte Carlo solver.
+    // Multiplying by the eigenvalue is unintuitive, but it is necessary.
+    // If the eigenvalue is 1.2, per starting source neutron, you will
+    // generate 1.2 neutrons. Thus if we normalize to generating only ONE
+    // neutron in total for the whole domain, then we don't actually have enough
+    // flux to generate the required 1.2 neutrons. We only know the flux
+    // required to generate 1 neutron (which would have required less than one
+    // starting neutron). Thus, you have to scale the flux up by the eigenvalue
+    // such that 1.2 neutrons are generated, so as to be consistent with the
+    // bookkeeping in MC which is all done per starting source neutron (not per
+    // neutron produced).
+    return k_eff_ / (fission_rate_ * simulation_volume_);
+  }
+
+  // If we are in adjoint mode of a fixed source problem, the external
+  // source is already normalized, such that all resulting fluxes are
+  // also normalized.
+  if (adjoint_) {
     return 1.0;
   }
 
+  // Fixed source mode normalization
+
   // Step 1 is to sum over all source regions and energy groups to get the
   // total external source strength in the simulation.
   double simulation_external_source_strength = 0.0;
diff --git a/src/random_ray/linear_source_domain.cpp b/src/random_ray/linear_source_domain.cpp
index e1ad68e3d..47ffbb727 100644
--- a/src/random_ray/linear_source_domain.cpp
+++ b/src/random_ray/linear_source_domain.cpp
@@ -68,9 +68,11 @@ void LinearSourceDomain::update_single_neutron_source(SourceRegionHandle& srh)
 
         // Compute source terms for flat and linear components of the flux
         scatter_flat += sigma_s * flux_flat;
-        fission_flat += nu_sigma_f * flux_flat * chi;
         scatter_linear += sigma_s * flux_linear;
-        fission_linear += nu_sigma_f * flux_linear * chi;
+        if (settings::create_fission_neutrons) {
+          fission_flat += nu_sigma_f * flux_flat * chi;
+          fission_linear += nu_sigma_f * flux_linear * chi;
+        }
       }
 
       // Compute the flat source term
diff --git a/tests/regression_tests/random_ray_adjoint_k_eff/results_true.dat b/tests/regression_tests/random_ray_adjoint_k_eff/results_true.dat
index 657c841b5..dfef53cd2 100644
--- a/tests/regression_tests/random_ray_adjoint_k_eff/results_true.dat
+++ b/tests/regression_tests/random_ray_adjoint_k_eff/results_true.dat
@@ -1,171 +1,171 @@
 k-combined:
 1.006640E+00 1.812969E-03
 tally 1:
-6.684129E+00
-8.939821E+00
-2.685967E+00
-1.443592E+00
+1.208044E+00
+2.920182E-01
+4.854426E-01
+4.715453E-02
 0.000000E+00
 0.000000E+00
-6.358774E+00
-8.091444E+00
-9.687217E-01
-1.878029E-01
+1.149242E+00
+2.643067E-01
+1.750801E-01
+6.134563E-03
 0.000000E+00
 0.000000E+00
-5.963160E+00
-7.117108E+00
-1.932332E-01
-7.473914E-03
+1.077743E+00
+2.324814E-01
+3.492371E-02
+2.441363E-04
 0.000000E+00
 0.000000E+00
-5.137593E+00
-5.283310E+00
-1.714616E-01
-5.884834E-03
-1.086218E-06
-2.361752E-13
-4.857253E+00
-4.719856E+00
-5.689580E-02
-6.476286E-04
-2.989356E-03
-1.787808E-06
-4.830516E+00
-4.666801E+00
-7.203015E-03
-1.037676E-05
-3.620020E+00
-2.620927E+00
-5.161382E+00
-5.328124E+00
-6.786255E-02
-9.210763E-04
-5.531943E+00
-6.120553E+00
-5.414034E+00
-5.864661E+00
+9.285362E-01
+1.725808E-01
+3.098889E-02
+1.922297E-04
+1.963161E-07
+7.714727E-15
+8.778641E-01
+1.541719E-01
+1.028293E-02
+2.115448E-05
+5.402741E-04
+5.839789E-08
+8.730274E-01
+1.524358E-01
+1.301813E-03
+3.389450E-07
+6.542525E-01
+8.560964E-02
+9.328247E-01
+1.740366E-01
+1.226491E-02
+3.008584E-05
+9.997969E-01
+1.999204E-01
+9.784958E-01
+1.915688E-01
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-5.632338E+00
-6.347626E+00
+1.017952E+00
+2.073461E-01
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-5.682608E+00
-6.462382E+00
+1.027039E+00
+2.110955E-01
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-5.310716E+00
-5.645180E+00
+9.598240E-01
+1.844004E-01
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-4.945409E+00
-4.893171E+00
+8.937969E-01
+1.598332E-01
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-4.842688E+00
-4.690352E+00
+8.752275E-01
+1.532052E-01
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-5.117198E+00
-5.237280E+00
+9.248400E-01
+1.710699E-01
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-6.938711E+00
-9.633345E+00
-2.835258E+00
-1.608212E+00
+1.254054E+00
+3.146708E-01
+5.124223E-01
+5.253093E-02
 0.000000E+00
 0.000000E+00
-6.549505E+00
-8.584036E+00
-1.015138E+00
-2.061993E-01
+1.183712E+00
+2.803961E-01
+1.834683E-01
+6.735381E-03
 0.000000E+00
 0.000000E+00
-6.050651E+00
-7.327711E+00
-1.992816E-01
-7.948424E-03
+1.093555E+00
+2.393604E-01
+3.601678E-02
+2.596341E-04
 0.000000E+00
 0.000000E+00
-5.113981E+00
-5.234801E+00
-1.732323E-01
-6.006619E-03
-1.097435E-06
-2.410627E-13
-4.837033E+00
-4.680541E+00
-5.760042E-02
-6.637112E-04
-3.026377E-03
-1.832205E-06
-4.827049E+00
-4.660105E+00
-7.319913E-03
-1.071647E-05
-3.678770E+00
-2.706730E+00
-5.175337E+00
-5.356957E+00
-6.923046E-02
-9.586177E-04
-5.643451E+00
-6.370016E+00
-6.693323E+00
-8.964322E+00
-2.753307E+00
-1.516683E+00
+9.242694E-01
+1.709967E-01
+3.130894E-02
+1.962084E-04
+1.983437E-07
+7.874400E-15
+8.742100E-01
+1.528879E-01
+1.041026E-02
+2.167970E-05
+5.469644E-04
+5.984780E-08
+8.724009E-01
+1.522171E-01
+1.322938E-03
+3.500386E-07
+6.648691E-01
+8.841161E-02
+9.353464E-01
+1.749781E-01
+1.251209E-02
+3.131171E-05
+1.019947E+00
+2.080664E-01
+1.209708E+00
+2.928214E-01
+4.976146E-01
+4.954258E-02
 0.000000E+00
 0.000000E+00
-6.358384E+00
-8.090233E+00
-9.912008E-01
-1.965868E-01
+1.149174E+00
+2.642694E-01
+1.791431E-01
+6.421530E-03
 0.000000E+00
 0.000000E+00
-5.957484E+00
-7.103246E+00
-1.974033E-01
-7.798286E-03
+1.076718E+00
+2.320295E-01
+3.567737E-02
+2.547314E-04
 0.000000E+00
 0.000000E+00
-5.130744E+00
-5.268844E+00
-1.749233E-01
-6.123348E-03
-1.108148E-06
-2.457474E-13
-4.857340E+00
-4.720019E+00
-5.816659E-02
-6.768049E-04
-3.056125E-03
-1.868351E-06
-4.830629E+00
-4.667018E+00
-7.366289E-03
-1.085264E-05
-3.702077E+00
-2.741125E+00
-5.164864E+00
-5.335279E+00
-6.947917E-02
-9.655086E-04
-5.663725E+00
-6.415806E+00
+9.272977E-01
+1.721077E-01
+3.161443E-02
+2.000179E-04
+2.002789E-07
+8.027290E-15
+8.778794E-01
+1.541769E-01
+1.051257E-02
+2.210729E-05
+5.523400E-04
+6.102818E-08
+8.730477E-01
+1.524429E-01
+1.331320E-03
+3.544869E-07
+6.690816E-01
+8.953516E-02
+9.334544E-01
+1.742707E-01
+1.255707E-02
+3.153710E-05
+1.023613E+00
+2.095641E-01
diff --git a/tests/regression_tests/random_ray_auto_convert/infinite_medium/results_true.dat b/tests/regression_tests/random_ray_auto_convert/infinite_medium/results_true.dat
index c7584ab64..ee396fa74 100644
--- a/tests/regression_tests/random_ray_auto_convert/infinite_medium/results_true.dat
+++ b/tests/regression_tests/random_ray_auto_convert/infinite_medium/results_true.dat
@@ -1,2 +1,2 @@
 k-combined:
-7.797820E-01 1.054725E-02
+7.797252E-01 1.055731E-02
diff --git a/tests/regression_tests/random_ray_auto_convert/material_wise/results_true.dat b/tests/regression_tests/random_ray_auto_convert/material_wise/results_true.dat
index d544a27df..3bade01e0 100644
--- a/tests/regression_tests/random_ray_auto_convert/material_wise/results_true.dat
+++ b/tests/regression_tests/random_ray_auto_convert/material_wise/results_true.dat
@@ -1,2 +1,2 @@
 k-combined:
-7.356667E-01 6.637270E-03
+7.372542E-01 6.967831E-03
diff --git a/tests/regression_tests/random_ray_auto_convert/stochastic_slab/results_true.dat b/tests/regression_tests/random_ray_auto_convert/stochastic_slab/results_true.dat
index 75a10a224..86e08a710 100644
--- a/tests/regression_tests/random_ray_auto_convert/stochastic_slab/results_true.dat
+++ b/tests/regression_tests/random_ray_auto_convert/stochastic_slab/results_true.dat
@@ -1,2 +1,2 @@
 k-combined:
-7.551716E-01 8.117378E-03
+7.496641E-01 8.282032E-03
diff --git a/tests/regression_tests/random_ray_auto_convert/test.py b/tests/regression_tests/random_ray_auto_convert/test.py
index fa7f2f17f..99a931dce 100644
--- a/tests/regression_tests/random_ray_auto_convert/test.py
+++ b/tests/regression_tests/random_ray_auto_convert/test.py
@@ -27,7 +27,7 @@ def test_random_ray_auto_convert(method):
 
         # Convert to a multi-group model
         model.convert_to_multigroup(
-            method=method, groups='CASMO-2', nparticles=30,
+            method=method, groups='CASMO-2', nparticles=100,
             overwrite_mgxs_library=False, mgxs_path="mgxs.h5"
         )
 
diff --git a/tests/regression_tests/random_ray_diagonal_stabilization/results_true.dat b/tests/regression_tests/random_ray_diagonal_stabilization/results_true.dat
index f27ad46b4..034d7f7c6 100644
--- a/tests/regression_tests/random_ray_diagonal_stabilization/results_true.dat
+++ b/tests/regression_tests/random_ray_diagonal_stabilization/results_true.dat
@@ -1,2 +1,2 @@
 k-combined:
-7.201808E-01 1.506596E-02
+7.134473E-01 1.422763E-02
diff --git a/tests/regression_tests/random_ray_diagonal_stabilization/test.py b/tests/regression_tests/random_ray_diagonal_stabilization/test.py
index c7a1c9f7c..8d36e1d25 100644
--- a/tests/regression_tests/random_ray_diagonal_stabilization/test.py
+++ b/tests/regression_tests/random_ray_diagonal_stabilization/test.py
@@ -23,7 +23,7 @@ def test_random_ray_diagonal_stabilization():
     # MGXS data with some negatives on the diagonal, in order
     # to trigger diagonal correction.
     model.convert_to_multigroup(
-        method='material_wise', groups='CASMO-70', nparticles=30,
+        method='material_wise', groups='CASMO-70', nparticles=13,
         overwrite_mgxs_library=True, mgxs_path="mgxs.h5", correction='P0'
     )
 
diff --git a/tests/regression_tests/random_ray_halton_samples/results_true.dat b/tests/regression_tests/random_ray_halton_samples/results_true.dat
index b62398935..256f8a744 100644
--- a/tests/regression_tests/random_ray_halton_samples/results_true.dat
+++ b/tests/regression_tests/random_ray_halton_samples/results_true.dat
@@ -1,171 +1,171 @@
 k-combined:
 8.388051E-01 7.383265E-03
 tally 1:
-5.033308E+00
-5.072162E+00
-1.917335E+00
-7.360725E-01
-4.666410E+00
-4.360038E+00
-2.851812E+00
-1.629362E+00
-4.365590E-01
-3.818884E-02
-1.062497E+00
-2.262071E-01
-1.697621E+00
-5.829333E-01
-5.639912E-02
-6.427568E-04
-1.372642E-01
-3.807294E-03
-2.376683E+00
-1.151027E+00
-8.060903E-02
-1.323179E-03
-1.961862E-01
-7.837693E-03
-7.145452E+00
-1.037540E+01
-8.551803E-02
-1.486269E-03
-2.081363E-01
-8.803955E-03
-2.053205E+01
-8.469498E+01
-3.235618E-02
-2.102891E-04
-8.006311E-02
-1.287559E-03
-1.326545E+01
-3.519484E+01
-1.867471E-01
-6.975133E-03
-5.194275E-01
-5.396284E-02
-7.558115E+00
-1.142535E+01
+1.065839E+00
+2.274384E-01
+4.060094E-01
+3.300592E-02
+9.881457E-01
+1.955066E-01
+6.038893E-01
+7.306038E-02
+9.244411E-02
+1.712380E-03
+2.249905E-01
+1.014308E-02
+3.594916E-01
+2.614145E-02
+1.194318E-02
+2.882412E-05
+2.906731E-02
+1.707363E-04
+5.032954E-01
+5.161897E-02
+1.707007E-02
+5.933921E-05
+4.154514E-02
+3.514889E-04
+1.513147E+00
+4.652938E-01
+1.810962E-02
+6.665306E-05
+4.407572E-02
+3.948212E-04
+4.347893E+00
+3.798064E+00
+6.851785E-03
+9.430195E-06
+1.695426E-02
+5.773923E-05
+2.809071E+00
+1.578195E+00
+3.954523E-02
+3.127754E-04
+1.099931E-01
+2.419775E-03
+1.600493E+00
+5.123291E-01
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-3.386211E+00
-2.294414E+00
+7.170555E-01
+1.028835E-01
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-1.827274E+00
-6.782305E-01
+3.869491E-01
+3.041553E-02
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-2.702858E+00
-1.489752E+00
+5.723683E-01
+6.680970E-02
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-7.475537E+00
-1.133971E+01
+1.583046E+00
+5.085372E-01
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-1.828685E+01
-6.719606E+01
+3.872447E+00
+3.013344E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-1.143600E+01
-2.615734E+01
+2.421670E+00
+1.172938E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-4.590713E+00
-4.224107E+00
-1.705847E+00
-5.831967E-01
-4.151691E+00
-3.454497E+00
-2.730853E+00
-1.495413E+00
-4.072633E-01
-3.325944E-02
-9.911973E-01
-1.970084E-01
-1.664732E+00
-5.598668E-01
-5.385645E-02
-5.858353E-04
-1.310758E-01
-3.470126E-03
-2.312239E+00
-1.088485E+00
-7.662778E-02
-1.195422E-03
-1.864967E-01
-7.080943E-03
-7.105766E+00
-1.025960E+01
-8.287512E-02
-1.396474E-03
-2.017039E-01
-8.272053E-03
-2.099024E+01
-8.854251E+01
-3.191885E-02
-2.048368E-04
-7.898095E-02
-1.254175E-03
-1.355820E+01
-3.676862E+01
-1.815102E-01
-6.590727E-03
-5.048614E-01
-5.098890E-02
-5.093659E+00
-5.192360E+00
-1.874632E+00
-7.031793E-01
-4.562478E+00
-4.165199E+00
-2.870214E+00
-1.650126E+00
-4.244069E-01
-3.608745E-02
-1.032921E+00
-2.137598E-01
-1.703400E+00
-5.873029E-01
-5.464557E-02
-6.042855E-04
-1.329964E-01
-3.579413E-03
-2.389118E+00
-1.163674E+00
-7.832237E-02
-1.251254E-03
-1.906210E-01
-7.411654E-03
-7.162707E+00
-1.042515E+01
-8.273831E-02
-1.391799E-03
-2.013709E-01
-8.244359E-03
-2.043145E+01
-8.383557E+01
-3.096158E-02
-1.924116E-04
-7.661226E-02
-1.178098E-03
-1.314148E+01
-3.454143E+01
-1.771732E-01
-6.279887E-03
-4.927984E-01
-4.858410E-02
+9.721128E-01
+1.894086E-01
+3.612242E-01
+2.615053E-02
+8.791475E-01
+1.548996E-01
+5.782742E-01
+6.705354E-02
+8.624040E-02
+1.491336E-03
+2.098919E-01
+8.833753E-03
+3.525265E-01
+2.510689E-02
+1.140473E-02
+2.627142E-05
+2.775683E-02
+1.556157E-04
+4.896481E-01
+4.881407E-02
+1.622698E-02
+5.360976E-05
+3.949322E-02
+3.175511E-04
+1.504743E+00
+4.601003E-01
+1.754995E-02
+6.262618E-05
+4.271358E-02
+3.709679E-04
+4.444922E+00
+3.970609E+00
+6.759184E-03
+9.185746E-06
+1.672513E-02
+5.624252E-05
+2.871068E+00
+1.648778E+00
+3.843643E-02
+2.955428E-04
+1.069090E-01
+2.286455E-03
+1.078620E+00
+2.328291E-01
+3.969671E-01
+3.153110E-02
+9.661384E-01
+1.867708E-01
+6.077864E-01
+7.399164E-02
+8.987086E-02
+1.618157E-03
+2.187277E-01
+9.584966E-03
+3.607158E-01
+2.633746E-02
+1.157185E-02
+2.709895E-05
+2.816358E-02
+1.605174E-04
+5.059289E-01
+5.218618E-02
+1.658585E-02
+5.611375E-05
+4.036663E-02
+3.323832E-04
+1.516801E+00
+4.675245E-01
+1.752096E-02
+6.241641E-05
+4.264304E-02
+3.697253E-04
+4.326588E+00
+3.759517E+00
+6.556454E-03
+8.628460E-06
+1.622349E-02
+5.283037E-05
+2.782815E+00
+1.548888E+00
+3.751781E-02
+2.815972E-04
+1.043539E-01
+2.178566E-03
diff --git a/tests/regression_tests/random_ray_k_eff/results_true.dat b/tests/regression_tests/random_ray_k_eff/results_true.dat
index 37eca77f3..ace18df8c 100644
--- a/tests/regression_tests/random_ray_k_eff/results_true.dat
+++ b/tests/regression_tests/random_ray_k_eff/results_true.dat
@@ -1,171 +1,171 @@
 k-combined:
-8.400321E-01 8.023358E-03
+8.400321E-01 8.023357E-03
 tally 1:
-5.086559E+00
-5.180935E+00
-1.885166E+00
-7.115503E-01
-4.588116E+00
-4.214784E+00
-2.860400E+00
-1.639328E+00
-4.245221E-01
-3.610929E-02
-1.033202E+00
-2.138892E-01
-1.692631E+00
-5.793966E-01
-5.445818E-02
-5.996625E-04
-1.325403E-01
-3.552030E-03
-2.372248E+00
-1.146944E+00
-7.808142E-02
-1.242278E-03
-1.900346E-01
-7.358491E-03
-7.134949E+00
-1.034824E+01
-8.272647E-02
-1.391871E-03
-2.013421E-01
-8.244788E-03
-2.043539E+01
-8.389902E+01
-3.099367E-02
-1.930673E-04
-7.669167E-02
-1.182113E-03
-1.313212E+01
-3.449537E+01
-1.764293E-01
-6.225586E-03
-4.907293E-01
-4.816400E-02
-7.567715E+00
-1.145439E+01
+1.075769E+00
+2.317354E-01
+3.986991E-01
+3.182682E-02
+9.703538E-01
+1.885224E-01
+6.049423E-01
+7.331941E-02
+8.978161E-02
+1.614997E-03
+2.185105E-01
+9.566247E-03
+3.579852E-01
+2.591721E-02
+1.151770E-02
+2.682363E-05
+2.803176E-02
+1.588866E-04
+5.017326E-01
+5.130808E-02
+1.651428E-02
+5.557274E-05
+4.019245E-02
+3.291786E-04
+1.509054E+00
+4.629325E-01
+1.749679E-02
+6.226587E-05
+4.258421E-02
+3.688336E-04
+4.322054E+00
+3.753085E+00
+6.555113E-03
+8.636537E-06
+1.622017E-02
+5.287982E-05
+2.777351E+00
+1.542942E+00
+3.731363E-02
+2.784662E-04
+1.037860E-01
+2.154343E-03
+1.600522E+00
+5.123477E-01
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-3.383194E+00
-2.290468E+00
+7.155116E-01
+1.024445E-01
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-1.819672E+00
-6.726158E-01
+3.848568E-01
+3.008769E-02
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-2.693683E+00
-1.480961E+00
+5.697160E-01
+6.624996E-02
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-7.453758E+00
-1.128171E+01
+1.576480E+00
+5.046890E-01
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-1.823561E+01
-6.681652E+01
+3.856827E+00
+2.989000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-1.137517E+01
-2.588512E+01
+2.405807E+00
+1.157889E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-4.601916E+00
-4.242624E+00
-1.719723E+00
-5.923465E-01
-4.185462E+00
-3.508695E+00
-2.730305E+00
-1.494324E+00
-4.108214E-01
-3.383938E-02
-9.998572E-01
-2.004436E-01
-1.660852E+00
-5.570432E-01
-5.428709E-02
-5.947848E-04
-1.321239E-01
-3.523137E-03
-2.306069E+00
-1.082855E+00
-7.697031E-02
-1.206036E-03
-1.873303E-01
-7.143815E-03
-7.075194E+00
-1.017519E+01
-8.322052E-02
-1.408294E-03
-2.025446E-01
-8.342071E-03
-2.094832E+01
-8.816715E+01
-3.234739E-02
-2.101889E-04
-8.004135E-02
-1.286945E-03
-1.357413E+01
-3.685983E+01
-1.861680E-01
-6.934827E-03
-5.178169E-01
-5.365102E-02
-5.072149E+00
-5.151429E+00
-1.916643E+00
-7.358710E-01
-4.664726E+00
-4.358845E+00
-2.859464E+00
-1.638250E+00
-4.332944E-01
-3.763170E-02
-1.054552E+00
-2.229070E-01
-1.693008E+00
-5.796671E-01
-5.561096E-02
-6.247543E-04
-1.353459E-01
-3.700658E-03
-2.368860E+00
-1.143296E+00
-7.951819E-02
-1.286690E-03
-1.935314E-01
-7.621557E-03
-7.119587E+00
-1.030023E+01
-8.428175E-02
-1.442931E-03
-2.051274E-01
-8.547243E-03
-2.046758E+01
-8.418768E+01
-3.181946E-02
-2.034766E-04
-7.873502E-02
-1.245847E-03
-1.325834E+01
-3.515919E+01
-1.832838E-01
-6.720555E-03
-5.097947E-01
-5.199331E-02
+9.732717E-01
+1.897670E-01
+3.637108E-01
+2.649544E-02
+8.851992E-01
+1.569426E-01
+5.774286E-01
+6.683395E-02
+8.688408E-02
+1.513473E-03
+2.114585E-01
+8.964883E-03
+3.512640E-01
+2.491729E-02
+1.148149E-02
+2.660532E-05
+2.794365E-02
+1.575935E-04
+4.877362E-01
+4.844138E-02
+1.627932E-02
+5.395212E-05
+3.962062E-02
+3.195790E-04
+1.496416E+00
+4.551920E-01
+1.760130E-02
+6.300084E-05
+4.283856E-02
+3.731872E-04
+4.430519E+00
+3.943947E+00
+6.841363E-03
+9.402132E-06
+1.692847E-02
+5.756741E-05
+2.870816E+00
+1.648662E+00
+3.937267E-02
+3.101707E-04
+1.095131E-01
+2.399624E-03
+1.072714E+00
+2.304093E-01
+4.053505E-01
+3.291277E-02
+9.865420E-01
+1.949549E-01
+6.047420E-01
+7.327008E-02
+9.163611E-02
+1.683034E-03
+2.230240E-01
+9.969255E-03
+3.580639E-01
+2.592902E-02
+1.176143E-02
+2.794541E-05
+2.862497E-02
+1.655313E-04
+5.010143E-01
+5.114429E-02
+1.681803E-02
+5.755790E-05
+4.093173E-02
+3.409375E-04
+1.505803E+00
+4.607828E-01
+1.782566E-02
+6.454911E-05
+4.338462E-02
+3.823584E-04
+4.328879E+00
+3.766055E+00
+6.729800E-03
+9.102372E-06
+1.665242E-02
+5.573204E-05
+2.804070E+00
+1.572690E+00
+3.876396E-02
+3.006259E-04
+1.078200E-01
+2.325780E-03
diff --git a/tests/regression_tests/random_ray_k_eff_mesh/results_true.dat b/tests/regression_tests/random_ray_k_eff_mesh/results_true.dat
index 83209044b..2ae8fad85 100644
--- a/tests/regression_tests/random_ray_k_eff_mesh/results_true.dat
+++ b/tests/regression_tests/random_ray_k_eff_mesh/results_true.dat
@@ -1,171 +1,171 @@
 k-combined:
 8.379203E-01 8.057199E-03
 tally 1:
-5.080172E+00
-5.167984E+00
-1.880341E+00
-7.079266E-01
-4.576373E+00
-4.193319E+00
-2.859914E+00
-1.638769E+00
-4.243332E-01
-3.607732E-02
-1.032742E+00
-2.136998E-01
-1.692643E+00
-5.794069E-01
-5.445214E-02
-5.995213E-04
-1.325256E-01
-3.551193E-03
-2.372336E+00
-1.147031E+00
-7.807378E-02
-1.242019E-03
-1.900160E-01
-7.356955E-03
-7.135636E+00
-1.035026E+01
-8.273225E-02
-1.392069E-03
-2.013562E-01
-8.245961E-03
-2.044034E+01
-8.394042E+01
-3.100485E-02
-1.932097E-04
-7.671934E-02
-1.182985E-03
-1.313652E+01
-3.451846E+01
-1.764978E-01
-6.230420E-03
-4.909196E-01
-4.820140E-02
-7.585874E+00
-1.150936E+01
+1.073897E+00
+2.309328E-01
+3.974859E-01
+3.163415E-02
+9.674011E-01
+1.873811E-01
+6.045463E-01
+7.322367E-02
+8.969819E-02
+1.612011E-03
+2.183075E-01
+9.548557E-03
+3.578121E-01
+2.589198E-02
+1.151076E-02
+2.679073E-05
+2.801489E-02
+1.586917E-04
+5.015038E-01
+5.126076E-02
+1.650453E-02
+5.550572E-05
+4.016872E-02
+3.287816E-04
+1.508456E+00
+4.625615E-01
+1.748939E-02
+6.221267E-05
+4.256620E-02
+3.685184E-04
+4.320984E+00
+3.751237E+00
+6.554265E-03
+8.634389E-06
+1.621807E-02
+5.286667E-05
+2.776930E+00
+1.542475E+00
+3.730995E-02
+2.784113E-04
+1.037757E-01
+2.153918E-03
+1.603583E+00
+5.143065E-01
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-3.386790E+00
-2.295327E+00
+7.159242E-01
+1.025623E-01
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-1.820058E+00
-6.729239E-01
+3.847488E-01
+3.007151E-02
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-2.694013E+00
-1.481363E+00
+5.695050E-01
+6.620177E-02
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-7.453818E+00
-1.128202E+01
+1.575716E+00
+5.042003E-01
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-1.823642E+01
-6.682239E+01
+3.855109E+00
+2.986316E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-1.137903E+01
-2.590265E+01
+2.405453E+00
+1.157547E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-4.589529E+00
-4.219985E+00
-1.712446E+00
-5.873675E-01
-4.167750E+00
-3.479202E+00
-2.728285E+00
-1.492132E+00
-4.104063E-01
-3.377132E-02
-9.988468E-01
-2.000405E-01
-1.660506E+00
-5.567967E-01
-5.427391E-02
-5.944708E-04
-1.320918E-01
-3.521277E-03
-2.305889E+00
-1.082691E+00
-7.695793E-02
-1.205644E-03
-1.873002E-01
-7.141490E-03
-7.076637E+00
-1.017946E+01
-8.323139E-02
-1.408687E-03
-2.025710E-01
-8.344398E-03
-2.095897E+01
-8.825741E+01
-3.236513E-02
-2.104220E-04
-8.008525E-02
-1.288373E-03
-1.358006E+01
-3.689205E+01
-1.862562E-01
-6.941428E-03
-5.180621E-01
-5.370209E-02
-5.067386E+00
-5.141748E+00
-1.912704E+00
-7.328484E-01
-4.655140E+00
-4.340941E+00
-2.858992E+00
-1.637705E+00
-4.331050E-01
-3.759875E-02
-1.054091E+00
-2.227118E-01
-1.692974E+00
-5.796396E-01
-5.560487E-02
-6.246120E-04
-1.353311E-01
-3.699815E-03
-2.368737E+00
-1.143184E+00
-7.950086E-02
-1.286135E-03
-1.934892E-01
-7.618269E-03
-7.119767E+00
-1.030095E+01
-8.427628E-02
-1.442764E-03
-2.051141E-01
-8.546249E-03
-2.047651E+01
-8.426275E+01
-3.183786E-02
-2.037156E-04
-7.878057E-02
-1.247311E-03
-1.326415E+01
-3.519010E+01
-1.833688E-01
-6.726832E-03
-5.100312E-01
-5.204188E-02
+9.701818E-01
+1.885724E-01
+3.619962E-01
+2.624740E-02
+8.810264E-01
+1.554734E-01
+5.767221E-01
+6.667165E-02
+8.675429E-02
+1.508976E-03
+2.111426E-01
+8.938242E-03
+3.510185E-01
+2.488161E-02
+1.147307E-02
+2.656498E-05
+2.792316E-02
+1.573545E-04
+4.874578E-01
+4.838573E-02
+1.626869E-02
+5.388082E-05
+3.959473E-02
+3.191567E-04
+1.495984E+00
+4.549294E-01
+1.759493E-02
+6.295564E-05
+4.282306E-02
+3.729194E-04
+4.430601E+00
+3.944093E+00
+6.841763E-03
+9.403281E-06
+1.692946E-02
+5.757445E-05
+2.870670E+00
+1.648496E+00
+3.937215E-02
+3.101637E-04
+1.095116E-01
+2.399569E-03
+1.071187E+00
+2.297540E-01
+4.043214E-01
+3.274592E-02
+9.840375E-01
+1.939666E-01
+6.043491E-01
+7.317500E-02
+9.155169E-02
+1.679939E-03
+2.228185E-01
+9.950920E-03
+3.578809E-01
+2.590208E-02
+1.175437E-02
+2.791136E-05
+2.860779E-02
+1.653296E-04
+5.007414E-01
+5.108824E-02
+1.680608E-02
+5.747571E-05
+4.090264E-02
+3.404506E-04
+1.505100E+00
+4.603562E-01
+1.781573E-02
+6.447733E-05
+4.336044E-02
+3.819332E-04
+4.328647E+00
+3.765700E+00
+6.730396E-03
+9.104085E-06
+1.665389E-02
+5.574253E-05
+2.803934E+00
+1.572540E+00
+3.876306E-02
+3.006136E-04
+1.078175E-01
+2.325685E-03
diff --git a/tests/regression_tests/random_ray_linear/linear/results_true.dat b/tests/regression_tests/random_ray_linear/linear/results_true.dat
index 4c0e14370..77d41f373 100644
--- a/tests/regression_tests/random_ray_linear/linear/results_true.dat
+++ b/tests/regression_tests/random_ray_linear/linear/results_true.dat
@@ -1,171 +1,171 @@
 k-combined:
 1.095967E+00 1.543581E-02
 tally 1:
-2.548108E+01
-3.269093E+01
-9.271804E+00
-4.327275E+00
-2.256572E+01
-2.563210E+01
-1.816107E+01
-1.653421E+01
-2.659203E+00
-3.544951E-01
-6.471969E+00
-2.099810E+00
-1.364193E+01
-9.308675E+00
-4.362828E-01
-9.521133E-03
-1.061825E+00
-5.639730E-02
-1.746102E+01
-1.524680E+01
-5.733016E-01
-1.643671E-02
-1.395301E+00
-9.736092E-02
-4.539598E+01
-1.030472E+02
-5.263055E-01
-1.385088E-02
-1.280938E+00
-8.204609E-02
-9.945736E+01
-4.946716E+02
-1.505228E-01
-1.133424E-03
-3.724582E-01
-6.939732E-03
-5.324914E+01
-1.418809E+02
-7.219589E-01
-2.614875E-02
-2.008092E+00
-2.022988E-01
-4.188246E+01
-8.843469E+01
+5.425537E+00
+1.482137E+00
+1.974189E+00
+1.961888E-01
+4.804781E+00
+1.162101E+00
+3.866915E+00
+7.496163E-01
+5.662059E-01
+1.607180E-02
+1.378032E+00
+9.519943E-02
+2.904666E+00
+4.220197E-01
+9.289413E-02
+4.316514E-04
+2.260857E-01
+2.556836E-03
+3.717829E+00
+6.912286E-01
+1.220682E-01
+7.451721E-04
+2.970897E-01
+4.413940E-03
+9.665773E+00
+4.671720E+00
+1.120617E-01
+6.279393E-04
+2.727390E-01
+3.719615E-03
+2.117656E+01
+2.242614E+01
+3.204951E-02
+5.138445E-05
+7.930426E-02
+3.146169E-04
+1.133784E+01
+6.432186E+00
+1.537206E-01
+1.185474E-03
+4.275660E-01
+9.171376E-03
+8.917756E+00
+4.009380E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-2.224363E+01
-2.481131E+01
+4.736166E+00
+1.124858E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-1.436097E+01
-1.031496E+01
+3.057755E+00
+4.676344E-01
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-1.901248E+01
-1.807657E+01
+4.048156E+00
+8.195089E-01
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-4.559337E+01
-1.039424E+02
+9.707791E+00
+4.712281E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-8.802992E+01
-3.874925E+02
+1.874344E+01
+1.756722E+01
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-4.506602E+01
-1.016497E+02
+9.595520E+00
+4.608366E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-2.207833E+01
-2.455068E+01
-8.139772E+00
-3.337974E+00
-1.981058E+01
-1.977210E+01
-1.710407E+01
-1.466648E+01
-2.542287E+00
-3.240467E-01
-6.187418E+00
-1.919453E+00
-1.342690E+01
-9.017908E+00
-4.362263E-01
-9.518695E-03
-1.061688E+00
-5.638286E-02
-1.713924E+01
-1.469065E+01
-5.714028E-01
-1.632839E-02
-1.390680E+00
-9.671931E-02
-4.539193E+01
-1.030326E+02
-5.345254E-01
-1.428719E-02
-1.300944E+00
-8.463057E-02
-1.013270E+02
-5.134168E+02
-1.555517E-01
-1.210145E-03
-3.849017E-01
-7.409480E-03
-5.377836E+01
-1.446537E+02
-7.374053E-01
-2.722908E-02
-2.051056E+00
-2.106567E-01
-2.522726E+01
-3.202007E+01
-9.366659E+00
-4.412278E+00
-2.279657E+01
-2.613561E+01
-1.803368E+01
-1.629756E+01
-2.696490E+00
-3.643066E-01
-6.562716E+00
-2.157928E+00
-1.357447E+01
-9.216150E+00
-4.437305E-01
-9.847287E-03
-1.079951E+00
-5.832923E-02
-1.735848E+01
-1.506775E+01
-5.825173E-01
-1.696803E-02
-1.417731E+00
-1.005081E-01
-4.519297E+01
-1.021280E+02
-5.357712E-01
-1.435322E-02
-1.303976E+00
-8.502167E-02
-9.934508E+01
-4.935314E+02
-1.538761E-01
-1.184229E-03
-3.807556E-01
-7.250804E-03
-5.335839E+01
-1.424221E+02
-7.404823E-01
-2.747396E-02
-2.059614E+00
-2.125512E-01
+4.701002E+00
+1.113069E+00
+1.733152E+00
+1.513360E-01
+4.218145E+00
+8.964208E-01
+3.641849E+00
+6.649342E-01
+5.413112E-01
+1.469131E-02
+1.317443E+00
+8.702223E-02
+2.858878E+00
+4.088359E-01
+9.288202E-02
+4.315389E-04
+2.260562E-01
+2.556170E-03
+3.649312E+00
+6.660131E-01
+1.216639E-01
+7.402611E-04
+2.961057E-01
+4.384849E-03
+9.664912E+00
+4.671059E+00
+1.138118E-01
+6.477188E-04
+2.769985E-01
+3.836780E-03
+2.157464E+01
+2.327600E+01
+3.312018E-02
+5.486221E-05
+8.195357E-02
+3.359106E-04
+1.145052E+01
+6.557893E+00
+1.570084E-01
+1.234420E-03
+4.367109E-01
+9.550040E-03
+5.371474E+00
+1.451702E+00
+1.994382E+00
+2.000414E-01
+4.853928E+00
+1.184921E+00
+3.839778E+00
+7.388780E-01
+5.741437E-01
+1.651648E-02
+1.397351E+00
+9.783345E-02
+2.890296E+00
+4.178220E-01
+9.447974E-02
+4.464346E-04
+2.299448E-01
+2.644403E-03
+3.695989E+00
+6.831063E-01
+1.240303E-01
+7.692555E-04
+3.018649E-01
+4.556594E-03
+9.622545E+00
+4.630042E+00
+1.140770E-01
+6.507108E-04
+2.776440E-01
+3.854503E-03
+2.115266E+01
+2.237450E+01
+3.276343E-02
+5.368742E-05
+8.107083E-02
+3.287176E-04
+1.136109E+01
+6.456700E+00
+1.576636E-01
+1.245524E-03
+4.385334E-01
+9.635950E-03
diff --git a/tests/regression_tests/random_ray_linear/linear_xy/results_true.dat b/tests/regression_tests/random_ray_linear/linear_xy/results_true.dat
index abfd03c06..052608b42 100644
--- a/tests/regression_tests/random_ray_linear/linear_xy/results_true.dat
+++ b/tests/regression_tests/random_ray_linear/linear_xy/results_true.dat
@@ -1,171 +1,171 @@
 k-combined:
 1.104727E+00 1.593303E-02
 tally 1:
-2.566934E+01
-3.317503E+01
-9.417202E+00
-4.465518E+00
-2.291958E+01
-2.645097E+01
-1.823903E+01
-1.667438E+01
-2.679931E+00
-3.600420E-01
-6.522415E+00
-2.132667E+00
-1.365623E+01
-9.327448E+00
-4.370682E-01
-9.554968E-03
-1.063736E+00
-5.659772E-02
-1.750634E+01
-1.532609E+01
-5.762870E-01
-1.660889E-02
-1.402567E+00
-9.838082E-02
-4.543609E+01
-1.032286E+02
-5.271287E-01
-1.389456E-02
-1.282941E+00
-8.230483E-02
-9.881678E+01
-4.882586E+02
-1.487616E-01
-1.106634E-03
-3.681003E-01
-6.775702E-03
-5.260781E+01
-1.384126E+02
-7.018594E-01
-2.464953E-02
-1.952187E+00
-1.907001E-01
-4.184779E+01
-8.826530E+01
+5.465547E+00
+1.504031E+00
+2.005120E+00
+2.024490E-01
+4.880060E+00
+1.199182E+00
+3.883466E+00
+7.559482E-01
+5.706123E-01
+1.632280E-02
+1.388756E+00
+9.668619E-02
+2.907681E+00
+4.228621E-01
+9.306046E-02
+4.331768E-04
+2.264905E-01
+2.565871E-03
+3.727441E+00
+6.948089E-01
+1.227027E-01
+7.529631E-04
+2.986338E-01
+4.460088E-03
+9.674219E+00
+4.679846E+00
+1.122358E-01
+6.299070E-04
+2.731629E-01
+3.731271E-03
+2.103996E+01
+2.213497E+01
+3.167421E-02
+5.016895E-05
+7.837561E-02
+3.071747E-04
+1.120119E+01
+6.274853E+00
+1.494396E-01
+1.117486E-03
+4.156586E-01
+8.645390E-03
+8.910289E+00
+4.001626E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-2.226932E+01
-2.486554E+01
+4.741600E+00
+1.127303E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-1.441107E+01
-1.038682E+01
+3.068401E+00
+4.708885E-01
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-1.909194E+01
-1.822767E+01
+4.065045E+00
+8.263510E-01
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-4.579319E+01
-1.048559E+02
+9.750251E+00
+4.753623E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-8.833276E+01
-3.901410E+02
+1.880773E+01
+1.768690E+01
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-4.528911E+01
-1.025740E+02
+9.642921E+00
+4.650165E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
 0.000000E+00
-2.218278E+01
-2.477434E+01
-8.203467E+00
-3.389915E+00
-1.996560E+01
-2.007976E+01
-1.714818E+01
-1.473927E+01
-2.551034E+00
-3.262450E-01
-6.208707E+00
-1.932474E+00
-1.343470E+01
-9.027502E+00
-4.363259E-01
-9.522121E-03
-1.061930E+00
-5.640315E-02
-1.717034E+01
-1.474381E+01
-5.729720E-01
-1.641841E-02
-1.394499E+00
-9.725251E-02
-4.542715E+01
-1.031896E+02
-5.348128E-01
-1.430232E-02
-1.301643E+00
-8.472019E-02
-1.009076E+02
-5.091264E+02
-1.543547E-01
-1.191320E-03
-3.819398E-01
-7.294216E-03
-5.342751E+01
-1.427427E+02
-7.255554E-01
-2.633014E-02
-2.018096E+00
-2.037021E-01
-2.540053E+01
-3.247261E+01
-9.483956E+00
-4.526477E+00
-2.308205E+01
-2.681205E+01
-1.812760E+01
-1.646855E+01
-2.717374E+00
-3.700301E-01
-6.613545E+00
-2.191830E+00
-1.362672E+01
-9.286907E+00
-4.458292E-01
-9.940508E-03
-1.085059E+00
-5.888142E-02
-1.744511E+01
-1.521876E+01
-5.866632E-01
-1.721091E-02
-1.427821E+00
-1.019468E-01
-4.538426E+01
-1.029941E+02
-5.385934E-01
-1.450495E-02
-1.310845E+00
-8.592045E-02
-9.921424E+01
-4.921945E+02
-1.532444E-01
-1.174272E-03
-3.791926E-01
-7.189835E-03
-5.301633E+01
-1.405571E+02
-7.285745E-01
-2.655093E-02
-2.026493E+00
-2.054102E-01
+4.723189E+00
+1.123179E+00
+1.746692E+00
+1.536860E-01
+4.251098E+00
+9.103405E-01
+3.651202E+00
+6.682179E-01
+5.431675E-01
+1.479058E-02
+1.321961E+00
+8.761024E-02
+2.860513E+00
+4.092640E-01
+9.290237E-02
+4.316867E-04
+2.261058E-01
+2.557045E-03
+3.655900E+00
+6.684112E-01
+1.219969E-01
+7.443277E-04
+2.969160E-01
+4.408937E-03
+9.672316E+00
+4.678082E+00
+1.138719E-01
+6.483917E-04
+2.771448E-01
+3.840766E-03
+2.148514E+01
+2.308100E+01
+3.286501E-02
+5.400774E-05
+8.132216E-02
+3.306788E-04
+1.137571E+01
+6.471140E+00
+1.544841E-01
+1.193653E-03
+4.296897E-01
+9.234647E-03
+5.408307E+00
+1.472183E+00
+2.019332E+00
+2.052123E-01
+4.914651E+00
+1.215551E+00
+3.859737E+00
+7.466141E-01
+5.785840E-01
+1.677554E-02
+1.408158E+00
+9.936796E-02
+2.901397E+00
+4.210234E-01
+9.492573E-02
+4.506531E-04
+2.310302E-01
+2.669390E-03
+3.714401E+00
+6.899411E-01
+1.249118E-01
+7.802521E-04
+3.040104E-01
+4.621732E-03
+9.663183E+00
+4.669215E+00
+1.146768E-01
+6.575767E-04
+2.791038E-01
+3.895173E-03
+2.112461E+01
+2.231346E+01
+3.262864E-02
+5.323508E-05
+8.073730E-02
+3.259479E-04
+1.128817E+01
+6.372070E+00
+1.551272E-01
+1.203670E-03
+4.314785E-01
+9.312148E-03

From ad5a876bee9f3e3b96ddc28867fdec0028cb7587 Mon Sep 17 00:00:00 2001
From: John Tramm <john.tramm@gmail.com>
Date: Wed, 3 Dec 2025 01:48:38 -0600
Subject: [PATCH 170/203] Improved automatic MGXS generation for random ray
 (#3658)

Co-authored-by: Paul Romano <paul.k.romano@gmail.com>
---
 docs/source/usersguide/random_ray.rst         |  28 ++-
 openmc/model/model.py                         | 186 +++++++++++++++---
 .../infinite_medium/results_true.dat          |   2 +-
 .../stochastic_slab/results_true.dat          |   2 +-
 .../__init__.py                               |   0
 .../infinite_medium/model/inputs_true.dat     |  61 ++++++
 .../infinite_medium/model/results_true.dat    |   2 +
 .../infinite_medium/user/inputs_true.dat      |  64 ++++++
 .../infinite_medium/user/results_true.dat     |   2 +
 .../stochastic_slab/model/inputs_true.dat     |  61 ++++++
 .../stochastic_slab/model/results_true.dat    |   2 +
 .../stochastic_slab/user/inputs_true.dat      |  64 ++++++
 .../stochastic_slab/user/results_true.dat     |   2 +
 .../test.py                                   |  66 +++++++
 14 files changed, 511 insertions(+), 31 deletions(-)
 create mode 100644 tests/regression_tests/random_ray_auto_convert_source_energy/__init__.py
 create mode 100644 tests/regression_tests/random_ray_auto_convert_source_energy/infinite_medium/model/inputs_true.dat
 create mode 100644 tests/regression_tests/random_ray_auto_convert_source_energy/infinite_medium/model/results_true.dat
 create mode 100644 tests/regression_tests/random_ray_auto_convert_source_energy/infinite_medium/user/inputs_true.dat
 create mode 100644 tests/regression_tests/random_ray_auto_convert_source_energy/infinite_medium/user/results_true.dat
 create mode 100644 tests/regression_tests/random_ray_auto_convert_source_energy/stochastic_slab/model/inputs_true.dat
 create mode 100644 tests/regression_tests/random_ray_auto_convert_source_energy/stochastic_slab/model/results_true.dat
 create mode 100644 tests/regression_tests/random_ray_auto_convert_source_energy/stochastic_slab/user/inputs_true.dat
 create mode 100644 tests/regression_tests/random_ray_auto_convert_source_energy/stochastic_slab/user/results_true.dat
 create mode 100644 tests/regression_tests/random_ray_auto_convert_source_energy/test.py

diff --git a/docs/source/usersguide/random_ray.rst b/docs/source/usersguide/random_ray.rst
index d5d752a83..881498a0a 100644
--- a/docs/source/usersguide/random_ray.rst
+++ b/docs/source/usersguide/random_ray.rst
@@ -644,7 +644,8 @@ model to use these multigroup cross sections. An example is given below::
       nparticles=2000,
       overwrite_mgxs_library=False,
       mgxs_path="mgxs.h5",
-      correction=None
+      correction=None,
+      source_energy=None
   )
 
 The most important parameter to set is the ``method`` parameter, which can be
@@ -706,6 +707,31 @@ generation and use an existing library file.
     with a :math:`\rho` default value of 1.0, which can be adjusted with the
     ``settings.random_ray['diagonal_stabilization_rho']`` parameter.
 
+When generating MGXS data with either the ``stochastic_slab`` or
+``infinite_medium`` methods, by default the simulation will use a uniform source
+distribution spread evenly over all energy groups. This ensures that all energy
+groups receive tallies and therefore produce non-zero total multigroup cross
+sections. Additionally, the function will convert any sources in the model into
+simplified spatial sources that retain the original energy distributions.  If
+sources are present, they will be used 99% of the time to sample source energies
+during MGXS generation. The other 1% of the time, energies will be sampled
+uniformly over all energy groups to ensure that all groups receive some tallies.
+However, the user may wish to specify a different source energy spectrum (for
+instance, if they are using a FileSource, such that the energy distribution
+cannot be extracted from the python source object). This can be done by
+providing a :class:`openmc.stats.Univariate` distribution as the
+``source_energy`` parameter of the :meth:`openmc.Model.convert_to_multigroup`
+method. If provided, it will override any sources present in the model and will
+be used 99% of the time to sample source energies during MGXS generation. The
+other 1% of the time, energies will be sampled uniformly over all energy groups
+to ensure that all groups receive some tallies.
+
+For instance, a D-D fusion simulation may involve a complex file source. In this
+case, the user may wish to provide a discrete 2.45 MeV energy source
+distribution for MGXS generation as::
+
+  source_energy = openmc.stats.delta_function(2.45e6)
+
 Ultimately, the methods described above are all just approximations.
 Approximations in the generated MGXS data will fundamentally limit the potential
 accuracy of the random ray solver. However, the methods described above are all
diff --git a/openmc/model/model.py b/openmc/model/model.py
index 48ae9f0b9..299724759 100644
--- a/openmc/model/model.py
+++ b/openmc/model/model.py
@@ -1687,6 +1687,91 @@ class Model:
                 self.geometry.get_all_materials().values()
             )
 
+    def _create_mgxs_sources(
+        self,
+        groups: openmc.mgxs.EnergyGroups,
+        spatial_dist: openmc.stats.Spatial,
+        source_energy: openmc.stats.Univariate | None = None,
+    ) -> list[openmc.IndependentSource]:
+        """Create a list of independent sources to use with MGXS generation.
+
+        Note that in all cases, a discrete source that is uniform over all
+        energy groups is created (strength = 0.01) to ensure that total cross
+        sections are generated for all energy groups. In the case that the user
+        has provided a source_energy distribution as an argument, an additional
+        source (strength = 0.99) is created using that energy distribution. If
+        the user has not provided a source_energy distribution, but the model
+        has sources defined, and all of those sources are of IndependentSource
+        type, then additional sources are created based on the model's existing
+        sources, keeping their energy distributions but replacing their
+        spatial/angular distributions, with their combined strength being 0.99.
+        If the user has not provided a source_energy distribution and no sources
+        are defined on the model and the run mode is 'eigenvalue', then a
+        default Watt spectrum source (strength = 0.99) is added.
+
+        Parameters
+        ----------
+        groups : openmc.mgxs.EnergyGroups
+            Energy group structure for the MGXS.
+        spatial_dist : openmc.stats.Spatial
+            Spatial distribution to use for all sources.
+        source_energy : openmc.stats.Univariate, optional
+            Energy distribution to use when generating MGXS data, replacing any
+            existing sources in the model.
+
+        Returns
+        -------
+        list[openmc.IndependentSource]
+            A list of independent sources to use for MGXS generation.
+        """
+        # Make a discrete source that is uniform over the bins of the group structure
+        midpoints = []
+        strengths = []
+        for i in range(groups.num_groups):
+            bounds = groups.get_group_bounds(i+1)
+            midpoints.append((bounds[0] + bounds[1]) / 2.0)
+            strengths.append(1.0)
+
+        uniform_energy = openmc.stats.Discrete(x=midpoints, p=strengths)
+        uniform_distribution = openmc.IndependentSource(spatial_dist, energy=uniform_energy, strength=0.01)
+        sources = [uniform_distribution]
+
+        # If the user provided an energy distribution, use that
+        if source_energy is not None:
+            user_energy = openmc.IndependentSource(
+                space=spatial_dist, energy=source_energy, strength=0.99)
+            sources.append(user_energy)
+
+        # If the user did not provide an energy distribution, create sources
+        # based on what is in their model, keeping the energy spectrum but
+        # replacing the spatial/angular distributions. We only do this if ALL
+        # sources are of IndependentSource type, as we can't pull the energy
+        # distribution from e.g. CompiledSource or FileSource types.
+        else:
+            if self.settings.source is not None:
+                for src in self.settings.source:
+                    if not isinstance(src, openmc.IndependentSource):
+                        break
+                else:
+                    n_user_sources = len(self.settings.source)
+                    for src in self.settings.source:
+                        # Create a new IndependentSource with adjusted strength, space, and angle
+                        user_source = openmc.IndependentSource(
+                            space=spatial_dist,
+                            energy=src.energy,
+                            strength=0.99 / n_user_sources
+                        )
+                        sources.append(user_source)
+            else:
+                # No user sources defined. If we are in eigenvalue mode, then use the default Watt spectrum.
+                if self.settings.run_mode == 'eigenvalue':
+                    watt_energy = openmc.stats.Watt()
+                    watt_source = openmc.IndependentSource(
+                        space=spatial_dist, energy=watt_energy, strength=0.99)
+                    sources.append(watt_source)
+
+        return sources
+
     def _generate_infinite_medium_mgxs(
         self,
         groups: openmc.mgxs.EnergyGroups,
@@ -1694,6 +1779,7 @@ class Model:
         mgxs_path: PathLike,
         correction: str | None,
         directory: PathLike,
+        source_energy: openmc.stats.Univariate | None = None,
     ):
         """Generate a MGXS library by running multiple OpenMC simulations, each
         representing an infinite medium simulation of a single isolated
@@ -1702,6 +1788,20 @@ class Model:
         method that ignores all spatial self shielding effects and all resonance
         shielding effects between materials.
 
+        Note that in all cases, a discrete source that is uniform over all
+        energy groups is created (strength = 0.01) to ensure that total cross
+        sections are generated for all energy groups. In the case that the user
+        has provided a source_energy distribution as an argument, an additional
+        source (strength = 0.99) is created using that energy distribution. If
+        the user has not provided a source_energy distribution, but the model
+        has sources defined, and all of those sources are of IndependentSource
+        type, then additional sources are created based on the model's existing
+        sources, keeping their energy distributions but replacing their
+        spatial/angular distributions, with their combined strength being 0.99.
+        If the user has not provided a source_energy distribution and no sources
+        are defined on the model and the run mode is 'eigenvalue', then a
+        default Watt spectrum source (strength = 0.99) is added.
+
         Parameters
         ----------
         groups : openmc.mgxs.EnergyGroups
@@ -1715,9 +1815,10 @@ class Model:
             "P0".
         directory : str
             Directory to run the simulation in, so as to contain XML files.
+        source_energy : openmc.stats.Univariate, optional
+            Energy distribution to use when generating MGXS data, replacing any
+            existing sources in the model.
         """
-        warnings.warn("The infinite medium method of generating MGXS may hang "
-                      "if a material has a k-infinity > 1.0.")
         mgxs_sets = []
         for material in self.materials:
             model = openmc.Model()
@@ -1728,20 +1829,16 @@ class Model:
             # Settings
             model.settings.batches = 100
             model.settings.particles = nparticles
+
+            model.settings.source = self._create_mgxs_sources(
+                groups,
+                spatial_dist=openmc.stats.Point(),
+                source_energy=source_energy
+            )
+
             model.settings.run_mode = 'fixed source'
+            model.settings.create_fission_neutrons = False
 
-            # Make a discrete source that is uniform over the bins of the group structure
-            n_groups = groups.num_groups
-            midpoints = []
-            strengths = []
-            for i in range(n_groups):
-                bounds = groups.get_group_bounds(i+1)
-                midpoints.append((bounds[0] + bounds[1]) / 2.0)
-                strengths.append(1.0)
-
-            energy_distribution = openmc.stats.Discrete(x=midpoints, p=strengths)
-            model.settings.source = openmc.IndependentSource(
-                space=openmc.stats.Point(), energy=energy_distribution)
             model.settings.output = {'summary': True, 'tallies': False}
 
             # Geometry
@@ -1891,6 +1988,7 @@ class Model:
         mgxs_path: PathLike,
         correction: str | None,
         directory: PathLike,
+        source_energy: openmc.stats.Univariate | None = None,
     ) -> None:
         """Generate MGXS assuming a stochastic "sandwich" of materials in a layered
         slab geometry. While geometry-specific spatial shielding effects are not
@@ -1915,6 +2013,23 @@ class Model:
             "P0".
         directory : str
             Directory to run the simulation in, so as to contain XML files.
+        source_energy : openmc.stats.Univariate, optional
+            Energy distribution to use when generating MGXS data, replacing any
+            existing sources in the model. In all cases, a discrete source that
+            is uniform over all energy groups is created (strength = 0.01) to
+            ensure that total cross sections are generated for all energy
+            groups. In the case that the user has provided a source_energy
+            distribution as an argument, an additional source (strength = 0.99)
+            is created using that energy distribution. If the user has not
+            provided a source_energy distribution, but the model has sources
+            defined, and all of those sources are of IndependentSource type,
+            then additional sources are created based on the model's existing
+            sources, keeping their energy distributions but replacing their
+            spatial/angular distributions, with their combined strength being
+            0.99. If the user has not provided a source_energy distribution and
+            no sources are defined on the model and the run mode is
+            'eigenvalue', then a default Watt spectrum source (strength = 0.99)
+            is added.
         """
         model = openmc.Model()
         model.materials = self.materials
@@ -1924,24 +2039,20 @@ class Model:
         model.settings.inactive = 100
         model.settings.particles = nparticles
         model.settings.output = {'summary': True, 'tallies': False}
-        model.settings.run_mode = self.settings.run_mode
 
         # Stochastic slab geometry
         model.geometry, spatial_distribution = Model._create_stochastic_slab_geometry(
             model.materials)
 
-        # Make a discrete source that is uniform over the bins of the group structure
-        n_groups = groups.num_groups
-        midpoints = []
-        strengths = []
-        for i in range(n_groups):
-            bounds = groups.get_group_bounds(i+1)
-            midpoints.append((bounds[0] + bounds[1]) / 2.0)
-            strengths.append(1.0)
+        # Define the sources
+        model.settings.source = self._create_mgxs_sources(
+            groups,
+            spatial_dist=spatial_distribution,
+            source_energy=source_energy
+        )
 
-        energy_distribution = openmc.stats.Discrete(x=midpoints, p=strengths)
-        model.settings.source = [openmc.IndependentSource(
-            space=spatial_distribution, energy=energy_distribution, strength=1.0)]
+        model.settings.run_mode = 'fixed source'
+        model.settings.create_fission_neutrons = False
 
         model.settings.output = {'summary': True, 'tallies': False}
 
@@ -2099,6 +2210,7 @@ class Model:
         overwrite_mgxs_library: bool = False,
         mgxs_path: PathLike = "mgxs.h5",
         correction: str | None = None,
+        source_energy: openmc.stats.Univariate | None = None,
     ):
         """Convert all materials from continuous energy to multigroup.
 
@@ -2121,6 +2233,24 @@ class Model:
         correction : str, optional
             Transport correction to apply to the MGXS. Options are None and
             "P0".
+        source_energy : openmc.stats.Univariate, optional
+            Energy distribution to use when generating MGXS data, replacing any
+            existing sources in the model. In all cases, a discrete source that
+            is uniform over all energy groups is created (strength = 0.01) to
+            ensure that total cross sections are generated for all energy
+            groups. In the case that the user has provided a source_energy
+            distribution as an argument, an additional source (strength = 0.99)
+            is created using that energy distribution. If the user has not
+            provided a source_energy distribution, but the model has sources
+            defined, and all of those sources are of IndependentSource type,
+            then additional sources are created based on the model's existing
+            sources, keeping their energy distributions but replacing their
+            spatial/angular distributions, with their combined strength being
+            0.99. If the user has not provided a source_energy distribution and
+            no sources are defined on the model and the run mode is
+            'eigenvalue', then a default Watt spectrum source (strength = 0.99)
+            is added. Note that this argument is only used when using the
+            "stochastic_slab" or "infinite_medium" MGXS generation methods.
         """
         if isinstance(groups, str):
             groups = openmc.mgxs.EnergyGroups(groups)
@@ -2150,13 +2280,13 @@ class Model:
             if not Path(mgxs_path).is_file() or overwrite_mgxs_library:
                 if method == "infinite_medium":
                     self._generate_infinite_medium_mgxs(
-                        groups, nparticles, mgxs_path, correction, tmpdir)
+                        groups, nparticles, mgxs_path, correction, tmpdir, source_energy)
                 elif method == "material_wise":
                     self._generate_material_wise_mgxs(
                         groups, nparticles, mgxs_path, correction, tmpdir)
                 elif method == "stochastic_slab":
                     self._generate_stochastic_slab_mgxs(
-                        groups, nparticles, mgxs_path, correction, tmpdir)
+                        groups, nparticles, mgxs_path, correction, tmpdir, source_energy)
                 else:
                     raise ValueError(
                         f'MGXS generation method "{method}" not recognized')
diff --git a/tests/regression_tests/random_ray_auto_convert/infinite_medium/results_true.dat b/tests/regression_tests/random_ray_auto_convert/infinite_medium/results_true.dat
index ee396fa74..f984f3718 100644
--- a/tests/regression_tests/random_ray_auto_convert/infinite_medium/results_true.dat
+++ b/tests/regression_tests/random_ray_auto_convert/infinite_medium/results_true.dat
@@ -1,2 +1,2 @@
 k-combined:
-7.797252E-01 1.055731E-02
+7.479770E-01 1.624548E-02
diff --git a/tests/regression_tests/random_ray_auto_convert/stochastic_slab/results_true.dat b/tests/regression_tests/random_ray_auto_convert/stochastic_slab/results_true.dat
index 86e08a710..674dee4aa 100644
--- a/tests/regression_tests/random_ray_auto_convert/stochastic_slab/results_true.dat
+++ b/tests/regression_tests/random_ray_auto_convert/stochastic_slab/results_true.dat
@@ -1,2 +1,2 @@
 k-combined:
-7.496641E-01 8.282032E-03
+6.413334E-01 2.083132E-02
diff --git a/tests/regression_tests/random_ray_auto_convert_source_energy/__init__.py b/tests/regression_tests/random_ray_auto_convert_source_energy/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/regression_tests/random_ray_auto_convert_source_energy/infinite_medium/model/inputs_true.dat b/tests/regression_tests/random_ray_auto_convert_source_energy/infinite_medium/model/inputs_true.dat
new file mode 100644
index 000000000..80a166c67
--- /dev/null
+++ b/tests/regression_tests/random_ray_auto_convert_source_energy/infinite_medium/model/inputs_true.dat
@@ -0,0 +1,61 @@
+<?xml version='1.0' encoding='utf-8'?>
+<model>
+  <materials>
+    <cross_sections>mgxs.h5</cross_sections>
+    <material id="1" name="UO2__2_4__" depletable="true">
+      <density value="1.0" units="macro"/>
+      <macroscopic name="UO2__2_4__"/>
+    </material>
+    <material id="2" name="Zircaloy">
+      <density value="1.0" units="macro"/>
+      <macroscopic name="Zircaloy"/>
+    </material>
+    <material id="3" name="Hot_borated_water">
+      <density value="1.0" units="macro"/>
+      <macroscopic name="Hot_borated_water"/>
+    </material>
+  </materials>
+  <geometry>
+    <cell id="1" name="Fuel" material="1" region="-1" universe="0"/>
+    <cell id="2" name="Cladding" material="2" region="1 -2" universe="0"/>
+    <cell id="3" name="Water" material="3" region="2 3 -4 5 -6" universe="0"/>
+    <surface id="1" name="Fuel OR" type="z-cylinder" coeffs="0 0 0.39218"/>
+    <surface id="2" name="Clad OR" type="z-cylinder" coeffs="0 0 0.4572"/>
+    <surface id="3" name="left" type="x-plane" boundary="reflective" coeffs="-0.63"/>
+    <surface id="4" name="right" type="x-plane" boundary="reflective" coeffs="0.63"/>
+    <surface id="5" name="bottom" type="y-plane" boundary="reflective" coeffs="-0.63"/>
+    <surface id="6" name="top" type="y-plane" boundary="reflective" coeffs="0.63"/>
+  </geometry>
+  <settings>
+    <run_mode>eigenvalue</run_mode>
+    <particles>100</particles>
+    <batches>10</batches>
+    <inactive>5</inactive>
+    <source type="independent" strength="1.0" particle="neutron">
+      <energy type="discrete">
+        <parameters>7000000.0 1.0</parameters>
+      </energy>
+    </source>
+    <energy_mode>multi-group</energy_mode>
+    <random_ray>
+      <source type="independent" strength="1.0" particle="neutron">
+        <space type="box">
+          <parameters>-0.63 -0.63 -1.0 0.63 0.63 1.0</parameters>
+        </space>
+      </source>
+      <distance_inactive>30.0</distance_inactive>
+      <distance_active>150.0</distance_active>
+      <source_region_meshes>
+        <mesh id="1">
+          <domain id="0" type="universe"/>
+        </mesh>
+      </source_region_meshes>
+      <source_shape>linear</source_shape>
+    </random_ray>
+    <mesh id="1">
+      <dimension>2 2</dimension>
+      <lower_left>-0.63 -0.63</lower_left>
+      <upper_right>0.63 0.63</upper_right>
+    </mesh>
+  </settings>
+  </model>
diff --git a/tests/regression_tests/random_ray_auto_convert_source_energy/infinite_medium/model/results_true.dat b/tests/regression_tests/random_ray_auto_convert_source_energy/infinite_medium/model/results_true.dat
new file mode 100644
index 000000000..1fb09fd68
--- /dev/null
+++ b/tests/regression_tests/random_ray_auto_convert_source_energy/infinite_medium/model/results_true.dat
@@ -0,0 +1,2 @@
+k-combined:
+7.657815E-01 2.317564E-02
diff --git a/tests/regression_tests/random_ray_auto_convert_source_energy/infinite_medium/user/inputs_true.dat b/tests/regression_tests/random_ray_auto_convert_source_energy/infinite_medium/user/inputs_true.dat
new file mode 100644
index 000000000..464c89a5d
--- /dev/null
+++ b/tests/regression_tests/random_ray_auto_convert_source_energy/infinite_medium/user/inputs_true.dat
@@ -0,0 +1,64 @@
+<?xml version='1.0' encoding='utf-8'?>
+<model>
+  <materials>
+    <cross_sections>mgxs.h5</cross_sections>
+    <material id="1" name="UO2__2_4__" depletable="true">
+      <density value="1.0" units="macro"/>
+      <macroscopic name="UO2__2_4__"/>
+    </material>
+    <material id="2" name="Zircaloy">
+      <density value="1.0" units="macro"/>
+      <macroscopic name="Zircaloy"/>
+    </material>
+    <material id="3" name="Hot_borated_water">
+      <density value="1.0" units="macro"/>
+      <macroscopic name="Hot_borated_water"/>
+    </material>
+  </materials>
+  <geometry>
+    <cell id="1" name="Fuel" material="1" region="-1" universe="0"/>
+    <cell id="2" name="Cladding" material="2" region="1 -2" universe="0"/>
+    <cell id="3" name="Water" material="3" region="2 3 -4 5 -6" universe="0"/>
+    <surface id="1" name="Fuel OR" type="z-cylinder" coeffs="0 0 0.39218"/>
+    <surface id="2" name="Clad OR" type="z-cylinder" coeffs="0 0 0.4572"/>
+    <surface id="3" name="left" type="x-plane" boundary="reflective" coeffs="-0.63"/>
+    <surface id="4" name="right" type="x-plane" boundary="reflective" coeffs="0.63"/>
+    <surface id="5" name="bottom" type="y-plane" boundary="reflective" coeffs="-0.63"/>
+    <surface id="6" name="top" type="y-plane" boundary="reflective" coeffs="0.63"/>
+  </geometry>
+  <settings>
+    <run_mode>eigenvalue</run_mode>
+    <particles>100</particles>
+    <batches>10</batches>
+    <inactive>5</inactive>
+    <source type="independent" strength="1.0" particle="neutron">
+      <space type="box">
+        <parameters>-0.63 -0.63 -1 0.63 0.63 1</parameters>
+      </space>
+      <constraints>
+        <fissionable>true</fissionable>
+      </constraints>
+    </source>
+    <energy_mode>multi-group</energy_mode>
+    <random_ray>
+      <source type="independent" strength="1.0" particle="neutron">
+        <space type="box">
+          <parameters>-0.63 -0.63 -1.0 0.63 0.63 1.0</parameters>
+        </space>
+      </source>
+      <distance_inactive>30.0</distance_inactive>
+      <distance_active>150.0</distance_active>
+      <source_region_meshes>
+        <mesh id="1">
+          <domain id="0" type="universe"/>
+        </mesh>
+      </source_region_meshes>
+      <source_shape>linear</source_shape>
+    </random_ray>
+    <mesh id="1">
+      <dimension>2 2</dimension>
+      <lower_left>-0.63 -0.63</lower_left>
+      <upper_right>0.63 0.63</upper_right>
+    </mesh>
+  </settings>
+  </model>
diff --git a/tests/regression_tests/random_ray_auto_convert_source_energy/infinite_medium/user/results_true.dat b/tests/regression_tests/random_ray_auto_convert_source_energy/infinite_medium/user/results_true.dat
new file mode 100644
index 000000000..073c5c99f
--- /dev/null
+++ b/tests/regression_tests/random_ray_auto_convert_source_energy/infinite_medium/user/results_true.dat
@@ -0,0 +1,2 @@
+k-combined:
+7.827784E-01 2.062954E-02
diff --git a/tests/regression_tests/random_ray_auto_convert_source_energy/stochastic_slab/model/inputs_true.dat b/tests/regression_tests/random_ray_auto_convert_source_energy/stochastic_slab/model/inputs_true.dat
new file mode 100644
index 000000000..80a166c67
--- /dev/null
+++ b/tests/regression_tests/random_ray_auto_convert_source_energy/stochastic_slab/model/inputs_true.dat
@@ -0,0 +1,61 @@
+<?xml version='1.0' encoding='utf-8'?>
+<model>
+  <materials>
+    <cross_sections>mgxs.h5</cross_sections>
+    <material id="1" name="UO2__2_4__" depletable="true">
+      <density value="1.0" units="macro"/>
+      <macroscopic name="UO2__2_4__"/>
+    </material>
+    <material id="2" name="Zircaloy">
+      <density value="1.0" units="macro"/>
+      <macroscopic name="Zircaloy"/>
+    </material>
+    <material id="3" name="Hot_borated_water">
+      <density value="1.0" units="macro"/>
+      <macroscopic name="Hot_borated_water"/>
+    </material>
+  </materials>
+  <geometry>
+    <cell id="1" name="Fuel" material="1" region="-1" universe="0"/>
+    <cell id="2" name="Cladding" material="2" region="1 -2" universe="0"/>
+    <cell id="3" name="Water" material="3" region="2 3 -4 5 -6" universe="0"/>
+    <surface id="1" name="Fuel OR" type="z-cylinder" coeffs="0 0 0.39218"/>
+    <surface id="2" name="Clad OR" type="z-cylinder" coeffs="0 0 0.4572"/>
+    <surface id="3" name="left" type="x-plane" boundary="reflective" coeffs="-0.63"/>
+    <surface id="4" name="right" type="x-plane" boundary="reflective" coeffs="0.63"/>
+    <surface id="5" name="bottom" type="y-plane" boundary="reflective" coeffs="-0.63"/>
+    <surface id="6" name="top" type="y-plane" boundary="reflective" coeffs="0.63"/>
+  </geometry>
+  <settings>
+    <run_mode>eigenvalue</run_mode>
+    <particles>100</particles>
+    <batches>10</batches>
+    <inactive>5</inactive>
+    <source type="independent" strength="1.0" particle="neutron">
+      <energy type="discrete">
+        <parameters>7000000.0 1.0</parameters>
+      </energy>
+    </source>
+    <energy_mode>multi-group</energy_mode>
+    <random_ray>
+      <source type="independent" strength="1.0" particle="neutron">
+        <space type="box">
+          <parameters>-0.63 -0.63 -1.0 0.63 0.63 1.0</parameters>
+        </space>
+      </source>
+      <distance_inactive>30.0</distance_inactive>
+      <distance_active>150.0</distance_active>
+      <source_region_meshes>
+        <mesh id="1">
+          <domain id="0" type="universe"/>
+        </mesh>
+      </source_region_meshes>
+      <source_shape>linear</source_shape>
+    </random_ray>
+    <mesh id="1">
+      <dimension>2 2</dimension>
+      <lower_left>-0.63 -0.63</lower_left>
+      <upper_right>0.63 0.63</upper_right>
+    </mesh>
+  </settings>
+  </model>
diff --git a/tests/regression_tests/random_ray_auto_convert_source_energy/stochastic_slab/model/results_true.dat b/tests/regression_tests/random_ray_auto_convert_source_energy/stochastic_slab/model/results_true.dat
new file mode 100644
index 000000000..c5cdf8e29
--- /dev/null
+++ b/tests/regression_tests/random_ray_auto_convert_source_energy/stochastic_slab/model/results_true.dat
@@ -0,0 +1,2 @@
+k-combined:
+7.479571E-01 2.398563E-02
diff --git a/tests/regression_tests/random_ray_auto_convert_source_energy/stochastic_slab/user/inputs_true.dat b/tests/regression_tests/random_ray_auto_convert_source_energy/stochastic_slab/user/inputs_true.dat
new file mode 100644
index 000000000..464c89a5d
--- /dev/null
+++ b/tests/regression_tests/random_ray_auto_convert_source_energy/stochastic_slab/user/inputs_true.dat
@@ -0,0 +1,64 @@
+<?xml version='1.0' encoding='utf-8'?>
+<model>
+  <materials>
+    <cross_sections>mgxs.h5</cross_sections>
+    <material id="1" name="UO2__2_4__" depletable="true">
+      <density value="1.0" units="macro"/>
+      <macroscopic name="UO2__2_4__"/>
+    </material>
+    <material id="2" name="Zircaloy">
+      <density value="1.0" units="macro"/>
+      <macroscopic name="Zircaloy"/>
+    </material>
+    <material id="3" name="Hot_borated_water">
+      <density value="1.0" units="macro"/>
+      <macroscopic name="Hot_borated_water"/>
+    </material>
+  </materials>
+  <geometry>
+    <cell id="1" name="Fuel" material="1" region="-1" universe="0"/>
+    <cell id="2" name="Cladding" material="2" region="1 -2" universe="0"/>
+    <cell id="3" name="Water" material="3" region="2 3 -4 5 -6" universe="0"/>
+    <surface id="1" name="Fuel OR" type="z-cylinder" coeffs="0 0 0.39218"/>
+    <surface id="2" name="Clad OR" type="z-cylinder" coeffs="0 0 0.4572"/>
+    <surface id="3" name="left" type="x-plane" boundary="reflective" coeffs="-0.63"/>
+    <surface id="4" name="right" type="x-plane" boundary="reflective" coeffs="0.63"/>
+    <surface id="5" name="bottom" type="y-plane" boundary="reflective" coeffs="-0.63"/>
+    <surface id="6" name="top" type="y-plane" boundary="reflective" coeffs="0.63"/>
+  </geometry>
+  <settings>
+    <run_mode>eigenvalue</run_mode>
+    <particles>100</particles>
+    <batches>10</batches>
+    <inactive>5</inactive>
+    <source type="independent" strength="1.0" particle="neutron">
+      <space type="box">
+        <parameters>-0.63 -0.63 -1 0.63 0.63 1</parameters>
+      </space>
+      <constraints>
+        <fissionable>true</fissionable>
+      </constraints>
+    </source>
+    <energy_mode>multi-group</energy_mode>
+    <random_ray>
+      <source type="independent" strength="1.0" particle="neutron">
+        <space type="box">
+          <parameters>-0.63 -0.63 -1.0 0.63 0.63 1.0</parameters>
+        </space>
+      </source>
+      <distance_inactive>30.0</distance_inactive>
+      <distance_active>150.0</distance_active>
+      <source_region_meshes>
+        <mesh id="1">
+          <domain id="0" type="universe"/>
+        </mesh>
+      </source_region_meshes>
+      <source_shape>linear</source_shape>
+    </random_ray>
+    <mesh id="1">
+      <dimension>2 2</dimension>
+      <lower_left>-0.63 -0.63</lower_left>
+      <upper_right>0.63 0.63</upper_right>
+    </mesh>
+  </settings>
+  </model>
diff --git a/tests/regression_tests/random_ray_auto_convert_source_energy/stochastic_slab/user/results_true.dat b/tests/regression_tests/random_ray_auto_convert_source_energy/stochastic_slab/user/results_true.dat
new file mode 100644
index 000000000..c6cce2e39
--- /dev/null
+++ b/tests/regression_tests/random_ray_auto_convert_source_energy/stochastic_slab/user/results_true.dat
@@ -0,0 +1,2 @@
+k-combined:
+7.620306E-01 2.175179E-02
diff --git a/tests/regression_tests/random_ray_auto_convert_source_energy/test.py b/tests/regression_tests/random_ray_auto_convert_source_energy/test.py
new file mode 100644
index 000000000..bb9119d89
--- /dev/null
+++ b/tests/regression_tests/random_ray_auto_convert_source_energy/test.py
@@ -0,0 +1,66 @@
+import os
+
+import openmc
+from openmc.examples import pwr_pin_cell
+from openmc import RegularMesh
+from openmc.utility_funcs import change_directory
+import pytest
+
+from tests.testing_harness import TolerantPyAPITestHarness
+
+
+class MGXSTestHarness(TolerantPyAPITestHarness):
+    def _cleanup(self):
+        super()._cleanup()
+        f = 'mgxs.h5'
+        if os.path.exists(f):
+            os.remove(f)
+
+
+@pytest.mark.parametrize("source_type", ["model", "user"])
+@pytest.mark.parametrize("method", ["stochastic_slab", "infinite_medium"])
+def test_random_ray_auto_convert_source_energy(method, source_type):
+    dirname = f"{method}/{source_type}"
+    with change_directory(dirname):
+        openmc.reset_auto_ids()
+
+        # Start with a normal continuous energy model
+        model = pwr_pin_cell()
+
+        # Define the source energy distribution, using different methods
+        source_energy = None
+        if source_type == "model":
+            model.settings.source = openmc.IndependentSource(
+                energy=openmc.stats.delta_function(7.0e6)
+            )
+        elif source_type == "user":
+            source_energy = openmc.stats.delta_function(1.0e4)
+
+        # Convert to a multi-group model
+        model.convert_to_multigroup(
+            method=method, groups='CASMO-8', nparticles=100,
+            overwrite_mgxs_library=False, mgxs_path="mgxs.h5",
+            source_energy=source_energy
+        )
+
+        # Convert to a random ray model
+        model.convert_to_random_ray()
+
+        # Set the number of particles
+        model.settings.particles = 100
+
+        # Overlay a basic 2x2 mesh
+        n = 2
+        mesh = RegularMesh()
+        mesh.dimension = (n, n)
+        bbox = model.geometry.bounding_box
+        mesh.lower_left = (bbox.lower_left[0], bbox.lower_left[1])
+        mesh.upper_right = (bbox.upper_right[0], bbox.upper_right[1])
+        model.settings.random_ray['source_region_meshes'] = [
+            (mesh, [model.geometry.root_universe])]
+
+        # Set the source shape to linear
+        model.settings.random_ray['source_shape'] = 'linear'
+
+        harness = MGXSTestHarness('statepoint.10.h5', model)
+        harness.main()

From db8d4627386c5a5da94d7ddd953d57e93eaa10bb Mon Sep 17 00:00:00 2001
From: Paul Romano <paul.k.romano@gmail.com>
Date: Thu, 4 Dec 2025 06:53:04 -0600
Subject: [PATCH 171/203] Allow DistribcellFilter to work with
 apply_tally_results=True (#3667)

---
 openmc/__init__.py                          |  2 +-
 openmc/data/decay.py                        | 16 ++-----
 openmc/data/neutron.py                      |  8 +---
 openmc/filter.py                            | 19 ++++++--
 openmc/model/model.py                       | 11 +++++
 openmc/statepoint.py                        |  2 +-
 openmc/tallies.py                           | 37 ++++----------
 tests/unit_tests/test_filter_distribcell.py | 53 +++++++++++++++++++++
 8 files changed, 94 insertions(+), 54 deletions(-)
 create mode 100644 tests/unit_tests/test_filter_distribcell.py

diff --git a/openmc/__init__.py b/openmc/__init__.py
index bb972b4e6..c204929c8 100644
--- a/openmc/__init__.py
+++ b/openmc/__init__.py
@@ -37,7 +37,7 @@ from openmc.tracks import *
 from .config import *
 
 # Import a few names from the model module
-from openmc.model import Model
+from openmc.model import Model, SearchResult
 
 from . import examples
 
diff --git a/openmc/data/decay.py b/openmc/data/decay.py
index c8a0bb5e7..7cd4bf43d 100644
--- a/openmc/data/decay.py
+++ b/openmc/data/decay.py
@@ -13,7 +13,7 @@ import openmc.checkvalue as cv
 from openmc.exceptions import DataError
 from openmc.mixin import EqualityMixin
 from openmc.stats import Discrete, Tabular, Univariate, combine_distributions
-from .data import ATOMIC_SYMBOL, ATOMIC_NUMBER
+from .data import ATOMIC_NUMBER, gnds_name
 from .function import INTERPOLATION_SCHEME
 from .endf import Evaluation, get_head_record, get_list_record, get_tab1_record
 
@@ -126,9 +126,7 @@ class FissionProductYields(EqualityMixin):
                 for j in range(n_products):
                     Z, A = divmod(int(values[4*j]), 1000)
                     isomeric_state = int(values[4*j + 1])
-                    name = ATOMIC_SYMBOL[Z] + str(A)
-                    if isomeric_state > 0:
-                        name += f'_m{isomeric_state}'
+                    name = gnds_name(Z, A, isomeric_state)
                     yield_j = ufloat(values[4*j + 2], values[4*j + 3])
                     yields[name] = yield_j
 
@@ -256,10 +254,7 @@ class DecayMode(EqualityMixin):
                         A += delta_A
                         Z += delta_Z
 
-        if self._daughter_state > 0:
-            return f'{ATOMIC_SYMBOL[Z]}{A}_m{self._daughter_state}'
-        else:
-            return f'{ATOMIC_SYMBOL[Z]}{A}'
+        return gnds_name(Z, A, self._daughter_state)
 
     @property
     def parent(self):
@@ -348,10 +343,7 @@ class Decay(EqualityMixin):
         self.nuclide['atomic_number'] = Z
         self.nuclide['mass_number'] = A
         self.nuclide['isomeric_state'] = metastable
-        if metastable > 0:
-            self.nuclide['name'] = f'{ATOMIC_SYMBOL[Z]}{A}_m{metastable}'
-        else:
-            self.nuclide['name'] = f'{ATOMIC_SYMBOL[Z]}{A}'
+        self.nuclide['name'] = gnds_name(Z, A, metastable)
         self.nuclide['mass'] = items[1]  # AWR
         self.nuclide['excited_state'] = items[2]  # State of the original nuclide
         self.nuclide['stable'] = (items[4] == 1)  # Nucleus stability flag
diff --git a/openmc/data/neutron.py b/openmc/data/neutron.py
index 95a3424ea..628801e5e 100644
--- a/openmc/data/neutron.py
+++ b/openmc/data/neutron.py
@@ -11,7 +11,7 @@ import h5py
 
 from . import HDF5_VERSION, HDF5_VERSION_MAJOR
 from .ace import Library, Table, get_table, get_metadata
-from .data import ATOMIC_SYMBOL, K_BOLTZMANN, EV_PER_MEV
+from .data import ATOMIC_SYMBOL, K_BOLTZMANN, EV_PER_MEV, gnds_name
 from .endf import (
     Evaluation, SUM_RULES, get_head_record, get_tab1_record, get_evaluations)
 from .fission_energy import FissionEnergyRelease
@@ -678,11 +678,7 @@ class IncidentNeutron(EqualityMixin):
         temperature = ev.target['temperature']
 
         # Determine name
-        element = ATOMIC_SYMBOL[atomic_number]
-        if metastable > 0:
-            name = f'{element}{mass_number}_m{metastable}'
-        else:
-            name = f'{element}{mass_number}'
+        name = gnds_name(atomic_number, mass_number, metastable)
 
         # Instantiate incident neutron data
         data = cls(name, atomic_number, mass_number, metastable,
diff --git a/openmc/filter.py b/openmc/filter.py
index 6a666d2a0..550146f85 100644
--- a/openmc/filter.py
+++ b/openmc/filter.py
@@ -1839,12 +1839,21 @@ class DistribcellFilter(Filter):
 
     @property
     def paths(self):
-        return self._paths
+        if self._paths is None:
+            if not hasattr(self, '_geometry'):
+                raise ValueError(
+                    "Model must be exported before the 'paths' attribute is" \
+                    "available for a DistribcellFilter.")
 
-    @paths.setter
-    def paths(self, paths):
-        cv.check_iterable_type('paths', paths, str)
-        self._paths = paths
+            # Determine paths for cell instances
+            self._geometry.determine_paths()
+
+            # Get paths for the corresponding cell
+            cell_id = self.bins[0]
+            cell = self._geometry.get_all_cells()[cell_id]
+            self._paths = cell.paths
+
+        return self._paths
 
     @Filter.bins.setter
     def bins(self, bins):
diff --git a/openmc/model/model.py b/openmc/model/model.py
index 299724759..782725b78 100644
--- a/openmc/model/model.py
+++ b/openmc/model/model.py
@@ -546,6 +546,13 @@ class Model:
                 depletion_operator.cleanup_when_done = True
                 depletion_operator.finalize()
 
+    def _link_geometry_to_filters(self):
+        """Establishes a link between distribcell filters and the geometry"""
+        for tally in self.tallies:
+            for f in tally.filters:
+                if isinstance(f, openmc.DistribcellFilter):
+                    f._geometry = self.geometry
+
     def export_to_xml(self, directory: PathLike = '.', remove_surfs: bool = False,
                       nuclides_to_ignore: Iterable[str] | None = None):
         """Export model to separate XML files.
@@ -587,6 +594,8 @@ class Model:
         if self.plots:
             self.plots.export_to_xml(d)
 
+        self._link_geometry_to_filters()
+
     def export_to_model_xml(self, path: PathLike = 'model.xml', remove_surfs: bool = False,
                             nuclides_to_ignore: Iterable[str] | None = None):
         """Export model to a single XML file.
@@ -666,6 +675,8 @@ class Model:
                 fh.write(ET.tostring(plots_element, encoding="unicode"))
             fh.write("</model>\n")
 
+        self._link_geometry_to_filters()
+
     def import_properties(self, filename: PathLike):
         """Import physical properties
 
diff --git a/openmc/statepoint.py b/openmc/statepoint.py
index 11986841f..a10ec3a83 100644
--- a/openmc/statepoint.py
+++ b/openmc/statepoint.py
@@ -723,7 +723,7 @@ class StatePoint:
                     cell = cells[cell_id]
                     if not cell._paths:
                         summary.geometry.determine_paths()
-                    tally_filter.paths = cell.paths
+                    tally_filter._paths = cell.paths
 
         self._summary = summary
 
diff --git a/openmc/tallies.py b/openmc/tallies.py
index add356579..09365e525 100644
--- a/openmc/tallies.py
+++ b/openmc/tallies.py
@@ -290,7 +290,7 @@ class Tally(IDManagerMixin):
 
     @property
     def num_nuclides(self):
-        return len(self._nuclides)
+        return max(len(self._nuclides), 1)
 
     @property
     def scores(self):
@@ -393,6 +393,11 @@ class Tally(IDManagerMixin):
             group = f[f'tallies/tally {self.id}']
             self._num_realizations = int(group['n_realizations'][()])
 
+            for filt in self.filters:
+                if isinstance(filt, openmc.DistribcellFilter):
+                    filter_group = f[f'tallies/filters/filter {filt.id}']
+                    filt._num_bins = int(filter_group['n_bins'][()])
+
             # Update nuclides
             nuclide_names = group['nuclides'][()]
             self._nuclides = [name.decode().strip() for name in nuclide_names]
@@ -3704,43 +3709,17 @@ class Tallies(cv.CheckedList):
             if possible. Defaults to False.
 
         """
-        if not isinstance(tally, Tally):
-            msg = f'Unable to add a non-Tally "{tally}" to the Tallies instance'
-            raise TypeError(msg)
-
         if merge:
-            merged = False
-
             # Look for a tally to merge with this one
             for i, tally2 in enumerate(self):
-
                 # If a mergeable tally is found
                 if tally2.can_merge(tally):
                     # Replace tally2 with the merged tally
                     merged_tally = tally2.merge(tally)
                     self[i] = merged_tally
-                    merged = True
-                    break
+                    return
 
-            # If no mergeable tally was found, simply add this tally
-            if not merged:
-                super().append(tally)
-
-        else:
-            super().append(tally)
-
-    def insert(self, index, item):
-        """Insert tally before index
-
-        Parameters
-        ----------
-        index : int
-            Index in list
-        item : openmc.Tally
-            Tally to insert
-
-        """
-        super().insert(index, item)
+        super().append(tally)
 
     def merge_tallies(self):
         """Merge any mergeable tallies together. Note that n-way merges are
diff --git a/tests/unit_tests/test_filter_distribcell.py b/tests/unit_tests/test_filter_distribcell.py
new file mode 100644
index 000000000..d5734a2c0
--- /dev/null
+++ b/tests/unit_tests/test_filter_distribcell.py
@@ -0,0 +1,53 @@
+import openmc
+import pandas as pd
+
+
+def test_distribcell_filter_apply_tally_results(run_in_tmpdir):
+    # Reset IDs to ensure consistent paths
+    openmc.reset_auto_ids()
+
+    mat = openmc.Material()
+    mat.add_nuclide("U235", 1.0)
+    mat.set_density("g/cm3", 1.0)
+
+    # Define 2x2 lattice with a cylinder in each universe
+    cyl = openmc.ZCylinder(r=1.0)
+    cell1 = openmc.Cell(fill=mat, region=-cyl)
+    cell2 = openmc.Cell(fill=None, region=+cyl)
+    univ = openmc.Universe(cells=[cell1, cell2])
+    lattice = openmc.RectLattice()
+    lattice.lower_left = (-3.0, -3.0)
+    lattice.pitch = (3.0, 3.0)
+    lattice.universes = [[univ, univ], [univ, univ]]
+    box = openmc.model.RectangularPrism(6., 6., boundary_type='reflective')
+    root_cell = openmc.Cell(region=-box, fill=lattice)
+    geometry = openmc.Geometry([root_cell])
+
+    # Create model and add tally with distribcell filter
+    model = openmc.Model(geometry)
+    model.settings.batches = 10
+    model.settings.particles = 1000
+    tally = openmc.Tally()
+    distribcell_filter = openmc.DistribcellFilter(cell1)
+    tally.filters = [distribcell_filter]
+    tally.scores = ['flux']
+    model.tallies = [tally]
+
+    # Run OpenMC and apply tally results
+    model.run(apply_tally_results=True)
+
+    # Check that mean and standard deviation are available on tally
+    assert tally.mean.shape == (4, 1, 1)
+    assert tally.std_dev.shape == (4, 1, 1)
+
+    # Make sure paths attribute on filter is correct
+    assert distribcell_filter.paths == [
+        'u3->c3->l2(0,0)->u1->c1',
+        'u3->c3->l2(1,0)->u1->c1',
+        'u3->c3->l2(0,1)->u1->c1',
+        'u3->c3->l2(1,1)->u1->c1',
+    ]
+
+    # Check that we can get a DataFrame from the tally
+    df = tally.get_pandas_dataframe()
+    assert isinstance(df, pd.DataFrame)

From f28139250ac8dc7fdef3f8f13b8c65c5dbb82923 Mon Sep 17 00:00:00 2001
From: Jonathan Shimwell <mail@jshimwell.com>
Date: Fri, 5 Dec 2025 18:02:26 +0100
Subject: [PATCH 172/203] Fixed plotting issue by scaling source locations with
 axis units (#3668)

---
 openmc/model/model.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/openmc/model/model.py b/openmc/model/model.py
index 782725b78..538c64ff3 100644
--- a/openmc/model/model.py
+++ b/openmc/model/model.py
@@ -1287,8 +1287,8 @@ class Model:
             tol = plane_tolerance
             for particle in particles:
                 if (slice_value - tol < particle.r[z] < slice_value + tol):
-                    xs.append(particle.r[x])
-                    ys.append(particle.r[y])
+                    xs.append(particle.r[x] * axis_scaling_factor[axis_units])
+                    ys.append(particle.r[y] * axis_scaling_factor[axis_units])
             axes.scatter(xs, ys, **source_kwargs)
 
         return axes

From 9b675adda5c64f8620c11e3d6723c598f443f982 Mon Sep 17 00:00:00 2001
From: Boris Polania <boris.polania@gmail.com>
Date: Fri, 5 Dec 2025 12:17:09 -0800
Subject: [PATCH 173/203] Introduce SlicePlot and VoxelPlot to replace the Plot
 class (#3528)

Co-authored-by: Paul Romano <paul.k.romano@gmail.com>
---
 docs/source/pythonapi/base.rst             |   3 +-
 docs/source/usersguide/plots.rst           |  46 ++-
 docs/source/usersguide/random_ray.rst      |   6 +-
 examples/lattice/hexagonal/build_xml.py    |   4 +-
 examples/lattice/nested/build_xml.py       |   2 +-
 examples/lattice/simple/build_xml.py       |   2 +-
 examples/pincell_random_ray/build_xml.py   |   3 +-
 openmc/examples.py                         |   6 +-
 openmc/executor.py                         |   2 +-
 openmc/model/model.py                      |   2 +-
 openmc/plots.py                            | 324 ++++++++++++++++++---
 src/mcpl_interface.cpp                     |  13 +-
 tests/regression_tests/distribmat/test.py  |   4 +-
 tests/unit_tests/test_model.py             |   6 +-
 tests/unit_tests/test_plots.py             |  34 +--
 tests/unit_tests/test_slice_voxel_plots.py | 273 +++++++++++++++++
 16 files changed, 618 insertions(+), 112 deletions(-)
 create mode 100644 tests/unit_tests/test_slice_voxel_plots.py

diff --git a/docs/source/pythonapi/base.rst b/docs/source/pythonapi/base.rst
index ce2f6f0f8..dea8c4427 100644
--- a/docs/source/pythonapi/base.rst
+++ b/docs/source/pythonapi/base.rst
@@ -176,7 +176,8 @@ Geometry Plotting
    :nosignatures:
    :template: myclass.rst
 
-   openmc.Plot
+   openmc.SlicePlot
+   openmc.VoxelPlot
    openmc.WireframeRayTracePlot
    openmc.SolidRayTracePlot
    openmc.Plots
diff --git a/docs/source/usersguide/plots.rst b/docs/source/usersguide/plots.rst
index da0c69bdd..b5c29a3e8 100644
--- a/docs/source/usersguide/plots.rst
+++ b/docs/source/usersguide/plots.rst
@@ -6,13 +6,14 @@ Geometry Visualization
 
 .. currentmodule:: openmc
 
-OpenMC is capable of producing two-dimensional slice plots of a geometry as well
-as three-dimensional voxel plots using the geometry plotting :ref:`run mode
-<usersguide_run_modes>`. The geometry plotting mode relies on the presence of a
-:ref:`plots.xml <io_plots>` file that indicates what plots should be created. To
-create this file, one needs to create one or more :class:`openmc.Plot`
-instances, add them to a :class:`openmc.Plots` collection, and then use the
-:class:`Plots.export_to_xml` method to write the ``plots.xml`` file.
+OpenMC is capable of producing two-dimensional slice plots of a geometry,
+three-dimensional voxel plots, and three-dimensional raytrace plots using the
+geometry plotting :ref:`run mode <usersguide_run_modes>`. The geometry plotting
+mode relies on the presence of a :ref:`plots.xml <io_plots>` file that indicates
+what plots should be created. To create this file, one needs to create one or
+more instances of the various plot classes described below, add them to a
+:class:`openmc.Plots` collection, and then use the :class:`Plots.export_to_xml`
+method to write the ``plots.xml`` file.
 
 -----------
 Slice Plots
@@ -21,15 +22,14 @@ Slice Plots
 .. image:: ../_images/atr.png
    :width: 300px
 
-By default, when an instance of :class:`openmc.Plot` is created, it indicates
-that a 2D slice plot should be made. You can specify the origin of the plot
-(:attr:`Plot.origin`), the width of the plot in each direction
-(:attr:`Plot.width`), the number of pixels to use in each direction
-(:attr:`Plot.pixels`), and the basis directions for the plot. For example, to
-create a :math:`x` - :math:`z` plot centered at (5.0, 2.0, 3.0) with a width of
-(50., 50.)  and 400x400 pixels::
+The :class:`openmc.SlicePlot` class indicates that a 2D slice plot should be
+made. You can specify the origin of the plot (:attr:`SlicePlot.origin`), the
+width of the plot in each direction (:attr:`SlicePlot.width`), the number of
+pixels to use in each direction (:attr:`SlicePlot.pixels`), and the basis
+directions for the plot. For example, to create a :math:`x` - :math:`z` plot
+centered at (5.0, 2.0, 3.0) with a width of (50., 50.)  and 400x400 pixels::
 
-  plot = openmc.Plot()
+  plot = openmc.SlicePlot()
   plot.basis = 'xz'
   plot.origin = (5.0, 2.0, 3.0)
   plot.width = (50., 50.)
@@ -47,7 +47,7 @@ that location.
 
 By default, a unique color will be assigned to each cell in the geometry. If you
 want your plot to be colored by material instead, change the
-:attr:`Plot.color_by` attribute::
+:attr:`SlicePlot.color_by` attribute::
 
   plot.color_by = 'material'
 
@@ -68,8 +68,8 @@ particular cells/materials should be given colors of your choosing::
 Note that colors can be given as RGB tuples or by a string indicating a valid
 `SVG color <https://www.w3.org/TR/SVG11/types.html#ColorKeywords>`_.
 
-When you're done creating your :class:`openmc.Plot` instances, you need to then
-assign them to a :class:`openmc.Plots` collection and export it to XML::
+When you're done creating your :class:`openmc.SlicePlot` instances, you need to
+then assign them to a :class:`openmc.Plots` collection and export it to XML::
 
   plots = openmc.Plots([plot1, plot2, plot3])
   plots.export_to_xml()
@@ -97,13 +97,11 @@ Voxel Plots
 .. image:: ../_images/3dba.png
    :width: 200px
 
-The :class:`openmc.Plot` class can also be told to generate a 3D voxel plot
-instead of a 2D slice plot. Simply change the :attr:`Plot.type` attribute to
-'voxel'. In this case, the :attr:`Plot.width` and :attr:`Plot.pixels` attributes
-should be three items long, e.g.::
+The :class:`openmc.VoxelPlot` class enables the generation of a 3D voxel plot
+instead of a 2D slice plot. In this case, the :attr:`VoxelPlot.width` and
+:attr:`VoxelPlot.pixels` attributes should be three items long, e.g.::
 
-  vox_plot = openmc.Plot()
-  vox_plot.type = 'voxel'
+  vox_plot = openmc.VoxelPlot()
   vox_plot.width = (100., 100., 50.)
   vox_plot.pixels = (400, 400, 200)
 
diff --git a/docs/source/usersguide/random_ray.rst b/docs/source/usersguide/random_ray.rst
index 881498a0a..382381a9e 100644
--- a/docs/source/usersguide/random_ray.rst
+++ b/docs/source/usersguide/random_ray.rst
@@ -1131,11 +1131,10 @@ given below:
     tallies.export_to_xml()
 
     # Create voxel plot
-    plot = openmc.Plot()
+    plot = openmc.VoxelPlot()
     plot.origin = [0, 0, 0]
     plot.width = [2*pitch, 2*pitch, 1]
     plot.pixels = [1000, 1000, 1]
-    plot.type = 'voxel'
 
     # Instantiate a Plots collection and export to XML
     plots = openmc.Plots([plot])
@@ -1215,11 +1214,10 @@ given below:
     tallies.export_to_xml()
 
     # Create voxel plot
-    plot = openmc.Plot()
+    plot = openmc.VoxelPlot()
     plot.origin = [0, 0, 0]
     plot.width = [2*pitch, 2*pitch, 1]
     plot.pixels = [1000, 1000, 1]
-    plot.type = 'voxel'
 
     # Instantiate a Plots collection and export to XML
     plots = openmc.Plots([plot])
diff --git a/examples/lattice/hexagonal/build_xml.py b/examples/lattice/hexagonal/build_xml.py
index 9485d0aa4..2624e52b4 100644
--- a/examples/lattice/hexagonal/build_xml.py
+++ b/examples/lattice/hexagonal/build_xml.py
@@ -128,14 +128,14 @@ settings_file.export_to_xml()
 #                   Exporting to OpenMC plots.xml file
 ###############################################################################
 
-plot_xy = openmc.Plot(plot_id=1)
+plot_xy = openmc.SlicePlot(plot_id=1)
 plot_xy.filename = 'plot_xy'
 plot_xy.origin = [0, 0, 0]
 plot_xy.width = [6, 6]
 plot_xy.pixels = [400, 400]
 plot_xy.color_by = 'material'
 
-plot_yz = openmc.Plot(plot_id=2)
+plot_yz = openmc.SlicePlot(plot_id=2)
 plot_yz.filename = 'plot_yz'
 plot_yz.basis = 'yz'
 plot_yz.origin = [0, 0, 0]
diff --git a/examples/lattice/nested/build_xml.py b/examples/lattice/nested/build_xml.py
index 2db23a46b..a1d9c092d 100644
--- a/examples/lattice/nested/build_xml.py
+++ b/examples/lattice/nested/build_xml.py
@@ -135,7 +135,7 @@ settings_file.export_to_xml()
 #                   Exporting to OpenMC plots.xml file
 ###############################################################################
 
-plot = openmc.Plot(plot_id=1)
+plot = openmc.SlicePlot(plot_id=1)
 plot.origin = [0, 0, 0]
 plot.width = [4, 4]
 plot.pixels = [400, 400]
diff --git a/examples/lattice/simple/build_xml.py b/examples/lattice/simple/build_xml.py
index 56c466121..44531edd8 100644
--- a/examples/lattice/simple/build_xml.py
+++ b/examples/lattice/simple/build_xml.py
@@ -128,7 +128,7 @@ settings_file.export_to_xml()
 #                   Exporting to OpenMC plots.xml file
 ###############################################################################
 
-plot = openmc.Plot(plot_id=1)
+plot = openmc.SlicePlot(plot_id=1)
 plot.origin = [0, 0, 0]
 plot.width = [4, 4]
 plot.pixels = [400, 400]
diff --git a/examples/pincell_random_ray/build_xml.py b/examples/pincell_random_ray/build_xml.py
index b3dd8020a..5ff4c0082 100644
--- a/examples/pincell_random_ray/build_xml.py
+++ b/examples/pincell_random_ray/build_xml.py
@@ -192,11 +192,10 @@ tallies.export_to_xml()
 #                   Exporting to OpenMC plots.xml file
 ###############################################################################
 
-plot = openmc.Plot()
+plot = openmc.VoxelPlot()
 plot.origin = [0, 0, 0]
 plot.width = [pitch, pitch, pitch]
 plot.pixels = [1000, 1000, 1]
-plot.type = 'voxel'
 
 # Instantiate a Plots collection and export to XML
 plots = openmc.Plots([plot])
diff --git a/openmc/examples.py b/openmc/examples.py
index 5578d513e..01dd9d01f 100644
--- a/openmc/examples.py
+++ b/openmc/examples.py
@@ -83,7 +83,7 @@ def pwr_pin_cell() -> openmc.Model:
         constraints={'fissionable': True}
     )
 
-    plot = openmc.Plot.from_geometry(model.geometry)
+    plot = openmc.SlicePlot.from_geometry(model.geometry)
     plot.pixels = (300, 300)
     plot.color_by = 'material'
     model.plots.append(plot)
@@ -429,7 +429,7 @@ def pwr_core() -> openmc.Model:
     model.settings.source = openmc.IndependentSource(space=openmc.stats.Box(
         [-160, -160, -183], [160, 160, 183]))
 
-    plot = openmc.Plot()
+    plot = openmc.SlicePlot()
     plot.origin = (125, 125, 0)
     plot.width = (250, 250)
     plot.pixels = (3000, 3000)
@@ -544,7 +544,7 @@ def pwr_assembly() -> openmc.Model:
         constraints={'fissionable': True}
     )
 
-    plot = openmc.Plot()
+    plot = openmc.SlicePlot()
     plot.origin = (0.0, 0.0, 0)
     plot.width = (21.42, 21.42)
     plot.pixels = (300, 300)
diff --git a/openmc/executor.py b/openmc/executor.py
index aacc48b3f..9cd299345 100644
--- a/openmc/executor.py
+++ b/openmc/executor.py
@@ -164,7 +164,7 @@ def plot_inline(plots, openmc_exec='openmc', cwd='.', path_input=None):
 
     Parameters
     ----------
-    plots : Iterable of openmc.Plot
+    plots : Iterable of openmc.PlotBase
         Plots to display
     openmc_exec : str
         Path to OpenMC executable
diff --git a/openmc/model/model.py b/openmc/model/model.py
index 538c64ff3..e2ac57eba 100644
--- a/openmc/model/model.py
+++ b/openmc/model/model.py
@@ -1170,7 +1170,7 @@ class Model:
                 self.settings.plot_seed = seed
 
             # Create plot object matching passed arguments
-            plot = openmc.Plot()
+            plot = openmc.SlicePlot()
             plot.origin = origin
             plot.width = width
             plot.pixels = pixels
diff --git a/openmc/plots.py b/openmc/plots.py
index a0bde3f00..cb722abc6 100644
--- a/openmc/plots.py
+++ b/openmc/plots.py
@@ -2,6 +2,7 @@ from collections.abc import Iterable, Mapping
 from numbers import Integral, Real
 from pathlib import Path
 from textwrap import dedent
+import warnings
 
 import h5py
 import lxml.etree as ET
@@ -626,14 +627,15 @@ class PlotBase(IDManagerMixin):
         return element
 
 
-class Plot(PlotBase):
-    """Definition of a finite region of space to be plotted.
+class SlicePlot(PlotBase):
+    """Definition of a 2D slice plot of the geometry.
 
-    OpenMC is capable of generating two-dimensional slice plots, or
-    three-dimensional voxel or projection plots. Colors that are used in plots can be given as
-    RGB tuples, e.g. (255, 255, 255) would be white, or by a string indicating a
+    Colors that are used in plots can be given as RGB tuples, e.g.
+    (255, 255, 255) would be white, or by a string indicating a
     valid `SVG color <https://www.w3.org/TR/SVG11/types.html#ColorKeywords>`_.
 
+    .. versionadded:: 0.15.4
+
     Parameters
     ----------
     plot_id : int
@@ -648,7 +650,7 @@ class Plot(PlotBase):
     name : str
         Name of the plot
     pixels : Iterable of int
-        Number of pixels to use in each direction
+        Number of pixels to use in each direction (2 values)
     filename : str
         Path to write the plot to
     color_by : {'cell', 'material'}
@@ -671,11 +673,9 @@ class Plot(PlotBase):
     level : int
         Universe depth to plot at
     width : Iterable of float
-        Width of the plot in each basis direction
+        Width of the plot in each basis direction (2 values)
     origin : tuple or list of ndarray
-        Origin (center) of the plot
-    type : {'slice', 'voxel'}
-        The type of the plot
+        Origin (center) of the plot (3 values)
     basis : {'xy', 'xz', 'yz'}
         The basis directions for the plot
     meshlines : dict
@@ -688,10 +688,37 @@ class Plot(PlotBase):
         super().__init__(plot_id, name)
         self._width = [4.0, 4.0]
         self._origin = [0., 0., 0.]
-        self._type = 'slice'
         self._basis = 'xy'
         self._meshlines = None
 
+    @property
+    def type(self):
+        warnings.warn(
+            "The 'type' attribute is deprecated and will be removed in a future version. "
+            "This is a SlicePlot instance.",
+            FutureWarning, stacklevel=2
+        )
+        return 'slice'
+
+    @type.setter
+    def type(self, value):
+        raise TypeError(
+            "Setting plot.type is no longer supported. "
+            "Use openmc.SlicePlot() for 2D slice plots or openmc.VoxelPlot() for 3D voxel plots."
+        )
+
+    @property
+    def pixels(self):
+        return self._pixels
+
+    @pixels.setter
+    def pixels(self, pixels):
+        cv.check_type('plot pixels', pixels, Iterable, Integral)
+        cv.check_length('plot pixels', pixels, 2, 2)
+        for dim in pixels:
+            cv.check_greater_than('plot pixels', dim, 0)
+        self._pixels = pixels
+
     @property
     def width(self):
         return self._width
@@ -699,7 +726,7 @@ class Plot(PlotBase):
     @width.setter
     def width(self, width):
         cv.check_type('plot width', width, Iterable, Real)
-        cv.check_length('plot width', width, 2, 3)
+        cv.check_length('plot width', width, 2, 2)
         self._width = width
 
     @property
@@ -712,15 +739,6 @@ class Plot(PlotBase):
         cv.check_length('plot origin', origin, 3)
         self._origin = origin
 
-    @property
-    def type(self):
-        return self._type
-
-    @type.setter
-    def type(self, plottype):
-        cv.check_value('plot type', plottype, ['slice', 'voxel'])
-        self._type = plottype
-
     @property
     def basis(self):
         return self._basis
@@ -763,11 +781,10 @@ class Plot(PlotBase):
         self._meshlines = meshlines
 
     def __repr__(self):
-        string = 'Plot\n'
+        string = 'SlicePlot\n'
         string += '{: <16}=\t{}\n'.format('\tID', self._id)
         string += '{: <16}=\t{}\n'.format('\tName', self._name)
         string += '{: <16}=\t{}\n'.format('\tFilename', self._filename)
-        string += '{: <16}=\t{}\n'.format('\tType', self._type)
         string += '{: <16}=\t{}\n'.format('\tBasis', self._basis)
         string += '{: <16}=\t{}\n'.format('\tWidth', self._width)
         string += '{: <16}=\t{}\n'.format('\tOrigin', self._origin)
@@ -883,7 +900,7 @@ class Plot(PlotBase):
                 self._colors[domain] = (r, g, b)
 
     def to_xml_element(self):
-        """Return XML representation of the slice/voxel plot
+        """Return XML representation of the slice plot
 
         Returns
         -------
@@ -893,10 +910,8 @@ class Plot(PlotBase):
         """
 
         element = super().to_xml_element()
-        element.set("type", self._type)
-
-        if self._type == 'slice':
-            element.set("basis", self._basis)
+        element.set("type", "slice")
+        element.set("basis", self._basis)
 
         subelement = ET.SubElement(element, "origin")
         subelement.text = ' '.join(map(str, self._origin))
@@ -942,8 +957,8 @@ class Plot(PlotBase):
 
         Returns
         -------
-        openmc.Plot
-            Plot object
+        openmc.SlicePlot
+            SlicePlot object
 
         """
         plot_id = int(get_text(elem, "id"))
@@ -952,9 +967,7 @@ class Plot(PlotBase):
         if "filename" in elem.keys():
             plot.filename = get_text(elem, "filename")
         plot.color_by = get_text(elem, "color_by")
-        plot.type = get_text(elem, "type")
-        if plot.type == 'slice':
-            plot.basis = get_text(elem, "basis")
+        plot.basis = get_text(elem, "basis")
 
         plot.origin = tuple(get_elem_list(elem, "origin", float))
         plot.width = tuple(get_elem_list(elem, "width", float))
@@ -1036,9 +1049,215 @@ class Plot(PlotBase):
         # Return produced image
         return _get_plot_image(self, cwd)
 
+
+
+class VoxelPlot(PlotBase):
+    """Definition of a 3D voxel plot of the geometry.
+
+    Colors that are used in plots can be given as RGB tuples, e.g.
+    (255, 255, 255) would be white, or by a string indicating a
+    valid `SVG color <https://www.w3.org/TR/SVG11/types.html#ColorKeywords>`_.
+
+    .. versionadded:: 0.15.1
+
+    Parameters
+    ----------
+    plot_id : int
+        Unique identifier for the plot
+    name : str
+        Name of the plot
+
+    Attributes
+    ----------
+    id : int
+        Unique identifier
+    name : str
+        Name of the plot
+    pixels : Iterable of int
+        Number of pixels to use in each direction (3 values)
+    filename : str
+        Path to write the plot to
+    color_by : {'cell', 'material'}
+        Indicate whether the plot should be colored by cell or by material
+    background : Iterable of int or str
+        Color of the background
+    mask_components : Iterable of openmc.Cell or openmc.Material or int
+        The cells or materials (or corresponding IDs) to mask
+    mask_background : Iterable of int or str
+        Color to apply to all cells/materials listed in mask_components
+    show_overlaps : bool
+        Indicate whether or not overlapping regions are shown
+    overlap_color : Iterable of int or str
+        Color to apply to overlapping regions
+    colors : dict
+        Dictionary indicating that certain cells/materials should be
+        displayed with a particular color. The keys can be of type
+        :class:`~openmc.Cell`, :class:`~openmc.Material`, or int (ID for a
+        cell/material).
+    level : int
+        Universe depth to plot at
+    width : Iterable of float
+        Width of the plot in each dimension (3 values)
+    origin : tuple or list of ndarray
+        Origin (center) of the plot (3 values)
+
+    """
+
+    def __init__(self, plot_id=None, name=''):
+        super().__init__(plot_id, name)
+        self._width = [4.0, 4.0, 4.0]
+        self._origin = [0., 0., 0.]
+        self._pixels = [400, 400, 400]
+
+    @property
+    def pixels(self):
+        return self._pixels
+
+    @pixels.setter
+    def pixels(self, pixels):
+        cv.check_type('plot pixels', pixels, Iterable, Integral)
+        cv.check_length('plot pixels', pixels, 3, 3)
+        for dim in pixels:
+            cv.check_greater_than('plot pixels', dim, 0)
+        self._pixels = pixels
+
+    @property
+    def width(self):
+        return self._width
+
+    @width.setter
+    def width(self, width):
+        cv.check_type('plot width', width, Iterable, Real)
+        cv.check_length('plot width', width, 3, 3)
+        self._width = width
+
+    @property
+    def origin(self):
+        return self._origin
+
+    @origin.setter
+    def origin(self, origin):
+        cv.check_type('plot origin', origin, Iterable, Real)
+        cv.check_length('plot origin', origin, 3)
+        self._origin = origin
+
+    def __repr__(self):
+        string = 'VoxelPlot\n'
+        string += '{: <16}=\t{}\n'.format('\tID', self._id)
+        string += '{: <16}=\t{}\n'.format('\tName', self._name)
+        string += '{: <16}=\t{}\n'.format('\tFilename', self._filename)
+        string += '{: <16}=\t{}\n'.format('\tWidth', self._width)
+        string += '{: <16}=\t{}\n'.format('\tOrigin', self._origin)
+        string += '{: <16}=\t{}\n'.format('\tPixels', self._pixels)
+        string += '{: <16}=\t{}\n'.format('\tColor by', self._color_by)
+        string += '{: <16}=\t{}\n'.format('\tBackground', self._background)
+        string += '{: <16}=\t{}\n'.format('\tMask components',
+                                          self._mask_components)
+        string += '{: <16}=\t{}\n'.format('\tMask background',
+                                          self._mask_background)
+        string += '{: <16}=\t{}\n'.format('\tOverlap Color',
+                                          self._overlap_color)
+        string += '{: <16}=\t{}\n'.format('\tColors', self._colors)
+        string += '{: <16}=\t{}\n'.format('\tLevel', self._level)
+        return string
+
+    def to_xml_element(self):
+        """Return XML representation of the voxel plot
+
+        Returns
+        -------
+        element : lxml.etree._Element
+            XML element containing plot data
+
+        """
+
+        element = super().to_xml_element()
+        element.set("type", "voxel")
+
+        subelement = ET.SubElement(element, "origin")
+        subelement.text = ' '.join(map(str, self._origin))
+
+        subelement = ET.SubElement(element, "width")
+        subelement.text = ' '.join(map(str, self._width))
+
+        if self._colors:
+            self._colors_to_xml(element)
+
+        if self._show_overlaps:
+            subelement = ET.SubElement(element, "show_overlaps")
+            subelement.text = "true"
+
+            if self._overlap_color is not None:
+                color = self._overlap_color
+                if isinstance(color, str):
+                    color = _SVG_COLORS[color.lower()]
+                subelement = ET.SubElement(element, "overlap_color")
+                subelement.text = ' '.join(str(x) for x in color)
+
+        return element
+
+    @classmethod
+    def from_xml_element(cls, elem):
+        """Generate plot object from an XML element
+
+        Parameters
+        ----------
+        elem : lxml.etree._Element
+            XML element
+
+        Returns
+        -------
+        openmc.VoxelPlot
+            VoxelPlot object
+
+        """
+        plot_id = int(get_text(elem, "id"))
+        name = get_text(elem, 'name', '')
+        plot = cls(plot_id, name)
+        if "filename" in elem.keys():
+            plot.filename = get_text(elem, "filename")
+        plot.color_by = get_text(elem, "color_by")
+
+        plot.origin = tuple(get_elem_list(elem, "origin", float))
+        plot.width = tuple(get_elem_list(elem, "width", float))
+        plot.pixels = tuple(get_elem_list(elem, "pixels"))
+        background = get_elem_list(elem, "background")
+        if background is not None:
+            plot._background = tuple(background)
+
+        # Set plot colors
+        colors = {}
+        for color_elem in elem.findall("color"):
+            uid = int(get_text(color_elem, "id"))
+            colors[uid] = tuple(get_elem_list(color_elem, "rgb", int))
+        plot.colors = colors
+
+        # Set masking information
+        mask_elem = elem.find("mask")
+        if mask_elem is not None:
+            plot.mask_components = get_elem_list(mask_elem, "components", int)
+            background = get_elem_list(mask_elem, "background", int)
+            if background is not None:
+                plot.mask_background = tuple(background)
+
+        # show overlaps
+        overlap = get_text(elem, "show_overlaps")
+        if overlap is not None:
+            plot.show_overlaps = (overlap in ('true', '1'))
+        overlap_color = get_elem_list(elem, "overlap_color", int)
+        if overlap_color is not None:
+            plot.overlap_color = tuple(overlap_color)
+
+        # Set universe level
+        level = get_text(elem, "level")
+        if level is not None:
+            plot.level = int(level)
+
+        return plot
+
     def to_vtk(self, output: PathLike | None = None,
                openmc_exec: str = 'openmc', cwd: str = '.'):
-        """Render plot as an voxel image
+        """Render plot as a voxel image
 
         This method runs OpenMC in plotting mode to produce a .vti file.
 
@@ -1059,10 +1278,6 @@ class Plot(PlotBase):
             Path of the .vti file produced
 
         """
-        if self.type != 'voxel':
-            raise ValueError(
-                'Generating a VTK file only works for voxel plots')
-
         # Create plots.xml
         Plots([self]).export_to_xml(cwd)
 
@@ -1082,6 +1297,20 @@ class Plot(PlotBase):
         return voxel_to_vtk(h5_voxel_file, output)
 
 
+def Plot(plot_id=None, name=''):
+    """Legacy Plot class for backward compatibility.
+
+    .. deprecated:: 0.15.4
+        Use :class:`SlicePlot` for 2D slice plots or :class:`VoxelPlot` for 3D voxel plots.
+
+    """
+    warnings.warn(
+        "The Plot class is deprecated. Use SlicePlot for 2D slice plots "
+        "or VoxelPlot for 3D voxel plots.", FutureWarning
+    )
+    return SlicePlot(plot_id, name)
+
+
 class RayTracePlot(PlotBase):
     """Definition of a camera's view of OpenMC geometry
 
@@ -1737,16 +1966,16 @@ class SolidRayTracePlot(RayTracePlot):
 
 
 class Plots(cv.CheckedList):
-    """Collection of Plots used for an OpenMC simulation.
+    """Collection of plots used for an OpenMC simulation.
 
     This class corresponds directly to the plots.xml input file. It can be
     thought of as a normal Python list where each member is inherits from
     :class:`PlotBase`. It behaves like a list as the following example
     demonstrates:
 
-    >>> xz_plot = openmc.Plot()
-    >>> big_plot = openmc.Plot()
-    >>> small_plot = openmc.Plot()
+    >>> xz_plot = openmc.SlicePlot()
+    >>> big_plot = openmc.VoxelPlot()
+    >>> small_plot = openmc.SlicePlot()
     >>> p = openmc.Plots((xz_plot, big_plot))
     >>> p.append(small_plot)
     >>> small_plot = p.pop()
@@ -1782,7 +2011,7 @@ class Plots(cv.CheckedList):
         ----------
         index : int
             Index in list
-        plot : openmc.Plot
+        plot : openmc.PlotBase
             Plot to insert
 
         """
@@ -1903,8 +2132,13 @@ class Plots(cv.CheckedList):
                 plots.append(WireframeRayTracePlot.from_xml_element(e))
             elif plot_type == 'solid_raytrace':
                 plots.append(SolidRayTracePlot.from_xml_element(e))
-            elif plot_type in ('slice', 'voxel'):
-                plots.append(Plot.from_xml_element(e))
+            elif plot_type == 'slice':
+                plots.append(SlicePlot.from_xml_element(e))
+            elif plot_type == 'voxel':
+                plots.append(VoxelPlot.from_xml_element(e))
+            elif plot_type is None:
+                # For backward compatibility, assume slice if no type specified
+                plots.append(SlicePlot.from_xml_element(e))
             else:
                 raise ValueError("Unknown plot type: {}".format(plot_type))
         return plots
diff --git a/src/mcpl_interface.cpp b/src/mcpl_interface.cpp
index 129407301..256f3343f 100644
--- a/src/mcpl_interface.cpp
+++ b/src/mcpl_interface.cpp
@@ -63,7 +63,7 @@ using mcpl_read_fpt = const mcpl_particle_repr_t* (*)(mcpl_file_t* file_handle);
 using mcpl_close_file_fpt = void (*)(mcpl_file_t* file_handle);
 
 using mcpl_hdr_add_data_fpt = void (*)(mcpl_outfile_t* file_handle,
-  const char* key, int32_t ldata, const char* data);
+  const char* key, uint32_t datalength, const char* data);
 using mcpl_create_outfile_fpt = mcpl_outfile_t* (*)(const char* filename);
 using mcpl_hdr_set_srcname_fpt = void (*)(
   mcpl_outfile_t* outfile_handle, const char* srcname);
@@ -150,13 +150,20 @@ struct McplApi {
       load_symbol_platform("mcpl_create_outfile"));
     hdr_set_srcname = reinterpret_cast<mcpl_hdr_set_srcname_fpt>(
       load_symbol_platform("mcpl_hdr_set_srcname"));
-    hdr_add_data = reinterpret_cast<mcpl_hdr_add_data_fpt>(
-      load_symbol_platform("mcpl_hdr_add_data"));
     add_particle = reinterpret_cast<mcpl_add_particle_fpt>(
       load_symbol_platform("mcpl_add_particle"));
     close_outfile = reinterpret_cast<mcpl_close_outfile_fpt>(
       load_symbol_platform("mcpl_close_outfile"));
 
+    // Try to load mcpl_hdr_add_data (available in MCPL >= 2.1.0)
+    // Set to nullptr if not available for graceful fallback
+    try {
+      hdr_add_data = reinterpret_cast<mcpl_hdr_add_data_fpt>(
+        load_symbol_platform("mcpl_hdr_add_data"));
+    } catch (const std::runtime_error&) {
+      hdr_add_data = nullptr;
+    }
+
     // Try to load mcpl_hdr_add_stat_sum (available in MCPL >= 2.1.0)
     // Set to nullptr if not available for graceful fallback
     try {
diff --git a/tests/regression_tests/distribmat/test.py b/tests/regression_tests/distribmat/test.py
index 02f7e773e..dd09eec36 100644
--- a/tests/regression_tests/distribmat/test.py
+++ b/tests/regression_tests/distribmat/test.py
@@ -73,7 +73,7 @@ class DistribmatTestHarness(PyAPITestHarness):
         # Plots
         ####################
 
-        plot1 = openmc.Plot(plot_id=1)
+        plot1 = openmc.SlicePlot(plot_id=1)
         plot1.basis = 'xy'
         plot1.color_by = 'cell'
         plot1.filename = 'cellplot'
@@ -81,7 +81,7 @@ class DistribmatTestHarness(PyAPITestHarness):
         plot1.width = (7, 7)
         plot1.pixels = (400, 400)
 
-        plot2 = openmc.Plot(plot_id=2)
+        plot2 = openmc.SlicePlot(plot_id=2)
         plot2.basis = 'xy'
         plot2.color_by = 'material'
         plot2.filename = 'matplot'
diff --git a/tests/unit_tests/test_model.py b/tests/unit_tests/test_model.py
index f4f94a47c..9b28ff1c4 100644
--- a/tests/unit_tests/test_model.py
+++ b/tests/unit_tests/test_model.py
@@ -73,13 +73,13 @@ def pin_model_attributes():
     tal.scores = ['flux', 'fission']
     tals.append(tal)
 
-    plot1 = openmc.Plot(plot_id=1)
+    plot1 = openmc.SlicePlot(plot_id=1)
     plot1.origin = (0., 0., 0.)
     plot1.width = (pitch, pitch)
     plot1.pixels = (300, 300)
     plot1.color_by = 'material'
     plot1.filename = 'test'
-    plot2 = openmc.Plot(plot_id=2)
+    plot2 = openmc.SlicePlot(plot_id=2)
     plot2.origin = (0., 0., 0.)
     plot2.width = (pitch, pitch)
     plot2.pixels = (300, 300)
@@ -911,7 +911,7 @@ def test_setter_from_list():
     model = openmc.Model(tallies=[tally])
     assert isinstance(model.tallies, openmc.Tallies)
 
-    plot = openmc.Plot()
+    plot = openmc.SlicePlot()
     model = openmc.Model(plots=[plot])
     assert isinstance(model.plots, openmc.Plots)
 
diff --git a/tests/unit_tests/test_plots.py b/tests/unit_tests/test_plots.py
index fad574ee6..98a93e44b 100644
--- a/tests/unit_tests/test_plots.py
+++ b/tests/unit_tests/test_plots.py
@@ -9,12 +9,11 @@ from openmc.plots import _SVG_COLORS
 
 @pytest.fixture(scope='module')
 def myplot():
-    plot = openmc.Plot(name='myplot')
+    plot = openmc.SlicePlot(name='myplot')
     plot.width = (100., 100.)
     plot.origin = (2., 3., -10.)
     plot.pixels = (500, 500)
     plot.filename = './not-a-dir/myplot'
-    plot.type = 'slice'
     plot.basis = 'yz'
     plot.background = 'black'
     plot.background = (0, 0, 0)
@@ -80,8 +79,7 @@ def test_voxel_plot(run_in_tmpdir):
     geometry.export_to_xml()
     materials = openmc.Materials()
     materials.export_to_xml()
-    vox_plot = openmc.Plot()
-    vox_plot.type = 'voxel'
+    vox_plot = openmc.VoxelPlot()
     vox_plot.id = 12
     vox_plot.width = (1500., 1500., 1500.)
     vox_plot.pixels = (200, 200, 200)
@@ -97,8 +95,9 @@ def test_voxel_plot(run_in_tmpdir):
     assert Path('h5_voxel_plot.h5').is_file()
     assert Path('another_test_voxel_plot.vti').is_file()
 
-    slice_plot = openmc.Plot()
-    with pytest.raises(ValueError):
+    # SlicePlot should not have to_vtk method
+    slice_plot = openmc.SlicePlot()
+    with pytest.raises(AttributeError):
         slice_plot.to_vtk('shimmy.vti')
 
 
@@ -153,14 +152,14 @@ def test_from_geometry():
     geom = openmc.Geometry(univ)
 
     for basis in ('xy', 'yz', 'xz'):
-        plot = openmc.Plot.from_geometry(geom, basis)
+        plot = openmc.SlicePlot.from_geometry(geom, basis)
         assert plot.origin == pytest.approx((0., 0., 0.))
         assert plot.width == pytest.approx((width, width))
         assert plot.basis == basis
 
 
 def test_highlight_domains():
-    plot = openmc.Plot()
+    plot = openmc.SlicePlot()
     plot.color_by = 'material'
     plots = openmc.Plots([plot])
 
@@ -179,8 +178,8 @@ def test_xml_element(myplot):
     assert elem.find('pixels') is not None
     assert elem.find('background').text == '0 0 0'
 
-    newplot = openmc.Plot.from_xml_element(elem)
-    attributes = ('id', 'color_by', 'filename', 'type', 'basis', 'level',
+    newplot = openmc.SlicePlot.from_xml_element(elem)
+    attributes = ('id', 'color_by', 'filename', 'basis', 'level',
                   'meshlines', 'show_overlaps', 'origin', 'width', 'pixels',
                   'background', 'mask_background')
     for attr in attributes:
@@ -200,11 +199,11 @@ def test_to_xml_element_proj(myprojectionplot):
 
 
 def test_plots(run_in_tmpdir):
-    p1 = openmc.Plot(name='plot1')
+    p1 = openmc.SlicePlot(name='plot1')
     p1.origin = (5., 5., 5.)
     p1.colors = {10: (255, 100, 0)}
     p1.mask_components = [2, 4, 6]
-    p2 = openmc.Plot(name='plot2')
+    p2 = openmc.SlicePlot(name='plot2')
     p2.origin = (-3., -3., -3.)
     plots = openmc.Plots([p1, p2])
     assert len(plots) == 2
@@ -213,7 +212,7 @@ def test_plots(run_in_tmpdir):
     plots = openmc.Plots([p1, p2, p3])
     assert len(plots) == 3
 
-    p4 = openmc.Plot(name='plot4')
+    p4 = openmc.VoxelPlot(name='plot4')
     plots.append(p4)
     assert len(plots) == 4
 
@@ -230,8 +229,7 @@ def test_plots(run_in_tmpdir):
 
 def test_voxel_plot_roundtrip():
     # Define a voxel plot and create XML element
-    plot = openmc.Plot(name='my voxel plot')
-    plot.type = 'voxel'
+    plot = openmc.VoxelPlot(name='my voxel plot')
     plot.filename = 'voxel1'
     plot.pixels = (50, 50, 50)
     plot.origin = (0., 0., 0.)
@@ -243,7 +241,6 @@ def test_voxel_plot_roundtrip():
     new_plot = plot.from_xml_element(elem)
     assert new_plot.name == plot.name
     assert new_plot.filename == plot.filename
-    assert new_plot.type == plot.type
     assert new_plot.pixels == plot.pixels
     assert new_plot.origin == plot.origin
     assert new_plot.width == plot.width
@@ -288,10 +285,9 @@ def test_phong_plot_roundtrip():
 def test_plot_directory(run_in_tmpdir):
     pwr_pin = openmc.examples.pwr_pin_cell()
 
-    # create a standard plot, expected to work
-    plot = openmc.Plot()
+    # create a standard slice plot, expected to work
+    plot = openmc.SlicePlot()
     plot.filename = 'plot_1'
-    plot.type = 'slice'
     plot.pixels = (10, 10)
     plot.color_by = 'material'
     plot.width = (100., 100.)
diff --git a/tests/unit_tests/test_slice_voxel_plots.py b/tests/unit_tests/test_slice_voxel_plots.py
new file mode 100644
index 000000000..48ca31b7a
--- /dev/null
+++ b/tests/unit_tests/test_slice_voxel_plots.py
@@ -0,0 +1,273 @@
+"""Tests for SlicePlot and VoxelPlot classes
+
+This module tests the functionality of the new SlicePlot and VoxelPlot
+classes that replace the legacy Plot class.
+"""
+import warnings
+
+import pytest
+import openmc
+
+
+def test_slice_plot_initialization():
+    """Test SlicePlot initialization with defaults"""
+    plot = openmc.SlicePlot()
+    assert plot.width == [4.0, 4.0]
+    assert plot.pixels == [400, 400]
+    assert plot.basis == 'xy'
+    assert plot.origin == [0., 0., 0.]
+
+
+def test_slice_plot_width_validation():
+    """Test that SlicePlot only accepts 2 values for width"""
+    plot = openmc.SlicePlot()
+
+    # Should accept 2 values
+    plot.width = [10.0, 20.0]
+    assert plot.width == [10.0, 20.0]
+
+    # Should reject 1 value
+    with pytest.raises(ValueError, match='must be of length "2"'):
+        plot.width = [10.0]
+
+    # Should reject 3 values
+    with pytest.raises(ValueError, match='must be of length "2"'):
+        plot.width = [10.0, 20.0, 30.0]
+
+
+def test_slice_plot_pixels_validation():
+    """Test that SlicePlot only accepts 2 values for pixels"""
+    plot = openmc.SlicePlot()
+
+    # Should accept 2 values
+    plot.pixels = [100, 200]
+    assert plot.pixels == [100, 200]
+
+    # Should reject 1 value
+    with pytest.raises(ValueError, match='must be of length "2"'):
+        plot.pixels = [100]
+
+    # Should reject 3 values
+    with pytest.raises(ValueError, match='must be of length "2"'):
+        plot.pixels = [100, 200, 300]
+
+
+def test_slice_plot_basis():
+    """Test that SlicePlot has basis attribute"""
+    plot = openmc.SlicePlot()
+
+    # Test all valid basis values
+    for basis in ['xy', 'xz', 'yz']:
+        plot.basis = basis
+        assert plot.basis == basis
+
+    # Test invalid basis
+    with pytest.raises(ValueError):
+        plot.basis = 'invalid'
+
+
+def test_slice_plot_meshlines():
+    """Test that SlicePlot has meshlines attribute"""
+    plot = openmc.SlicePlot()
+
+    meshlines = {
+        'type': 'tally',
+        'id': 1,
+        'linewidth': 2,
+        'color': (255, 0, 0)
+    }
+    plot.meshlines = meshlines
+    assert plot.meshlines == meshlines
+
+
+def test_slice_plot_xml_roundtrip():
+    """Test SlicePlot XML serialization and deserialization"""
+    plot = openmc.SlicePlot(name='test_slice')
+    plot.width = [15.0, 25.0]
+    plot.pixels = [150, 250]
+    plot.basis = 'xz'
+    plot.origin = [1.0, 2.0, 3.0]
+    plot.color_by = 'material'
+    plot.filename = 'test_plot'
+
+    # Convert to XML and back
+    elem = plot.to_xml_element()
+    new_plot = openmc.SlicePlot.from_xml_element(elem)
+
+    # Check all attributes preserved
+    assert new_plot.name == plot.name
+    assert new_plot.width == pytest.approx(plot.width)
+    assert new_plot.pixels == tuple(plot.pixels)
+    assert new_plot.basis == plot.basis
+    assert new_plot.origin == pytest.approx(plot.origin)
+    assert new_plot.color_by == plot.color_by
+    assert new_plot.filename == plot.filename
+
+
+def test_slice_plot_from_geometry():
+    """Test creating SlicePlot from geometry"""
+    # Create simple geometry
+    s = openmc.Sphere(r=10.0, boundary_type='vacuum')
+    c = openmc.Cell(region=-s)
+    univ = openmc.Universe(cells=[c])
+    geom = openmc.Geometry(univ)
+
+    # Test all basis options
+    for basis in ['xy', 'xz', 'yz']:
+        plot = openmc.SlicePlot.from_geometry(geom, basis=basis)
+        assert plot.basis == basis
+        assert plot.width == pytest.approx([20.0, 20.0])
+        assert plot.origin == pytest.approx([0.0, 0.0, 0.0])
+
+
+def test_voxel_plot_initialization():
+    """Test VoxelPlot initialization with defaults"""
+    plot = openmc.VoxelPlot()
+    assert plot.width == [4.0, 4.0, 4.0]
+    assert plot.pixels == [400, 400, 400]
+    assert plot.origin == [0., 0., 0.]
+
+
+def test_voxel_plot_width_validation():
+    """Test that VoxelPlot only accepts 3 values for width"""
+    plot = openmc.VoxelPlot()
+
+    # Should accept 3 values
+    plot.width = [10.0, 20.0, 30.0]
+    assert plot.width == [10.0, 20.0, 30.0]
+
+    # Should reject 2 values
+    with pytest.raises(ValueError, match='must be of length "3"'):
+        plot.width = [10.0, 20.0]
+
+    # Should reject 1 value
+    with pytest.raises(ValueError, match='must be of length "3"'):
+        plot.width = [10.0]
+
+
+def test_voxel_plot_pixels_validation():
+    """Test that VoxelPlot only accepts 3 values for pixels"""
+    plot = openmc.VoxelPlot()
+
+    # Should accept 3 values
+    plot.pixels = [100, 200, 300]
+    assert plot.pixels == [100, 200, 300]
+
+    # Should reject 2 values
+    with pytest.raises(ValueError, match='must be of length "3"'):
+        plot.pixels = [100, 200]
+
+    # Should reject 1 value
+    with pytest.raises(ValueError, match='must be of length "3"'):
+        plot.pixels = [100]
+
+
+def test_voxel_plot_xml_roundtrip():
+    """Test VoxelPlot XML serialization and deserialization"""
+    plot = openmc.VoxelPlot(name='test_voxel')
+    plot.width = [10.0, 20.0, 30.0]
+    plot.pixels = [100, 200, 300]
+    plot.origin = [1.0, 2.0, 3.0]
+    plot.color_by = 'cell'
+    plot.filename = 'voxel_plot'
+
+    # Convert to XML and back
+    elem = plot.to_xml_element()
+    new_plot = openmc.VoxelPlot.from_xml_element(elem)
+
+    # Check all attributes preserved
+    assert new_plot.name == plot.name
+    assert new_plot.width == pytest.approx(plot.width)
+    assert new_plot.pixels == tuple(plot.pixels)
+    assert new_plot.origin == pytest.approx(plot.origin)
+    assert new_plot.color_by == plot.color_by
+    assert new_plot.filename == plot.filename
+
+
+def test_plot_deprecation_warning():
+    """Test that Plot class raises deprecation warning"""
+    with warnings.catch_warnings(record=True) as w:
+        warnings.simplefilter("always")
+        openmc.Plot()
+
+        assert len(w) == 1
+        assert issubclass(w[0].category, FutureWarning)
+        assert "deprecated" in str(w[0].message).lower()
+
+
+def test_plot_returns_slice_plot():
+    """Test that Plot() returns a SlicePlot instance"""
+    with warnings.catch_warnings():
+        warnings.simplefilter("ignore")
+        plot = openmc.Plot()
+
+        # Should be an actual SlicePlot instance
+        assert isinstance(plot, openmc.SlicePlot)
+
+
+def test_plot_type_setter_raises_error():
+    """Test that setting plot.type raises a helpful error"""
+    with warnings.catch_warnings():
+        warnings.simplefilter("ignore")
+        plot = openmc.Plot()
+
+        with pytest.raises(TypeError, match="no longer supported"):
+            plot.type = 'voxel'
+
+        with pytest.raises(TypeError, match="no longer supported"):
+            plot.type = 'slice'
+
+
+def test_plot_type_getter_warns():
+    """Test that getting plot.type raises a deprecation warning"""
+    with warnings.catch_warnings():
+        warnings.simplefilter("ignore")
+        plot = openmc.Plot()
+
+    with warnings.catch_warnings(record=True) as w:
+        warnings.simplefilter("always")
+        plot_type = plot.type
+
+        assert plot_type == 'slice'
+        assert len(w) == 1
+        assert issubclass(w[0].category, FutureWarning)
+        assert "deprecated" in str(w[0].message).lower()
+
+
+def test_plots_collection_mixed_types():
+    """Test Plots collection with different plot types"""
+    slice_plot = openmc.SlicePlot(name='slice')
+    voxel_plot = openmc.VoxelPlot(name='voxel')
+    wireframe_plot = openmc.WireframeRayTracePlot(name='wireframe')
+
+    plots = openmc.Plots([slice_plot, voxel_plot, wireframe_plot])
+
+    assert len(plots) == 3
+    assert isinstance(plots[0], openmc.SlicePlot)
+    assert isinstance(plots[1], openmc.VoxelPlot)
+    assert isinstance(plots[2], openmc.WireframeRayTracePlot)
+
+
+def test_plots_collection_xml_roundtrip(run_in_tmpdir):
+    """Test XML export and import with new plot types"""
+    s1 = openmc.SlicePlot(name='slice1')
+    s1.width = [10.0, 20.0]
+    s1.basis = 'xz'
+
+    v1 = openmc.VoxelPlot(name='voxel1')
+    v1.width = [10.0, 20.0, 30.0]
+
+    plots = openmc.Plots([s1, v1])
+    plots.export_to_xml()
+
+    # Read back
+    new_plots = openmc.Plots.from_xml()
+
+    assert len(new_plots) == 2
+    assert isinstance(new_plots[0], openmc.SlicePlot)
+    assert isinstance(new_plots[1], openmc.VoxelPlot)
+    assert new_plots[0].name == 'slice1'
+    assert new_plots[1].name == 'voxel1'
+    assert new_plots[0].basis == 'xz'
+    assert new_plots[0].width == pytest.approx([10.0, 20.0])
+    assert new_plots[1].width == pytest.approx([10.0, 20.0, 30.0])

From f70febb05f5fc32925d08707db48ff2c33dfe493 Mon Sep 17 00:00:00 2001
From: Paul Romano <paul.k.romano@gmail.com>
Date: Sat, 6 Dec 2025 15:54:30 -0600
Subject: [PATCH 174/203] Update CITATION.cff file (#3671)

---
 CITATION.cff | 36 +++++++++++++++++++++++++++++++++++-
 1 file changed, 35 insertions(+), 1 deletion(-)

diff --git a/CITATION.cff b/CITATION.cff
index 19b4213a1..ab27d89b8 100644
--- a/CITATION.cff
+++ b/CITATION.cff
@@ -1,9 +1,43 @@
+cff-version: 1.2.0
+message: "If you use this software, please cite it as below."
+title: OpenMC
+authors:
+- family-names: Romano
+  given-names: Paul K.
+  orcid: "https://orcid.org/0000-0002-1147-045X"
+- family-names: Shriwise
+  given-names: Patrick C.
+  orcid: "https://orcid.org/0000-0002-3979-7665"
+- family-names: Shimwell
+  given-names: Jonathan
+  orcid: "https://orcid.org/0000-0001-6909-0946"
+- family-names: Harper
+  given-names: Sterling
+- family-names: Boyd
+  given-names: Will
+- family-names: Nelson
+  given-names: Adam G.
+  orcid: "https://orcid.org/0000-0002-3614-0676"
+- family-names: Tramm
+  given-names: John R.
+  orcid: "https://orcid.org/0000-0002-5397-4402"
+- family-names: Ridley
+  given-names: Gavin
+  orcid: "https://orcid.org/0000-0003-1635-8042"
+- family-names: Johnson
+  given-names: Andrew
+  orcid: "https://orcid.org/0000-0003-2125-8775"
+- family-names: Peterson
+  given-names: Ethan E.
+  orcid: "https://orcid.org/0000-0002-5694-7194"
+- family-names: Herman
+  given-names: Bryan R.
 preferred-citation:
   authors:
   - family-names: Romano
     given-names: Paul K.
     orcid: "https://orcid.org/0000-0002-1147-045X"
-  - final-names: Horelik
+  - family-names: Horelik
     given-names: Nicholas E.
   - family-names: Herman
     given-names: Bryan R.

From 9b40ea008efb4ca48e51b5ab4569fb09c42c4380 Mon Sep 17 00:00:00 2001
From: GuySten <62616591+GuySten@users.noreply.github.com>
Date: Mon, 8 Dec 2025 13:39:48 +0200
Subject: [PATCH 175/203] Read IFP settings only in source/eigenvalue run mode
 (#3673)

---
 src/settings.cpp | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/settings.cpp b/src/settings.cpp
index 9dcf7c8db..d47e9b5e6 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -545,6 +545,20 @@ void read_settings_xml(pugi::xml_node root)
     } else if (rel_max_lost_particles <= 0.0 || rel_max_lost_particles >= 1.0) {
       fatal_error("Relative max lost particles must be between zero and one.");
     }
+
+    // Check for user value for the number of generation of the Iterated Fission
+    // Probability (IFP) method
+    if (check_for_node(root, "ifp_n_generation")) {
+      ifp_n_generation = std::stoi(get_node_value(root, "ifp_n_generation"));
+      if (ifp_n_generation <= 0) {
+        fatal_error("'ifp_n_generation' must be greater than 0.");
+      }
+      // Avoid tallying 0 if IFP logs are not complete when active cycles start
+      if (ifp_n_generation > n_inactive) {
+        fatal_error("'ifp_n_generation' must be lower than or equal to the "
+                    "number of inactive cycles.");
+      }
+    }
   }
 
   // Copy plotting random number seed if specified
@@ -1130,20 +1144,6 @@ void read_settings_xml(pugi::xml_node root)
     temperature_range[1] = range.at(1);
   }
 
-  // Check for user value for the number of generation of the Iterated Fission
-  // Probability (IFP) method
-  if (check_for_node(root, "ifp_n_generation")) {
-    ifp_n_generation = std::stoi(get_node_value(root, "ifp_n_generation"));
-    if (ifp_n_generation <= 0) {
-      fatal_error("'ifp_n_generation' must be greater than 0.");
-    }
-    // Avoid tallying 0 if IFP logs are not complete when active cycles start
-    if (ifp_n_generation > n_inactive) {
-      fatal_error("'ifp_n_generation' must be lower than or equal to the "
-                  "number of inactive cycles.");
-    }
-  }
-
   // Check for tabular_legendre options
   if (check_for_node(root, "tabular_legendre")) {
     // Get pointer to tabular_legendre node

From 8e06ed89986394ad46e6dccf7afc5157b6c9b870 Mon Sep 17 00:00:00 2001
From: Jonathan Shimwell <mail@jshimwell.com>
Date: Mon, 8 Dec 2025 16:54:37 +0100
Subject: [PATCH 176/203] Allowing model.id_map to return overlap ID values
 (#3669)

Co-authored-by: Paul Romano <paul.k.romano@gmail.com>
---
 openmc/lib/plot.py             | 12 +++---------
 openmc/model/model.py          |  6 ++++++
 tests/unit_tests/test_model.py | 26 ++++++++++++++++++++++++++
 3 files changed, 35 insertions(+), 9 deletions(-)

diff --git a/openmc/lib/plot.py b/openmc/lib/plot.py
index f97348b20..68f61821c 100644
--- a/openmc/lib/plot.py
+++ b/openmc/lib/plot.py
@@ -52,7 +52,7 @@ class _PlotBase(Structure):
 
     C-Type Attributes
     -----------------
-    origin : openmc.lib.plot._Position
+    origin_ : openmc.lib.plot._Position
         A position defining the origin of the plot.
     width_ : openmc.lib.plot._Position
         The width of the plot along the x, y, and z axes, respectively
@@ -60,6 +60,8 @@ class _PlotBase(Structure):
         The axes basis of the plot view.
     pixels_ : c_size_t[3]
         The resolution of the plot in the horizontal and vertical dimensions
+    color_overlaps_ : c_bool
+        Whether to assign unique IDs (-3) to overlapping regions.
     level_ : c_int
         The universe level for the plot view
 
@@ -187,14 +189,6 @@ class _PlotBase(Structure):
     def color_overlaps(self, color_overlaps):
         self.color_overlaps_ = color_overlaps
 
-    @property
-    def color_overlaps(self):
-        return self.color_overlaps_
-
-    @color_overlaps.setter
-    def color_overlaps(self, val):
-        self.color_overlaps_ = val
-
     def __repr__(self):
         out_str = ["-----",
                    "Plot:",
diff --git a/openmc/model/model.py b/openmc/model/model.py
index e2ac57eba..a9aaa481d 100644
--- a/openmc/model/model.py
+++ b/openmc/model/model.py
@@ -1037,6 +1037,7 @@ class Model:
         width: Sequence[float] | None = None,
         pixels: int | Sequence[int] = 40000,
         basis: str = 'xy',
+        color_overlaps: bool = False,
         **init_kwargs
     ) -> np.ndarray:
         """Generate an ID map for domains based on the plot parameters
@@ -1065,6 +1066,10 @@ class Model:
             total and the image aspect ratio based on the width argument.
         basis : {'xy', 'yz', 'xz'}, optional
             Basis of the plot.
+        color_overlaps : bool, optional
+            Whether to assign unique IDs (-3) to overlapping regions. If False,
+            overlapping regions will be assigned the ID of the lowest-numbered
+            cell that occupies that region. Defaults to False.
         **init_kwargs
             Keyword arguments passed to :meth:`Model.init_lib`.
 
@@ -1089,6 +1094,7 @@ class Model:
         plot_obj.h_res = pixels[0]
         plot_obj.v_res = pixels[1]
         plot_obj.basis = basis
+        plot_obj.color_overlaps = color_overlaps
 
         # Silence output by default. Also set arguments to start in volume
         # calculation mode to avoid loading cross sections
diff --git a/tests/unit_tests/test_model.py b/tests/unit_tests/test_model.py
index 9b28ff1c4..d553af53c 100644
--- a/tests/unit_tests/test_model.py
+++ b/tests/unit_tests/test_model.py
@@ -902,6 +902,32 @@ def test_id_map_aligned_model():
     assert tr_material == 5, f"Expected material ID 5 at top-right corner, got {tr_material}"
 
 
+def test_id_map_model_with_overlaps():
+    """Test id_map with a model that has overlaps and color_overlaps option"""
+    surface1 = openmc.Sphere(r=50, boundary_type="vacuum")
+    surface2 = openmc.Sphere(r=30)
+    cell1 = openmc.Cell(region=-surface1)
+    cell2 = openmc.Cell(region=-surface2)
+    geometry = openmc.Geometry([cell1, cell2])
+    settings = openmc.Settings()
+    model = openmc.Model(geometry=geometry, settings=settings)
+    id_slice = model.id_map(
+        pixels=(10, 10),
+        basis='xy',
+        origin=(0, 0, 0),
+        width=(100, 100),
+    )
+    assert -3 not in id_slice  # -3 indicates overlap region
+    id_slice = model.id_map(
+        pixels=(10, 10),
+        basis='xy',
+        origin=(0, 0, 0),
+        width=(100, 100),
+        color_overlaps=True,  # enables id_map to return -3 for overlaps
+    )
+    assert -3 in id_slice
+
+
 def test_setter_from_list():
     mat = openmc.Material()
     model = openmc.Model(materials=[mat])

From a9dc84f75a8de4499c5bb04bede0f7a65eb844c5 Mon Sep 17 00:00:00 2001
From: Jonathan Shimwell <mail@jshimwell.com>
Date: Mon, 8 Dec 2025 20:43:30 +0100
Subject: [PATCH 177/203] Allowing material making from class constructor
 (#3649)

Co-authored-by: Jon Shimwell <jon@proximafusion.com>
Co-authored-by: Paul Romano <paul.k.romano@gmail.com>
---
 openmc/material.py                | 48 ++++++++++++++++++++++++++---
 tests/unit_tests/test_material.py | 51 +++++++++++++++++++++++++++++++
 2 files changed, 95 insertions(+), 4 deletions(-)

diff --git a/openmc/material.py b/openmc/material.py
index 1609da05a..735a05743 100644
--- a/openmc/material.py
+++ b/openmc/material.py
@@ -60,6 +60,26 @@ class Material(IDManagerMixin):
     temperature : float, optional
         Temperature of the material in Kelvin. If not specified, the material
         inherits the default temperature applied to the model.
+    density : float, optional
+        Density of the material (units defined separately)
+    density_units : str
+        Units used for `density`. Can be one of 'g/cm3', 'g/cc', 'kg/m3',
+        'atom/b-cm', 'atom/cm3', 'sum', or 'macro'.  The 'macro' unit only
+        applies in the case of a multi-group calculation. Defaults to 'sum'.
+    depletable : bool, optional
+        Indicate whether the material is depletable. Defaults to False.
+    volume : float, optional
+        Volume of the material in cm^3. This can either be set manually or
+        calculated in a stochastic volume calculation and added via the
+        :meth:`Material.add_volume_information` method.
+    components : dict of str to float or dict
+        Dictionary mapping element or nuclide names to their atom or weight
+        percent. To specify enrichment of an element, the entry of
+        ``components`` for that element must instead be a dictionary containing
+        the keyword arguments as well as a value for ``'percent'``
+    percent_type : {'ao', 'wo'}
+        Whether the values in `components` should be interpreted as atom percent
+        ('ao') or weight percent ('wo').
 
     Attributes
     ----------
@@ -111,17 +131,28 @@ class Material(IDManagerMixin):
     next_id = 1
     used_ids = set()
 
-    def __init__(self, material_id=None, name='', temperature=None):
+    def __init__(
+        self,
+        material_id: int | None = None,
+        name: str = "",
+        temperature: float | None = None,
+        density: float | None = None,
+        density_units: str = "sum",
+        depletable: bool | None = False,
+        volume: float | None = None,
+        components: dict | None = None,
+        percent_type: str = "ao",
+    ):
         # Initialize class attributes
         self.id = material_id
         self.name = name
         self.temperature = temperature
         self._density = None
-        self._density_units = 'sum'
-        self._depletable = False
+        self._density_units = density_units
+        self._depletable = depletable
         self._paths = None
         self._num_instances = None
-        self._volume = None
+        self._volume = volume
         self._atoms = {}
         self._isotropic = []
         self._ncrystal_cfg = None
@@ -136,6 +167,15 @@ class Material(IDManagerMixin):
         # If specified, a list of table names
         self._sab = []
 
+        # Set density if provided
+        if density is not None:
+            self.set_density(density_units, density)
+
+        # Add components if provided
+        if components is not None:
+            self.add_components(components, percent_type=percent_type)
+
+
     def __repr__(self) -> str:
         string = 'Material\n'
         string += '{: <16}=\t{}\n'.format('\tID', self._id)
diff --git a/tests/unit_tests/test_material.py b/tests/unit_tests/test_material.py
index ce58339d7..764c98d41 100644
--- a/tests/unit_tests/test_material.py
+++ b/tests/unit_tests/test_material.py
@@ -768,3 +768,54 @@ def test_mean_free_path():
     mat2.add_nuclide('Pb208', 1.0)
     mat2.set_density('g/cm3', 11.34)
     assert mat2.mean_free_path(energy=14e6) == pytest.approx(5.65, abs=1e-2)
+
+
+def test_material_from_constructor():
+    # Test that components and percent_type work in the constructor
+    components = {
+        'Li': {'percent': 0.5, 'enrichment': 60.0, 'enrichment_target': 'Li7'},
+        'O16': 1.0,
+        'Be': 0.5
+    }
+    mat = openmc.Material(
+        material_id=123,
+        name="test-mat",
+        components=components,
+        percent_type="ao"
+    )
+    # Check that nuclides were added
+    nuclide_names = [nuc.name for nuc in mat.nuclides]
+    assert 'O16' in nuclide_names
+    assert 'Be9' in nuclide_names
+    assert 'Li7' in nuclide_names
+    assert 'Li6' in nuclide_names
+    assert mat.id == 123
+    assert mat.name == "test-mat"
+
+    mat1 = openmc.Material(
+        **{
+            "material_id": 1,
+            "name": "neutron_star",
+            "density": 1e17,
+            "density_units": "kg/m3",
+        }
+    )
+    assert mat1.id == 1
+    assert mat1.name == "neutron_star"
+    assert mat1._density == 1e17
+    assert mat1._density_units == "kg/m3"
+    assert mat1.nuclides == []
+
+    mat2 = openmc.Material(
+        material_id=42,
+        name="plasma",
+        temperature=None,
+        density=1e-7,
+        density_units="g/cm3",
+    )
+    assert mat2.id == 42
+    assert mat2.name == "plasma"
+    assert mat2.temperature is None
+    assert mat2.density == 1e-7
+    assert mat2.density_units == "g/cm3"
+    assert mat2.nuclides == []

From bc1348579f30281d1a84961389d87558d64cbaf6 Mon Sep 17 00:00:00 2001
From: Lewis Gross <43077972+lewisgross1296@users.noreply.github.com>
Date: Wed, 10 Dec 2025 04:16:04 -0600
Subject: [PATCH 178/203] Generalize RotationalPeriodicBC for X-, Y-, or Z-axis
 (#3591)

Co-authored-by: GuySten <62616591+GuySten@users.noreply.github.com>
---
 docs/source/io_formats/geometry.rst           |   8 +-
 docs/source/usersguide/geometry.rst           |   2 +-
 include/openmc/boundary_condition.h           |  14 ++-
 openmc/surface.py                             |  14 +--
 src/boundary_condition.cpp                    | 114 +++++++++---------
 src/surface.cpp                               |  40 +++++-
 .../periodic_cyls/__init__.py                 |   0
 tests/regression_tests/periodic_cyls/test.py  |  91 ++++++++++++++
 .../periodic_cyls/xcyl_model/inputs_true.dat  |  29 +++++
 .../periodic_cyls/xcyl_model/results_true.dat |   2 +
 .../periodic_cyls/ycyl_model/inputs_true.dat  |  29 +++++
 .../periodic_cyls/ycyl_model/results_true.dat |   2 +
 12 files changed, 265 insertions(+), 80 deletions(-)
 create mode 100644 tests/regression_tests/periodic_cyls/__init__.py
 create mode 100644 tests/regression_tests/periodic_cyls/test.py
 create mode 100644 tests/regression_tests/periodic_cyls/xcyl_model/inputs_true.dat
 create mode 100644 tests/regression_tests/periodic_cyls/xcyl_model/results_true.dat
 create mode 100644 tests/regression_tests/periodic_cyls/ycyl_model/inputs_true.dat
 create mode 100644 tests/regression_tests/periodic_cyls/ycyl_model/results_true.dat

diff --git a/docs/source/io_formats/geometry.rst b/docs/source/io_formats/geometry.rst
index 6d0a37a24..dda1efa9a 100644
--- a/docs/source/io_formats/geometry.rst
+++ b/docs/source/io_formats/geometry.rst
@@ -38,11 +38,9 @@ Each ``<surface>`` element can have the following attributes or sub-elements:
 
   :boundary:
      The boundary condition for the surface. This can be "transmission",
-     "vacuum", "reflective", or "periodic". Periodic boundary conditions can
-     only be applied to x-, y-, and z-planes. Only axis-aligned periodicity is
-     supported, i.e., x-planes can only be paired with x-planes. Specify which
-     planes are periodic and the code will automatically identify which planes
-     are paired together.
+     "vacuum", "reflective", or "periodic". Specify which planes are
+     periodic and the code will automatically identify which planes are
+     paired together.
 
     *Default*: "transmission"
 
diff --git a/docs/source/usersguide/geometry.rst b/docs/source/usersguide/geometry.rst
index 6f14ebfa5..8c68e4851 100644
--- a/docs/source/usersguide/geometry.rst
+++ b/docs/source/usersguide/geometry.rst
@@ -192,7 +192,7 @@ Otherwise it is necessary to specify pairs explicitly using the
 Both rotational and translational periodic boundary conditions are specified in
 the same fashion. If both planes have the same normal vector, a translational
 periodicity is assumed; rotational periodicity is assumed otherwise. Currently,
-only rotations about the :math:`z`-axis are supported.
+rotations must be about the :math:`x`-, :math:`y`-, or :math:`z`-axis.
 
 For a rotational periodic BC, the normal vectors of each surface must point
 inwards---towards the valid geometry. For example, a :class:`XPlane` and
diff --git a/include/openmc/boundary_condition.h b/include/openmc/boundary_condition.h
index af40131f1..5a14239e8 100644
--- a/include/openmc/boundary_condition.h
+++ b/include/openmc/boundary_condition.h
@@ -138,18 +138,26 @@ protected:
 //==============================================================================
 //! A BC that rotates particles about a global axis.
 //
-//! Currently only rotations about the z-axis are supported.
+//! Only rotations about the x, y, and z axes are supported.
 //==============================================================================
 
 class RotationalPeriodicBC : public PeriodicBC {
 public:
-  RotationalPeriodicBC(int i_surf, int j_surf);
-
+  enum PeriodicAxis { x, y, z };
+  RotationalPeriodicBC(int i_surf, int j_surf, PeriodicAxis axis);
+  double compute_periodic_rotation(
+    double rise_1, double run_1, double rise_2, double run_2) const;
   void handle_particle(Particle& p, const Surface& surf) const override;
 
 protected:
   //! Angle about the axis by which particle coordinates will be rotated
   double angle_;
+  //! Ensure that choice of axes is right handed. axis_1_idx_ corresponds to the
+  //! independent axis and axis_2_idx_ corresponds to the dependent axis in the
+  //! 2D plane  perpendicular to the planes' axis of rotation
+  int zero_axis_idx_;
+  int axis_1_idx_;
+  int axis_2_idx_;
 };
 
 } // namespace openmc
diff --git a/openmc/surface.py b/openmc/surface.py
index 4839783ff..1fe5fabdf 100644
--- a/openmc/surface.py
+++ b/openmc/surface.py
@@ -123,9 +123,8 @@ class Surface(IDManagerMixin, ABC):
     boundary_type : {'transmission', 'vacuum', 'reflective', 'periodic', 'white'}, optional
         Boundary condition that defines the behavior for particles hitting the
         surface. Defaults to transmissive boundary condition where particles
-        freely pass through the surface. Note that periodic boundary conditions
-        can only be applied to x-, y-, and z-planes, and only axis-aligned
-        periodicity is supported.
+        freely pass through the surface. Note that only axis-aligned
+        periodicity is supported around the x-, y-, and z-axes.
     albedo : float, optional
         Albedo of the surfaces as a ratio of particle weight after interaction
         with the surface to the initial weight. Values must be positive. Only
@@ -822,8 +821,7 @@ class XPlane(PlaneMixin, Surface):
     boundary_type : {'transmission', 'vacuum', 'reflective', 'periodic', 'white'}, optional
         Boundary condition that defines the behavior for particles hitting the
         surface. Defaults to transmissive boundary condition where particles
-        freely pass through the surface. Only axis-aligned periodicity is
-        supported, i.e., x-planes can only be paired with x-planes.
+        freely pass through the surface.
     albedo : float, optional
         Albedo of the surfaces as a ratio of particle weight after interaction
         with the surface to the initial weight. Values must be positive. Only
@@ -887,8 +885,7 @@ class YPlane(PlaneMixin, Surface):
     boundary_type : {'transmission', 'vacuum', 'reflective', 'periodic', 'white'}, optional
         Boundary condition that defines the behavior for particles hitting the
         surface. Defaults to transmissive boundary condition where particles
-        freely pass through the surface. Only axis-aligned periodicity is
-        supported, i.e., y-planes can only be paired with y-planes.
+        freely pass through the surface.
     albedo : float, optional
         Albedo of the surfaces as a ratio of particle weight after interaction
         with the surface to the initial weight. Values must be positive. Only
@@ -952,8 +949,7 @@ class ZPlane(PlaneMixin, Surface):
     boundary_type : {'transmission', 'vacuum', 'reflective', 'periodic', 'white'}, optional
         Boundary condition that defines the behavior for particles hitting the
         surface. Defaults to transmissive boundary condition where particles
-        freely pass through the surface. Only axis-aligned periodicity is
-        supported, i.e., z-planes can only be paired with z-planes.
+        freely pass through the surface.
     albedo : float, optional
         Albedo of the surfaces as a ratio of particle weight after interaction
         with the surface to the initial weight. Values must be positive. Only
diff --git a/src/boundary_condition.cpp b/src/boundary_condition.cpp
index 7216ac896..2840b3c7d 100644
--- a/src/boundary_condition.cpp
+++ b/src/boundary_condition.cpp
@@ -158,63 +158,44 @@ void TranslationalPeriodicBC::handle_particle(
 // RotationalPeriodicBC implementation
 //==============================================================================
 
-RotationalPeriodicBC::RotationalPeriodicBC(int i_surf, int j_surf)
+RotationalPeriodicBC::RotationalPeriodicBC(
+  int i_surf, int j_surf, PeriodicAxis axis)
   : PeriodicBC(i_surf, j_surf)
 {
   Surface& surf1 {*model::surfaces[i_surf_]};
   Surface& surf2 {*model::surfaces[j_surf_]};
 
-  // Check the type of the first surface
-  bool surf1_is_xyplane;
-  if (const auto* ptr = dynamic_cast<const SurfaceXPlane*>(&surf1)) {
-    surf1_is_xyplane = true;
-  } else if (const auto* ptr = dynamic_cast<const SurfaceYPlane*>(&surf1)) {
-    surf1_is_xyplane = true;
-  } else if (const auto* ptr = dynamic_cast<const SurfacePlane*>(&surf1)) {
-    surf1_is_xyplane = false;
-  } else {
-    throw std::invalid_argument(fmt::format(
-      "Surface {} is an invalid type for "
-      "rotational periodic BCs. Only x-planes, y-planes, or general planes "
-      "(that are perpendicular to z) are supported for these BCs.",
-      surf1.id_));
-  }
-
-  // Check the type of the second surface
-  bool surf2_is_xyplane;
-  if (const auto* ptr = dynamic_cast<const SurfaceXPlane*>(&surf2)) {
-    surf2_is_xyplane = true;
-  } else if (const auto* ptr = dynamic_cast<const SurfaceYPlane*>(&surf2)) {
-    surf2_is_xyplane = true;
-  } else if (const auto* ptr = dynamic_cast<const SurfacePlane*>(&surf2)) {
-    surf2_is_xyplane = false;
-  } else {
-    throw std::invalid_argument(fmt::format(
-      "Surface {} is an invalid type for "
-      "rotational periodic BCs. Only x-planes, y-planes, or general planes "
-      "(that are perpendicular to z) are supported for these BCs.",
-      surf2.id_));
+  // below convention for right handed coordinate system
+  switch (axis) {
+  case x:
+    zero_axis_idx_ = 0; // x component of plane must be zero
+    axis_1_idx_ = 1;    // y component independent
+    axis_2_idx_ = 2;    // z component dependent
+    break;
+  case y:
+    // for a right handed coordinate system, z should be the independent axis
+    // but this would cause the y-rotation case to be different than the other
+    // two. using a left handed coordinate system and a negative rotation the
+    // compute angle and rotation matrix behavior mimics that of the x and z
+    // cases
+    zero_axis_idx_ = 1; // y component of plane must be zero
+    axis_1_idx_ = 0;    // x component independent
+    axis_2_idx_ = 2;    // z component dependent
+    break;
+  case z:
+    zero_axis_idx_ = 2; // z component of plane must be zero
+    axis_1_idx_ = 0;    // x component independent
+    axis_2_idx_ = 1;    // y component dependent
+    break;
+  default:
+    throw std::invalid_argument(
+      fmt::format("You've specified an axis that is not x, y, or z."));
   }
 
   // Compute the surface normal vectors and make sure they are perpendicular
-  // to the z-axis
+  // to the correct axis
   Direction norm1 = surf1.normal({0, 0, 0});
   Direction norm2 = surf2.normal({0, 0, 0});
-  if (std::abs(norm1.z) > FP_PRECISION) {
-    throw std::invalid_argument(fmt::format(
-      "Rotational periodic BCs are only "
-      "supported for rotations about the z-axis, but surface {} is not "
-      "perpendicular to the z-axis.",
-      surf1.id_));
-  }
-  if (std::abs(norm2.z) > FP_PRECISION) {
-    throw std::invalid_argument(fmt::format(
-      "Rotational periodic BCs are only "
-      "supported for rotations about the z-axis, but surface {} is not "
-      "perpendicular to the z-axis.",
-      surf2.id_));
-  }
-
   // Make sure both surfaces intersect the origin
   if (std::abs(surf1.evaluate({0, 0, 0})) > FP_COINCIDENT) {
     throw std::invalid_argument(fmt::format(
@@ -231,15 +212,8 @@ RotationalPeriodicBC::RotationalPeriodicBC(int i_surf, int j_surf)
       surf2.id_));
   }
 
-  // Compute the BC rotation angle.  Here it is assumed that both surface
-  // normal vectors point inwards---towards the valid geometry region.
-  // Consequently, the rotation angle is not the difference between the two
-  // normals, but is instead the difference between one normal and one
-  // anti-normal.  (An incident ray on one surface must be an outgoing ray on
-  // the other surface after rotation hence the anti-normal.)
-  double theta1 = std::atan2(norm1.y, norm1.x);
-  double theta2 = std::atan2(norm2.y, norm2.x) + PI;
-  angle_ = theta2 - theta1;
+  angle_ = compute_periodic_rotation(norm1[axis_2_idx_], norm1[axis_1_idx_],
+    norm2[axis_2_idx_], norm2[axis_1_idx_]);
 
   // Warn the user if the angle does not evenly divide a circle
   double rem = std::abs(std::remainder((2 * PI / angle_), 1.0));
@@ -251,6 +225,20 @@ RotationalPeriodicBC::RotationalPeriodicBC(int i_surf, int j_surf)
   }
 }
 
+double RotationalPeriodicBC::compute_periodic_rotation(
+  double rise_1, double run_1, double rise_2, double run_2) const
+{
+  // Compute the BC rotation angle.  Here it is assumed that both surface
+  // normal vectors point inwards---towards the valid geometry region.
+  // Consequently, the rotation angle is not the difference between the two
+  // normals, but is instead the difference between one normal and one
+  // anti-normal.  (An incident ray on one surface must be an outgoing ray on
+  // the other surface after rotation hence the anti-normal.)
+  double theta1 = std::atan2(rise_1, run_1);
+  double theta2 = std::atan2(rise_2, run_2) + PI;
+  return theta2 - theta1;
+}
+
 void RotationalPeriodicBC::handle_particle(
   Particle& p, const Surface& surf) const
 {
@@ -278,10 +266,16 @@ void RotationalPeriodicBC::handle_particle(
   Direction u = p.u();
   double cos_theta = std::cos(theta);
   double sin_theta = std::sin(theta);
-  Position new_r = {
-    cos_theta * r.x - sin_theta * r.y, sin_theta * r.x + cos_theta * r.y, r.z};
-  Direction new_u = {
-    cos_theta * u.x - sin_theta * u.y, sin_theta * u.x + cos_theta * u.y, u.z};
+
+  Position new_r;
+  new_r[zero_axis_idx_] = r[zero_axis_idx_];
+  new_r[axis_1_idx_] = cos_theta * r[axis_1_idx_] - sin_theta * r[axis_2_idx_];
+  new_r[axis_2_idx_] = sin_theta * r[axis_1_idx_] + cos_theta * r[axis_2_idx_];
+
+  Direction new_u;
+  new_u[zero_axis_idx_] = u[zero_axis_idx_];
+  new_u[axis_1_idx_] = cos_theta * u[axis_1_idx_] - sin_theta * u[axis_2_idx_];
+  new_u[axis_2_idx_] = sin_theta * u[axis_1_idx_] + cos_theta * u[axis_2_idx_];
 
   // Handle the effects of the surface albedo on the particle's weight.
   BoundaryCondition::handle_albedo(p, surf);
diff --git a/src/surface.cpp b/src/surface.cpp
index ea19514a3..09fc0f24f 100644
--- a/src/surface.cpp
+++ b/src/surface.cpp
@@ -1334,8 +1334,44 @@ void read_surfaces(pugi::xml_node node)
       surf1.bc_ = make_unique<TranslationalPeriodicBC>(i_surf, j_surf);
       surf2.bc_ = make_unique<TranslationalPeriodicBC>(i_surf, j_surf);
     } else {
-      surf1.bc_ = make_unique<RotationalPeriodicBC>(i_surf, j_surf);
-      surf2.bc_ = make_unique<RotationalPeriodicBC>(i_surf, j_surf);
+      // check that both normals have at least one 0 component
+      if (std::abs(norm1.x) > FP_PRECISION &&
+          std::abs(norm1.y) > FP_PRECISION &&
+          std::abs(norm1.z) > FP_PRECISION) {
+        fatal_error(fmt::format(
+          "The normal ({}) of the periodic surface ({}) does not contain any "
+          "component with a zero value. A RotationalPeriodicBC requires one "
+          "component which is zero for both plane normals.",
+          norm1, i_surf));
+      }
+      if (std::abs(norm2.x) > FP_PRECISION &&
+          std::abs(norm2.y) > FP_PRECISION &&
+          std::abs(norm2.z) > FP_PRECISION) {
+        fatal_error(fmt::format(
+          "The normal ({}) of the periodic surface ({}) does not contain any "
+          "component with a zero value. A RotationalPeriodicBC requires one "
+          "component which is zero for both plane normals.",
+          norm2, j_surf));
+      }
+      // find common zero component, which indicates the periodic axis
+      RotationalPeriodicBC::PeriodicAxis axis;
+      if (std::abs(norm1.x) <= FP_PRECISION &&
+          std::abs(norm2.x) <= FP_PRECISION) {
+        axis = RotationalPeriodicBC::PeriodicAxis::x;
+      } else if (std::abs(norm1.y) <= FP_PRECISION &&
+                 std::abs(norm2.y) <= FP_PRECISION) {
+        axis = RotationalPeriodicBC::PeriodicAxis::y;
+      } else if (std::abs(norm1.z) <= FP_PRECISION &&
+                 std::abs(norm2.z) <= FP_PRECISION) {
+        axis = RotationalPeriodicBC::PeriodicAxis::z;
+      } else {
+        fatal_error(fmt::format(
+          "There is no component which is 0.0 in both normal vectors. This "
+          "indicates that the two planes are not periodic about the X, Y, or Z "
+          "axis, which is not supported."));
+      }
+      surf1.bc_ = make_unique<RotationalPeriodicBC>(i_surf, j_surf, axis);
+      surf2.bc_ = make_unique<RotationalPeriodicBC>(i_surf, j_surf, axis);
     }
 
     // If albedo data is present in albedo map, set the boundary albedo.
diff --git a/tests/regression_tests/periodic_cyls/__init__.py b/tests/regression_tests/periodic_cyls/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/regression_tests/periodic_cyls/test.py b/tests/regression_tests/periodic_cyls/test.py
new file mode 100644
index 000000000..a341e3799
--- /dev/null
+++ b/tests/regression_tests/periodic_cyls/test.py
@@ -0,0 +1,91 @@
+import openmc
+import numpy as np
+import pytest
+from openmc.utility_funcs import change_directory
+from tests.testing_harness import PyAPITestHarness
+
+
+@pytest.fixture
+def xcyl_model():
+    model = openmc.Model()
+    # Define materials
+    fuel = openmc.Material()
+    fuel.add_nuclide('U235', 0.2)
+    fuel.add_nuclide('U238', 0.8)
+    fuel.set_density('g/cc', 19.1)
+    model.materials = openmc.Materials([fuel])
+
+    # Define geometry
+    # finite cylinder
+    x_min = openmc.XPlane(x0=0.0, boundary_type='reflective')
+    x_max = openmc.XPlane(x0=20.0, boundary_type='reflective')
+    x_cyl = openmc.XCylinder(r=20.0,boundary_type='vacuum')
+    # slice cylinder for periodic BC
+    periodic_bounding_yplane = openmc.YPlane(y0=0, boundary_type='periodic')
+    periodic_bounding_plane = openmc.Plane(
+        a=0.0, b=-np.sqrt(3) / 3, c=1, boundary_type='periodic',
+    )
+    sixth_cyl_cell = openmc.Cell(1, fill=fuel, region = 
+        +x_min &- x_max & -x_cyl & +periodic_bounding_yplane & +periodic_bounding_plane)
+    periodic_bounding_yplane.periodic_surface = periodic_bounding_plane
+    periodic_bounding_plane.periodic_surface = periodic_bounding_yplane
+
+    model.geometry = openmc.Geometry([sixth_cyl_cell])
+
+
+    # Define settings
+    model.settings.particles = 1000
+    model.settings.batches = 4
+    model.settings.inactive = 0
+    model.settings.source = openmc.IndependentSource(space=openmc.stats.Box(
+        (0, 0, 0), (20, 20, 20))
+    )
+    return model
+
+@pytest.fixture
+def ycyl_model():
+    model = openmc.Model()
+    # Define materials
+    fuel = openmc.Material()
+    fuel.add_nuclide('U235', 0.2)
+    fuel.add_nuclide('U238', 0.8)
+    fuel.set_density('g/cc', 19.1)
+    model.materials = openmc.Materials([fuel])
+
+    # Define geometry
+    # finite cylinder
+    y_min = openmc.YPlane(y0=0.0, boundary_type='reflective')
+    y_max = openmc.YPlane(y0=20.0, boundary_type='reflective')
+    y_cyl = openmc.YCylinder(r=20.0,boundary_type='vacuum')
+    # slice cylinder for periodic BC
+    periodic_bounding_xplane = openmc.XPlane(x0=0, boundary_type='periodic')
+    periodic_bounding_plane = openmc.Plane(
+        a=-np.sqrt(3) / 3, b=0.0, c=1, boundary_type='periodic',
+    )
+    sixth_cyl_cell = openmc.Cell(1, fill=fuel, region = 
+        +y_min &- y_max & -y_cyl & +periodic_bounding_xplane & +periodic_bounding_plane)
+    periodic_bounding_xplane.periodic_surface = periodic_bounding_plane
+    periodic_bounding_plane.periodic_surface = periodic_bounding_xplane
+    model.geometry = openmc.Geometry([sixth_cyl_cell])
+
+
+    # Define settings
+    model.settings.particles = 1000
+    model.settings.batches = 4
+    model.settings.inactive = 0
+    model.settings.source = openmc.IndependentSource(space=openmc.stats.Box(
+        (0, 0, 0), (20, 20, 20))
+    )
+    return model
+
+def test_xcyl(xcyl_model):
+    with change_directory("xcyl_model"):
+        openmc.reset_auto_ids()
+        harness = PyAPITestHarness('statepoint.4.h5', xcyl_model)
+        harness.main()
+
+def test_ycyl(ycyl_model):
+    with change_directory("ycyl_model"):
+        openmc.reset_auto_ids()
+        harness = PyAPITestHarness('statepoint.4.h5', ycyl_model)
+        harness.main()
\ No newline at end of file
diff --git a/tests/regression_tests/periodic_cyls/xcyl_model/inputs_true.dat b/tests/regression_tests/periodic_cyls/xcyl_model/inputs_true.dat
new file mode 100644
index 000000000..7d1ecf426
--- /dev/null
+++ b/tests/regression_tests/periodic_cyls/xcyl_model/inputs_true.dat
@@ -0,0 +1,29 @@
+<?xml version='1.0' encoding='utf-8'?>
+<model>
+  <materials>
+    <material id="1" depletable="true">
+      <density value="19.1" units="g/cc"/>
+      <nuclide name="U235" ao="0.2"/>
+      <nuclide name="U238" ao="0.8"/>
+    </material>
+  </materials>
+  <geometry>
+    <cell id="1" material="1" region="1 -2 -3 4 5" universe="1"/>
+    <surface id="1" type="x-plane" boundary="reflective" coeffs="0.0"/>
+    <surface id="2" type="x-plane" boundary="reflective" coeffs="20.0"/>
+    <surface id="3" type="x-cylinder" boundary="vacuum" coeffs="0.0 0.0 20.0"/>
+    <surface id="4" type="y-plane" boundary="periodic" coeffs="0" periodic_surface_id="5"/>
+    <surface id="5" type="plane" boundary="periodic" coeffs="0.0 -0.5773502691896257 1 0.0" periodic_surface_id="4"/>
+  </geometry>
+  <settings>
+    <run_mode>eigenvalue</run_mode>
+    <particles>1000</particles>
+    <batches>4</batches>
+    <inactive>0</inactive>
+    <source type="independent" strength="1.0" particle="neutron">
+      <space type="box">
+        <parameters>0 0 0 20 20 20</parameters>
+      </space>
+    </source>
+  </settings>
+  </model>
diff --git a/tests/regression_tests/periodic_cyls/xcyl_model/results_true.dat b/tests/regression_tests/periodic_cyls/xcyl_model/results_true.dat
new file mode 100644
index 000000000..c7e3eb670
--- /dev/null
+++ b/tests/regression_tests/periodic_cyls/xcyl_model/results_true.dat
@@ -0,0 +1,2 @@
+k-combined:
+1.082283E+00 6.676373E-02
diff --git a/tests/regression_tests/periodic_cyls/ycyl_model/inputs_true.dat b/tests/regression_tests/periodic_cyls/ycyl_model/inputs_true.dat
new file mode 100644
index 000000000..f3ca7e0f4
--- /dev/null
+++ b/tests/regression_tests/periodic_cyls/ycyl_model/inputs_true.dat
@@ -0,0 +1,29 @@
+<?xml version='1.0' encoding='utf-8'?>
+<model>
+  <materials>
+    <material id="2" depletable="true">
+      <density value="19.1" units="g/cc"/>
+      <nuclide name="U235" ao="0.2"/>
+      <nuclide name="U238" ao="0.8"/>
+    </material>
+  </materials>
+  <geometry>
+    <cell id="1" material="2" region="6 -7 -8 9 10" universe="2"/>
+    <surface id="6" type="y-plane" boundary="reflective" coeffs="0.0"/>
+    <surface id="7" type="y-plane" boundary="reflective" coeffs="20.0"/>
+    <surface id="8" type="y-cylinder" boundary="vacuum" coeffs="0.0 0.0 20.0"/>
+    <surface id="9" type="x-plane" boundary="periodic" coeffs="0" periodic_surface_id="10"/>
+    <surface id="10" type="plane" boundary="periodic" coeffs="-0.5773502691896257 0.0 1 0.0" periodic_surface_id="9"/>
+  </geometry>
+  <settings>
+    <run_mode>eigenvalue</run_mode>
+    <particles>1000</particles>
+    <batches>4</batches>
+    <inactive>0</inactive>
+    <source type="independent" strength="1.0" particle="neutron">
+      <space type="box">
+        <parameters>0 0 0 20 20 20</parameters>
+      </space>
+    </source>
+  </settings>
+  </model>
diff --git a/tests/regression_tests/periodic_cyls/ycyl_model/results_true.dat b/tests/regression_tests/periodic_cyls/ycyl_model/results_true.dat
new file mode 100644
index 000000000..562467f2c
--- /dev/null
+++ b/tests/regression_tests/periodic_cyls/ycyl_model/results_true.dat
@@ -0,0 +1,2 @@
+k-combined:
+1.082652E+00 3.316031E-02

From d09fbc61b5e164e9a434de85358dfe48a3f1b0b9 Mon Sep 17 00:00:00 2001
From: John Tramm <john.tramm@gmail.com>
Date: Wed, 10 Dec 2025 09:26:26 -0600
Subject: [PATCH 179/203] Copilot Bot File (#3651)

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: Paul Romano <paul.k.romano@gmail.com>
Co-authored-by: Patrick Shriwise <pshriwise@gmail.com>
---
 AGENTS.md | 280 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 280 insertions(+)
 create mode 100644 AGENTS.md

diff --git a/AGENTS.md b/AGENTS.md
new file mode 100644
index 000000000..32e30213a
--- /dev/null
+++ b/AGENTS.md
@@ -0,0 +1,280 @@
+# OpenMC AI Coding Agent Instructions
+
+## Project Overview
+
+OpenMC is a Monte Carlo particle transport code for simulating nuclear reactors,
+fusion devices, or other systems with neutron/photon radiation. It's a hybrid
+C++17/Python codebase where:
+- **C++ core** (`src/`, `include/openmc/`) handles the computationally intensive transport simulation
+- **Python API** (`openmc/`) provides user-facing model building, post-processing, and depletion capabilities
+- **C API bindings** (`openmc/lib/`) wrap the C++ library via ctypes for runtime control
+
+## Architecture & Key Components
+
+### C++ Component Structure
+- **Global vectors of unique_ptrs**: Core objects like `model::cells`, `model::universes`, `nuclides` are stored as `vector<unique_ptr<T>>` in nested namespaces (`openmc::model`, `openmc::simulation`, `openmc::settings`, `openmc::data`)
+- **Custom container types**: OpenMC provides its own `vector`, `array`, `unique_ptr`, and `make_unique` in the `openmc::` namespace (defined in `vector.h`, `array.h`, `memory.h`). These are currently typedefs to `std::` equivalents but may become custom implementations for accelerator support. Always use `openmc::vector`, not `std::vector`.
+- **Geometry systems**:
+  - **CSG (default)**: Arbitrarily complex Constructive Solid Geometry using `Surface`, `Region`, `Cell`, `Universe`, `Lattice`
+  - **DAGMC**: CAD-based geometry via Direct Accelerated Geometry Monte Carlo (optional, requires `OPENMC_USE_DAGMC`)
+  - **Unstructured mesh**: libMesh-based geometry (optional, requires `OPENMC_USE_LIBMESH`)
+- **Particle tracking**: `Particle` class with `GeometryState` manages particle transport through geometry
+- **Tallies**: Score quantities during simulation via `Filter` and `Tally` objects
+- **Random ray solver**: Alternative deterministic method in `src/random_ray/`
+- **Optional features**: DAGMC (CAD geometry), libMesh (unstructured mesh), MPI, all controlled by `#ifdef OPENMC_MPI`, etc.
+
+### Python Component Structure
+- **ID management**: All geometry objects (Cell, Surface, Material, etc.) inherit from `IDManagerMixin` which auto-assigns unique integer IDs and tracks them via class-level `used_ids` and `next_id`
+- **Input validation**: Extensive use of `openmc.checkvalue` module functions (`check_type`, `check_value`, `check_length`) for all setters
+- **XML I/O**: Most classes implement `to_xml_element()` and `from_xml_element()` for serialization to OpenMC's XML input format
+- **HDF5 output**: Post-simulation data in statepoint files read via `openmc.StatePoint`
+- **Depletion**: `openmc.deplete` implements burnup via operator-splitting with various integrators (Predictor, CECM, etc.)
+- **Nuclear Data**: `openmc.data` provides programmatic access to nuclear data files (ENDF, ACE, HDF5)
+
+## Critical Build & Test Workflows
+
+### Build Dependencies
+- **C++17 compiler**: GCC, Clang, or Intel
+- **CMake** (3.16+): Required for configuring and building the C++ library
+- **HDF5**: Required for cross section data and output file formats
+- **libpng**: Used for generating visualization when OpenMC is run in plotting mode
+
+Without CMake and HDF5, OpenMC cannot be compiled.
+
+### Building the C++ Library
+```bash
+# Configure with CMake (from build/ directory)
+cmake .. -DOPENMC_USE_MPI=ON -DOPENMC_USE_OPENMP=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo
+
+# Available CMake options (all default OFF except OPENMC_USE_OPENMP and OPENMC_BUILD_TESTS):
+# -DOPENMC_USE_OPENMP=ON/OFF        # OpenMP parallelism
+# -DOPENMC_USE_MPI=ON/OFF           # MPI support
+# -DOPENMC_USE_DAGMC=ON/OFF         # CAD geometry support
+# -DOPENMC_USE_LIBMESH=ON/OFF       # Unstructured mesh
+# -DOPENMC_ENABLE_PROFILE=ON/OFF    # Profiling flags
+# -DOPENMC_ENABLE_COVERAGE=ON/OFF   # Coverage analysis
+
+# Build
+make -j
+
+# C++ unit tests (uses Catch2)
+ctest
+```
+
+### Python Development
+```bash
+# Install in development mode (requires building C++ library first)
+pip install -e .
+
+# Python tests (uses pytest)
+pytest tests/unit_tests/           # Fast unit tests
+pytest tests/regression_tests/     # Full regression suite (requires nuclear data)
+```
+
+### Nuclear Data Setup (CRITICAL for Running OpenMC)
+Most tests require the NNDC HDF5 nuclear cross-section library.
+
+**Important**: Check if `OPENMC_CROSS_SECTIONS` is already set in the user's
+environment before downloading, as many users already have nuclear data
+installed. Though do note that if this variable is present that it may point to
+different cross section data and that the NNDC data is required for tests to
+pass.
+
+**If not already configured, download and setup:**
+```bash
+# Download NNDC HDF5 cross section library (~800 MB compressed)
+wget -q -O - https://anl.box.com/shared/static/teaup95cqv8s9nn56hfn7ku8mmelr95p.xz | tar -C $HOME -xJ
+
+# Set environment variable (add to ~/.bashrc or ~/.zshrc for persistence)
+export OPENMC_CROSS_SECTIONS=$HOME/nndc_hdf5/cross_sections.xml
+```
+
+**Alternative**: Use the provided download script (checks if data exists before downloading):
+```bash
+bash tools/ci/download-xs.sh  # Downloads both NNDC HDF5 and ENDF/B-VII.1 data
+```
+
+Without this data, regression tests will fail with "No cross_sections.xml file
+found" errors, or, in the case that alternative cross section data is configured
+the tests will execute but will not pass. The `cross_sections.xml` file is an
+index listing paths to individual HDF5 nuclear data files for each nuclide.
+
+## Testing Expectations
+
+### Environment Requirements
+
+  - **Data**: As described above, OpenMC's test suite requires OpenMC to be configured with NNDC data.
+  - **OpenMP Settings**: OpenMC's tests may fail is more than two OpenMP threads are used. The environment variable `OMP_NUM_THREADS=2` should be set to avoid sporadic test failures.
+  - **Executable configuration**: The OpenMC executable should compiled with debug symbols enabled.
+
+### C++ Tests
+Located in `tests/cpp_unit_tests/`, use Catch2 framework. Run via `ctest` after building with `-DOPENMC_BUILD_TESTS=ON`.
+
+### Python Unit Tests
+Located in `tests/unit_tests/`, these are fast, standalone tests that verify Python API functionality without running full simulations. Use standard pytest patterns:
+
+**Categories**:
+- **API validation**: Test object creation, property setters/getters, XML serialization (e.g., `test_material.py`, `test_cell.py`, `test_source.py`)
+- **Data processing**: Test nuclear data handling, cross sections, depletion chains (e.g., `test_data_neutron.py`, `test_deplete_chain.py`)
+- **Library bindings**: Test `openmc.lib` ctypes interface with `model.init_lib()`/`model.finalize_lib()` (e.g., `test_lib.py`)
+- **Geometry operations**: Test bounding boxes, containment, lattice generation (e.g., `test_bounding_box.py`, `test_lattice.py`)
+
+**Common patterns**:
+- Use fixtures from `tests/unit_tests/conftest.py` (e.g., `uo2`, `water`, `sphere_model`)
+- Test invalid inputs with `pytest.raises(ValueError)` or `pytest.raises(TypeError)`
+- Use `run_in_tmpdir` fixture for tests that create files
+- Tests with `openmc.lib` require calling `model.init_lib()` in try/finally with `model.finalize_lib()`
+
+**Example**:
+```python
+def test_material_properties():
+    m = openmc.Material()
+    m.add_nuclide('U235', 1.0)
+    assert 'U235' in m.nuclides
+
+    with pytest.raises(TypeError):
+        m.add_nuclide('H1', '1.0')  # Invalid type
+```
+
+Unit tests should be fast. For tests requiring simulation output, use regression tests instead.
+
+### Python Regression Tests
+Regression tests compare OpenMC output against reference data. **Prefer using existing models from `openmc.examples` or those found in tests/unit_tests/conftest.py** (like `pwr_pin_cell()`, `pwr_assembly()`, `slab_mg()`) rather than building from scratch.
+
+**Test Harness Types** (in `tests/testing_harness.py`):
+- **PyAPITestHarness**: Standard harness for Python API tests. Compares `inputs_true.dat` (XML hash) and `results_true.dat` (statepoint k-eff and tally values). Requires `model.xml` generation.
+- **HashedPyAPITestHarness**: Like PyAPITestHarness but hashes the results for compact comparison
+- **TolerantPyAPITestHarness**: For tests with floating-point non-associativity (e.g., random ray solver with single precision). Uses relative tolerance comparisons.
+- **WeightWindowPyAPITestHarness**: Compares weight window bounds from `weight_windows.h5`
+- **CollisionTrackTestHarness**: Compares collision track data from `collision_track.h5` against `collision_track_true.h5`
+- **TestHarness**: Base harness for XML-based tests (no Python model building)
+- **PlotTestHarness**: Compares plot output files (PNG or voxel HDF5)
+- **CMFDTestHarness**: Specialized for CMFD acceleration tests
+- **ParticleRestartTestHarness**: Tests particle restart functionality
+
+Almost all cases use either `PyAPITestHarness` or `HashedPyAPITestHarness`
+
+**Example Test**:
+```python
+from openmc.examples import pwr_pin_cell
+from tests.testing_harness import PyAPITestHarness
+
+def test_my_feature():
+    model = pwr_pin_cell()
+    model.settings.particles = 1000  # Modify to exercise feature
+    harness = PyAPITestHarness('statepoint.10.h5', model)
+    harness.main()
+```
+
+**Workflow**: Create `test.py` and `__init__.py` in `tests/regression_tests/my_test/`, run `pytest --update` to generate reference files (`inputs_true.dat`, `results_true.dat`, etc.), then verify with `pytest` without `--update`. Test results should be generated with a debug build (`-DCMAKE_BUILD_TYPE=Debug`)
+
+**Critical**: When modifying OpenMC code, regenerate affected test references with `pytest --update` and commit updated reference files.
+
+### Test Configuration
+
+`pytest.ini` sets: `python_files = test*.py`, `python_classes = NoThanks` (disables class-based test collection).
+
+### Testing Options
+
+For builds of OpenMC with MPI enabled, the `--mpi` flag should be passed to the test suite to ensure that appropriate tests are executed using two MPI processes.
+
+The entire test suite can be executed with OpenMC running in event-based mode (instead of the default history-based mode) by providing the `--event` flag to the `pytest` command.
+
+## Cross-Language Boundaries
+
+The C API (defined in `include/openmc/capi.h`) exposes C++ functionality to Python via ctypes bindings in `openmc/lib/`. Example:
+```cpp
+// C++ API in capi.h
+extern "C" int openmc_run();
+
+// Python binding in openmc/lib/core.py
+_dll.openmc_run.restype = c_int
+def run():
+    _dll.openmc_run()
+```
+
+When modifying C++ public APIs, update corresponding ctypes signatures in `openmc/lib/*.py`.
+
+## Code Style & Conventions
+
+### C++ Style (enforced by .clang-format)
+  OpenMC generally tries to follow C++ core guidelines where possible
+  (https://isocpp.github.io/CppCoreGuidelines/CppCoreGuidelines) and follow
+  modern C++ practices (e.g. RAII) whenever possible.
+
+- **Naming**:
+  - Classes: `CamelCase` (e.g., `HexLattice`)
+  - Functions/methods: `snake_case` (e.g., `get_indices`)
+  - Variables: `snake_case` with trailing underscore for class members (e.g., `n_particles_`, `energy_`)
+  - Constants: `UPPER_SNAKE_CASE` (e.g., `SQRT_PI`)
+- **Namespaces**: All code in `openmc::` namespace, global state in sub-namespaces
+- **Include order**: Related header first, then C/C++ stdlib, third-party libs, local headers
+- **Comments**: C++-style (`//`) only, never C-style (`/* */`)
+- **Standard**: C++17 features allowed
+- **Formatting**: Run `clang-format` (version 15) before committing; install via `tools/dev/install-commit-hooks.sh`
+
+### Python Style
+- **PEP8** compliant
+- **Docstrings**: numpydoc format for all public functions/methods
+- **Type hints**: Use sparingly, primarily for complex signatures
+- **Path handling**: Use `pathlib.Path` for filesystem operations, accept `str | os.PathLike` in function arguments
+- **Dependencies**: Core dependencies only (numpy, scipy, h5py, pandas, matplotlib, lxml, ipython, uncertainties, setuptools, endf). Other packages must be optional
+- **Python version**: Minimum 3.11 (as of Nov 2025)
+
+### ID Management Pattern (Python)
+When creating geometry objects, IDs can be auto-assigned or explicit:
+```python
+# Auto-assigned ID
+cell = openmc.Cell()  # Gets next available ID
+
+# Explicit ID
+cell = openmc.Cell(id=10)  # Warning if ID already used
+
+# Reset all IDs (useful in test fixtures)
+openmc.reset_auto_ids()
+```
+
+### Input Validation Pattern (Python)
+All setters use checkvalue functions:
+```python
+import openmc.checkvalue as cv
+
+@property
+def temperature(self):
+    return self._temperature
+
+@temperature.setter
+def temperature(self, temp):
+    cv.check_type('temperature', temp, Real)
+    cv.check_greater_than('temperature', temp, 0.0)
+    self._temperature = temp
+```
+
+### Working with HDF5 Files
+C++ uses custom HDF5 wrappers in `src/hdf5_interface.cpp`. Python uses h5py directly. Statepoint format version is `VERSION_STATEPOINT` in `include/openmc/constants.h`.
+
+### Conditional Compilation
+Check for optional features:
+```cpp
+#ifdef OPENMC_MPI
+  // MPI-specific code
+#endif
+
+#ifdef OPENMC_DAGMC
+  // DAGMC-specific code
+#endif
+```
+
+## Documentation
+
+- **User docs**: Sphinx documentation in `docs/source/` hosted at https://docs.openmc.org
+- **C++ docs**: Doxygen-style comments with `\brief`, `\param` tags
+- **Python docs**: numpydoc format docstrings
+
+## Common Pitfalls
+
+1. **Forgetting nuclear data**: Tests fail without `OPENMC_CROSS_SECTIONS` environment variable
+2. **ID conflicts**: Python objects with duplicate IDs trigger `IDWarning`, use `reset_auto_ids()` between tests
+3. **MPI builds**: Code must work with and without MPI; use `#ifdef OPENMC_MPI` guards
+4. **Path handling**: Use `pathlib.Path` in new Python code, not `os.path`
+5. **Clang-format version**: CI uses version 15; other versions may produce different formatting

From a62e754bbb77646a81bcbe2dd6bcb58e9686286d Mon Sep 17 00:00:00 2001
From: pranav <pranav8iisc@gmail.com>
Date: Thu, 11 Dec 2025 09:24:28 +0530
Subject: [PATCH 180/203] Add user documentation for DAGMCUniverse
 synchronization (#3674)

Co-authored-by: Patrick Shriwise <pshriwise@gmail.com>
---
 docs/source/usersguide/geometry.rst | 85 +++++++++++++++++++++++++++++
 1 file changed, 85 insertions(+)

diff --git a/docs/source/usersguide/geometry.rst b/docs/source/usersguide/geometry.rst
index 8c68e4851..f51fbd73c 100644
--- a/docs/source/usersguide/geometry.rst
+++ b/docs/source/usersguide/geometry.rst
@@ -182,6 +182,8 @@ boundary condition.
 
 Periodic boundary conditions can be applied to pairs of planar surfaces.
 If there are only two periodic surfaces they will be matched automatically.
+
+
 Otherwise it is necessary to specify pairs explicitly using the
 :attr:`Surface.periodic_surface` attribute as in the following example::
 
@@ -530,6 +532,89 @@ UWUW and OpenMC material ID space will cause an error. To automatically resolve
 these ID overlaps, ``auto_ids`` can be set to ``True`` to append the UWUW
 material IDs to the OpenMC material ID space.
 
+
+Material overrides and differentiation
+--------------------------------------
+
+Programmatic access to DAGMC cell information for material overrides
+and differentiation requires synchronization of the DAGMC universe
+representation across Python and C-API::
+
+  model.init_lib()
+  model.sync_dagmc_universes()
+  model.finalize_lib()
+
+Upon completion of these steps, the :attr:`DAGMCUniverse.cells` attribute will
+be populated with :class:`DAGMCCell` proxy objects that represent the cells
+defined in the DAGMC model. The :class:`DAGMCCell` objects  will have
+:class:`openmc.Material`'s' applied according to the assignments upon
+initialization of the model. These materials can be replaced in the same manner
+as :class:`openmc.Cell` objects to override material assignments in the DAGMC
+model.
+
+Depletion with DAGMC geometry
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The synchronization of :class:`openmc.DAGMCUniverse`'s is important for
+depletion calculations using DAGMC geometry when materials need to be
+differentiated to perform material burnup independently in each DAGMC cell. See
+:meth:`openmc.model.Model.differentiate_mats`.
+
+Material overrides
+~~~~~~~~~~~~~~~~~~
+
+OpenMC supports overriding material assignments defined inside a DAGMC HDF5
+model so that CAD-assigned materials can be replaced by :class:`openmc.Material`
+objects. This is useful when the CAD geometry provides the shape but OpenMC
+materials (specific nuclide content, densities, or depletion behavior) are
+required.
+
+
+Replacing materials by name
+^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+If a DAGMC file includes material name tags, you can replace all cells that
+reference a particular name with an :class:`openmc.Material` using
+:meth:`~openmc.DAGMCUniverse.replace_material_assignment`::
+
+  import openmc
+
+  dag_univ = openmc.DAGMCUniverse('dagmc.h5m')
+
+  fuel = openmc.Material(name='fuel')
+  fuel.add_nuclide('U235', 0.05)
+  fuel.add_nuclide('U238', 0.95)
+  fuel.set_density('g/cm3', 10.5)
+
+  dag_univ.replace_material_assignment('Fuel', fuel)
+
+This lets you keep CAD geometry while adopting OpenMC material definitions.
+
+Per-cell material overrides
+^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+To assign overrides without initializing :class:`openmc.Model`, the
+:meth:`openmc.DAGMCUniverse.add_material_override` method can be used to assign
+materials to particular DAGMC cells. The method accepts either an integer cell
+ID::
+
+  dag_univ = openmc.DAGMCUniverse('dagmc.h5m')
+
+  enriched = openmc.Material(name='fuel_enriched')
+  enriched.add_nuclide('U235', 0.10)
+  enriched.add_nuclide('U238', 0.90)
+  enriched.set_density('g/cm3', 10.5)
+
+  dag_univ.add_material_override(1, enriched)
+
+In the case that the :class:`openmc.DAGMCUniverse` has already been synchronized,
+a :class:`openmc.DAGMCCell` object can also be provide to assign the material.
+
+Overrides are written to the `<material_overrides>` element of the
+:ref:`<dagmc_universe> <dagmc_element>` XML element so the C++ core can apply
+them on initialization.
+
+
 .. _Direct Accelerated Geometry Monte Carlo: https://svalinn.github.io/DAGMC/
 .. _University of Wisconsin Unified Workflow: https://svalinn.github.io/DAGMC/usersguide/uw2.html
 

From 5c4121efd2ad6f2ef2b3bc394157a4eb6d9a1a73 Mon Sep 17 00:00:00 2001
From: GuySten <62616591+GuySten@users.noreply.github.com>
Date: Fri, 12 Dec 2025 06:01:10 +0200
Subject: [PATCH 181/203] Fix hdf5 source_bank struct size. (#3676)

---
 include/openmc/bank_io.h                      |  16 ++++++------
 src/collision_track.cpp                       |   4 +--
 src/state_point.cpp                           |  23 +++++++++++-------
 .../surface_source/surface_source_true.h5     | Bin 106144 -> 88096 bytes
 .../case-01/surface_source_true.h5            | Bin 33344 -> 29296 bytes
 .../case-02/surface_source_true.h5            | Bin 13896 -> 13588 bytes
 .../case-03/surface_source_true.h5            | Bin 33344 -> 29296 bytes
 .../case-04/surface_source_true.h5            | Bin 33344 -> 29296 bytes
 .../case-05/surface_source_true.h5            | Bin 33344 -> 29296 bytes
 .../case-06/surface_source_true.h5            | Bin 33344 -> 29296 bytes
 .../case-07/surface_source_true.h5            | Bin 33344 -> 29296 bytes
 .../case-08/surface_source_true.h5            | Bin 33344 -> 29296 bytes
 .../case-09/surface_source_true.h5            | Bin 33344 -> 29296 bytes
 .../case-10/surface_source_true.h5            | Bin 33344 -> 29296 bytes
 .../case-11/surface_source_true.h5            | Bin 5160 -> 6532 bytes
 .../case-12/surface_source_true.h5            | Bin 33344 -> 29296 bytes
 .../case-13/surface_source_true.h5            | Bin 33344 -> 29296 bytes
 .../case-14/surface_source_true.h5            | Bin 33344 -> 29296 bytes
 .../case-15/surface_source_true.h5            | Bin 2144 -> 2144 bytes
 .../case-16/surface_source_true.h5            | Bin 33344 -> 29296 bytes
 .../case-17/surface_source_true.h5            | Bin 2144 -> 2144 bytes
 .../case-18/surface_source_true.h5            | Bin 2144 -> 2144 bytes
 .../case-19/surface_source_true.h5            | Bin 2144 -> 2144 bytes
 .../case-20/surface_source_true.h5            | Bin 33344 -> 29296 bytes
 .../case-21/surface_source_true.h5            | Bin 2144 -> 2144 bytes
 .../case-a01/surface_source_true.h5           | Bin 6720 -> 7792 bytes
 26 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/include/openmc/bank_io.h b/include/openmc/bank_io.h
index 90ffd820f..418ec111f 100644
--- a/include/openmc/bank_io.h
+++ b/include/openmc/bank_io.h
@@ -16,8 +16,9 @@
 namespace openmc {
 
 template<typename SiteType>
-void write_bank_dataset(const char* dataset_name, hid_t group_id,
-  span<SiteType> bank, const vector<int64_t>& bank_index, hid_t banktype
+void write_bank_dataset(
+  const char* dataset_name, hid_t group_id, span<SiteType> bank,
+  const vector<int64_t>& bank_index, hid_t membanktype, hid_t filebanktype
 #ifdef OPENMC_MPI
   ,
   MPI_Datatype mpi_dtype
@@ -30,8 +31,8 @@ void write_bank_dataset(const char* dataset_name, hid_t group_id,
 #ifdef PHDF5
   hsize_t dims[] {static_cast<hsize_t>(dims_size)};
   hid_t dspace = H5Screate_simple(1, dims, nullptr);
-  hid_t dset = H5Dcreate(group_id, dataset_name, banktype, dspace, H5P_DEFAULT,
-    H5P_DEFAULT, H5P_DEFAULT);
+  hid_t dset = H5Dcreate(group_id, dataset_name, filebanktype, dspace,
+    H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
 
   hsize_t count[] {static_cast<hsize_t>(count_size)};
   hid_t memspace = H5Screate_simple(1, count, nullptr);
@@ -42,7 +43,7 @@ void write_bank_dataset(const char* dataset_name, hid_t group_id,
   hid_t plist = H5Pcreate(H5P_DATASET_XFER);
   H5Pset_dxpl_mpio(plist, H5FD_MPIO_COLLECTIVE);
 
-  H5Dwrite(dset, banktype, memspace, dspace, plist, bank.data());
+  H5Dwrite(dset, membanktype, memspace, dspace, plist, bank.data());
 
   H5Sclose(dspace);
   H5Sclose(memspace);
@@ -52,7 +53,7 @@ void write_bank_dataset(const char* dataset_name, hid_t group_id,
   if (mpi::master) {
     hsize_t dims[] {static_cast<hsize_t>(dims_size)};
     hid_t dspace = H5Screate_simple(1, dims, nullptr);
-    hid_t dset = H5Dcreate(group_id, dataset_name, banktype, dspace,
+    hid_t dset = H5Dcreate(group_id, dataset_name, filebanktype, dspace,
       H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
 
 #ifdef OPENMC_MPI
@@ -75,7 +76,8 @@ void write_bank_dataset(const char* dataset_name, hid_t group_id,
       H5Sselect_hyperslab(
         dspace_rank, H5S_SELECT_SET, start, nullptr, count, nullptr);
 
-      H5Dwrite(dset, banktype, memspace, dspace_rank, H5P_DEFAULT, bank.data());
+      H5Dwrite(
+        dset, membanktype, memspace, dspace_rank, H5P_DEFAULT, bank.data());
 
       H5Sclose(memspace);
       H5Sclose(dspace_rank);
diff --git a/src/collision_track.cpp b/src/collision_track.cpp
index 75e56574a..03cbc32b7 100644
--- a/src/collision_track.cpp
+++ b/src/collision_track.cpp
@@ -78,10 +78,10 @@ void write_collision_track_bank(hid_t group_id,
   hid_t banktype = h5_collision_track_banktype();
 #ifdef OPENMC_MPI
   write_bank_dataset("collision_track_bank", group_id, collision_track_bank,
-    bank_index, banktype, mpi::collision_track_site);
+    bank_index, banktype, banktype, mpi::collision_track_site);
 #else
   write_bank_dataset("collision_track_bank", group_id, collision_track_bank,
-    bank_index, banktype);
+    bank_index, banktype, banktype);
 #endif
 
   H5Tclose(banktype);
diff --git a/src/state_point.cpp b/src/state_point.cpp
index 47296da3a..8ccebeb05 100644
--- a/src/state_point.cpp
+++ b/src/state_point.cpp
@@ -554,7 +554,7 @@ extern "C" int openmc_statepoint_load(const char* filename)
   return 0;
 }
 
-hid_t h5banktype()
+hid_t h5banktype(bool memory)
 {
   // Create compound type for position
   hid_t postype = H5Tcreate(H5T_COMPOUND, sizeof(struct Position));
@@ -569,7 +569,10 @@ hid_t h5banktype()
   // - openmc/statepoint.py
   // - docs/source/io_formats/statepoint.rst
   // - docs/source/io_formats/source.rst
-  hid_t banktype = H5Tcreate(H5T_COMPOUND, sizeof(struct SourceSite));
+  auto n = sizeof(SourceSite);
+  if (!memory)
+    n = 2 * sizeof(struct Position) + 3 * sizeof(double) + 3 * sizeof(int);
+  hid_t banktype = H5Tcreate(H5T_COMPOUND, n);
   H5Tinsert(banktype, "r", HOFFSET(SourceSite, r), postype);
   H5Tinsert(banktype, "u", HOFFSET(SourceSite, u), postype);
   H5Tinsert(banktype, "E", HOFFSET(SourceSite, E), H5T_NATIVE_DOUBLE);
@@ -641,17 +644,19 @@ void write_h5_source_point(const char* filename, span<SourceSite> source_bank,
 void write_source_bank(hid_t group_id, span<SourceSite> source_bank,
   const vector<int64_t>& bank_index)
 {
-  hid_t banktype = h5banktype();
+  hid_t membanktype = h5banktype(true);
+  hid_t filebanktype = h5banktype(false);
 
 #ifdef OPENMC_MPI
-  write_bank_dataset("source_bank", group_id, source_bank, bank_index, banktype,
-    mpi::source_site);
+  write_bank_dataset("source_bank", group_id, source_bank, bank_index,
+    membanktype, filebanktype, mpi::source_site);
 #else
-  write_bank_dataset(
-    "source_bank", group_id, source_bank, bank_index, banktype);
+  write_bank_dataset("source_bank", group_id, source_bank, bank_index,
+    membanktype, filebanktype);
 #endif
 
-  H5Tclose(banktype);
+  H5Tclose(membanktype);
+  H5Tclose(filebanktype);
 }
 
 // Determine member names of a compound HDF5 datatype
@@ -672,7 +677,7 @@ std::string dtype_member_names(hid_t dtype_id)
 void read_source_bank(
   hid_t group_id, vector<SourceSite>& sites, bool distribute)
 {
-  hid_t banktype = h5banktype();
+  hid_t banktype = h5banktype(true);
 
   // Open the dataset
   hid_t dset = H5Dopen(group_id, "source_bank", H5P_DEFAULT);
diff --git a/tests/regression_tests/surface_source/surface_source_true.h5 b/tests/regression_tests/surface_source/surface_source_true.h5
index 2c2a19038fc1b6d9c7785e8a7f591e9e5c7fd959..d343d12aed654f2da53310c5943c20d8bd85afb9 100644
GIT binary patch
delta 4436
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
F^$W+aIS~K=

delta 18335
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
O|NFnu`G$l~AN~ikN(rz4

diff --git a/tests/regression_tests/surface_source_write/case-01/surface_source_true.h5 b/tests/regression_tests/surface_source_write/case-01/surface_source_true.h5
index a43646158be4af47fc9ed18b9c2e2246ca57e35e..3a2315acc1d44c93445801716b75b13e94991b32 100644
GIT binary patch
delta 1273
zcma*lIc(EV9LI4xLEv(lL&6eEL^({k3>3){0)+~J2P6XhSF#YarW8my({d=~5Gi6{
zjQp046%z{*RhNtzE2fMdGcb7cn1O+>RU(|CKqGw=|NWld@BN?M{FqCA=yf|+nOz$C
zkk@7TYkoMtPtWNZKSQ&$^dhfoW?E}nWm5gzXl?lZ*_~dtHhKC|Gwz`RL(~eK0Z|JB
z5^fe%Mhos1QHwCPimGlG74h%w5cOr7D9h}BFJ`Q?Q&a<mU90mF{{7veny~kXs-xeU
z<-O#i-}rj>vEF$r`)PlW_6H?AK>KLHJxKd74vDHDLh&%|!?f8R+VGBu`UY!AR1GoG
ztv8O+{xMOXkib7q`>;>^se_Z8J{*U5N5WIYqdR@^H1TJMM}*=q@i5O4f$qGu%l@yf
zpA*$V_W6bL5?&x4+1uIO7B3PHb7V}-jg0opvo8JpoG)~LnU2Tk{tABAb&q&->$T%)
z?OyFaZeF8(wBeOFeOT8yeZ)xDZQS7WN6ANme`RI&mS(s7-uacAy>)kf`xg1P$%i#g
zK4O$6$VVX{AL)Jn4sRd!Bp*LI2=4Os;Y{)NrzE_`@uLOzJ|7>92fTemD3&>XnA5b6
zHoS+#!+JyvVw4^ekHQn;k-&dSJnU!0ql2JAJe(QgXC#~@9@SUGKPMi>3*r%>_>y>J
t=VY&IRpL>aBOZm<#3O<KhIrU-iAM*)yPmbe_mpVCt*s6j^TZ>XmtQo0{@wrp

delta 4990
zcmZXXOH7<q6vvqvhDXc04DYw)F|<&gsZ#`j(niW7YOq2n6euX#QpKbun6RLcMNMkN
zFI{xOqKlfis0lVr)Wk#=HL1}iHNgZEj7{u<MU5<2XtX-_{=ak2%{{Y$^Sl55|D1d8
zHy`28-vi&gAN;5;*nMTA{z@n?f9H0nEmRx~1`^_*l!OBHBOw%+O3}Y0{I=x%lT?tn
z8U23#PC@bufseCB(*KKpv|LHNp{#L-+!SO_kp67fwJyl6ASZIh!@B$0M#TFhXPAq>
zsql6)&+B=D*g$;3=?e5>l3nhSM-i8-<)T;6B!)yH6G~)4iA*RlWD*li;&vYTGilCu
z$*Le*`Is@$B!*4mN&);#HU)_mx|(G{9u}fU*z`y;J?Lba&^a)nb6`T}kYo~*O=4*Y
zCStN!g8s=y?LV5<%`&0>OsGE->Yri~Q%!%`5fe&eLWxW$G1VmQ6NyYHkqIR-p~QVA
zalc4pLWxW$kqIU4H;HK?kqIR-p+qK>m}U~wP2x~B?vcq&LG}dcuW?=Lg6s-%qSkfY
z5afv<J$0_@x*$7(bVgm*njnt_iPgKVYl1uyr2UZVx+=)_A$&X1%^hTzJ6JsoKa(v%
z8X8>9icd04PI^0fWU9CBrFOh^b@4&tuzuIFmfTskTWgps9YIefKMGRW<Z3QAVTvp@
z#m`NcLKpSTn1b_Yifnrd{l_9(xocWr;N^uDgzM!8VmZ<}o}&Kl<izv5+14p8zOak5
zwkf?;B~zb}H`j)3Frm>7KoZZR<2_&>uP*3#SxfF*;m)<)x*#`e$sG~yi0#$|xmio@
zJmJn$?#URgL>HgOaKfx5cfN4v+r4!W?0}oK{T(<*ChLMwheFYz(C(lM+8t}jU1YoU
zZ8F*E#8XnF@=kSONM2s+I-3@MNEkfs!qiNtOR?QWKbXb#jJoLUMg!K8yF|E4Y_~3G
zhpgQgz%-@C-O!8ulq&a!y|_PJOb(+rYsp<E+-1uB>v6bs(b5MuYsp<M+~sy}T~Ke<
zlDk5<D{QweemaTXtR;7)a97%HT~Ke<lDkT{tCYK}AMJQ~t{=zD<V!))Pq~_DpFHEY
zN%HOrk~)C5kkWXg19;c4fhIj@CJhgw4U@4!-1tE?`&WaQotFbcu7N_UO(;Dy)%M}(
zf)0<h<gO9!8r!W4a<i7)wZdI%yLIvOMeK#O<gOF$I@_&_;g{iNExDt@9kt!MpvhTF
z?t0^njo@UNTpPhv)T_KdMlb*`x4+^VR$c`;Y(lqv4U^{6u4dII4aT)4NQ0lu8tT<(
zT${dzNpuvwm@JRt0X-6Tc|VNe0ab<i1ib1o7?>=L;S8G88T>MaSBNee&)`6sV2<Zq
zJ_C2NA@>C-9d|X0g4`3N@T}`v5ae5*w3zOZ3C!N2W`B1A<MQ&?_Hx;zyF51ucdK%L
zH;J9=qUap7t)|oTIn38)$X!8Fr(Dg1AR9huH#y;HxR{Iya(fz+9#xZO%wSSo%*<fY
zqbBdu8RR`{$iITTbl%n6667yIhGsEEOil6GEE>m5n>~B^^qjlAHV^kP<$gMcJ?P@(
z8_*szQ8!-0d>uXsdrt)EdEM1q_sMg{wIfL9JY1}yxjOB+bU|}<nz=~ZWovao+AgEL
z`X)L(?~@E~Tae}pu4Yw`tqb@<s~oTHBEHbwerVWRxrhiRn}S3aT+OmidQ8qkL8>po
z#hN8S=s<ey1JMN?NUz@^!Mpz!@{XIHrEj}rQILCrP|rTq^SwnpNV<4n7gg^J=c@k~
J`e*?E=l@H`IFA4T

diff --git a/tests/regression_tests/surface_source_write/case-02/surface_source_true.h5 b/tests/regression_tests/surface_source_write/case-02/surface_source_true.h5
index 5a73e7ab2ae7b7b582c93eeba57e8beadfef4515..2c2d5bc0016822dbc166423d7bdf1ff3dbb4247e 100644
GIT binary patch
delta 526
zcmZY4KP&@L9Ki9rRyY!zs5*)sRZjgov`NPsJ2vr?u-%9lj7BjToBJ7zVzNjyT{?E`
zVCdMfW5<pi48Elz;w7KF-+ROR<~6S#E-PLvQK;tb;-=JI<N0{XjF|?@G8|(t#7)B<
zoDCz9)sInU<o&sLQFF#hX0_4%LqkiniO2CT(S+zZhR1(<Fe&;1drI^M9h9a;-{9Dy
zx9ASlXMX3OyT<JIT_qvfM>t0wev)QVqIvRYq3DP{!CDZ#MjOE*dDtoP=%BPj9?mjP
z50zI$>u}Se_voch^vpfhhAZl=idN7^xJDj+hI~e%b@FJTm?aNugFM;@Hp#>G$fJYO
z7I`>1evdB7+vMTykVg-vyP^$vd*snaxKAFwPu`d4fIM0#9+HQ3L>_GfdGfFe<k2a}
EC%&A+L;wH)

delta 2101
zcmZYAF-%io6b0bdK8mOmTcuK{RZ6MSN`Ycgn^=XQvBVH#0#PhzQAxnaz`(%Zpa}y5
ziTHGIU|?`?U?9YSfq{WUOc)p#92^)(WN>hBFwtnsJ?~t@>(b`SIrlZWfB(LD`svxL
zCU@@QQsSlQ8eLvA(`Lx+b{WN2g%K>h8K$dHvH!vNmb8AC2g|nOpGTL2hjOmhzCQ2Y
z;%h%%idenA`~g{jxMf5!V~a`Y@k^_WG7s@k>{hu$@a6uSeAtmW;*g^bsif?kkniKA
zWUCL#oI`dY4Qyos(rTp4LK2i6NQ%;NQd-v_Rn`oo8{)B2HIli@mM!-v)5r`^>`dMv
zgARG<kOC!MD^Gt!u_r&FY$2l(tCN=QeF~!c+JxvXA|Yv2aq=YO7-a);oDx1ItvbpC
zBtlt-G(mh;ZCF|=<B&94YmiHnz-eh+ri?){lvPM4#I*cpq;-p#5s1B0m$d@XoqFq~
zr8^yl+~=H+5Z&@nL|VFKTZY(LLgoR*(;%$^WdJfvS%m0Ga770zi&w&9M*5>NMi0UV
zh+Z3iAiCr`jnb;&oc9o2=`To_nckSRbjb^l7&AX1_L2>&=d83^n3;#PQhq?%C^ybY
zOMkfUAnnMQ)^|t;TU|}k(!=r=a)p^a$W=-<E-m{?FswO9Co{W{>y%7FTJ{k$ty#!z
zW_BR`l#cV#(gQW)kgpC&HA_pkJPpx{{|iL7oJ>l~$EUx5R8zJgK}x(uS|Q4FhipOg
zY{Xinr7{Jn=bTMQloDx^mR{JCkY;8!AbK{!DQW51n1JZs*CAQXscn~*Zh0Ki#mpMy
kCM9q|S~<!Xq>r-d5Pw=)ni+xUWwVmbSC{_Y`QygCfBZk0r~m)}

diff --git a/tests/regression_tests/surface_source_write/case-03/surface_source_true.h5 b/tests/regression_tests/surface_source_write/case-03/surface_source_true.h5
index 228f5a7d0a462f38a1cb0b4274dd40d4307b5a12..d14771f5a00887c16ca1399a629d0e2448430bda 100644
GIT binary patch
delta 1272
zcmZ|LIc(EV9DwnpL14roi=!CI5hM;%E+dMt0HJW3a=G-Cn%k5DDQ8-)l%u4GA!FsY
zFrrRbkf^$J%$N<29z8I4^yq<s&k9kXh)6%ZXXnLV{;q%Oh<{|K^p4WlO!voJR?L3Q
z_2jy;9oY;YC8K51O)i^J)9Xy8G$em6)E0c7Hb-W)MOJpE9{okSijWN$i-r7*+Oqa)
zE)ntzl%+zJ5TJENUEbce?)`7At`IVYvr@=9^i@JmA%VM^K8#MD*D1U;LKfk})S5@q
zW2s<mbFHltQtfK)Lsn~j``p|{A)^gKrfW-e6L~m!^3XSvM}pRwKiA?G`Y^XLK9p^Y
zj{t@3ydtQ&kY$9hb_n?mTDOoDM6h@AY~*(dSw*@})pyh1Lmvs!dyTz}Z!o?gynT!h
zAL&=h{(sea+V{c(?R|Q-a<F-AoBSS)Bkk2WL>~HK@<=f6jCYhg=G~U10@I^#jOmen
zUp~(Cuud>Nw3Fl!!9K+q<WDm_VmN2WL$}ByfqRy}2&0$jdxdw7JbakvdHGN-@bVF$
zaFIOJOXLy4vdKg1BaaC7W%9`PlSd3kkcU1%9tqql<Y5ew9~7QL9zM*g<e^+6j{t@1
z<e}amj}X>P^3ZOPM+EyedE{O4h~eBJ4}FL{61aEC!x$z%EWCT<;lsR79?Apq2v8`J
zhdM$YA*_ewp*<px2=-(0$Uh;E7|v7j(4Ub<0=GmS#whtw;f;}p5A!*BC@;t(_^tMm
z{44SZVZ9~~txO(Kc|i7!_sh9)@^8o^hVzy@^mpWuz<p01#sv8Z;e8+vA7+I-lu7ak
GCdDt?4iOsw

delta 4957
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

diff --git a/tests/regression_tests/surface_source_write/case-04/surface_source_true.h5 b/tests/regression_tests/surface_source_write/case-04/surface_source_true.h5
index c276af40f4302f4e0feff883bc3c472bc4df7ca1..d2acc69910740026a283af0568d90370f9ff7065 100644
GIT binary patch
delta 1271
zcmZY5Ic(HG7(n4Y5Ezia+!hgFZYv-#5WpM(a|IJF0|PO)2>~{on{b6IB#44C@-!(U
zDjFoBG%2@CgXGes3ksJmT~P4M?rMct>C<?|BR~CH`&>$Y6~~NHb#Su%Q@JRnzLz`7
zZN*Ztz)vY?h5VshEU5XuP^k9G-?Oz@KfhZ2Q`#J-I9W^nA$>*28JKg09B-)16EZ};
zpP1h|Z@$l0b%BsWh~X?0@&`0kNMosx39GwE$Z6<{h5UjP-je$J{7x=wtTW5#FaLWM
ztY}@aH1f#TCVQoj-=Ma&&YJJ?bz~KJxU0!SUqc=#JYC2djI~0JA%nk;@ln~pnCnHr
zl0W9GjpU(hs_!FKdoy{c2Gb)(ephS%-}IK&S-Q3LoZlVWR^R*E$v2FfBG|#_&^(&h
zNq$#rZ+DP~y1RZBvpReD^P%l!dL(cyriZ?d>5;<Q&-5@3kVgjpAm4%6$@HBfI7A*H
ztiwzX#TK%P2=)>3P>(V_VmQahLpx3$3EUIpp?8r-3hyL&7!G-4@K2G4*-gG%1gFU(
zgms2Il(Xa!!9GVG>Ur{r;ke|XT_BGH?nUy@FOf$IPmqUknLIN1SIEQcA>Shck32$H
zSII-UMjjFD>*S%{Am8BJBoFNtc_eUelZWn;M+)x_c^JLqk-@)99%di;J`vm_j}X><
z@=zX-M+Cb<9%?^%#Bd&xhxUj(61b1aLw`aZDZHoTVLT&`41Se7%mMNPA{Zo(5Y}_@
zP+pKn1p6g<sISN)hVz;{v?20H;JzUb{VjQ<@ZOP!@t!;~_#eo_940?3f{)}8!WtnD
KWt2RkQSk@sQ~=Zf

delta 4948
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
LR$g#9+{pZYZtI3k

diff --git a/tests/regression_tests/surface_source_write/case-05/surface_source_true.h5 b/tests/regression_tests/surface_source_write/case-05/surface_source_true.h5
index c276af40f4302f4e0feff883bc3c472bc4df7ca1..553090b19ee4862673d0e597e9bb4345e6b1fb36 100644
GIT binary patch
delta 1271
zcmZY5Ic(HG7(n4Y5Ezia+!hgFZYv-#5WpM(a|IJF0|PO)2>~{on{b6IB#44C@-!(U
zDjFoBG%2@Chf9|(C|tU9LBTV-s}*9UPvaSn{Pb__b1D5*95YJQ!O8Yd<)WDSUhXKj
z6-&heKc%1*@`rM<pyvBRq1r2d&(>!B{A%@2X>*+7WG(rJ^c5jzV9phCyrD8r$PoE{
zVt(tq`95FO1wsxXhO<z}AJ9}Gjio{+tnMNqr=c$v@(WUUOX~0QJGrc}&Mc$9{O?(?
zqIJd6$Rl5y?3F@(gWA?QYrf0ZkyYg3t|kwC4SA&SbRlan)(Sa>4E{RCM`Z(Jt``AI
z{+P2il83UXzK>Y#&E%mPOph4(U9J6p(_30+>DJbBes^qJeeZ84-!N{9U<aQ=^Jrox
z`CYBO-9aAe?)q8G>g?gqhqjmLk-)W>9{N6}M+$F0)5ADG9vS?Dd<SMH(|3yC5P5{K
z4l_LzTgWOR*hk1iJ<9Zm;T$6m?KpWPa8Hnj-bEfMyp!Z%IOLJRKSds9H~DT6oF<PD
z)*13p&XPw2`y6?w=gA|6<C2GVfjknp7s*4vL>?(TK_13s^2p#{ArG^Me2)k`@(5vF
zB@g8qc|@?UlZSePe1mh7JhWTnk-)u89=cB+DZD%6Vf2zm2LCR3n0@5?L~xHhLRk07
zLwP_R5$p<isQu&-!+A&^+9UEv;65e~{Rw%b@Sc)~@r*n&_*L>S2gnbIV30gQSkK8r
zc|jf#?3d)Bz9Nqp&TI0}hR7p<`-VL9x8#w+dq*C|d-BNOe;^NYnEbE^K9WZWYlJ+M
JQSyjJ#UJ$40M-Bi

delta 4948
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
LR$g#9+{pZYZtI3k

diff --git a/tests/regression_tests/surface_source_write/case-06/surface_source_true.h5 b/tests/regression_tests/surface_source_write/case-06/surface_source_true.h5
index 6946938adb27e24a74078b6546c045551d24713b..60a9f4f82193ffcd3340f099855eb38461519189 100644
GIT binary patch
delta 1267
zcmajcIc(EV9LMpbLEv(T3{VUO6oe2Khh#wka}*+=U@;&g{XqtSFr|f*Gc8xRN{bjW
zMt%z;V#<Qls!PX=j1iN^3>`9N%)r3cF;?PKf=D0z^RE2zf3NmsptX{&7z4$b#RH!+
zX<7P_8OaQ%2hu4%T1roaUoz=bHXNr?#c}m}t-j{hcWY`%UuUNmYt01ZX`+6@92E6+
zQ2h0x3J9mI4apj8jK<YX$$5Koa@>Eee{5_KRY4oxR^nj}5kDmUHsVo-rAI%jZ5LHU
z@V8cXh{_I&Dxm>;XSA;G5;cb=oZX_9(R(gFAJ_Jt?z*{`c=YbK_9e&Rx%_@nRfM%<
zB**c5T$c}u${i9_M!4TS{O|qoxwu+KM16yHl>dPM;kY_N|HsHj1NL!I3(!x{KbmkX
z`bX|0`DnpCC8`GFG}n(dyfa)s%u)Iu75^;Pk2<V##6io))A4HdJmF}-zCbwii}5by
zjFCOo8I~^*4fit9Fzn8BJ1Sw4d4*v7uja4PIQsW3IAmX2J>R>}mF{}wI*r4-LF4GH
z1((iY-K2A9x037e{?cuFhka-Dx^tK25&mx3i>iCCyRR}%KD_(n!<?Z13GpYn_{mPO
z9*_?0A<vEg`2yV|JH^eT0sB!@^~XFrnsA<wj@(ny(SrMoyNB_dXGa@ek#v~Tq)&@K
zLptiPUJwuMCGiN5e?>g9uZc$k_8T4^dWm>6;k+dtxp%~)1@}GiFg_5EHoT9-!<;34
TR{T%IqYi71cxdy)Bbb*zT`c@f

delta 4999
zcmZXYO-xi*6vyX-Z$uenR6a%+D&iPv<x3nC6$Atn5CH`TbO1lVf|MpMXyT%#F1ny8
zytr`Tg6=f62^bfekQ5RYZDLXuHg#7`U9^cwF?G?VO*{Ag?>+bSo!RL7{r=~i``$bf
z4!{56{q{58mwSB2ZY}P;<@b&~dg!nA7x;W$PvVp2*&+V%_`UHo`5({EGtS>BJCc5i
zd_VSRM{28gKD#&T-^548Ma1dIj=9JJBkve#3&fITpSi`L^B~ZP3uj}?sBGrL^hEnN
zISBg5`I+;ROCon?E9#QSC6lYqg-a%vLQc<1A(u*SHi)`Za_T8r=S(A)PIbCxI=Kwy
zGRS2zmq~6DbDPLzk-M3Puf&jbMoRPDnHff&F%m9tSKVObJ4Ql<?y6}<)(Y`#v*>;{
z)BQ|_P;bae2<a{2^?6#-DPNi`RFKe;WD{B5=_Y|9H@VEnlOl}C7Gv^@F~&62rw9nW
zs&s&6riWu`;vLUP5T`#JHy2-97xN`?c~+4UAHSp9ZnbZ2D{P{Z*15LMWjbi<Ak*7~
zUfP9Q+Q#&DRV{xm<;6Fp$Zn_XyHY$sL-f(|?Adu#pmn~`XUfnopXma-x`63ITNjd^
zi{QHo3Edt+^AOWJg?_8_PNs|O>LR9#ZC%WC*w$gDON5@^hohB{ez6bF@jXRSobqxv
zN!*=$OLkG!bCoefKY>#F6s1(4^=@15X1dJQWlZm}^&X}pwvO0Z9)B;9wF=yjA$gS`
z`zSNX$ciH6lnGX$$`IY>eabAWj3I$){AhlV$T;z8`~->%@$ouOs_`!E7k86igD-49
zY@%Se1~V&&JZ2>QfIBn9$l?KvsT5;!YB8pgnhw-LR|)-8=_=CRgP2fFq>qvNiquf%
zA4a;P7*i|8EJbmOS}OQ6iZKU?bkw=YLLFK}MGM~{w1`qcLp^kz&<~WZBfW75{SGOT
z>@**Cle>x>rpy~g^q6{kOg)X!`iQNMke)k&nMW1b?7U_qdK8&sDwFKYGV)T92FlbN
zLzN-=D2?_}8dZVEsc1mKacXg!5#6Fmw5V&uFHrL03;W_#Bfg9#Y92X`=FQanCL_9e
zi)dcigcdE-LhBRu@lTKrH{<JW6?$(As#}?EvvnKO?Y3@b`lPK-GJVR{r$~>t;^sRP
zNq3eR(Z}z!TXa$jt-Ea9MS8d$H-B2_)pp$cY0|p7+pg|r`i!m5Fx_M89;SPR9_hgB
zUZ(r(>ORulojCbfp_e*QeU|h>7arX?A{~tAOh3yQqB8@Oxpx|!4cSoSJY|}@kul^h
zBX1bdvtraopV<(d8DtqlbY_S$uX}JFL!!MP7br8!i0*TdGWtA*=uDht45>JaS;H!m
z;@oCL_Zgu+<>ydkh|Y{s=DErkqBEB$qt9%}dOtdQDN{P&CNqloDD#Yw@Of1EDRYC7
z=@>FelnF7SGiK#mQyD|@2JyP5h}Zp-LA>r}4_q0<ZwO-hbFzo<8-iX1{m%FhPGJ_n
zWkv!QkTHwkWk!ZC;uIO;6!{l%3bP$*ohkIH(q=(Sk7I&a3x^n4jAKHUXpu9F31%}K
z7)A@TTRmjNJA#Z^u=*IeKY}rGRmvE}7_%yMkK%EP?a29|G3Y!VJt_Ag3H})U{|=P+
ztHLFW)LW6qSzzQHBW;&aWtOFTjBGH{e8pXL_X=)Cu2_Fv!OfTztKllNT(Q2o3T;-b
zU$3H{*{bTt++=PHE#zwTb_^}dA{8A+0sb5#p4luTFUQeBE?bS)(84TRpI?KP%hqp7
zn`NuwLrl>7mCw1&$O}cxl2tx|DnmY<z!<r9y_&!&%-R*1M1k3~ZZfhyi57DAs=SUC
zX7`%8juyp<#~?q>Ge*KwXdxG{TT}RLNM8Ing??eG4t<1vhD<9`LYXy2@}^N`GLwv~
QFcSPYmMi`QKvinOe;dR{8vp<R

diff --git a/tests/regression_tests/surface_source_write/case-07/surface_source_true.h5 b/tests/regression_tests/surface_source_write/case-07/surface_source_true.h5
index c276af40f4302f4e0feff883bc3c472bc4df7ca1..cb3079251c7b6a634beb0cc32030b1464941997b 100644
GIT binary patch
delta 1271
zcmZY5Ic(HG7(n4Y5Ezia+!hgFZYv-#5WpM(a|IJF0|PO)2>~{on{b6IB#44C@-!(U
zDjFoBG%2@C>4L(g3ksJmT~P4M?rMct>C<?|BR~CH`&>$Y6~~NHb#Su%Q@JRnzLz`7
zZN*Ztz)vY?h5VshEU5XuP^k9G-?Oz@KfhZ2Q`#J-I9W^nA$>*28JKg09B-)16EZ};
zpP1h|Z@$l0b%BsWh~X?0@&`0kNMosx39GwE$Z6<{h5UjP-je$J{7x=wtTW5#FaLWM
ztY}@aH1f#TCVQoj-=Ma&&YJJ?bz~KJxU0!SUqc=#JYC2djI~0JA%nk;@ln~pnCnHr
zl0W9GjpU(hs_!FKdoy{c2Gb)(ephS%-}IK&S-Q3LoZlVWR^R*E$v2FfBG|#_&^(&h
zNq$#rZ+DP~y1RZBvpReD^P%l!dL(cyriZ?d>5;<Q&-5@3kVgjpAm4%6$@HBfI7A*H
ztiwzX#TK%P2=)>3P>(V_VmQahLpx3$3EUIpp?8r-3hyL&7!G-4@K2G4*-gG%1gFU(
zgms2Il(Xa!!9GVG>Ur{r;ke|XT_BGH?nUy@FOf$IPmqUknLIN1SIEQcA>Shck32$H
zSII-UMjjFD>*S%{Am8BJBoFNtc_eUelZWn;M+)x_c^JLqk-@)99%di;J`vm_j}X><
z@=zX-M+Cb<9%?^%#Bd&xhxUj(61b1aLw`aZDZHoTVLT&`41Se7%mMNPA{Zo(5Y}_@
zP+pKn1p6g<sISN)hVz;{v?20H;JzUb{VjQ<@ZOP!@t!;~_#eo_940?3f{)}8!WtnD
KWt2RkQSk>1qX63g

delta 4948
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
LR$g#9+{pZYZtI3k

diff --git a/tests/regression_tests/surface_source_write/case-08/surface_source_true.h5 b/tests/regression_tests/surface_source_write/case-08/surface_source_true.h5
index 94cd377d40973fcdb8b1a30152b0e12ec12e09a1..ed3aba90776e51a4f9735a5769163058a198dcfb 100644
GIT binary patch
delta 1272
zcmZY5H*C~U9DwmF2n<MIstgD)-4ua=0Hy>?37F6fJc#Kg1h`Nyp&czGh#_O-w`4?2
zEJ#FIGTwNjC*<)429F*+Fz{LCbRbUp=@nb|>F@fdQu4DnW|XRf6PrGki(>Lyxud+S
zSSl9yDFv;NZOX-hnw<-UYOnk?U7Pmfi`74=&2Wkn_4pssSA=Z9oGIk^AC*}`hRDvJ
zXSeTL&$CsXBV-LtICF*k4owwu7%|*=LQX-SFXSi^cnk7p+4D@gFkc&s@^yT1`?<12
zNJ|qkTU#Rb_EI6gqILK8sx7CF814%C&{xt&0#6sR4r7&&V@TnzW`0!GGUpl*uw>he
zwT|(jtk2I8tG$6dRD<!6z2|KFpS!tzH@c<0&)zk*=I4~Pu`Oqs<V_K5Z(mtE$fNa2
zw3B=Xd1QCBU3`5wyZQRi_AotSxE9kx-^=t!;O%3282gzXDf|Qc7tBubogz5ML<nIW
zA`itDvWf`yVe(LqkVg~FQS#7^kw*--i#+t><dMKTK^}%f9x42j<Y9J`?-s!+@(5v_
zCJ*Hdc|@?!l81VZJeqJ^^3cwcM-2A@dFU6(BY`K#!?;8qDg4XiVfK*k5rIb@A*?Ip
zp<E@82=+DdP_L6m6V46t&~B1PjHz2W-6xL(-fi+QddVY&e}_EGKJtAcxJw=(tb634
z+$WC+c7;6De)4F-c|ac8L-L5>J|YkOF?l5Lo{)#}lsr=SRq`+g$Pb8MkUT<I&&Wf0
zP972L7v!P7B#$PXSLC79$RmdPnmqJ3<dML8OCH8M@<`#oCl7Oo{E!GfkVgn>m^_pb
I@`y&nZ^?BCC;$Ke

delta 4980
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

diff --git a/tests/regression_tests/surface_source_write/case-09/surface_source_true.h5 b/tests/regression_tests/surface_source_write/case-09/surface_source_true.h5
index ebce87b36aff8050b2b6b9df2bf4292296045da5..d62363f97fd4cdbacfd65b2dd99605721d60f03f 100644
GIT binary patch
delta 1273
zcmb8sH*C~U9DwmF2+RTogk*sL(@hbWZc4y(6Pkesm~KLV3-uD((ZU5W+<5X^GDexQ
zAQ5G`F=NIXJ>J0J(W3_jKFdU=WFgW||K}oq_g*Hyl;ZEjrctU6jBos0E{ch-<(=iF
z#Zs}rpHk2Y>7raLsOfc~Q0<XFW^1#;QLAr4o8uJ6C!;?|UlDQ&=3F6%|5I(AkR3Sl
zh5QCh&At&aQ>_I;>I<`V%=8vz>*?pyb87Lw_bpAxnb=EazCZnLeHq_EI$O)>uMo0<
z7@jWVB#f0pHj%(z#r{!Q!*5?L0!F$_S!;zHfwC^U4u8$D^+Kvf{+_deBlwHEDZkg)
zoUea>FWEwRYi`&S!M6M|eKfK?zYcfg>-1S|7pD(rHz&U*Q)fnSEq0H_-b~E&_OW{y
z``JAb_y_nV%r17{C4z(O3T;@2$V0J(tRjScSjaJ`N64cC=P3VtXva8oL~xIjhkk-Q
zVt6OX!*IwWfq#lT%x?1CA~;PRZCGc>Lpe(xA?$PHp`Is?4jh*}v<u`B!M#Wx`X%y+
z;R*6EE|W(B{|b4SSIMK|W!g;Z8ht3&=_7=FgFe)o^wEKHi$1j5^bw(TC!_oH5yQJn
zyC>6RCh+gkhuKTNR|NOTqYdi;c_<IbBZOTc54DdxI&dD5hxV8}BDhb;Lw`yhF}!DN
zAI5XGj|6^|Jj{Ob{UR73k2b6q<e|JIj}Z1N@=#xsM+eRu^3ZDJ5y5>+9{M}-h~d2_
f590%QB=A3yhdD@oPz0aIqYbN09?B4TghS#d{mBeO

delta 5311
zcmZYDKTMQ&9LMqJ{voI+ww{8D<xo_psHmW)BAkkP>ZvHGh$#4{N?Y1u!oXlsOdT9Z
zioY;0IM9TFqzuG3IGEJIfx)CEb)bn!Ny^|rQwEZf)U@|J-_P&+A^dJ=pT7Kko;&V<
zx9Q)1hJN`W{NuK8{loE!hmp{|XJe7Qk@ewl$jd%*y+Z$AUL@3>8(esQ^qPNj3Zpmb
ze!KUqaLLKglY*xF|FVzZxPQcC3R)M*a6xM<IAdm4-U_b5dKJ;Ds9weNDo3xD=vA&>
z<>}Q@y;`PM%l)h1mE_Ay&%U<l)$-aX$@pUFcVx<u>NWBe<?C~-(C4UHD|cM!NP)^D
zoS{rQV(+s`SAB)8x&Hh3Nmk6Sh3)*0l6CFDSNf@*wd>W6#2s0)P=e2A?Z9~4{J!pN
zaMQI5|2U8$N7gyA-jNL|-5caBDt2U}BcC}^;z+`gQkBk)@?4uBImSNwW<6u2%#kgQ
zY;|OtBjt`%sEjA%^=wyZgH)>6GdombrSj45%!+9$l}~$@{_$9;+_Xw1v}v(4Lw4(#
zQOF*ZkC448jhp2@)hZ*9eJb;i{VJI<StV75AqQ0EAO|5alinh$Ln?Mvt1ByqRT{R+
zst&Tk3_<E4F*5^6so47*fp}(co80H<!ZX27!!iG-;Z(W&G#t~xK)DPW77l`+kK=mA
zKFtZ0sR~)0bR_M_DMwB_az>?UyWBYg$usu3&gvN}=Ts^yWp!S~o@sRCf+H6lX>z1l
zrEI4>*Cmz2E|JTQTydmDr3b64Die;_JGbf?E7u%pQz_alujjgoUEOe`T_wIpRvnNW
zV^=rzjFnrC+*Y}>SMI}@zJP@FOn$YTiKuiyqK?E=@@iz2qtaF*zfqQC#r#|&zflnR
zti<-oAWsKlkfn|+Qwi;t)pC_)2#Y%kVKF~KSj@(x+=qP}f!G>G%{;`fVel}S1G1tF
zL)gVRN74sn#Zo?nu#~e9ma^fHtQf~3i2RKy`-;pAgt<)B%8I!hgxFk$%?Ai`S$kMk
z%;f-txtxYDm&rO=mB_o3eLekk^0$_R|NHE(I{AIZc2?KRfbD$j$a_bsQu2M|_tku#
zlJ6s?buuM4Wm+qbh%l{v5T^AVglR25Dl01m=7A$`A<S>tF<CLcy^zoKU3mksL5`Y4
zgRCe$5GHy8VjCPa#m8l38yq#=5El0}#1=PdicZLi#qDzB6@(3rpOjUNeifY%R{14_
zRbG{r&p+vZ{`b@J`7_Zk(sENKI{%c2O|)k^AU4ra^BlrN=be@n6Ws=}iH?|YNIkxQ
zh>4w%l})r~S{xaJFxsJvtZcMB)9lD-M!rM+a+`lL@*QfU?U}~2atlU#1j1;~FOrDK
zoRbwZJ`7>T=OE1Z)AO=o#;q{pvp8cj?wN*0Sux{75N3P^!i=Xb$jW9sWCk7i0Abi`
zFUpExAAm6I(-4L|*(585y&q!39x_u9hP}F3Rt)=N2*ds!!i-m4k`*&<g&Cj38D_ll
zvaFc#K1e&h1wHc)Vl(cU2Uldpj9X#G-{K52Ue+QjX1o`|jK6^}<B6-XV#a$QHset<
z0b$0ATV>^E+<)YnZU|fc8e&@>HbvKD#g=zL*z#8pwmjY@E4I87!j`{;u;r_+%Ze?(
z1F<dl%nJz1oqt1CEO!Tloqi5sr}Nrn#ZI?5G7e$6V;!<$xmzGC_ZWob4&9WMEqC@;
z55$%`W=0___eTiJ-FQpx!*Y*6N`g-``wue@VXQN^WyM$zL;Mg24>Jd0jnj8z#Tq|_
zu*S0x*0|vdS=sh_W(dO4&Nz~~E48WcYxC1xsSQK?;jY}2QhRT)3_uv`X^2g;XOf+=
zVw(FQJM@j1g6veO{!&&p-=294vHAAQdx*_<#8iDHE1Pf6Jc2OalMu$b@@rW!)_oAB
z`5lBcF7J{R<pG3!e(OltH?m@}dlyNLc>}Qx_e|njS+U_g5H@@QVjJ$6;_qZd>4wzn
j`}`VWs~#~$-Lj%|L0I)y5LP{Yzjd|$zrOs2FMRwDQPTh6

diff --git a/tests/regression_tests/surface_source_write/case-10/surface_source_true.h5 b/tests/regression_tests/surface_source_write/case-10/surface_source_true.h5
index fded9d987e392214edeb3fccd50c3ecc5f8a7728..acaf39cb485cef41a634a2e980fe160b4bcc1316 100644
GIT binary patch
delta 1273
zcmZ9{H*C~U7{Kwn90CIZOt%z@sj@;d5WtjxDFG9jfd`mwLVyeP5?W{>K@1rqzlAYk
z%7R3cCF6}5Jz7j27(9CPz`)<R90x@D>GON<q<_BZ=ce>$aoA|8^p3TBDiy`}w^D1V
zx!6=J@TU~CLjF-I7S#M)C{#M-ubJA6A78ERac!1U9IGb(kiH`1B)-g^63h{@jQnWL
z{c~M^o|>ccgjDAX*@qa;0wKRcQ-vHr0(W8UK7Y%li)ypFxHgBEG~Oqd3TZCm-(c2-
z%js)Ej-Y<`_f(tdBZjkrKD3qek-%Lg<OKB9LJlE?rwf^_5z@dg^6%W_TKenQ75TZm
zUdRyE2KrDo*6t(b|6-$Yr?oV`^WRNus-1^6)80~3Wg1%>XMY=gOuq-)$s<I5HL`>J
zP9ZCZV7Cf63UwFjBZjk^^`Y%yeI#%#^3eCPK2mu5gsj5Y&-%#VA0Q92jrH3^aF9Gg
zSck|%vB@KXeV9DdBjgdoIZ7VdG4e>@wv&f`oIFx^C&<Ha$RmS)l03`~@*N^LMIIrn
z)8wI?A&&_5S@KZNkw*;2B@gX9c_eTzkcWPeJW_aqJd8`^k-@)A9_AJD)5;!wSXb#o
zxkeum?CbQQ-k^^d&Q1EzZqY{q_cnd#K7FL{?$C$PNgo;fyYyjp(eDz$J=RAE>ppoX
z56B~eT_z8;n>=DT56MG&L>>v;$K;_uA&(T^Q}QsLkw*r<LLO!h`5qDUl1B*ZIe92A
z$RmRNl04K`<PpPpO&(ewc_eV(kca-3JW_b?$isL~9vS=(<YD%c?-#*G@(5uKkcToz
I9?_uq4b-;}dH?_b

delta 4947
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

diff --git a/tests/regression_tests/surface_source_write/case-11/surface_source_true.h5 b/tests/regression_tests/surface_source_write/case-11/surface_source_true.h5
index b5b6036201bede37dac2749563dcd68620584009..962f95fddaebd8af081ef89bab678db6a8a748b2 100644
GIT binary patch
delta 193
zcmZ3X(PBJ7gQ-PwqgE3$W60*U%qGmzj7*FSK)}Hu!2n_~GcpK(_zVm!oRj~sNwC~q
zWRba9g5860<AE0_cya<q$mA11Y`_^Zc?M_5B(9Lj89;mih%LB7CNBVD4xW(71wecQ
zh#h!CCa(Zu0ltvQ6+rv|h&}j2CT{>@34xHw4M6+?hyw&eChq`Z1)-419YFj6h$DnU
JCLa(E0RVxPKIZ@c

delta 545
zcmZoMUZF8TgGobVqgE3$W5(vS%qGmzOiYXnK)}Hu0iqa~8520b42BcjlmD<uu-w)>
zm9bfZ-GgzGKnU-DAOI@|DVgjm5DgaLg=heZEW{A`3KbE6tML?!W(AoeFma>k<W+)x
zV2(J5^H0zZY@Q2Tt*a2khA6nmOd*JFVUUJjLJ$p#aA`+jhz1R)h`{8j!VnFXAPwJy
zAsV#c8f--%8m!<V6QLrGP!Z<IPoW|~a5a{q=<e!;ip0a!JQRgk%mT95Nep5!CtSKy
z3}OUA<gOS*12;&6oj62;FkC~cI7C_&B>hYr5^lyIj+F#Ntt(t@qXa~42uS)7R5}bU
PttlBT0*V5-W1%ttGbq0H

diff --git a/tests/regression_tests/surface_source_write/case-12/surface_source_true.h5 b/tests/regression_tests/surface_source_write/case-12/surface_source_true.h5
index 6c6925daba145c5db52a281023dd017f066e0732..4b830d057dee2d3175982058352b5aae3fbb2e45 100644
GIT binary patch
delta 1337
zcmY+@OKc2r9KiA2Ru~ctA{nn3B#e5ED#mlid(>;_A4`={udPRIJ?q^f9=B%ym!70t
z?14n};?})sdRiCRn@Kp#aTCHEM0_{X$+F2O|M}1C=KK3kvW3Sr<!{Lzqb7T$zwTje
zQVhJUZK$1*tVt&LC<!f5xu{Jh)XF}Q$hOMgqqR|AURiAe+88I<UkLsqJw?c&5xrwY
zZd|l2j;!&cc(un1nMb_$CkW|GtnNQd5;9PQtgIFK<mz>0Uzqa$-kZvA5r6;R)zXCQ
zgECFXEJ`Et(}h%L2-yiA&P*ZSq4K<I7JbCu)n^O&3~9Z}m?LBl;(J4LqwC&z)qC-?
zc+JkQKFcqlQAgj1R%c<fYTT>buW%P}CdB*lVt&7*y6;&kWC(9rbk8(}>@`JhxsVwY
zVbybdC@VNVO0XMv{ZLnuhYx2J$A`9><0F7;k%zv9<D-o9T3$blbsQfdy!E_(m>bA%
z5V?)yQG}Hu55*>r66{Unp>8G*AI=u?(6*9C0CyXC=-bJojPwrjFdXs-;q4?3vyptG
z$n7GJBCOryq3j`#670R?q3$COAC5~N+J5o~;2t0ky@`C2NJW1I#cl~Fe&4$-9DLK&
z;=lUwXYg~O>G|m9AZ5I$|J3>NYwA~i_3QUPhg19A;g9W4Hrr1hIhl>Oy5*ocRi*{w
z!#K$J2;m)Ke3*wB|FFoV86QPhM;IT<QN~9Jb~EEcJ;wO(;j}P5wBwAA0PYFKhwd>x
z%1ECi52KYlLU^ah!#qtMnKO|ht93S_oMQ%*U}xw<ZKDq#&UyOKF3?8+_ac4hm*}I6
zbUS?*m+2#fm!%K0gMNp|T_F$aYNU@<xyJEPf_<Gl)EngC!?{TwS|@n~aBq=^ew#eX
jNZ%n3<1TrG@a~a^d7u1!k$XUXgw@5{htf?RrEc*T6mKrd

delta 4944
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

diff --git a/tests/regression_tests/surface_source_write/case-13/surface_source_true.h5 b/tests/regression_tests/surface_source_write/case-13/surface_source_true.h5
index 6c6925daba145c5db52a281023dd017f066e0732..f53e2c3a2b0b5d0a55456dd2c6ab1ea3d7ca01af 100644
GIT binary patch
delta 1337
zcmY+@OKc2r9KiA2Ru~ct(qt$xNEr1RRXUzK-s3&=kEP0}*Vd!9p7m}Kk6W|<OHYD}
z9!OL#Zrz)vr*)A%j&PXcCWJYN_->|?)lEM6&wpk&-`{_d%|EUxeNXlnRoN^3bq}kP
zV&GkMLv?MkDw*J;B(y~NqB@yS%lkwk+baKz)y8~%ZM6+(<D6uFJ{U!MijYGiddG|0
zglJnBS>s3XYEKlh5AoigB&0LBvi~?m$Uqgcyq4)xE7#?He%k20SHo`+fB*m0(u8~o
zWx9}A6i4*U5K^rbvJ*a>nL@rt`FYnY`iQ@)&ld6-(t3q4N5~$;_lD+1*S+&9_u^;q
znw?*H*0+F09epEOorTe=aj$&8%w5Ep5bsNi`Tdg0zGtbBA-rYLJ<}Aj*A%(sLS|5a
zRnPIEtl;=4!fxR8LtRN8KAcq?A6g^FM*!C%4}CSqM+xaQynYyKIX*&o>v;Vz*OOl_
zavR8_04qfvicKCx*c-`1-9#QfoXzB+Z6S{U?pE^9w~<E)>FwlUIOGw++d&@YPVzfN
zZWnnJVC^OkWe<52Vecgmbsu^7a9r}x_LD~d_W*h5P2`(ID*7uZc1t+<$KI{s;M=Yi
z|MkzmgJ1GZ&&M_gDdR=`=gwE(Qos8e-+cHroZ9aWe`<fS$$t9C$!xgQEeF*anHG!>
z;~?WBgm;MXVIF4u!y=bvd=y|EVSFe@86QR1&5RHA7~{i-)57@Bjx#<2xF;ANy2tn^
zA$^iOj8^gp;hiE6^E7#6&O{2V*4c=1ju}vdouLo4jXr!h=jlVcKpz3zi}ayiqK^{N
z?et+>rjHO_mOji5`W+&7g*>dQk(aE>HI9!W?Ca#A-XISj&Q0>rI>{q|dy72u+vHI~
i`VM&*cgZ7!caJ>G`{eJ7+yn9>tS;U@ly34Uc8h-=b1uvP

delta 4944
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

diff --git a/tests/regression_tests/surface_source_write/case-14/surface_source_true.h5 b/tests/regression_tests/surface_source_write/case-14/surface_source_true.h5
index 6c6925daba145c5db52a281023dd017f066e0732..ec049fec48a990387c41b36f590e7ee85eb667eb 100644
GIT binary patch
delta 1337
zcmY+@Ic(EV9DwnpMPQJi283iTVL$>?E>kXZHKttVDuzC2pcKp<u99+=y9LCtRe4J%
zRJxD>B%ljhvw=E=1!c5U29J?I-~l1N$h88IetLd(qVNAKrSPPt{4LpQ)MT%|uYXjV
z6oYSTSJlo;)+7^rl!TV3T+}8LYGt2DWKYW9W3@3O1J?OLZJd*QUkLsqJw?dRqx!~+
z+=OUb99`o_@oG;LGLLxgPZH9ptL{He7BWzUtgIFKl<IY5Uzqy;-kZj65r6;R)zXCQ
zhcaErEJ~yDGlW!U3fTo8&MYC{q4K<YHhsk3)#nKL9BIAEm@8y2;(MRxMb~}vtM}q(
z@tR#weU@KHqn^GIt<Iuo)wox=U*Rt1Oo;d8CH#JAb>F*8$PnK0=$>f`*=LH}3L!Hn
z!fN37P*!q$lwhyo^+R1v9zL8k93R?Rj*kGYMIQP(j*l|Z>v{b!HgJ4|@HX=LVQwP7
zN#q*IqX;WS9*RvKCD@zELv11tAI=u?(6*9C0CyXC=-bJojPwrjFdXs-;q4?3a~Jtt
zBDb47im>*Ohq9MEO0b*BL)}LnJ{*@kwEg4}z&$`7dJFj$k&6BbirpU8eQ(|t4!!Aa
z_XmFb8Twjic`>#vNEt61zI44BN&U*Nef{C*aB9Ch{Hfz<ll|<mlWDx&BZt&!GA$S%
z#zDqM2=5T%!)#^zR*_3HK8mmoGd`3fjE@rRHpYi~l=0!iX=i+B#~2?0+~bT7-D7-|
zkv>5l#!2!B;hiE6^E7#6&P0l=*4c=1ju}vbouLo)Jbn0ZF3^W|kv;;rm*_*kOdn;W
zJLto>LLVW#EPa@r^gBiFDtTDfBK@q&b&ih`>>K2v-Xsqn&MorLy2vAddz(D;JLFMD
i`Yw4G_sAoJcb`1W2jm}!+(YuCtZv>ulpgXZ^@zVHcP`EV

delta 4944
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

diff --git a/tests/regression_tests/surface_source_write/case-15/surface_source_true.h5 b/tests/regression_tests/surface_source_write/case-15/surface_source_true.h5
index 5bdb39b2a703fa7cdb17a153a688cb0ea7664f1c..fd5892096c58be336ca5c9fea4b7afc60dd66dbb 100644
GIT binary patch
delta 30
mcmaDL@IYY08fM0j&1;!Wm>C%-KVmatdA7(RbF&1y2O|Ki$_gd`

delta 30
mcmaDL@IYY08fM0f&1;!Wm>HQSKVmatxu<z5W3vRi2O|Kkc?wGa

diff --git a/tests/regression_tests/surface_source_write/case-16/surface_source_true.h5 b/tests/regression_tests/surface_source_write/case-16/surface_source_true.h5
index 79ac8e1a65e38b5b4c38de45c29da9f3579a35aa..147ce035836bab90281b1808384f882d349c063f 100644
GIT binary patch
delta 1270
zcmY+-Ik44q7{=jq?sYV{#toym1aXPDMMaGZdK86-dX4f&;vNx^>w3WrHw1^ml1Um%
z$I8YT85+x5Ql9dZ#~F*1DNkYHL+Lm3%zSV4TR*up{4+k4Ev+3nz4fQ%aX9nG^0wto
z<E8P)MWbYN?pYp>;&Xd6THD|Kdwz0W|68$oCb?i`e0shApYC9^(w&V$mv0E&FB?L8
zVdxGqrMM_`zY<*>x;17@E(zW5#FvKdD09loLiZ<09J=H5RF{YDFVZVQ_cH_am7!ZF
zyDD_2SkPP@y0hdP<u``*8hNG^i9FG@^30fACr`Xdo;l_9@+3FN(^K6jPkNI)19d7-
zwppG9&CT-UTjaNd_7-`j6t~I~-6qeB$?fvQnLKmKJLE~W%F|QbDNlNrJOlOJ@?`hO
zv!J<Go;;V&Lwlb*Q;PfLi5`$=#$=m3@q_ZrDIbz2d03vFs*oprM4o~AQF*e*<XO->
zE>FH)etT%2kY`Hqq&(3?o*9#;<cXh_XHL08p5z&Mda7sTNq5RKQ16l_E9F_xJSR`S
zTYh(FpO<G!@q#?ji}K8vtjH6;B+s0(k|%jto}TIzdD1=d4AeoMY_B{Enpfq?_sQ=I
zZ7t7~;x&1q*X5Zpc|)G~O?l>&Z^@IqEl*GNjy!22&p`dIJlTGE7Buh4lOK>j5Zd?U
znNl2-C;C918Iwcu#H;eFd%M3^_jKil@+2S0(^GvcPx^^G1NEo!WS_~ipjneAKP-PZ
zv`6HbQhY8?^o2Y#CSS@Ee<jbH@@sjLqw@4r-^i1GE6+gvojlq1@+@e6kS9MTe=M{=
Q$}^=nE>Cnqp4o};AC~9`mjD0&

delta 4944
zcmZXXZ%EZ=6vw^SKc%Jl@2b~->CJ0i>)JH6tkkr$Zp~X(T56VBEp=H_C@?5cR!~sP
zE(HYz1_lO=N%W$?n1O=^?VUk^vc?L0Va%XGV{P;KeJ{^*c8+iIe9rlPzvn#SCI9%{
z_T#tq@AB-M2gmXULv5W8AA}Z%rrGVbkcF?sAt~ygkWgFOV(XibU;6`pN2G+!cz*7D
zn6k)k3q-{FqyJs_vgXxHpf0wBkzqkT3gV07s@sCh3sMu`5^kjrjX47M;`u6bwCzvu
zo7uYwe0Da0FHoLH%<m*}!P`VGD06UfMUXdwlq7N0B|)YIDNKgSj-SiIyI)Agx_0#z
z?~<{uX?s(+U?50BwZ)Vm9w$_0=A08Tp(<v^i5Sy%r*c8RATI>TPUEW6f;<-_Bb}^r
zKAo>JN!z&@yxo%lb(lKjmtZ?gzl9?cD;d%y$ap5P$Xt#DBRIC4TRavdI*ZS=XA#q9
zS==--n+sY6851Pj#Z^r%67$5xV{9wX4p*<!u>$RI{W_zx9hHOMENk{q4rU|t>_`r*
zB9v8xo44!SSj`BA-9%u|<pN(WY2O#^`CRxd(hJnA<mBc`SS(U2{k0P7TZKQ56nFEG
zZLDVVxK+7_lOYc=|KK5hwfUsDMT__OJgH<Aak;UIx2I{lVl~>q4{7ybu(~BoeJ~FF
zkQ8_)x?V4KHuD35OnH$Xsh+5`00EKuP0tmO_DlipvSy3c@Y((~WcKwMGF$KkDF$ir
zk{0=e+_JY27np@61#uSfnI1tVipXlNwb&*~oqT33GNbg#<7?q(NL(?<5<PRQ7=BBX
z#ZSfXvx?Lb_?g-E5;FTN*j}owB1>UzNNXtsOO^T4QkYvs{5qJM*`{@5_Q^WTMk`^=
zddx=aq=xlKGGtVc&w|vKan*<*pUSXBj0$evfZ!M%JiGxGhI|ynw-GbTwCc7X^BWPf
zOvUWkgk!DZ-X>%k_1q>h>n}$;R-0chN1P$Ef|OVAnV|}p#;OHARB+R>O47bn$=h!#
zxnId<kT|{9B|)Y)!!%B1R#f3=tGE^{;#KEe72@KxmA4w^h7450$`brm%>|w<q<wh{
zlC0U8EqvC!mCRn;N@ibg<+Ir}m`zZ74%VQZp!a-E+xfM;-CK(@j9^j_=QfgXb{i}b
zb;86pSQz5i4&u-=U4o2nhp9uYo$14gR?+7}f>A&AalhytoU{w_C`gj@7LhxVnWQqi
zcOug&p6*1ZnGOFE35GNY@<0$<9aPCWvq6wiK|Tvo@8>=vf_w@R{B^Mq7^vHY`%=_>
z-|xbGR$<>wibh)8r^P?J@eIbYrXGtJa#N5wL8|s})pbE;_mE|G?B&5jd%4A1LCW^=
znJfE<>HB@;=;{WZaH#=mr~X+@H$d%F?^n?XwN+eegxbu$YUFC~eoh7inc7bhN)P<s
z)D}2*0PR$@z{~+GU=>A8q_`L?($v`NCb*>QGqRiElCIi=&Ak1*8G9N*Mhg*~Z{dPT
z+Ri<QMJ)5P2l?#8L0Dy|Y*#C0t>R28W;6Ak<E>c4khnuoXDW5yp<PQC{_|zJk7+mc
zFubkNlZWA*rM({=hPNS+ZSc-g-ra3nFxJKe;q9C>wG)dc?O4F_i|HUmM+Y|_?I6Oa
zBfMRIgeQ$0A%cjb5M=A?>W)HS$gm(E1@Rr@s@sCh3sUnHSKSN}m)>VikgDTQnVIXy
zags~D|DVTkl4+NBlJ=cW-hNBlwOx2^%j#AapMBHCvrD>(`HgM}R_OJoyCE>7@M}&k
z2=XdOa<q^41Y&a3iC0e`#<ZtSz|;^=4-s7M!Bv)eriZKDC%L*`kQahvpMuJ*mppw6
onQpb@%TtIk?Tl}@pjVJdL7cr@)g#D+AdbG4MD_QTP7f~mAGF0-ng9R*

diff --git a/tests/regression_tests/surface_source_write/case-17/surface_source_true.h5 b/tests/regression_tests/surface_source_write/case-17/surface_source_true.h5
index aadcc3fa407a973be80196cab5f3cc4051c1a724..436063aee23677c481b9cec5ff8e6c8791d021b7 100644
GIT binary patch
delta 30
mcmaDL@IYY08fM0j&1;!Wm>C%-KVmatdA-OYbF&1y2O|Ki_X;Zj

delta 30
mcmaDL@IYY08fM0f&1;!Wm>HQSKVmatxvzODW3vRi2O|Kkf(lFk

diff --git a/tests/regression_tests/surface_source_write/case-18/surface_source_true.h5 b/tests/regression_tests/surface_source_write/case-18/surface_source_true.h5
index e5a7619c552c4321cdcaa3710363e430fa57516b..436063aee23677c481b9cec5ff8e6c8791d021b7 100644
GIT binary patch
delta 30
mcmaDL@IYY08fM0j&1;!Wm>C%-KVmatdA-OYbF&1y2O|Ki_X;Zj

delta 30
mcmaDL@IYY08fM0f&1;!Wm>HQSKVmatd7ybJW3vRi2O|KkiwaEu

diff --git a/tests/regression_tests/surface_source_write/case-19/surface_source_true.h5 b/tests/regression_tests/surface_source_write/case-19/surface_source_true.h5
index db8a49dceeb20ebdc3e0c1b8db765cafed5a4052..eda3e030bda7d7bc798329e59061173d516ec10c 100644
GIT binary patch
delta 30
mcmaDL@IYY08fM0j&1;!Wm>C%-KVmatdArCWbF&1y2O|Kj2?{L$

delta 30
mcmaDL@IYY08fM0f&1;!Wm>HQSKVmatd8m0RW3vRi2O|KklnPD&

diff --git a/tests/regression_tests/surface_source_write/case-20/surface_source_true.h5 b/tests/regression_tests/surface_source_write/case-20/surface_source_true.h5
index 01d2abf61cf8a41876d664d1aa505a967e7559cb..083ce90c8964c549b597eceef343401fe63fd70d 100644
GIT binary patch
delta 1270
zcmY+<Ik44q6u{wo-*Ys$#toym1aOJCMMaGZ8uy4>ls^*pfT-a5zzsJ9$HJ0H8cWB@
z#u*tJ%U4pSOnD27+j+}dSol$TX1<wos^6UTpH>!sPfuhkYlly6`*C#|PW`dEeRb1x
zWjZm@B$=F9R;QEr%srW`?d$(NJ2~s0--?5$l5?u*$@TgF^lcRS)8rdM|I3EZog4ZC
z3>4>u{#T;&L%+sIc|quZC%!QBN0?Dv6#73&;?N&sPJMCc|02C4^gpwpxis|aWS52h
z1WVe><;ge7Zw%cP@(dJ-Jkgc%jFeZ&6K|4dMs>A3$u;uKsjrnMy-uD5O)5{eS)S$Q
z-TmGzyZX~x<hROi4c+zf3=}uW6Wu7!NO_YyaVF1<>SlS8ZSu^iZ;>axRh|XSZSrKd
z%d@1t!}sL5d>*<x<rygMk|(-bo{@69Jn=p9%&6{_C%I3aIdvgVdcQming`^`9+YQE
z`;a{O4*4CSdsv=<;t_eGQl63WQF-FW<e5=DE>H4=Jag(N<w>8CXF>C{JXs~rlJ*&S
z@}2TKL-(va1I2UlM9<4JQobNh{GvQFs#>1pC3)u5FUynel4n5^<jHo+v!s1Ro_vq|
zp3pV&3>2@*6TK$SNcp-v@f-5YsNR$(c}t!-_1p5Ktvm~wz4B!H<XO_bBTv3xet+oR
zm1m%MPoC&~c}B_u^27(_nNfWpPx7HWbLx-eNk5inLGy_`*{AX>Y1ib*56K@2-C=nK
ziqGVUK9^^t{6e1iOL=BgU&)gkk!Mc*wLIxJ@+@e+l_&d7o+a(~^5jS5kB06Cc?ODO
M@<hkw8IOnm0G@vbm;e9(

delta 5469
zcmZYDF-+746vuJ?hbXktf^rJtsi&NJ>a{)f)KgDA_0&_(7WK3gQLv?jwzQ=Q0|Nu5
z3=AZt|1dBxFfcGM5W~PgQU(T^FfcGMkd&kh3?yY>ASr1N-|yZ_|34PYC-3|I|C59~
z{rfNH_g{R!p7h;#Gk)q#q0{nqtnhqcwa@1i<i3gvD!0EC6grK?@BUEmXQ%tm&dMFj
z;Xhj5R_?mz{8sj~^xxdqyYcN2H&a&ckztYzl61MZ8X{RIN$v4ggCuJZpL~Ga8z%Qk
zWimjr3MteoQ6be1m41>H$WEP!`=v7JBUvVi?ekW>BugaG{obkvvP<7*5rQ9Q?r$Sf
zDOHKibVJ@#Ss)2lNwr&Nx=7|Br8*NjAeBic$s9?r+FNx%KG4mxB!PoceW)|-ki9B1
zkP3+7Rt2OoX(O42_;ru}kW?nEBvT~ihrLxZWS?%Hgd9*QJtCD!6Qo*aCLjTolAu(F
zR2m>hRK`h)j!I=SbtGeupzd*wNoA5H870|*9MwIwHL}NKq~^u$+%KDBI<kq88kI~)
zqL9ik$p%UKxKzir8X{SToY0xn38_p5At!ZajU;(eDw`RAgtb~FNra_3r8E5`E0EJV
z6F()DNgw2l&MZSBDzVd2<;8J(NtQ^WXS`Jp$s$Q4;;p(NXZ3v+NWvdUWiwqQ^N{np
zC-kvYCY_L&&dfnBs02Te%A^BwQD<gJ0#T`KrX3R3YKElhtW-AB2Dz-&G~|kk|D04N
ztt3;Bt6G(xmnxys47si{2}!Dy#-uW7BAFm5x!|oDASvBE4!NUJbWtjkI+8IG=aRR|
zLhkD3QIajlJ)NnI%N~;vNLpt$NivtEvYBC$4U+T~sUGO&A(C}SMrTr2rFsN$+(D8x
z$YZUN38|i_3_zZ$tU|IXiEC0lQ|TvJA&Fm?>bX{ZkUEuRlGqKYY^E1duhkMsG%1zM
z^gv!}wFr5o61gdrNjJ#?q*1HzEvcGRx=7|pLbs)QtyL$)QJI6-nHfw;Wzs=1OA@#v
zRgrFPhuA4P<B{C?b62YTjN`UJ?1Y?#6zgXHJ*n)3Y$ch3<c~_nEl*4JzV2xzne>R`
zmfrt=<+x1{J4Gi*N*+jMGYur;Bt;LUvU9bLWDHWKpTfyVWs)TsCE0?MV~@|ReI$EK
zMj(6iS(^|$X)~WnWikxOpR@(;21)uescdElVyEajNvc*Vn;9foBS}7%YQKJp0g_dc
z#1n7TPqG4$f3)V-yYZ(|Rq3<(NR}aXP{*=Tne>t@L8^6g^qEv9JtT`Hk>^q!)IHrK
z3lKZ!!=FoK(nT^4v6DYkCzVMjB&biHBME*Xm7U=oko+C)xU(dIdZ}!ton(fj>V>yz
zgB-^jI_@-yzd<USX(gG0*sWgvQYw>Xh+XEBB&DyUvRl0gVwd>@NlBwrc851W><%9%
zDQc3+?(jNDRDWJ$kaH@|YpLwY%|h~5uH%kE?55o!sr^#+*vtsYCd97X%vVxf()SsL
z*iE|uv70vCEY%gQhDg>ScEP5;mda!ha!vQFktDy7%4P;gR!I^q-l`vB*YXNUyj7~3
z`aXRm%OtUHrMjh6FUb-~^gD0W1G%kx79n<ZN4}TJq?=@cB;4k$x=7|Bcl7C@AEYwr
zgxF<12eGR=_@h)N9T2;*XCe3XS%IIVGHEB7f!Nhu)h^XT-O~oKt9zQn|8srC_J4xr
I@9=#5ADMyiv;Y7A

diff --git a/tests/regression_tests/surface_source_write/case-21/surface_source_true.h5 b/tests/regression_tests/surface_source_write/case-21/surface_source_true.h5
index 4e5dcb446c26e85f1f763b75e4a33e490c1ba01d..f7e886db4f6a622b51101ac29da83f3574c25faa 100644
GIT binary patch
delta 30
mcmaDL@IYY08fM0j&1;!Wm>C%-KVmat`LxI)bF&1y2O|KjHVQHT

delta 30
mcmaDL@IYY08fM0f&1;!Wm>HQSKVmatd8BzNW3vRi2O|KkoeEC?

diff --git a/tests/regression_tests/surface_source_write/case-a01/surface_source_true.h5 b/tests/regression_tests/surface_source_write/case-a01/surface_source_true.h5
index da36fc505eb67f3da0ce48511464b699a4fb16e3..807211e3ac16e7c7c452f6fd43079e2a4cfa71ea 100644
GIT binary patch
delta 252
zcmY+-FAM=;7zXg~bH@39{+-WkCYmH%xFCq4@B~q$T@+0c&09p16dO~-i=rrs;srqv
zJfe5|?RnnxgkIEJwPQi^)LB>>=Y!>04IR^pXDg$A#nQ_8{YnLS`6NvIwezQElN{(%
z`1~Vd8*-&?3bILIorX;4Mt%ljXCZgmviEb4fPK$&@{k!lXi$J0$vBWXJ!x2kT&Puo
nEGeQ<84^;v0$I_x3VAcH%&yCM7wa15=|;ZcEZKF=(!Gu^BJ)*K

delta 850
zcmexhbHHSR29tx-My)1h#*EEtnN66bnV1+EfPjNR0z@$|GbV6=84M2uC;wrSU`evS
zlCfEW-GgzGKnU-DAOI@|DVgjm5DgaLg=heZEW{A`iXq}D7|j7PM+juZ48a7j5m9g>
zJ_<q%HH3?}3PD6n;3AH~5D}0OU@&<mRE;BC<Rw&%FkIv<RE;xSWGYmRJ6yz81md_r
zpvdGN5s2fI;L=Y;AQmG;EJYzA8gMneXd(iWA3{ZRplVnqn~FhnS;BR7LPf0MB6p!8
z_HYqHafmK4xJWC8$W5q75L}I}1Vk4ih#R3Ins7B&p(0vv5lu;mE`&%eRKysr<|0&t
z1ujx41<}P07g2?ZAbfEaLqt&;qKgx*s}w5Y3KuyE72$@9$jU%;1;9lLp&}u0k)u!%
makz-2EJT+qTqGANf(W03P!U8di^@fdfYNLnR2MXhFaQ7<KnYa<


From 1b5033dab4e92d2b99bdcc1960c0bc954dae56cc Mon Sep 17 00:00:00 2001
From: GuySten <62616591+GuySten@users.noreply.github.com>
Date: Fri, 12 Dec 2025 08:21:46 +0200
Subject: [PATCH 182/203] IFP creates fatal error in all run modes except
 eigenvalue. (#3681)

---
 src/tallies/tally.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/tallies/tally.cpp b/src/tallies/tally.cpp
index 9daeb1d69..6eef1da9c 100644
--- a/src/tallies/tally.cpp
+++ b/src/tallies/tally.cpp
@@ -215,7 +215,7 @@ Tally::Tally(pugi::xml_node node)
                       "number of inactive cycles.");
         }
         settings::ifp_on = true;
-      } else {
+      } else if (settings::run_mode == RunMode::FIXED_SOURCE) {
         fatal_error(
           "Iterated Fission Probability can only be used in an eigenvalue "
           "calculation.");

From bbfa18d72c34d8710b5f4f3fa1fff54f5248fcc5 Mon Sep 17 00:00:00 2001
From: Kevin Sawatzky <66632997+nuclearkevin@users.noreply.github.com>
Date: Fri, 12 Dec 2025 03:29:43 -0600
Subject: [PATCH 183/203] Add a command-line argument for output verbosity
 (#3680)

Co-authored-by: Paul Romano <paul.k.romano@gmail.com>
---
 docs/source/usersguide/scripts.rst |  1 +
 man/man1/openmc.1                  |  3 +++
 src/finalize.cpp                   |  2 +-
 src/initialize.cpp                 | 13 ++++++++++++-
 src/output.cpp                     |  1 +
 src/settings.cpp                   |  6 ++++--
 6 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/docs/source/usersguide/scripts.rst b/docs/source/usersguide/scripts.rst
index 0879d63ef..eb0abeb0d 100644
--- a/docs/source/usersguide/scripts.rst
+++ b/docs/source/usersguide/scripts.rst
@@ -48,6 +48,7 @@ flags:
                        restart file
 -s, --threads N        Run with *N* OpenMP threads
 -t, --track            Write tracks for all particles (up to max_tracks)
+-q, --verbosity V      Set the output verbosity to *V*
 -v, --version          Show version information
 -h, --help             Show help message
 
diff --git a/man/man1/openmc.1 b/man/man1/openmc.1
index 7826a759a..30e8b2ce4 100644
--- a/man/man1/openmc.1
+++ b/man/man1/openmc.1
@@ -39,6 +39,9 @@ Use \fIN\fP OpenMP threads.
 .B "\-t\fR, \fP\-\-track"
 Write tracks for all particles (up to max_tracks).
 .TP
+.BI \-q " V" "\fR,\fP \-\-verbosity" " V"
+Set the output verbosity to \fIV\fP.
+.TP
 .B "\-v\fR, \fP\-\-version"
 Show version information.
 .TP
diff --git a/src/finalize.cpp b/src/finalize.cpp
index 9ee943409..344eaa1a0 100644
--- a/src/finalize.cpp
+++ b/src/finalize.cpp
@@ -142,7 +142,7 @@ int openmc_finalize()
   settings::uniform_source_sampling = false;
   settings::ufs_on = false;
   settings::urr_ptables_on = true;
-  settings::verbosity = 7;
+  settings::verbosity = -1;
   settings::weight_cutoff = 0.25;
   settings::weight_survive = 1.0;
   settings::weight_windows_file.clear();
diff --git a/src/initialize.cpp b/src/initialize.cpp
index e2a5b9743..a2269ed1e 100644
--- a/src/initialize.cpp
+++ b/src/initialize.cpp
@@ -226,6 +226,15 @@ int parse_command_line(int argc, char* argv[])
         i += 1;
         settings::n_particles = std::stoll(argv[i]);
 
+      } else if (arg == "-q" || arg == "--verbosity") {
+        i += 1;
+        settings::verbosity = std::stoi(argv[i]);
+        if (settings::verbosity > 10 || settings::verbosity < 1) {
+          auto msg = fmt::format("Invalid verbosity: {}.", settings::verbosity);
+          strcpy(openmc_err_msg, msg.c_str());
+          return OPENMC_E_INVALID_ARGUMENT;
+        }
+
       } else if (arg == "-e" || arg == "--event") {
         settings::event_based = true;
       } else if (arg == "-r" || arg == "--restart") {
@@ -376,8 +385,10 @@ bool read_model_xml()
   auto settings_root = root.child("settings");
 
   // Verbosity
-  if (check_for_node(settings_root, "verbosity")) {
+  if (check_for_node(settings_root, "verbosity") && settings::verbosity == -1) {
     settings::verbosity = std::stoi(get_node_value(settings_root, "verbosity"));
+  } else if (settings::verbosity == -1) {
+    settings::verbosity = 7;
   }
 
   // To this point, we haven't displayed any output since we didn't know what
diff --git a/src/output.cpp b/src/output.cpp
index 0a14e8843..80e2b10ab 100644
--- a/src/output.cpp
+++ b/src/output.cpp
@@ -281,6 +281,7 @@ void print_usage()
       "  -t, --track            Write tracks for all particles (up to "
       "max_tracks)\n"
       "  -e, --event            Run using event-based parallelism\n"
+      "  -q, --verbosity        Output verbosity\n"
       "  -v, --version          Show version information\n"
       "  -h, --help             Show this message\n");
   }
diff --git a/src/settings.cpp b/src/settings.cpp
index d47e9b5e6..5b472468f 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -145,7 +145,7 @@ int trace_gen;
 int64_t trace_particle;
 vector<array<int, 3>> track_identifiers;
 int trigger_batch_interval {1};
-int verbosity {7};
+int verbosity {-1};
 double weight_cutoff {0.25};
 double weight_survive {1.0};
 
@@ -396,8 +396,10 @@ void read_settings_xml()
   xml_node root = doc.document_element();
 
   // Verbosity
-  if (check_for_node(root, "verbosity")) {
+  if (check_for_node(root, "verbosity") && verbosity == -1) {
     verbosity = std::stoi(get_node_value(root, "verbosity"));
+  } else if (verbosity == -1) {
+    verbosity = 7;
   }
 
   // To this point, we haven't displayed any output since we didn't know what

From d1183566383e38e96c97db195613c407f9a5c091 Mon Sep 17 00:00:00 2001
From: Patrick Shriwise <pshriwise@gmail.com>
Date: Wed, 17 Dec 2025 00:10:07 -0600
Subject: [PATCH 184/203] Use MeshBase method to check replicated. Add header
 for replicated mesh (#3689)

---
 src/mesh.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/mesh.cpp b/src/mesh.cpp
index 610d057cf..c3a2d4581 100644
--- a/src/mesh.cpp
+++ b/src/mesh.cpp
@@ -51,6 +51,7 @@
 #include "libmesh/mesh_modification.h"
 #include "libmesh/mesh_tools.h"
 #include "libmesh/numeric_vector.h"
+#include "libmesh/replicated_mesh.h"
 #endif
 
 #ifdef OPENMC_DAGMC_ENABLED
@@ -3435,7 +3436,7 @@ LibMesh::LibMesh(hid_t group) : UnstructuredMesh(group)
 // create the mesh from a pointer to a libMesh Mesh
 LibMesh::LibMesh(libMesh::MeshBase& input_mesh, double length_multiplier)
 {
-  if (!dynamic_cast<libMesh::ReplicatedMesh*>(&input_mesh)) {
+  if (!input_mesh.is_replicated()) {
     fatal_error("At present LibMesh tallies require a replicated mesh. Please "
                 "ensure 'input_mesh' is a libMesh::ReplicatedMesh.");
   }

From e0eb91b9551ecc97c7027b4dfe242fc63e4eedde Mon Sep 17 00:00:00 2001
From: Jonathan Shimwell <mail@jshimwell.com>
Date: Wed, 17 Dec 2025 21:44:53 +0100
Subject: [PATCH 185/203] using id_map in model.plot for more efficient
 plotting (#3678)

---
 openmc/model/model.py          | 195 +++++++++++++++------------------
 openmc/plots.py                |  82 +++++++++++++-
 tests/unit_tests/test_model.py |  42 +++++++
 3 files changed, 211 insertions(+), 108 deletions(-)

diff --git a/openmc/model/model.py b/openmc/model/model.py
index a9aaa481d..6e4c1c585 100644
--- a/openmc/model/model.py
+++ b/openmc/model/model.py
@@ -23,7 +23,7 @@ from openmc.dummy_comm import DummyCommunicator
 from openmc.executor import _process_CLI_arguments
 from openmc.checkvalue import check_type, check_value, PathLike
 from openmc.exceptions import InvalidIDError
-from openmc.plots import add_plot_params, _BASIS_INDICES
+from openmc.plots import add_plot_params, _BASIS_INDICES, id_map_to_rgb
 from openmc.utility_funcs import change_directory
 
 
@@ -1114,13 +1114,12 @@ class Model:
         color_by: str = 'cell',
         colors: dict | None = None,
         seed: int | None = None,
-        openmc_exec: PathLike = 'openmc',
         axes=None,
         legend: bool = False,
         axis_units: str = 'cm',
         outline: bool | str = False,
         show_overlaps: bool = False,
-        overlap_color: Sequence[int] | str | None = None,
+        overlap_color: Sequence[int] | str = (255, 0, 0),
         n_samples: int | None = None,
         plane_tolerance: float = 1.,
         legend_kwargs: dict | None = None,
@@ -1132,7 +1131,6 @@ class Model:
 
         .. versionadded:: 0.15.1
         """
-        import matplotlib.image as mpimg
         import matplotlib.patches as mpatches
         import matplotlib.pyplot as plt
 
@@ -1162,125 +1160,108 @@ class Model:
         y_min = (origin[y] - 0.5*width[1]) * axis_scaling_factor[axis_units]
         y_max = (origin[y] + 0.5*width[1]) * axis_scaling_factor[axis_units]
 
-        # Determine whether any materials contains macroscopic data and if so,
-        # set energy mode accordingly
-        _energy_mode = self.settings._energy_mode
-        for mat in self.geometry.get_all_materials().values():
-            if mat._macroscopic is not None:
-                self.settings.energy_mode = 'multi-group'
-                break
+        # Get ID map from the C API
+        id_map = self.id_map(
+            origin=origin,
+            width=width,
+            pixels=pixels,
+            basis=basis,
+            color_overlaps=show_overlaps
+        )
 
-        with TemporaryDirectory() as tmpdir:
-            _plot_seed = self.settings.plot_seed
-            if seed is not None:
-                self.settings.plot_seed = seed
-
-            # Create plot object matching passed arguments
+        # Generate colors if not provided
+        if colors is None and seed is not None:
+            # Use the colorize method to generate random colors
             plot = openmc.SlicePlot()
-            plot.origin = origin
-            plot.width = width
-            plot.pixels = pixels
-            plot.basis = basis
             plot.color_by = color_by
-            plot.show_overlaps = show_overlaps
-            if overlap_color is not None:
-                plot.overlap_color = overlap_color
-            if colors is not None:
-                plot.colors = colors
-            self.plots.append(plot)
+            plot.colorize(self.geometry, seed=seed)
+            colors = plot.colors
 
-            # Run OpenMC in geometry plotting mode
-            self.plot_geometry(False, cwd=tmpdir, openmc_exec=openmc_exec)
+        # Convert ID map to RGB image
+        img = id_map_to_rgb(
+            id_map=id_map, 
+            color_by=color_by, 
+            colors=colors,
+            overlap_color=overlap_color
+        )
 
-            # Undo changes to model
-            self.plots.pop()
-            self.settings._plot_seed = _plot_seed
-            self.settings._energy_mode = _energy_mode
+        # Create a figure sized such that the size of the axes within
+        # exactly matches the number of pixels specified
+        if axes is None:
+            px = 1/plt.rcParams['figure.dpi']
+            fig, axes = plt.subplots()
+            axes.set_xlabel(xlabel)
+            axes.set_ylabel(ylabel)
+            params = fig.subplotpars
+            width_px = pixels[0]*px/(params.right - params.left)
+            height_px = pixels[1]*px/(params.top - params.bottom)
+            fig.set_size_inches(width_px, height_px)
 
-            # Read image from file
-            img_path = Path(tmpdir) / f'plot_{plot.id}.png'
-            if not img_path.is_file():
-                img_path = img_path.with_suffix('.ppm')
-            img = mpimg.imread(str(img_path))
+        if outline:
+            # Combine R, G, B values into a single int for contour detection
+            rgb = (img * 256).astype(int)
+            image_value = (rgb[..., 0] << 16) + \
+                (rgb[..., 1] << 8) + (rgb[..., 2])
 
-            # Create a figure sized such that the size of the axes within
-            # exactly matches the number of pixels specified
-            if axes is None:
-                px = 1/plt.rcParams['figure.dpi']
-                fig, axes = plt.subplots()
-                axes.set_xlabel(xlabel)
-                axes.set_ylabel(ylabel)
-                params = fig.subplotpars
-                width = pixels[0]*px/(params.right - params.left)
-                height = pixels[1]*px/(params.top - params.bottom)
-                fig.set_size_inches(width, height)
+            # Set default arguments for contour()
+            if contour_kwargs is None:
+                contour_kwargs = {}
+            contour_kwargs.setdefault('colors', 'k')
+            contour_kwargs.setdefault('linestyles', 'solid')
+            contour_kwargs.setdefault('algorithm', 'serial')
 
-            if outline:
-                # Combine R, G, B values into a single int
-                rgb = (img * 256).astype(int)
-                image_value = (rgb[..., 0] << 16) + \
-                    (rgb[..., 1] << 8) + (rgb[..., 2])
+            axes.contour(
+                image_value,
+                origin="upper",
+                levels=np.unique(image_value),
+                extent=(x_min, x_max, y_min, y_max),
+                **contour_kwargs
+            )
+            
+            # If only showing outline, set the axis limits and aspect explicitly
+            if outline == 'only':
+                axes.set_xlim(x_min, x_max)
+                axes.set_ylim(y_min, y_max)
+                axes.set_aspect('equal')
 
-                # Set default arguments for contour()
-                if contour_kwargs is None:
-                    contour_kwargs = {}
-                contour_kwargs.setdefault('colors', 'k')
-                contour_kwargs.setdefault('linestyles', 'solid')
-                contour_kwargs.setdefault('algorithm', 'serial')
+        # Add legend showing which colors represent which material or cell
+        if legend:
+            if colors is None or len(colors) == 0:
+                raise ValueError("Must pass 'colors' dictionary if you "
+                                 "are adding a legend via legend=True.")
 
-                axes.contour(
-                    image_value,
-                    origin="upper",
-                    levels=np.unique(image_value),
-                    extent=(x_min, x_max, y_min, y_max),
-                    **contour_kwargs
-                )
+            if color_by == "cell":
+                expected_key_type = openmc.Cell
+            else:
+                expected_key_type = openmc.Material
 
-            # add legend showing which colors represent which material
-            # or cell if that was requested
-            if legend:
-                if plot.colors == {}:
-                    raise ValueError("Must pass 'colors' dictionary if you "
-                                     "are adding a legend via legend=True.")
+            patches = []
+            for key, color in colors.items():
+                if isinstance(key, int):
+                    raise TypeError(
+                        "Cannot use IDs in colors dict for auto legend.")
+                elif not isinstance(key, expected_key_type):
+                    raise TypeError(
+                        "Color dict key type does not match color_by")
 
-                if color_by == "cell":
-                    expected_key_type = openmc.Cell
+                # this works whether we're doing cells or materials
+                label = key.name if key.name != '' else key.id
+
+                # matplotlib takes RGB on 0-1 scale rather than 0-255
+                if len(color) == 3 and not isinstance(color, str):
+                    scaled_color = (
+                        color[0]/255, color[1]/255, color[2]/255)
                 else:
-                    expected_key_type = openmc.Material
+                    scaled_color = color
 
-                patches = []
-                for key, color in plot.colors.items():
+                key_patch = mpatches.Patch(color=scaled_color, label=label)
+                patches.append(key_patch)
 
-                    if isinstance(key, int):
-                        raise TypeError(
-                            "Cannot use IDs in colors dict for auto legend.")
-                    elif not isinstance(key, expected_key_type):
-                        raise TypeError(
-                            "Color dict key type does not match color_by")
-
-                    # this works whether we're doing cells or materials
-                    label = key.name if key.name != '' else key.id
-
-                    # matplotlib takes RGB on 0-1 scale rather than 0-255. at
-                    # this point PlotBase has already checked that 3-tuple
-                    # based colors are already valid, so if the length is three
-                    # then we know it just needs to be converted to the 0-1
-                    # format.
-                    if len(color) == 3 and not isinstance(color, str):
-                        scaled_color = (
-                            color[0]/255, color[1]/255, color[2]/255)
-                    else:
-                        scaled_color = color
-
-                    key_patch = mpatches.Patch(color=scaled_color, label=label)
-                    patches.append(key_patch)
-
-                axes.legend(handles=patches, **legend_kwargs)
-
-            # Plot image and return the axes
-            if outline != 'only':
-                axes.imshow(img, extent=(x_min, x_max, y_min, y_max), **kwargs)
+            axes.legend(handles=patches, **legend_kwargs)
 
+        # Plot image and return the axes
+        if outline != 'only':
+            axes.imshow(img, extent=(x_min, x_max, y_min, y_max), **kwargs)
 
         if n_samples:
             # Sample external source particles
diff --git a/openmc/plots.py b/openmc/plots.py
index cb722abc6..8b67d5cac 100644
--- a/openmc/plots.py
+++ b/openmc/plots.py
@@ -1,4 +1,4 @@
-from collections.abc import Iterable, Mapping
+from collections.abc import Iterable, Mapping, Sequence
 from numbers import Integral, Real
 from pathlib import Path
 from textwrap import dedent
@@ -355,6 +355,86 @@ def voxel_to_vtk(voxel_file: PathLike, output: PathLike = 'plot.vti'):
     return output
 
 
+def id_map_to_rgb(
+    id_map: np.ndarray,
+    color_by: str = 'cell',
+    colors: dict | None = None,
+    overlap_color: Sequence[int] | str = (255, 0, 0)
+) -> np.ndarray:
+    """Convert ID map array to RGB image array.
+
+    Parameters
+    ----------
+    id_map : numpy.ndarray
+        Array with shape (v_pixels, h_pixels, 3) containing cell IDs,
+        cell instances, and material IDs
+    color_by : {'cell', 'material'}
+        Whether to color by cell or material
+    colors : dict, optional
+        Dictionary mapping cells/materials to colors
+    overlap_color : sequence of int or str, optional
+        Color to use for overlaps. Defaults to red (255, 0, 0).
+
+    Returns
+    -------
+    numpy.ndarray
+        RGB image array with shape (v_pixels, h_pixels, 3) with values
+        in range [0, 1] for matplotlib
+    """
+    # Initialize RGB array with white background (values between 0 and 1 for matplotlib)
+    img = np.ones(id_map.shape, dtype=float)
+    
+    # Get the appropriate index based on color_by
+    if color_by == 'cell':
+        id_index = 0  # Cell IDs are in the first channel
+    elif color_by == 'material':
+        id_index = 2  # Material IDs are in the third channel
+    else:
+        raise ValueError("color_by must be either 'cell' or 'material'")
+    
+    # Get all unique IDs in the plot
+    unique_ids = np.unique(id_map[:, :, id_index])
+    
+    # Generate default colors if not provided
+    if colors is None:
+        colors = {}
+    
+    # Convert colors dict to use IDs as keys
+    color_map = {}
+    for key, color in colors.items():
+        if isinstance(key, (openmc.Cell, openmc.Material)):
+            color_map[key.id] = color
+        else:
+            color_map[key] = color
+    
+    # Generate random colors for IDs not in color_map
+    rng = np.random.RandomState(1)
+    for uid in unique_ids:
+        if uid > 0 and uid not in color_map:
+            color_map[uid] = rng.randint(0, 256, (3,))
+    
+    # Apply colors to each pixel
+    for uid in unique_ids:
+        if uid == -1:  # Background/void
+            continue
+        elif uid == -3:  # Overlap (only present if color_overlaps was True)
+            if isinstance(overlap_color, str):
+                rgb = _SVG_COLORS[overlap_color.lower()]
+            else:
+                rgb = overlap_color
+            mask = id_map[:, :, id_index] == uid
+            img[mask] = np.array(rgb) / 255.0
+        elif uid in color_map:
+            color = color_map[uid]
+            if isinstance(color, str):
+                rgb = _SVG_COLORS[color.lower()]
+            else:
+                rgb = color
+            mask = id_map[:, :, id_index] == uid
+            img[mask] = np.array(rgb) / 255.0
+    
+    return img
+
 class PlotBase(IDManagerMixin):
     """
     Parameters
diff --git a/tests/unit_tests/test_model.py b/tests/unit_tests/test_model.py
index d553af53c..3846ba4fb 100644
--- a/tests/unit_tests/test_model.py
+++ b/tests/unit_tests/test_model.py
@@ -7,6 +7,7 @@ import pytest
 
 import openmc
 import openmc.lib
+from openmc.plots import id_map_to_rgb
 
 
 @pytest.fixture(scope='function')
@@ -996,3 +997,44 @@ def test_keff_search(run_in_tmpdir):
     # Check that total_batches property works
     assert result.total_batches == sum(result.batches)
     assert result.total_batches > 0
+
+
+def test_id_map_to_rgb():
+    """Test conversion of ID map to RGB image array."""
+    # Create a simple model
+    mat = openmc.Material()
+    mat.set_density('g/cm3', 1.0)
+    mat.add_nuclide('Li7', 1.0)
+
+    sphere = openmc.Sphere(r=5.0, boundary_type='vacuum')
+    cell = openmc.Cell(fill=mat, region=-sphere)
+    geometry = openmc.Geometry([cell])
+    settings = openmc.Settings(
+        batches=10, particles=100, run_mode='fixed source'
+    )
+    model = openmc.Model(geometry, settings=settings)
+
+    id_data = np.zeros((10, 10, 3), dtype=np.int32)
+    id_data[:, :, 0] = cell.id  # Cell IDs
+    id_data[:, :, 2] = mat.id   # Material IDs
+
+    # Test color_by with default colors
+    for color_by in ['cell', 'material']:
+        rgb = id_map_to_rgb(id_data, color_by=color_by)
+        assert rgb.shape == (10, 10, 3)
+        assert rgb.dtype == float
+        assert np.all((rgb >= 0) & (rgb <= 1))  # RGB values in [0, 1]
+
+    # Test with custom colors
+    colors = {cell.id: (255, 0, 0)}  # Red
+    rgb_custom = id_map_to_rgb(id_data, color_by='cell', colors=colors)
+    assert np.allclose(rgb_custom, [1.0, 0.0, 0.0])  # All pixels should be red
+
+    # Test with overlaps
+    id_data_overlap = id_data.copy()
+    id_data_overlap[5:, 5:, 0] = -3  # Mark some pixels as overlaps
+    rgb_overlap = id_map_to_rgb(
+        id_data_overlap, overlap_color=(0, 255, 0)
+    )
+    # Check that overlap region is green
+    assert np.allclose(rgb_overlap[5:, 5:], [0.0, 1.0, 0.0])

From a230b86128f58e093e4cba4f499efdfd5d90cdc9 Mon Sep 17 00:00:00 2001
From: GuySten <62616591+GuySten@users.noreply.github.com>
Date: Thu, 18 Dec 2025 17:56:43 +0200
Subject: [PATCH 186/203] Fix mcpl dependency in test (#3691)

---
 tests/unit_tests/test_collision_track.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/unit_tests/test_collision_track.py b/tests/unit_tests/test_collision_track.py
index 9bc6a8c15..25344a3bd 100644
--- a/tests/unit_tests/test_collision_track.py
+++ b/tests/unit_tests/test_collision_track.py
@@ -5,6 +5,7 @@ import openmc
 import pytest
 import h5py
 import numpy as np
+import shutil
 
 from tests.testing_harness import CollisionTrackTestHarness as ctt
 
@@ -109,6 +110,7 @@ def test_particle_location(run_in_tmpdir, model):
                 assert False
 
 
+@pytest.mark.skipif(shutil.which("mcpl-config") is None, reason="MCPL is not available.")
 def test_format_similarity(run_in_tmpdir, model):
     model.settings.collision_track = {"max_collisions": 200, "reactions": ['elastic'],
                                       "cell_ids": [1, 2], "mcpl": False}

From a2fd6cc57e7f0bce55b90e57e8d1a28d84bca5d4 Mon Sep 17 00:00:00 2001
From: Zoe Prieto <101403129+zoeprieto@users.noreply.github.com>
Date: Sat, 20 Dec 2025 01:56:13 -0300
Subject: [PATCH 187/203] Support rotation in MeshFilter (#3176)

Co-authored-by: Jonathan Shimwell <drshimwell@gmail.com>
Co-authored-by: Patrick Shriwise <pshriwise@gmail.com>
---
 include/openmc/tallies/filter_mesh.h          |   8 +
 openmc/filter.py                              |  43 +++
 openmc/lib/filter.py                          |  40 +++
 src/cell.cpp                                  |   2 +-
 src/tallies/filter_mesh.cpp                   |  92 +++++++
 src/weight_windows.cpp                        |   3 +-
 .../filter_rotations/__init__.py              |   0
 .../filter_rotations/inputs_true.dat          |  59 +++++
 .../filter_rotations/results_true.dat         | 244 ++++++++++++++++++
 .../regression_tests/filter_rotations/test.py |  72 ++++++
 tests/unit_tests/test_filter_mesh.py          |  26 ++
 tests/unit_tests/test_lib.py                  |   7 +
 12 files changed, 594 insertions(+), 2 deletions(-)
 create mode 100644 tests/regression_tests/filter_rotations/__init__.py
 create mode 100644 tests/regression_tests/filter_rotations/inputs_true.dat
 create mode 100644 tests/regression_tests/filter_rotations/results_true.dat
 create mode 100644 tests/regression_tests/filter_rotations/test.py

diff --git a/include/openmc/tallies/filter_mesh.h b/include/openmc/tallies/filter_mesh.h
index 4c9460d2e..c35a477fe 100644
--- a/include/openmc/tallies/filter_mesh.h
+++ b/include/openmc/tallies/filter_mesh.h
@@ -51,6 +51,12 @@ public:
 
   virtual bool translated() const { return translated_; }
 
+  virtual void set_rotation(const vector<double>& rotation);
+
+  virtual const vector<double>& rotation() const { return rotation_; }
+
+  virtual bool rotated() const { return rotated_; }
+
 protected:
   //----------------------------------------------------------------------------
   // Data members
@@ -58,6 +64,8 @@ protected:
   int32_t mesh_;            //!< Index of the mesh
   bool translated_ {false}; //!< Whether or not the filter is translated
   Position translation_ {0.0, 0.0, 0.0}; //!< Filter translation
+  bool rotated_ {false};    //!< Whether or not the filter is rotated
+  vector<double> rotation_; //!< Filter rotation
 };
 
 } // namespace openmc
diff --git a/openmc/filter.py b/openmc/filter.py
index 550146f85..39844798d 100644
--- a/openmc/filter.py
+++ b/openmc/filter.py
@@ -833,6 +833,25 @@ class MeshFilter(Filter):
     translation : Iterable of float
         This array specifies a vector that is used to translate (shift) the mesh
         for this filter
+    rotation : Iterable of float
+        This array specifies the angles in degrees about the x, y, and z axes
+        that the mesh should be rotated. The rotation applied is an intrinsic
+        rotation with specified Tait-Bryan angles. That is to say, if the angles
+        are :math:`(\phi, \theta, \psi)`, then the rotation matrix applied is
+        :math:`R_z(\psi) R_y(\theta) R_x(\phi)` or
+
+        .. math::
+
+           \left [ \begin{array}{ccc} \cos\theta \cos\psi & -\cos\phi \sin\psi
+           + \sin\phi \sin\theta \cos\psi & \sin\phi \sin\psi + \cos\phi
+           \sin\theta \cos\psi \\ \cos\theta \sin\psi & \cos\phi \cos\psi +
+           \sin\phi \sin\theta \sin\psi & -\sin\phi \cos\psi + \cos\phi
+           \sin\theta \sin\psi \\ -\sin\theta & \sin\phi \cos\theta & \cos\phi
+           \cos\theta \end{array} \right ]
+
+        A rotation matrix can also be specified directly by setting this
+        attribute to a nested list (or 2D numpy array) that specifies each
+        element of the matrix.
     bins : list of tuple
         A list of mesh indices for each filter bin, e.g. [(1, 1, 1), (2, 1, 1),
         ...]
@@ -845,6 +864,7 @@ class MeshFilter(Filter):
         self.mesh = mesh
         self.id = filter_id
         self._translation = None
+        self._rotation = None
 
     def __hash__(self):
         string = type(self).__name__ + '\n'
@@ -856,6 +876,7 @@ class MeshFilter(Filter):
         string += '{: <16}=\t{}\n'.format('\tMesh ID', self.mesh.id)
         string += '{: <16}=\t{}\n'.format('\tID', self.id)
         string += '{: <16}=\t{}\n'.format('\tTranslation', self.translation)
+        string += '{: <16}=\t{}\n'.format('\tRotation', self.rotation)
         return string
 
     @classmethod
@@ -879,6 +900,10 @@ class MeshFilter(Filter):
         if translation:
             out.translation = translation[()]
 
+        rotation = group.get('rotation')
+        if rotation:
+            out.rotation = rotation[()]
+
         return out
 
     @property
@@ -911,6 +936,15 @@ class MeshFilter(Filter):
         cv.check_length('mesh filter translation', t, 3)
         self._translation = np.asarray(t)
 
+    @property
+    def rotation(self):
+        return self._rotation
+
+    @rotation.setter
+    def rotation(self, rotation):
+        cv.check_length('mesh filter rotation', rotation, 3)
+        self._rotation = np.asarray(rotation)
+
     def can_merge(self, other):
         # Mesh filters cannot have more than one bin
         return False
@@ -996,6 +1030,8 @@ class MeshFilter(Filter):
         subelement.text = str(self.mesh.id)
         if self.translation is not None:
             element.set('translation', ' '.join(map(str, self.translation)))
+        if self.rotation is not None:
+            element.set('rotation', ' '.join(map(str, self.rotation.ravel())))
         return element
 
     @classmethod
@@ -1008,6 +1044,13 @@ class MeshFilter(Filter):
         translation = get_elem_list(elem, "translation", float) or []
         if translation:
             out.translation = translation
+
+        rotation = get_elem_list(elem, 'rotation', float) or []
+        if rotation:
+            if len(rotation) == 3:
+                out.rotation = rotation
+            elif len(rotation) == 9:
+                out.rotation = np.array(rotation).reshape(3, 3)
         return out
 
 
diff --git a/openmc/lib/filter.py b/openmc/lib/filter.py
index 55b681d89..5cf496107 100644
--- a/openmc/lib/filter.py
+++ b/openmc/lib/filter.py
@@ -97,6 +97,14 @@ _dll.openmc_mesh_filter_get_translation.errcheck = _error_handler
 _dll.openmc_mesh_filter_set_translation.argtypes = [c_int32, POINTER(c_double*3)]
 _dll.openmc_mesh_filter_set_translation.restype = c_int
 _dll.openmc_mesh_filter_set_translation.errcheck = _error_handler
+_dll.openmc_mesh_filter_get_rotation.argtypes = [c_int32, POINTER(c_double),
+    POINTER(c_size_t)]
+_dll.openmc_mesh_filter_get_rotation.restype = c_int
+_dll.openmc_mesh_filter_get_rotation.errcheck = _error_handler
+_dll.openmc_mesh_filter_set_rotation.argtypes = [
+    c_int32, POINTER(c_double), c_size_t]
+_dll.openmc_mesh_filter_set_rotation.restype = c_int
+_dll.openmc_mesh_filter_set_rotation.errcheck = _error_handler
 _dll.openmc_meshborn_filter_get_mesh.argtypes = [c_int32, POINTER(c_int32)]
 _dll.openmc_meshborn_filter_get_mesh.restype = c_int
 _dll.openmc_meshborn_filter_get_mesh.errcheck = _error_handler
@@ -393,6 +401,10 @@ class MeshFilter(Filter):
         Mesh used for the filter
     translation : Iterable of float
         3-D coordinates of the translation vector
+    rotation : Iterable of float
+        The rotation matrix or angles of the filter mesh. This can either be 
+        a fully specified 3 x 3 rotation matrix or an Iterable of length 3 
+        with the angles in degrees about the x, y, and z axes, respectively.
 
     """
     filter_type = 'mesh'
@@ -422,6 +434,34 @@ class MeshFilter(Filter):
     def translation(self, translation):
         _dll.openmc_mesh_filter_set_translation(self._index, (c_double*3)(*translation))
 
+    @property
+    def rotation(self):
+        rotation_data = np.zeros(12)
+        rot_size = c_size_t()
+
+        _dll.openmc_mesh_filter_get_rotation(
+            self._index, rotation_data.ctypes.data_as(POINTER(c_double)),
+            rot_size)
+        rot_size = rot_size.value
+
+        if rot_size == 9:
+            return rotation_data[:rot_size].shape(3, 3)
+        elif rot_size in (0, 12):
+            # If size is 0, rotation_data[9:] will be zeros. This indicates no
+            # rotation and is the most straightforward way to always return
+            # an iterable of floats
+            return rotation_data[9:]
+        else:
+            raise ValueError(
+                f'Invalid size of rotation matrix: {rot_size}')
+        
+    @rotation.setter
+    def rotation(self, rotation_data):
+        flat_rotation = np.asarray(rotation_data, dtype=float).flatten()
+
+        _dll.openmc_mesh_filter_set_rotation(
+            self._index, flat_rotation.ctypes.data_as(POINTER(c_double)),
+            c_size_t(len(flat_rotation)))
 
 class MeshBornFilter(Filter):
     """MeshBorn filter stored internally.
diff --git a/src/cell.cpp b/src/cell.cpp
index e2479994a..fd459cdcc 100644
--- a/src/cell.cpp
+++ b/src/cell.cpp
@@ -57,7 +57,7 @@ void Cell::set_rotation(const vector<double>& rot)
     fatal_error(fmt::format("Non-3D rotation vector applied to cell {}", id_));
   }
 
-  // Compute and store the rotation matrix.
+  // Compute and store the inverse rotation matrix for the angles given.
   rotation_.clear();
   rotation_.reserve(rot.size() == 9 ? 9 : 12);
   if (rot.size() == 3) {
diff --git a/src/tallies/filter_mesh.cpp b/src/tallies/filter_mesh.cpp
index 4edfbec4b..a0698992d 100644
--- a/src/tallies/filter_mesh.cpp
+++ b/src/tallies/filter_mesh.cpp
@@ -6,6 +6,7 @@
 #include "openmc/constants.h"
 #include "openmc/error.h"
 #include "openmc/mesh.h"
+#include "openmc/position.h"
 #include "openmc/xml_interface.h"
 
 namespace openmc {
@@ -30,6 +31,10 @@ void MeshFilter::from_xml(pugi::xml_node node)
   if (check_for_node(node, "translation")) {
     set_translation(get_node_array<double>(node, "translation"));
   }
+  // Read the rotation transform.
+  if (check_for_node(node, "rotation")) {
+    set_rotation(get_node_array<double>(node, "rotation"));
+  }
 }
 
 void MeshFilter::get_all_bins(
@@ -45,6 +50,12 @@ void MeshFilter::get_all_bins(
     last_r -= translation();
     r -= translation();
   }
+  // apply rotation if present
+  if (!rotation_.empty()) {
+    last_r = last_r.rotate(rotation_);
+    r = r.rotate(rotation_);
+    u = u.rotate(rotation_);
+  }
 
   if (estimator != TallyEstimator::TRACKLENGTH) {
     auto bin = model::meshes[mesh_]->get_bin(r);
@@ -65,6 +76,9 @@ void MeshFilter::to_statepoint(hid_t filter_group) const
   if (translated_) {
     write_dataset(filter_group, "translation", translation_);
   }
+  if (rotated_) {
+    write_dataset(filter_group, "rotation", rotation_);
+  }
 }
 
 std::string MeshFilter::text_label(int bin) const
@@ -93,6 +107,40 @@ void MeshFilter::set_translation(const double translation[3])
   this->set_translation({translation[0], translation[1], translation[2]});
 }
 
+void MeshFilter::set_rotation(const vector<double>& rot)
+{
+  rotated_ = true;
+
+  // Compute and store the inverse rotation matrix for the angles given.
+  rotation_.clear();
+  rotation_.reserve(rot.size() == 9 ? 9 : 12);
+  if (rot.size() == 3) {
+    double phi = -rot[0] * PI / 180.0;
+    double theta = -rot[1] * PI / 180.0;
+    double psi = -rot[2] * PI / 180.0;
+    rotation_.push_back(std::cos(theta) * std::cos(psi));
+    rotation_.push_back(-std::cos(phi) * std::sin(psi) +
+                        std::sin(phi) * std::sin(theta) * std::cos(psi));
+    rotation_.push_back(std::sin(phi) * std::sin(psi) +
+                        std::cos(phi) * std::sin(theta) * std::cos(psi));
+    rotation_.push_back(std::cos(theta) * std::sin(psi));
+    rotation_.push_back(std::cos(phi) * std::cos(psi) +
+                        std::sin(phi) * std::sin(theta) * std::sin(psi));
+    rotation_.push_back(-std::sin(phi) * std::cos(psi) +
+                        std::cos(phi) * std::sin(theta) * std::sin(psi));
+    rotation_.push_back(-std::sin(theta));
+    rotation_.push_back(std::sin(phi) * std::cos(theta));
+    rotation_.push_back(std::cos(phi) * std::cos(theta));
+
+    // When user specifies angles, write them at end of vector
+    rotation_.push_back(rot[0]);
+    rotation_.push_back(rot[1]);
+    rotation_.push_back(rot[2]);
+  } else {
+    std::copy(rot.begin(), rot.end(), std::back_inserter(rotation_));
+  }
+}
+
 //==============================================================================
 // C-API functions
 //==============================================================================
@@ -201,4 +249,48 @@ extern "C" int openmc_mesh_filter_set_translation(
   return 0;
 }
 
+//! Return the rotation matrix of a mesh filter
+extern "C" int openmc_mesh_filter_get_rotation(
+  int32_t index, double rot[], size_t* n)
+{
+  // Make sure this is a valid index to an allocated filter
+  if (int err = verify_filter(index))
+    return err;
+
+  // Check the filter type
+  const auto& filter = model::tally_filters[index];
+  if (filter->type() != FilterType::MESH) {
+    set_errmsg("Tried to get a rotation from a non-mesh filter.");
+    return OPENMC_E_INVALID_TYPE;
+  }
+  // Get rotation from the mesh filter and set value
+  auto mesh_filter = dynamic_cast<MeshFilter*>(filter.get());
+  *n = mesh_filter->rotation().size();
+  std::memcpy(rot, mesh_filter->rotation().data(),
+    *n * sizeof(mesh_filter->rotation()[0]));
+  return 0;
+}
+
+//! Set the flattened rotation matrix of a mesh filter
+extern "C" int openmc_mesh_filter_set_rotation(
+  int32_t index, const double rot[], size_t rot_len)
+{
+  // Make sure this is a valid index to an allocated filter
+  if (int err = verify_filter(index))
+    return err;
+
+  const auto& filter = model::tally_filters[index];
+  // Check the filter type
+  if (filter->type() != FilterType::MESH) {
+    set_errmsg("Tried to set a rotation from a non-mesh filter.");
+    return OPENMC_E_INVALID_TYPE;
+  }
+
+  // Get a pointer to the filter and downcast
+  auto mesh_filter = dynamic_cast<MeshFilter*>(filter.get());
+  std::vector<double> vec_rot(rot, rot + rot_len);
+  mesh_filter->set_rotation(vec_rot);
+  return 0;
+}
+
 } // namespace openmc
diff --git a/src/weight_windows.cpp b/src/weight_windows.cpp
index 9333800bc..4838e4591 100644
--- a/src/weight_windows.cpp
+++ b/src/weight_windows.cpp
@@ -933,7 +933,8 @@ void WeightWindowsGenerator::create_tally()
   for (const auto& f : model::tally_filters) {
     if (f->type() == FilterType::MESH) {
       const auto* mesh_filter = dynamic_cast<MeshFilter*>(f.get());
-      if (mesh_filter->mesh() == mesh_idx && !mesh_filter->translated()) {
+      if (mesh_filter->mesh() == mesh_idx && !mesh_filter->translated() &&
+          !mesh_filter->rotated()) {
         ww_tally->add_filter(f.get());
         found_mesh_filter = true;
         break;
diff --git a/tests/regression_tests/filter_rotations/__init__.py b/tests/regression_tests/filter_rotations/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/regression_tests/filter_rotations/inputs_true.dat b/tests/regression_tests/filter_rotations/inputs_true.dat
new file mode 100644
index 000000000..1ad2b9e86
--- /dev/null
+++ b/tests/regression_tests/filter_rotations/inputs_true.dat
@@ -0,0 +1,59 @@
+<?xml version='1.0' encoding='utf-8'?>
+<model>
+  <materials>
+    <material id="1" depletable="true">
+      <density value="10.0" units="g/cm3"/>
+      <nuclide name="U235" ao="1.0"/>
+    </material>
+    <material id="2">
+      <density value="1.0" units="g/cm3"/>
+      <nuclide name="Zr90" ao="1.0"/>
+    </material>
+  </materials>
+  <geometry>
+    <cell id="1" material="1" region="1 -2 3 -4 10 -9" universe="1"/>
+    <cell id="2" material="2" region="(-1 | 2 | -3 | 4) (5 -6 7 -8) 10 -9" universe="1"/>
+    <surface id="1" name="minimum x" type="x-plane" coeffs="-5.0"/>
+    <surface id="2" name="maximum x" type="x-plane" coeffs="5.0"/>
+    <surface id="3" name="minimum y" type="y-plane" coeffs="-5.0"/>
+    <surface id="4" name="maximum y" type="y-plane" coeffs="5.0"/>
+    <surface id="5" name="minimum x" type="x-plane" boundary="reflective" coeffs="-10.0"/>
+    <surface id="6" name="maximum x" type="x-plane" boundary="reflective" coeffs="10.0"/>
+    <surface id="7" name="minimum y" type="y-plane" boundary="reflective" coeffs="-10.0"/>
+    <surface id="8" name="maximum y" type="y-plane" boundary="reflective" coeffs="10.0"/>
+    <surface id="9" type="z-plane" boundary="vacuum" coeffs="10.0"/>
+    <surface id="10" type="z-plane" boundary="vacuum" coeffs="-10.0"/>
+  </geometry>
+  <settings>
+    <run_mode>eigenvalue</run_mode>
+    <particles>1000</particles>
+    <batches>5</batches>
+    <inactive>0</inactive>
+  </settings>
+  <tallies>
+    <mesh id="1">
+      <dimension>3 4 5</dimension>
+      <lower_left>-9 -9 -9</lower_left>
+      <upper_right>9 9 9</upper_right>
+    </mesh>
+    <mesh id="2">
+      <dimension>3 4 5</dimension>
+      <lower_left>-9 -9 -9</lower_left>
+      <upper_right>9 9 9</upper_right>
+    </mesh>
+    <filter id="1" type="mesh">
+      <bins>1</bins>
+    </filter>
+    <filter id="2" type="mesh" rotation="0 0 10">
+      <bins>2</bins>
+    </filter>
+    <tally id="1">
+      <filters>1</filters>
+      <scores>total</scores>
+    </tally>
+    <tally id="2">
+      <filters>2</filters>
+      <scores>total</scores>
+    </tally>
+  </tallies>
+</model>
diff --git a/tests/regression_tests/filter_rotations/results_true.dat b/tests/regression_tests/filter_rotations/results_true.dat
new file mode 100644
index 000000000..5c8b83b76
--- /dev/null
+++ b/tests/regression_tests/filter_rotations/results_true.dat
@@ -0,0 +1,244 @@
+k-combined:
+7.729082E-01 3.775399E-02
+tally 1:
+5.296804E-02
+5.661701E-04
+8.356446E-02
+1.412139E-03
+5.041335E-02
+5.143568E-04
+1.299348E-01
+3.467618E-03
+3.929702E-01
+3.147038E-02
+1.379707E-01
+3.888484E-03
+1.405034E-01
+4.473799E-03
+3.785796E-01
+2.940585E-02
+1.422010E-01
+4.113723E-03
+5.647073E-02
+6.735251E-04
+7.911154E-02
+1.329137E-03
+5.160755E-02
+5.361448E-04
+6.669424E-02
+9.090832E-04
+1.008621E-01
+2.134534E-03
+6.808932E-02
+9.355993E-04
+1.873006E-01
+7.135961E-03
+6.221575E-01
+7.819842E-02
+1.856653E-01
+6.954762E-03
+2.014929E-01
+8.327845E-03
+5.853251E-01
+6.945708E-02
+1.709645E-01
+5.917124E-03
+7.214913E-02
+1.058962E-03
+1.027720E-01
+2.138475E-03
+6.099853E-02
+7.493941E-04
+6.892071E-02
+9.630680E-04
+1.035459E-01
+2.173883E-03
+6.973870E-02
+9.904237E-04
+2.125703E-01
+9.112659E-03
+9.012205E-01
+2.163546E-01
+2.066426E-01
+8.617414E-03
+2.258950E-01
+1.039607E-02
+9.476792E-01
+2.350708E-01
+2.225585E-01
+1.017898E-02
+7.111503E-02
+1.036847E-03
+1.117012E-01
+2.530040E-03
+6.870474E-02
+9.551035E-04
+5.738897E-02
+6.699030E-04
+9.522335E-02
+1.835769E-03
+6.570917E-02
+8.656870E-04
+1.945592E-01
+7.593336E-03
+5.514753E-01
+6.122981E-02
+2.144202E-01
+9.421739E-03
+1.971631E-01
+7.944046E-03
+6.088996E-01
+7.442954E-02
+1.965447E-01
+7.765628E-03
+7.005494E-02
+1.012891E-03
+1.010633E-01
+2.084095E-03
+6.145926E-02
+7.694351E-04
+4.999479E-02
+5.129164E-04
+7.238243E-02
+1.062921E-03
+4.902309E-02
+4.852193E-04
+1.324655E-01
+3.642431E-03
+3.305312E-01
+2.265726E-02
+1.332993E-01
+3.728385E-03
+1.547469E-01
+4.894837E-03
+3.625944E-01
+2.747313E-02
+1.435761E-01
+4.334405E-03
+5.789603E-02
+7.065383E-04
+7.589559E-02
+1.205386E-03
+5.210018E-02
+5.790843E-04
+tally 2:
+4.597932E-02
+4.246849E-04
+8.494738E-02
+1.467238E-03
+5.155072E-02
+5.373129E-04
+1.479395E-01
+4.468164E-03
+3.931843E-01
+3.141943E-02
+1.264081E-01
+3.243689E-03
+1.229742E-01
+3.276501E-03
+3.768427E-01
+2.927971E-02
+1.574908E-01
+5.079304E-03
+5.621044E-02
+6.877866E-04
+8.490616E-02
+1.510673E-03
+4.709600E-02
+4.576632E-04
+5.382674E-02
+5.890600E-04
+1.116560E-01
+2.599817E-03
+6.648634E-02
+8.862677E-04
+1.996861E-01
+8.137198E-03
+6.218616E-01
+7.805532E-02
+1.672379E-01
+5.667797E-03
+1.841275E-01
+6.936896E-03
+5.887874E-01
+7.031665E-02
+1.872574E-01
+7.086584E-03
+7.574698E-02
+1.160992E-03
+1.100173E-01
+2.453972E-03
+5.427866E-02
+5.955556E-04
+5.644318E-02
+6.503634E-04
+1.058628E-01
+2.254338E-03
+8.012794E-02
+1.297032E-03
+2.292757E-01
+1.064490E-02
+9.001874E-01
+2.153097E-01
+1.921874E-01
+7.537343E-03
+2.058642E-01
+8.537136E-03
+9.442653E-01
+2.359241E-01
+2.419900E-01
+1.202201E-02
+7.563876E-02
+1.169874E-03
+1.165428E-01
+2.750405E-03
+5.646354E-02
+6.408683E-04
+4.963879E-02
+4.975915E-04
+1.005478E-01
+2.046400E-03
+7.041191E-02
+1.002590E-03
+1.959123E-01
+7.727902E-03
+5.625596E-01
+6.366248E-02
+1.987313E-01
+8.108832E-03
+1.922194E-01
+7.602752E-03
+6.062527E-01
+7.384124E-02
+2.039506E-01
+8.379010E-03
+7.019905E-02
+1.034239E-03
+1.081383E-01
+2.344040E-03
+5.125142E-02
+5.430397E-04
+4.230495E-02
+3.666730E-04
+7.722275E-02
+1.208856E-03
+4.998937E-02
+5.049355E-04
+1.461632E-01
+4.456332E-03
+3.315459E-01
+2.288314E-02
+1.238273E-01
+3.205844E-03
+1.355317E-01
+3.754923E-03
+3.646520E-01
+2.766067E-02
+1.543013E-01
+5.044487E-03
+6.082173E-02
+7.636985E-04
+8.490569E-02
+1.506309E-03
+4.046126E-02
+3.495832E-04
diff --git a/tests/regression_tests/filter_rotations/test.py b/tests/regression_tests/filter_rotations/test.py
new file mode 100644
index 000000000..f5d63d6b4
--- /dev/null
+++ b/tests/regression_tests/filter_rotations/test.py
@@ -0,0 +1,72 @@
+import numpy as np
+
+import openmc
+import pytest
+
+from tests.testing_harness import PyAPITestHarness
+
+
+@pytest.fixture
+def model():
+
+    model = openmc.model.Model()
+
+    fuel = openmc.Material()
+    fuel.set_density('g/cm3', 10.0)
+    fuel.add_nuclide('U235', 1.0)
+    zr = openmc.Material()
+    zr.set_density('g/cm3', 1.0)
+    zr.add_nuclide('Zr90', 1.0)
+    model.materials.extend([fuel, zr])
+
+    box1 = openmc.model.RectangularPrism(10.0, 10.0)
+    box2 = openmc.model.RectangularPrism(20.0, 20.0, boundary_type='reflective')
+    top = openmc.ZPlane(z0=10.0, boundary_type='vacuum')
+    bottom = openmc.ZPlane(z0=-10.0, boundary_type='vacuum')
+    cell1 = openmc.Cell(fill=fuel, region=-box1 & +bottom & -top)
+    cell2 = openmc.Cell(fill=zr, region=+box1 & -box2 & +bottom & -top)
+    model.geometry = openmc.Geometry([cell1, cell2])
+
+    model.settings.batches = 5
+    model.settings.inactive = 0
+    model.settings.particles = 1000
+
+    rotation = np.array((0, 0, 10))
+
+    llc = np.array([-9, -9, -9])
+    urc = np.array([9, 9, 9])
+
+    mesh_dims = (3, 4, 5)
+
+    filters = []
+
+    # un-rotated meshes
+    reg_mesh = openmc.RegularMesh()
+    reg_mesh.dimension = mesh_dims
+    reg_mesh.lower_left = llc
+    reg_mesh.upper_right = urc
+
+    filters.append(openmc.MeshFilter(reg_mesh))
+
+    # rotated meshes
+    rotated_reg_mesh = openmc.RegularMesh()
+    rotated_reg_mesh.dimension = mesh_dims
+    rotated_reg_mesh.lower_left = llc
+    rotated_reg_mesh.upper_right = urc
+
+    filters.append(openmc.MeshFilter(rotated_reg_mesh))
+    filters[-1].rotation = rotation
+
+    # Create tallies
+    for f in filters:
+        tally = openmc.Tally()
+        tally.filters = [f]
+        tally.scores = ['total']
+        model.tallies.append(tally)
+
+    return model
+
+
+def test_filter_mesh_rotations(model):
+    harness = PyAPITestHarness('statepoint.5.h5', model)
+    harness.main()
diff --git a/tests/unit_tests/test_filter_mesh.py b/tests/unit_tests/test_filter_mesh.py
index a8bd4996d..faa43af47 100644
--- a/tests/unit_tests/test_filter_mesh.py
+++ b/tests/unit_tests/test_filter_mesh.py
@@ -259,3 +259,29 @@ def test_get_reshaped_data(run_in_tmpdir):
 
     assert data1.shape == (2, 19*3*2, 1, 1)
     assert data2.shape == (2, 19, 3, 2, 1, 1)
+
+def test_mesh_filter_rotation_roundtrip(run_in_tmpdir):
+    """Test that MeshFilter rotation works as expected"""
+
+
+    mesh = openmc.RegularMesh()
+    mesh.lower_left = [-10, -10, -10]
+    mesh.upper_right = [10, 10, 10]
+    mesh.dimension = [2, 3, 4]
+
+    # check that rotatoin is round-tripped correctly for a set of angles
+    mesh_filter = openmc.MeshFilter(mesh)
+    mesh_filter.rotation = [0, 0, 90]  # Rotate around z-axis by 90 degrees
+
+    elem = mesh_filter.to_xml_element()
+    mesh_filter_xml = openmc.MeshFilter.from_xml_element(elem, meshes={mesh.id: mesh})
+    assert all(mesh_filter_xml.rotation == mesh_filter.rotation)
+
+    # check that rotation matrix is round-tripped correctly for a rotation matrix
+    mesh_filter.rotation = np.array([[0.7071, 0, 0.7071],
+                                     [0, 1, 0],
+                                     [-0.7071, 0, 0.7071]])
+
+    elem = mesh_filter.to_xml_element()
+    mesh_filter_xml = openmc.MeshFilter.from_xml_element(elem, meshes={mesh.id: mesh})
+    assert np.allclose(mesh_filter_xml.rotation, mesh_filter.rotation)
diff --git a/tests/unit_tests/test_lib.py b/tests/unit_tests/test_lib.py
index eb4dc3dce..e5a4d198e 100644
--- a/tests/unit_tests/test_lib.py
+++ b/tests/unit_tests/test_lib.py
@@ -608,6 +608,13 @@ def test_regular_mesh(lib_init):
         assert isinstance(mesh, openmc.lib.RegularMesh)
         assert mesh_id == mesh.id
 
+    rotation = (180.0, 0.0, 0.0)
+
+    mf = openmc.lib.MeshFilter(mesh)
+    assert mf.mesh == mesh
+    mf.rotation = rotation
+    assert np.allclose(mf.rotation, rotation)
+
     translation = (1.0, 2.0, 3.0)
 
     mf = openmc.lib.MeshFilter(mesh)

From 3f06a42abb89a9b09cb3f2e86680a31bae90cc08 Mon Sep 17 00:00:00 2001
From: GuySten <62616591+GuySten@users.noreply.github.com>
Date: Tue, 23 Dec 2025 22:18:59 +0200
Subject: [PATCH 188/203] Refactor get_energy_index to prevent repetition
 (#3686)

---
 include/openmc/math_functions.h | 11 +++++++++++
 src/distribution_angle.cpp      | 18 +++---------------
 src/math_functions.cpp          | 15 +++++++++++++++
 src/secondary_correlated.cpp    | 16 +++-------------
 src/secondary_kalbach.cpp       | 16 +++-------------
 src/secondary_thermal.cpp       | 15 +--------------
 6 files changed, 36 insertions(+), 55 deletions(-)

diff --git a/include/openmc/math_functions.h b/include/openmc/math_functions.h
index c30ef7558..0d960c33d 100644
--- a/include/openmc/math_functions.h
+++ b/include/openmc/math_functions.h
@@ -9,6 +9,7 @@
 #include <cstdlib>
 
 #include "openmc/position.h"
+#include "openmc/search.h"
 
 namespace openmc {
 
@@ -200,5 +201,15 @@ std::complex<double> faddeeva(std::complex<double> z);
 //! \return Derivative of Faddeeva function evaluated at z
 std::complex<double> w_derivative(std::complex<double> z, int order);
 
+//! Helper function to get index and interpolation function on an incident
+//! energy grid
+//!
+//! \param energies energy grid
+//! \param E incident energy
+//! \param i grid index
+//! \param f interpolation factor
+void get_energy_index(
+  const vector<double>& energies, double E, int& i, double& f);
+
 } // namespace openmc
 #endif // OPENMC_MATH_FUNCTIONS_H
diff --git a/src/distribution_angle.cpp b/src/distribution_angle.cpp
index 5e92b794a..a571b2a5f 100644
--- a/src/distribution_angle.cpp
+++ b/src/distribution_angle.cpp
@@ -7,6 +7,7 @@
 
 #include "openmc/endf.h"
 #include "openmc/hdf5_interface.h"
+#include "openmc/math_functions.h"
 #include "openmc/random_lcg.h"
 #include "openmc/search.h"
 #include "openmc/vector.h" // for vector
@@ -64,23 +65,10 @@ AngleDistribution::AngleDistribution(hid_t group)
 
 double AngleDistribution::sample(double E, uint64_t* seed) const
 {
-  // Determine number of incoming energies
-  auto n = energy_.size();
-
-  // Find energy bin and calculate interpolation factor -- if the energy is
-  // outside the range of the tabulated energies, choose the first or last bins
+  // Find energy bin and calculate interpolation factor
   int i;
   double r;
-  if (E < energy_[0]) {
-    i = 0;
-    r = 0.0;
-  } else if (E > energy_[n - 1]) {
-    i = n - 2;
-    r = 1.0;
-  } else {
-    i = lower_bound_index(energy_.begin(), energy_.end(), E);
-    r = (E - energy_[i]) / (energy_[i + 1] - energy_[i]);
-  }
+  get_energy_index(energy_, E, i, r);
 
   // Sample between the ith and (i+1)th bin
   if (r > prn(seed))
diff --git a/src/math_functions.cpp b/src/math_functions.cpp
index 5469b56c8..9473f928b 100644
--- a/src/math_functions.cpp
+++ b/src/math_functions.cpp
@@ -919,4 +919,19 @@ std::complex<double> w_derivative(std::complex<double> z, int order)
   }
 }
 
+// Helper function to get index and interpolation function on an incident energy
+// grid
+void get_energy_index(
+  const vector<double>& energies, double E, int& i, double& f)
+{
+  // Get index and interpolation factor for linear-linear energy grid
+  i = 0;
+  f = 0.0;
+  if (E >= energies.front()) {
+    i = lower_bound_index(energies.begin(), energies.end(), E);
+    if (i + 1 < energies.size())
+      f = (E - energies[i]) / (energies[i + 1] - energies[i]);
+  }
+}
+
 } // namespace openmc
diff --git a/src/secondary_correlated.cpp b/src/secondary_correlated.cpp
index 0e4891dd3..3f26fdb01 100644
--- a/src/secondary_correlated.cpp
+++ b/src/secondary_correlated.cpp
@@ -10,6 +10,7 @@
 
 #include "openmc/endf.h"
 #include "openmc/hdf5_interface.h"
+#include "openmc/math_functions.h"
 #include "openmc/random_lcg.h"
 #include "openmc/search.h"
 
@@ -156,21 +157,10 @@ CorrelatedAngleEnergy::CorrelatedAngleEnergy(hid_t group)
 void CorrelatedAngleEnergy::sample(
   double E_in, double& E_out, double& mu, uint64_t* seed) const
 {
-  // Find energy bin and calculate interpolation factor -- if the energy is
-  // outside the range of the tabulated energies, choose the first or last bins
-  auto n_energy_in = energy_.size();
+  // Find energy bin and calculate interpolation factor
   int i;
   double r;
-  if (E_in < energy_[0]) {
-    i = 0;
-    r = 0.0;
-  } else if (E_in > energy_[n_energy_in - 1]) {
-    i = n_energy_in - 2;
-    r = 1.0;
-  } else {
-    i = lower_bound_index(energy_.begin(), energy_.end(), E_in);
-    r = (E_in - energy_[i]) / (energy_[i + 1] - energy_[i]);
-  }
+  get_energy_index(energy_, E_in, i, r);
 
   // Sample between the ith and [i+1]th bin
   int l = r > prn(seed) ? i + 1 : i;
diff --git a/src/secondary_kalbach.cpp b/src/secondary_kalbach.cpp
index 4a7878343..6ac91e665 100644
--- a/src/secondary_kalbach.cpp
+++ b/src/secondary_kalbach.cpp
@@ -9,6 +9,7 @@
 #include "xtensor/xview.hpp"
 
 #include "openmc/hdf5_interface.h"
+#include "openmc/math_functions.h"
 #include "openmc/random_dist.h"
 #include "openmc/random_lcg.h"
 #include "openmc/search.h"
@@ -117,21 +118,10 @@ KalbachMann::KalbachMann(hid_t group)
 void KalbachMann::sample(
   double E_in, double& E_out, double& mu, uint64_t* seed) const
 {
-  // Find energy bin and calculate interpolation factor -- if the energy is
-  // outside the range of the tabulated energies, choose the first or last bins
-  auto n_energy_in = energy_.size();
+  // Find energy bin and calculate interpolation factor
   int i;
   double r;
-  if (E_in < energy_[0]) {
-    i = 0;
-    r = 0.0;
-  } else if (E_in > energy_[n_energy_in - 1]) {
-    i = n_energy_in - 2;
-    r = 1.0;
-  } else {
-    i = lower_bound_index(energy_.begin(), energy_.end(), E_in);
-    r = (E_in - energy_[i]) / (energy_[i + 1] - energy_[i]);
-  }
+  get_energy_index(energy_, E_in, i, r);
 
   // Sample between the ith and [i+1]th bin
   int l = r > prn(seed) ? i + 1 : i;
diff --git a/src/secondary_thermal.cpp b/src/secondary_thermal.cpp
index 8b9e8737c..030d398aa 100644
--- a/src/secondary_thermal.cpp
+++ b/src/secondary_thermal.cpp
@@ -1,6 +1,7 @@
 #include "openmc/secondary_thermal.h"
 
 #include "openmc/hdf5_interface.h"
+#include "openmc/math_functions.h"
 #include "openmc/random_lcg.h"
 #include "openmc/search.h"
 
@@ -11,20 +12,6 @@
 
 namespace openmc {
 
-// Helper function to get index on incident energy grid
-void get_energy_index(
-  const vector<double>& energies, double E, int& i, double& f)
-{
-  // Get index and interpolation factor for elastic grid
-  i = 0;
-  f = 0.0;
-  if (E >= energies.front()) {
-    i = lower_bound_index(energies.begin(), energies.end(), E);
-    if (i + 1 < energies.size())
-      f = (E - energies[i]) / (energies[i + 1] - energies[i]);
-  }
-}
-
 //==============================================================================
 // CoherentElasticAE implementation
 //==============================================================================

From 92d7fdb199032f89ed15533da87050ff90a5a55a Mon Sep 17 00:00:00 2001
From: Paul Romano <paul.k.romano@gmail.com>
Date: Tue, 30 Dec 2025 22:31:53 -0500
Subject: [PATCH 189/203] Use min/max position members in C++ BoundingBox class
 (#3699)

---
 include/openmc/bounding_box.h | 46 +++++++++++++++++++----------------
 include/openmc/mesh.h         |  4 +--
 src/cell.cpp                  | 12 ++++-----
 src/dagmc.cpp                 |  2 +-
 src/geometry.cpp              | 12 ++++-----
 src/mesh.cpp                  | 27 ++++++++++----------
 src/surface.cpp               | 28 ++++++++++-----------
 src/universe.cpp              |  2 +-
 8 files changed, 68 insertions(+), 65 deletions(-)

diff --git a/include/openmc/bounding_box.h b/include/openmc/bounding_box.h
index d02d92cb4..4fabe1b70 100644
--- a/include/openmc/bounding_box.h
+++ b/include/openmc/bounding_box.h
@@ -13,12 +13,19 @@ namespace openmc {
 //==============================================================================
 
 struct BoundingBox {
-  double xmin = -INFTY;
-  double xmax = INFTY;
-  double ymin = -INFTY;
-  double ymax = INFTY;
-  double zmin = -INFTY;
-  double zmax = INFTY;
+  Position min = {-INFTY, -INFTY, -INFTY};
+  Position max = {INFTY, INFTY, INFTY};
+
+  // Constructors
+  BoundingBox() = default;
+  BoundingBox(Position min_, Position max_) : min {min_}, max {max_} {}
+
+  // Static factory methods
+  static BoundingBox infinite() { return {}; }
+  static BoundingBox inverted()
+  {
+    return {{INFTY, INFTY, INFTY}, {-INFTY, -INFTY, -INFTY}};
+  }
 
   inline BoundingBox operator&(const BoundingBox& other)
   {
@@ -35,29 +42,26 @@ struct BoundingBox {
   // intersect operator
   inline BoundingBox& operator&=(const BoundingBox& other)
   {
-    xmin = std::max(xmin, other.xmin);
-    xmax = std::min(xmax, other.xmax);
-    ymin = std::max(ymin, other.ymin);
-    ymax = std::min(ymax, other.ymax);
-    zmin = std::max(zmin, other.zmin);
-    zmax = std::min(zmax, other.zmax);
+    min.x = std::max(min.x, other.min.x);
+    min.y = std::max(min.y, other.min.y);
+    min.z = std::max(min.z, other.min.z);
+    max.x = std::min(max.x, other.max.x);
+    max.y = std::min(max.y, other.max.y);
+    max.z = std::min(max.z, other.max.z);
     return *this;
   }
 
   // union operator
   inline BoundingBox& operator|=(const BoundingBox& other)
   {
-    xmin = std::min(xmin, other.xmin);
-    xmax = std::max(xmax, other.xmax);
-    ymin = std::min(ymin, other.ymin);
-    ymax = std::max(ymax, other.ymax);
-    zmin = std::min(zmin, other.zmin);
-    zmax = std::max(zmax, other.zmax);
+    min.x = std::min(min.x, other.min.x);
+    min.y = std::min(min.y, other.min.y);
+    min.z = std::min(min.z, other.min.z);
+    max.x = std::max(max.x, other.max.x);
+    max.y = std::max(max.y, other.max.y);
+    max.z = std::max(max.z, other.max.z);
     return *this;
   }
-
-  inline Position min() const { return {xmin, ymin, zmin}; }
-  inline Position max() const { return {xmax, ymax, zmax}; }
 };
 
 } // namespace openmc
diff --git a/include/openmc/mesh.h b/include/openmc/mesh.h
index 5c9272e93..7ceb623da 100644
--- a/include/openmc/mesh.h
+++ b/include/openmc/mesh.h
@@ -244,9 +244,7 @@ public:
   //! \return Bounding box of mesh
   BoundingBox bounding_box() const
   {
-    auto ll = this->lower_left();
-    auto ur = this->upper_right();
-    return {ll.x, ur.x, ll.y, ur.y, ll.z, ur.z};
+    return {this->lower_left(), this->upper_right()};
   }
 
   virtual Position lower_left() const = 0;
diff --git a/src/cell.cpp b/src/cell.cpp
index fd459cdcc..aceed31ca 100644
--- a/src/cell.cpp
+++ b/src/cell.cpp
@@ -1334,14 +1334,14 @@ extern "C" int openmc_cell_bounding_box(
   bbox = c->bounding_box();
 
   // set lower left corner values
-  llc[0] = bbox.xmin;
-  llc[1] = bbox.ymin;
-  llc[2] = bbox.zmin;
+  llc[0] = bbox.min.x;
+  llc[1] = bbox.min.y;
+  llc[2] = bbox.min.z;
 
   // set upper right corner values
-  urc[0] = bbox.xmax;
-  urc[1] = bbox.ymax;
-  urc[2] = bbox.zmax;
+  urc[0] = bbox.max.x;
+  urc[1] = bbox.max.y;
+  urc[2] = bbox.max.z;
 
   return 0;
 }
diff --git a/src/dagmc.cpp b/src/dagmc.cpp
index b2ebe89c0..571182fa6 100644
--- a/src/dagmc.cpp
+++ b/src/dagmc.cpp
@@ -753,7 +753,7 @@ BoundingBox DAGCell::bounding_box() const
   double min[3], max[3];
   rval = dagmc_ptr_->getobb(vol, min, max);
   MB_CHK_ERR_CONT(rval);
-  return {min[0], max[0], min[1], max[1], min[2], max[2]};
+  return {{min[0], min[1], min[2]}, {max[0], max[1], max[2]}};
 }
 
 //==============================================================================
diff --git a/src/geometry.cpp b/src/geometry.cpp
index 5ff15097b..ddb61385f 100644
--- a/src/geometry.cpp
+++ b/src/geometry.cpp
@@ -480,14 +480,14 @@ extern "C" int openmc_global_bounding_box(double* llc, double* urc)
   auto bbox = model::universes.at(model::root_universe)->bounding_box();
 
   // set lower left corner values
-  llc[0] = bbox.xmin;
-  llc[1] = bbox.ymin;
-  llc[2] = bbox.zmin;
+  llc[0] = bbox.min.x;
+  llc[1] = bbox.min.y;
+  llc[2] = bbox.min.z;
 
   // set upper right corner values
-  urc[0] = bbox.xmax;
-  urc[1] = bbox.ymax;
-  urc[2] = bbox.zmax;
+  urc[0] = bbox.max.x;
+  urc[1] = bbox.max.y;
+  urc[2] = bbox.max.z;
 
   return 0;
 }
diff --git a/src/mesh.cpp b/src/mesh.cpp
index c3a2d4581..9a7a8e751 100644
--- a/src/mesh.cpp
+++ b/src/mesh.cpp
@@ -359,9 +359,10 @@ void Mesh::material_volumes(int nx, int ny, int nz, int table_size,
   std::array<int, 3> n_rays = {nx, ny, nz};
 
   // Determine effective width of rays
-  Position width((nx > 0) ? (bbox.xmax - bbox.xmin) / nx : 0.0,
-    (ny > 0) ? (bbox.ymax - bbox.ymin) / ny : 0.0,
-    (nz > 0) ? (bbox.zmax - bbox.zmin) / nz : 0.0);
+  Position width = bbox.max - bbox.min;
+  width.x = (nx > 0) ? width.x / nx : 0.0;
+  width.y = (ny > 0) ? width.y / ny : 0.0;
+  width.z = (nz > 0) ? width.z / nz : 0.0;
 
   // Set flag for mesh being contained within model
   bool out_of_model = false;
@@ -380,15 +381,15 @@ void Mesh::material_volumes(int nx, int ny, int nz, int table_size,
     for (int axis = 0; axis < 3; ++axis) {
       // Set starting position and direction
       site.r = {0.0, 0.0, 0.0};
-      site.r[axis] = bbox.min()[axis];
+      site.r[axis] = bbox.min[axis];
       site.u = {0.0, 0.0, 0.0};
       site.u[axis] = 1.0;
 
       // Determine width of rays and number of rays in other directions
       int ax1 = (axis + 1) % 3;
       int ax2 = (axis + 2) % 3;
-      double min1 = bbox.min()[ax1];
-      double min2 = bbox.min()[ax2];
+      double min1 = bbox.min[ax1];
+      double min2 = bbox.min[ax2];
       double d1 = width[ax1];
       double d2 = width[ax2];
       int n1 = n_rays[ax1];
@@ -433,7 +434,7 @@ void Mesh::material_volumes(int nx, int ny, int nz, int table_size,
           while (true) {
             // Ray trace from r_start to r_end
             Position r0 = p.r();
-            double max_distance = bbox.max()[axis] - r0[axis];
+            double max_distance = bbox.max[axis] - r0[axis];
 
             // Find the distance to the nearest boundary
             BoundaryInfo boundary = distance_to_boundary(p);
@@ -2415,14 +2416,14 @@ extern "C" int openmc_mesh_bounding_box(int32_t index, double* ll, double* ur)
   BoundingBox bbox = model::meshes[index]->bounding_box();
 
   // set lower left corner values
-  ll[0] = bbox.xmin;
-  ll[1] = bbox.ymin;
-  ll[2] = bbox.zmin;
+  ll[0] = bbox.min.x;
+  ll[1] = bbox.min.y;
+  ll[2] = bbox.min.z;
 
   // set upper right corner values
-  ur[0] = bbox.xmax;
-  ur[1] = bbox.ymax;
-  ur[2] = bbox.zmax;
+  ur[0] = bbox.max.x;
+  ur[1] = bbox.max.y;
+  ur[2] = bbox.max.z;
   return 0;
 }
 
diff --git a/src/surface.cpp b/src/surface.cpp
index 09fc0f24f..bc9c7f4a9 100644
--- a/src/surface.cpp
+++ b/src/surface.cpp
@@ -251,9 +251,9 @@ void SurfaceXPlane::to_hdf5_inner(hid_t group_id) const
 BoundingBox SurfaceXPlane::bounding_box(bool pos_side) const
 {
   if (pos_side) {
-    return {x0_, INFTY, -INFTY, INFTY, -INFTY, INFTY};
+    return {{x0_, -INFTY, -INFTY}, {INFTY, INFTY, INFTY}};
   } else {
-    return {-INFTY, x0_, -INFTY, INFTY, -INFTY, INFTY};
+    return {{-INFTY, -INFTY, -INFTY}, {x0_, INFTY, INFTY}};
   }
 }
 
@@ -291,9 +291,9 @@ void SurfaceYPlane::to_hdf5_inner(hid_t group_id) const
 BoundingBox SurfaceYPlane::bounding_box(bool pos_side) const
 {
   if (pos_side) {
-    return {-INFTY, INFTY, y0_, INFTY, -INFTY, INFTY};
+    return {{-INFTY, y0_, -INFTY}, {INFTY, INFTY, INFTY}};
   } else {
-    return {-INFTY, INFTY, -INFTY, y0_, -INFTY, INFTY};
+    return {{-INFTY, -INFTY, -INFTY}, {INFTY, y0_, INFTY}};
   }
 }
 
@@ -331,9 +331,9 @@ void SurfaceZPlane::to_hdf5_inner(hid_t group_id) const
 BoundingBox SurfaceZPlane::bounding_box(bool pos_side) const
 {
   if (pos_side) {
-    return {-INFTY, INFTY, -INFTY, INFTY, z0_, INFTY};
+    return {{-INFTY, -INFTY, z0_}, {INFTY, INFTY, INFTY}};
   } else {
-    return {-INFTY, INFTY, -INFTY, INFTY, -INFTY, z0_};
+    return {{-INFTY, -INFTY, -INFTY}, {INFTY, INFTY, z0_}};
   }
 }
 
@@ -492,8 +492,8 @@ void SurfaceXCylinder::to_hdf5_inner(hid_t group_id) const
 BoundingBox SurfaceXCylinder::bounding_box(bool pos_side) const
 {
   if (!pos_side) {
-    return {-INFTY, INFTY, y0_ - radius_, y0_ + radius_, z0_ - radius_,
-      z0_ + radius_};
+    return {{-INFTY, y0_ - radius_, z0_ - radius_},
+      {INFTY, y0_ + radius_, z0_ + radius_}};
   } else {
     return {};
   }
@@ -535,8 +535,8 @@ void SurfaceYCylinder::to_hdf5_inner(hid_t group_id) const
 BoundingBox SurfaceYCylinder::bounding_box(bool pos_side) const
 {
   if (!pos_side) {
-    return {x0_ - radius_, x0_ + radius_, -INFTY, INFTY, z0_ - radius_,
-      z0_ + radius_};
+    return {{x0_ - radius_, -INFTY, z0_ - radius_},
+      {x0_ + radius_, INFTY, z0_ + radius_}};
   } else {
     return {};
   }
@@ -579,8 +579,8 @@ void SurfaceZCylinder::to_hdf5_inner(hid_t group_id) const
 BoundingBox SurfaceZCylinder::bounding_box(bool pos_side) const
 {
   if (!pos_side) {
-    return {x0_ - radius_, x0_ + radius_, y0_ - radius_, y0_ + radius_, -INFTY,
-      INFTY};
+    return {{x0_ - radius_, y0_ - radius_, -INFTY},
+      {x0_ + radius_, y0_ + radius_, INFTY}};
   } else {
     return {};
   }
@@ -657,8 +657,8 @@ void SurfaceSphere::to_hdf5_inner(hid_t group_id) const
 BoundingBox SurfaceSphere::bounding_box(bool pos_side) const
 {
   if (!pos_side) {
-    return {x0_ - radius_, x0_ + radius_, y0_ - radius_, y0_ + radius_,
-      z0_ - radius_, z0_ + radius_};
+    return {{x0_ - radius_, y0_ - radius_, z0_ - radius_},
+      {x0_ + radius_, y0_ + radius_, z0_ + radius_}};
   } else {
     return {};
   }
diff --git a/src/universe.cpp b/src/universe.cpp
index 78ddd54d4..e1db80b99 100644
--- a/src/universe.cpp
+++ b/src/universe.cpp
@@ -61,7 +61,7 @@ bool Universe::find_cell(GeometryState& p) const
 
 BoundingBox Universe::bounding_box() const
 {
-  BoundingBox bbox = {INFTY, -INFTY, INFTY, -INFTY, INFTY, -INFTY};
+  BoundingBox bbox = BoundingBox::inverted();
   if (cells_.size() == 0) {
     return {};
   } else {

From f08326a9ac416d54973ce0d210078729cfc3b008 Mon Sep 17 00:00:00 2001
From: GuySten <62616591+GuySten@users.noreply.github.com>
Date: Thu, 1 Jan 2026 13:30:09 +0200
Subject: [PATCH 190/203] Cache cross sections according to the hash of
 download-xs.sh script (#3701)

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d75a64d66..8a9c7322e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -154,7 +154,7 @@ jobs:
           path: |
             ~/nndc_hdf5
             ~/endf-b-vii.1
-          key: ${{ runner.os }}-build-xs-cache
+          key: ${{ runner.os }}-build-xs-cache-${{ hashFiles(format('{0}/tools/ci/download-xs.sh', github.workspace)) }}
 
       - name: before
         shell: bash

From 932f36f411ef11cbaa69635a2a35c0060edc58c2 Mon Sep 17 00:00:00 2001
From: Paul Romano <paul.k.romano@gmail.com>
Date: Fri, 2 Jan 2026 05:31:46 -0500
Subject: [PATCH 191/203] Add recognized thermal scattering names for JEFF 4.0
 and JENDL 5 (#3693)

---
 openmc/data/neutron.py                |   6 +-
 openmc/data/njoy.py                   |  98 +++++++++++++++++++++-
 openmc/data/thermal.py                | 115 +++++++++++++++++++++++---
 tests/unit_tests/test_data_thermal.py |  23 ++++++
 4 files changed, 230 insertions(+), 12 deletions(-)

diff --git a/openmc/data/neutron.py b/openmc/data/neutron.py
index 628801e5e..71927cbed 100644
--- a/openmc/data/neutron.py
+++ b/openmc/data/neutron.py
@@ -765,6 +765,11 @@ class IncidentNeutron(EqualityMixin):
             for table in lib.tables[1:]:
                 data.add_temperature_from_ace(table)
 
+            # Use name based on ENDF evaluation. The name assigned by from_ace
+            # may be wrong for higher metastable states (e.g., Hf178_m2)
+            ev = evaluation if evaluation is not None else Evaluation(filename)
+            data.name = ev.gnds_name
+
             # Add 0K elastic scattering cross section
             if '0K' not in data.energy:
                 pendf = Evaluation(kwargs['pendf'])
@@ -775,7 +780,6 @@ class IncidentNeutron(EqualityMixin):
                 data[2].xs['0K'] = xs
 
             # Add fission energy release data
-            ev = evaluation if evaluation is not None else Evaluation(filename)
             if (1, 458) in ev.section:
                 data.fission_energy = f = FissionEnergyRelease.from_endf(ev, data)
             else:
diff --git a/openmc/data/njoy.py b/openmc/data/njoy.py
index 4c538bd6e..ddc68cc37 100644
--- a/openmc/data/njoy.py
+++ b/openmc/data/njoy.py
@@ -15,19 +15,41 @@ import openmc.data
 # identifiers.
 ThermalTuple = namedtuple('ThermalTuple', ['name', 'zaids', 'nmix'])
 _THERMAL_DATA = {
+    'c_Ag': ThermalTuple('ag', [47107, 47109], 1),
     'c_Al27': ThermalTuple('al27', [13027], 1),
     'c_Al_in_Al2O3': ThermalTuple('asap00', [13027], 1),
+    'c_Al_in_Y3Al5O12': ThermalTuple('alyag', [13027], 1),
+    'c_Au': ThermalTuple('au', [79197], 1),
     'c_Be': ThermalTuple('be', [4009], 1),
     'c_Be_distinct': ThermalTuple('besd', [4009], 1),
     'c_Be_in_BeO': ThermalTuple('bebeo', [4009], 1),
     'c_Be_in_Be2C': ThermalTuple('bebe2c', [4009], 1),
     'c_Be_in_BeF2': ThermalTuple('bebef2', [4009], 1),
     'c_Be_in_FLiBe': ThermalTuple('beflib', [4009], 1),
+    'c_BeO': ThermalTuple('beo', [4009, 8016, 8017, 8018], 2),
+    'c_Bi': ThermalTuple('bi', [83209], 1),
+    'c_Bi_in_Ge3Bi4O12': ThermalTuple('bigbo', [83209], 1),
     'c_C6H6': ThermalTuple('benz', [1001, 6000, 6012], 2),
     'c_C_in_Be2C': ThermalTuple('cbe2c', [6000, 6012, 6013], 1),
     'c_C_in_C5O2H8': ThermalTuple('clucit', [6000, 6012, 6013], 1),
     'c_C_in_C8H8': ThermalTuple('cc8h8', [6000, 6012, 6013], 1),
+    'c_C_in_C19H16_liquid': ThermalTuple('c19liq', [6000, 6012, 6013], 1),
+    'c_C_in_C19H16_solid': ThermalTuple('c19sol', [6000, 6012, 6013], 1),
+    'c_C_in_C2H6O_liquid': ThermalTuple('ethliq', [6000, 6012, 6013], 1),
+    'c_C_in_C2H6O_solid': ThermalTuple('ethsol', [6000, 6012, 6013], 1),
+    'c_C_in_C6H6_liquid': ThermalTuple('benzlq', [6000, 6012, 6013], 1),
+    'c_C_in_C6H6_solid': ThermalTuple('benzsl', [6000, 6012, 6013], 1),
+    'c_C_in_C7H8_liquid': ThermalTuple('tolliq', [6000, 6012, 6013], 1),
+    'c_C_in_C7H8_solid': ThermalTuple('tolsol', [6000, 6012, 6013], 1),
+    'c_C_in_C8H10_liquid': ThermalTuple('xylliq', [6000, 6012, 6013], 1),
+    'c_C_in_C8H10_solid': ThermalTuple('xylsol', [6000, 6012, 6013], 1),
+    'c_C_in_C9H12_liquid': ThermalTuple('mesliq', [6000, 6012, 6013], 1),
+    'c_C_in_C9H12_solid': ThermalTuple('messol', [6000, 6012, 6013], 1),
     'c_C_in_CF2': ThermalTuple('ccf2', [6000, 6012, 6013], 1),
+    'c_C_in_CH2': ThermalTuple('cch2', [6000, 6012, 6013], 1),
+    'c_C_in_CH4_liquid': ThermalTuple('cch4lq', [6000, 6012, 6013], 1),
+    'c_C_in_CH4_solid': ThermalTuple('cch4sl', [6000, 6012, 6013], 1),
+    'c_C_in_Diamond': ThermalTuple('cdiam', [6000, 6012, 6013], 1),
     'c_C_in_SiC': ThermalTuple('csic', [6000, 6012, 6013], 1),
     'c_C_in_UC_100p': ThermalTuple('cuc100', [6000, 6012, 6013], 1),
     'c_C_in_UC_10p': ThermalTuple('cuc10', [6000, 6012, 6013], 1),
@@ -36,16 +58,29 @@ _THERMAL_DATA = {
     'c_C_in_UC_HALEU': ThermalTuple('cuchal', [6000, 6012, 6013], 1),
     'c_C_in_UC_HEU': ThermalTuple('cucheu', [6000, 6012, 6013], 1),
     'c_C_in_ZrC': ThermalTuple('czrc', [6000, 6012, 6013], 1),
+    'c_Ca': ThermalTuple('ca', [20040, 20042, 20043, 20044, 20046, 20048], 1),
     'c_Ca_in_CaH2': ThermalTuple('cacah2', [20040, 20042, 20043, 20044, 20046, 20048], 1),
+    'c_Ca_in_CaO2H2': ThermalTuple('cacaoh', [20040, 20042, 20043, 20044, 20046, 20048], 1),
+    'c_Cr': ThermalTuple('cr', [24050, 24052, 24053, 24054], 1),
+    'c_Cu': ThermalTuple('cu', [29063, 29065], 1),
     'c_D_in_7LiD': ThermalTuple('dlid', [1002], 1),
     'c_D_in_D2O': ThermalTuple('dd2o', [1002], 1),
     'c_D_in_D2O_solid': ThermalTuple('dice', [1002], 1),
+    'c_D_in_MgD2': ThermalTuple('dmgd2', [1002], 1),
     'c_F_in_Be2': ThermalTuple('fbef2', [9019], 1),
     'c_F_in_CF2': ThermalTuple('fcf2', [9019], 1),
     'c_F_in_FLiBe': ThermalTuple('fflibe', [9019], 1),
     'c_F_in_HF': ThermalTuple('f_hf', [9019], 1),
+    'c_F_in_LiF': ThermalTuple('flif', [9019], 1),
     'c_F_in_MgF2': ThermalTuple('fmgf2', [9019], 1),
     'c_Fe56': ThermalTuple('fe56', [26056], 1),
+    'c_Fe_in_Fe_alpha': ThermalTuple('fealph', [26054, 26056, 26057, 26058], 1),
+    'c_Fe_in_Fe_gamma': ThermalTuple('fegamm', [26054, 26056, 26057, 26058], 1),
+    'c_Ga_in_GaN': ThermalTuple('gagan', [31069, 31071], 1),
+    'c_Ga_in_GaSe': ThermalTuple('gagase', [31069, 31071], 1),
+    'c_Ge': ThermalTuple('ge', [32070, 32072, 32073, 32074, 32076], 1),
+    'c_Ge_in_Ge3Bi4O12': ThermalTuple('gegbo', [32070, 32072, 32073, 32074, 32076], 1),
+    'c_Ge_in_GeTe': ThermalTuple('gegete', [32070, 32072, 32073, 32074, 32076], 1),
     'c_Graphite': ThermalTuple('graph', [6000, 6012, 6013], 1),
     'c_Graphite_10p': ThermalTuple('grph10', [6000, 6012, 6013], 1),
     'c_Graphite_20p': ThermalTuple('grph20', [6000, 6012, 6013], 1),
@@ -54,7 +89,20 @@ _THERMAL_DATA = {
     'c_H_in_7LiH': ThermalTuple('hlih', [1001], 1),
     'c_H_in_C5O2H8': ThermalTuple('lucite', [1001], 1),
     'c_H_in_C8H8': ThermalTuple('hc8h8', [1001], 1),
+    'c_H_in_C19H16_liquid': ThermalTuple('h19liq', [1001], 1),
+    'c_H_in_C19H16_solid': ThermalTuple('h19sol', [1001], 1),
+    'c_H_in_C2H6O_liquid': ThermalTuple('hetliq', [1001], 1),
+    'c_H_in_C2H6O_solid': ThermalTuple('hetsol', [1001], 1),
+    'c_H_in_C6H6_liquid': ThermalTuple('hbzliq', [1001], 1),
+    'c_H_in_C6H6_solid': ThermalTuple('hbzsol', [1001], 1),
+    'c_H_in_C7H8_liquid': ThermalTuple('htlliq', [1001], 1),
+    'c_H_in_C7H8_solid': ThermalTuple('htlsol', [1001], 1),
+    'c_H_in_C8H10_liquid': ThermalTuple('hxyliq', [1001], 1),
+    'c_H_in_C8H10_solid': ThermalTuple('hxysol', [1001], 1),
+    'c_H_in_C9H12_liquid': ThermalTuple('hmsliq', [1001], 1),
+    'c_H_in_C9H12_solid': ThermalTuple('hmssol', [1001], 1),
     'c_H_in_CaH2': ThermalTuple('hcah2', [1001], 1),
+    'c_H_in_CaO2H2': ThermalTuple('hcaoh', [1001], 1),
     'c_H1_in_CaH2': ThermalTuple('h1cah2', [1001], 1),
     'c_H2_in_CaH2': ThermalTuple('h2cah2', [1001], 1),
     'c_H_in_CH2': ThermalTuple('hch2', [1001], 1),
@@ -64,32 +112,64 @@ _THERMAL_DATA = {
     'c_H_in_H2O': ThermalTuple('hh2o', [1001], 1),
     'c_H_in_H2O_solid': ThermalTuple('hice', [1001], 1),
     'c_H_in_HF': ThermalTuple('hhf', [1001], 1),
+    'c_H_in_KOH': ThermalTuple('hkoh', [1001], 1),
+    'c_H_in_LiH': ThermalTuple('hlih2', [1001], 1),
     'c_H_in_Mesitylene': ThermalTuple('mesi00', [1001], 1),
     'c_H_in_ParaffinicOil': ThermalTuple('hparaf', [1001], 1),
     'c_H_in_Toluene': ThermalTuple('tol00', [1001], 1),
+    'c_H_in_MgH2': ThermalTuple('hmgh2', [1001], 1),
+    'c_H_in_MgOH2': ThermalTuple('hmgoh', [1001], 1),
+    'c_H_in_NaMgH3': ThermalTuple('hnamg', [1001], 1),
+    'c_H_in_NaOH': ThermalTuple('hnaoh', [1001], 1),
+    'c_H_in_SrH2': ThermalTuple('hsrh2', [1001], 1),
     'c_H_in_UH3': ThermalTuple('huh3', [1001], 1),
     'c_H_in_YH2': ThermalTuple('hyh2', [1001], 1),
     'c_H_in_ZrH': ThermalTuple('hzrh', [1001], 1),
     'c_H_in_ZrH2': ThermalTuple('hzrh2', [1001], 1),
     'c_H_in_ZrHx': ThermalTuple('hzrhx', [1001], 1),
+    'c_I_in_NaI': ThermalTuple('inai', [53127], 1),
+    'c_K': ThermalTuple('k', [19039, 19040, 19041], 1),
+    'c_K_in_KOH': ThermalTuple('kkoh', [19039, 19040, 19041], 1),
     'c_Li_in_FLiBe': ThermalTuple('liflib', [3006, 3007], 1),
     'c_Li_in_7LiD': ThermalTuple('lilid', [3007], 1),
     'c_Li_in_7LiH': ThermalTuple('lilih', [3007], 1),
+    'c_Li_in_LiF': ThermalTuple('lilif', [3006, 3007], 1),
+    'c_Li_in_LiH': ThermalTuple('lilih2', [3006, 3007], 1),
     'c_Mg24': ThermalTuple('mg24', [12024], 1),
     'c_Mg_in_MgF2': ThermalTuple('mgmgf2', [12024, 12025, 12026], 1),
     'c_Mg_in_MgO': ThermalTuple('mgmgo', [12024, 12025, 12026], 1),
+    'c_Mg_in_MgD2': ThermalTuple('mgmgd2', [12024, 12025, 12026], 1),
+    'c_Mg_in_MgH2': ThermalTuple('mgmgh2', [12024, 12025, 12026], 1),
+    'c_Mg_in_MgOH2': ThermalTuple('mgoh2', [12024, 12025, 12026], 1),
+    'c_Mg_in_NaMgH3': ThermalTuple('mgnamg', [12024, 12025, 12026], 1),
+    'c_Mo': ThermalTuple('mo', [42092, 42094, 42095, 42096, 42097, 42098, 42100], 1),
+    'c_N_in_GaN': ThermalTuple('ngan', [7014, 7015], 1),
     'c_N_in_UN_100p': ThermalTuple('nun100', [7014, 7015], 1),
     'c_N_in_UN_10p': ThermalTuple('nun10', [7014, 7015], 1),
     'c_N_in_UN_5p': ThermalTuple('nun5', [7014, 7015], 1),
     'c_N_in_UN': ThermalTuple('n-un', [7014, 7015], 1),
     'c_N_in_UN_HALEU': ThermalTuple('nunhal', [7014, 7015], 1),
     'c_N_in_UN_HEU': ThermalTuple('nunheu', [7014, 7015], 1),
+    'c_Na': ThermalTuple('na', [11023], 1),
+    'c_Na_in_NaI': ThermalTuple('nanai', [11023], 1),
+    'c_Na_in_NaMgH3': ThermalTuple('nanamg', [11023], 1),
+    'c_Na_in_NaOH': ThermalTuple('nanaoh', [11023], 1),
+    'c_Nb': ThermalTuple('nb', [41093], 1),
+    'c_Ni': ThermalTuple('ni', [28058, 28060, 28061, 28062, 28064], 1),
     'c_O_in_Al2O3': ThermalTuple('osap00', [8016, 8017, 8018], 1),
     'c_O_in_BeO': ThermalTuple('obeo', [8016, 8017, 8018], 1),
     'c_O_in_C5O2H8': ThermalTuple('olucit', [8016, 8017, 8018], 1),
+    'c_O_in_C2H6O_liquid': ThermalTuple('oetliq', [8016, 8017, 8018], 1),
+    'c_O_in_C2H6O_solid': ThermalTuple('oetsol', [8016, 8017, 8018], 1),
+    'c_O_in_CaO2H2': ThermalTuple('ocaoh', [8016, 8017, 8018], 1),
     'c_O_in_D2O': ThermalTuple('od2o', [8016, 8017, 8018], 1),
     'c_O_in_H2O_solid': ThermalTuple('oice', [8016, 8017, 8018], 1),
     'c_O_in_MgO': ThermalTuple('omgo', [8016, 8017, 8018], 1),
+    'c_O_in_Ge3Bi4O12': ThermalTuple('ogbo', [8016, 8017, 8018], 1),
+    'c_O_in_H2O': ThermalTuple('oh2o', [8016, 8017, 8018], 1),
+    'c_O_in_KOH': ThermalTuple('okoh', [8016, 8017, 8018], 1),
+    'c_O_in_MgOH2': ThermalTuple('omgoh', [8016, 8017, 8018], 1),
+    'c_O_in_NaOH': ThermalTuple('onaoh', [8016, 8017, 8018], 1),
     'c_O_in_PuO2': ThermalTuple('opuo2', [8016, 8017, 8018], 1),
     'c_O_in_SiO2_alpha': ThermalTuple('osio2a', [8016, 8017, 8018], 1),
     'c_O_in_UO2_100p': ThermalTuple('ouo200', [8016, 8017, 8018], 1),
@@ -98,16 +178,26 @@ _THERMAL_DATA = {
     'c_O_in_UO2': ThermalTuple('ouo2', [8016, 8017, 8018], 1),
     'c_O_in_UO2_HALEU': ThermalTuple('ouo2hl', [8016, 8017, 8018], 1),
     'c_O_in_UO2_HEU': ThermalTuple('ouo2he', [8016, 8017, 8018], 1),
+    'c_O_in_Y3Al5O12': ThermalTuple('oyag', [8016, 8017, 8018], 1),
     'c_ortho_D': ThermalTuple('orthod', [1002], 1),
     'c_ortho_H': ThermalTuple('orthoh', [1001], 1),
     'c_para_D': ThermalTuple('parad', [1002], 1),
     'c_para_H': ThermalTuple('parah', [1001], 1),
+    'c_Pb': ThermalTuple('pb', [82204, 82206, 82207, 82208], 1),
+    'c_Pd': ThermalTuple('pd', [46102, 46104, 46105, 46106, 46108, 46110], 1),
+    'c_Pt': ThermalTuple('pt', [78190, 78192, 78194, 78195, 78196, 78198], 1),
     'c_Pu_in_PuO2': ThermalTuple('puo2', [94239, 94240, 94241, 94242, 94243], 1),
     'c_Si28': ThermalTuple('si00', [14028], 1),
     'c_Si_in_SiC': ThermalTuple('sisic', [14028, 14029, 14030], 1),
     'c_Si_in_SiO2_alpha': ThermalTuple('si_o2a', [14028, 14029, 14030], 1),
     'c_SiO2_alpha': ThermalTuple('sio2-a', [8016, 8017, 8018, 14028, 14029, 14030], 3),
     'c_SiO2_beta': ThermalTuple('sio2-b', [8016, 8017, 8018, 14028, 14029, 14030], 3),
+    'c_S_in_ZnS': ThermalTuple('szns', [16032, 16033, 16034, 16036], 1),
+    'c_Se_in_GaSe': ThermalTuple('segase', [34074, 34076, 34077, 34078, 34080, 34082], 1),
+    'c_Sn': ThermalTuple('sn', [50112, 50114, 50115, 50116, 50117, 50118, 50119, 50120, 50122, 50124], 1),
+    'c_Sr_in_SrH2': ThermalTuple('srsrh2', [38084, 38086, 38087, 38088], 1),
+    'c_Te_in_GeTe': ThermalTuple('tegete', [52120, 52122, 52123, 52124, 52125, 52126, 52128, 52130], 1),
+    'c_Ti': ThermalTuple('ti', [22046, 22047, 22048, 22049, 22050], 1),
     'c_U_metal_100p': ThermalTuple('u-100p', [92233, 92234, 92235, 92236, 92238], 1),
     'c_U_metal_10p': ThermalTuple('u-10p', [92233, 92234, 92235, 92236, 92238], 1),
     'c_U_metal_5p': ThermalTuple('u-5p', [92233, 92234, 92235, 92236, 92238], 1),
@@ -132,7 +222,13 @@ _THERMAL_DATA = {
     'c_U_in_UO2': ThermalTuple('uuo2', [92233, 92234, 92235, 92236, 92238], 1),
     'c_U_in_UO2_HALEU': ThermalTuple('uo2hal', [92233, 92234, 92235, 92236, 92238], 1),
     'c_U_in_UO2_HEU': ThermalTuple('uo2heu', [92233, 92234, 92235, 92236, 92238], 1),
+    'c_V': ThermalTuple('v', [23050, 23051], 1),
+    'c_W': ThermalTuple('w', [74180, 74182, 74183, 74184, 74186], 1),
+    'c_Y_in_Y3Al5O12': ThermalTuple('yyag', [39089], 1),
     'c_Y_in_YH2': ThermalTuple('yyh2', [39089], 1),
+    'c_Zn': ThermalTuple('zn', [30064, 30066, 30067, 30068, 30070], 1),
+    'c_Zn_in_ZnS': ThermalTuple('znzns', [30064, 30066, 30067, 30068, 30070], 1),
+    'c_Zr': ThermalTuple('zr', [40090, 40091, 40092, 40094, 40096], 1),
     'c_Zr_in_ZrC': ThermalTuple('zrzrc', [40000, 40090, 40091, 40092, 40094, 40096], 1),
     'c_Zr_in_ZrH': ThermalTuple('zrzrh', [40000, 40090, 40091, 40092, 40094, 40096], 1),
     'c_Zr_in_ZrH2': ThermalTuple('zrzrh2', [40000, 40090, 40091, 40092, 40094, 40096], 1),
@@ -565,7 +661,7 @@ def make_ace_thermal(filename, filename_thermal, temperatures=None,
     else:
         with warnings.catch_warnings(record=True) as w:
             proper_name = openmc.data.get_thermal_name(zsymam_thermal)
-            if w:
+            if w or proper_name not in _THERMAL_DATA:
                 raise RuntimeError(
                     f"Thermal scattering material {zsymam_thermal} not "
                     "recognized. Please contact OpenMC developers at "
diff --git a/openmc/data/thermal.py b/openmc/data/thermal.py
index 4ecc7c040..54e3a7330 100644
--- a/openmc/data/thermal.py
+++ b/openmc/data/thermal.py
@@ -27,20 +27,41 @@ from .thermal_angle_energy import (CoherentElasticAE, IncoherentElasticAE,
 
 
 _THERMAL_NAMES = {
+    'c_Ag': ('ag',),
     'c_Al27': ('al', 'al27', 'al-27', '13-al- 27'),
     'c_Al_in_Al2O3': ('asap00', 'asap', 'al(al2o3)'),
-    'c_Be': ('be', 'be-metal', 'be-met', 'be00', 'be-metal', 'be metal', '4-be'),
+    'c_Al_in_Y3Al5O12': ('al(y3al5o1', 'alyag'),
+    'c_Au': ('au',),
+    'c_Be': ('be', 'be-metal', 'be-met', 'be00', 'be-metal', 'be metal', '4-be', '4-be-'),
     'c_BeO': ('beo',),
     'c_Be_distinct': ('besd', 'be+sd'),
     'c_Be_in_BeO': ('bebeo', 'be-beo', 'be-o', 'be/o', 'bbeo00', 'be(beo)', 'be_beo'),
     'c_Be_in_Be2C': ('bebe2c', 'be(be2c)'),
     'c_Be_in_BeF2': ('bebef2', 'be in bef2'),
     'c_Be_in_FLiBe': ('beflib', 'be(flibe)'),
+    'c_Bi': ('83-bi-', 'bi'),
+    'c_Bi_in_Ge3Bi4O12': ('bi(ge3bi4o', 'bigbo'),
     'c_C6H6': ('benz', 'c6h6', 'benzine'),
     'c_C_in_Be2C': ('cbe2c', 'c(be2c)'),
+    'c_C_in_C19H16_liquid': ('c(c19h16)l', 'c19liq'),
+    'c_C_in_C19H16_solid': ('c(c19h16)s', 'c19sol'),
+    'c_C_in_C2H6O_liquid': ('c(c2h6o)l', 'ethliq'),
+    'c_C_in_C2H6O_solid': ('c(c2h6o)s', 'ethsol'),
     'c_C_in_C5O2H8': ('clucit', 'c(lucite)'),
+    'c_C_in_C6H6_liquid': ('c(c6h6)l', 'benzlq'),
+    'c_C_in_C6H6_solid': ('c(c6h6)s', 'benzsl'),
+    'c_C_in_C7H8_liquid': ('c(c7h8)l', 'tolliq'),
+    'c_C_in_C7H8_solid': ('c(c7h8)s', 'tolsol'),
     'c_C_in_C8H8': ('cc8h8', 'c(polystyr'),
+    'c_C_in_C8H10_liquid': ('c(m-c8h10)l', 'xylliq'),
+    'c_C_in_C8H10_solid': ('c(m-c8h10)s', 'xylsol'),
+    'c_C_in_C9H12_liquid': ('c(c9h12)l', 'mesliq'),
+    'c_C_in_C9H12_solid': ('c(c9h12)s', 'messol'),
     'c_C_in_CF2': ('ccf2', 'c(teflon)'),
+    'c_C_in_CH2': ('c(c2h4)n r', 'cch2'),
+    'c_C_in_CH4_liquid': ('c(ch4)l', 'cch4lq'),
+    'c_C_in_CH4_solid': ('c(ch4)s', 'cch4sl'),
+    'c_C_in_Diamond': ('c(c-diamon', 'cdiam'),
     'c_C_in_SiC': ('csic', 'c-sic', 'c(3c-sic)', 'c_sic'),
     'c_C_in_UC_100p': ('cuc100', 'cinuc_100p'),
     'c_C_in_UC_10p': ('cuc10', 'cinuc_10p'),
@@ -49,16 +70,29 @@ _THERMAL_NAMES = {
     'c_C_in_UC_HALEU': ('cuchal', 'cinuc_haleu'),
     'c_C_in_UC_HEU': ('cucheu', 'cinuc_heu'),
     'c_C_in_ZrC': ('czrc', 'c(zrc)'),
+    'c_Ca': ('ca',),
     'c_Ca_in_CaH2': ('cah', 'cah00', 'cacah2', 'ca(cah2)', 'ca_cah2'),
+    'c_Ca_in_CaO2H2': ('ca(caoh2)', 'cacaoh'),
+    'c_Cr': ('cr',),
+    'c_Cu': ('cu',),
     'c_D_in_7LiD': ('dlid', 'd(7lid)'),
     'c_D_in_D2O': ('dd2o', 'd-d2o', 'hwtr', 'hw', 'dhw00', 'd(d2o)'),
     'c_D_in_D2O_solid': ('dice',),
+    'c_D_in_MgD2': ('d(mgd2)', 'dmgd2'),
     'c_F_in_Be2': ('fbef2', 'f in bef2'),
     'c_F_in_CF2': ('fcf2', 'f(teflon)'),
     'c_F_in_FLiBe': ('fflibe', 'f(flibe)'),
     'c_F_in_HF': ('f_hf',),
+    'c_F_in_LiF': ('f(lif)', 'flif'),
     'c_F_in_MgF2': ('fmgf2', 'f in mgf2'),
     'c_Fe56': ('fe', 'fe56', 'fe-56', '26-fe- 56'),
+    'c_Fe_in_Fe_alpha': ('fe(fe-alph', 'fealph'),
+    'c_Fe_in_Fe_gamma': ('fe(fe-gamm', 'fegamm'),
+    'c_Ga_in_GaN': ('ga(gan)', 'gagan'),
+    'c_Ga_in_GaSe': ('ga(gase)', 'gagase'),
+    'c_Ge': ('ge',),
+    'c_Ge_in_Ge3Bi4O12': ('ge(ge3bi4o', 'gegbo'),
+    'c_Ge_in_GeTe': ('ge(gete)', 'gegete'),
     'c_Graphite': ('graph', 'grph', 'gr', 'gr00', 'graphite'),
     'c_Graphite_10p': ('grph10', '10p graphit'),
     'c_Graphite_20p': ('grph20', '20 graphite'),
@@ -68,41 +102,86 @@ _THERMAL_NAMES = {
     'c_H_in_C5O2H8': ('lucite', 'c5o2h8', 'h-luci', 'h(lucite)'),
     'c_H_in_C8H8': ('hc8h8', 'h(polystyr'),
     'c_H_in_CaH2': ('hcah2', 'hca00', 'h(cah2)'),
+    'c_H_in_CaO2H2': ('h(caoh2)', 'hcaoh'),
     'c_H1_in_CaH2': ('h1cah2', 'h1_cah2'),
     'c_H2_in_CaH2': ('h2cah2', 'h2_cah2'),
-    'c_H_in_CH2': ('hch2', 'poly', 'pol', 'h-poly', 'pol00', 'h(ch2)'),
-    'c_H_in_CH4_liquid': ('lch4', 'lmeth', 'l-ch4'),
-    'c_H_in_CH4_solid': ('sch4', 'smeth', 's-ch4'),
+    'c_H_in_C19H16_liquid': ('h(c19h16)l', 'h19liq'),
+    'c_H_in_C19H16_solid': ('h(c19h16)s', 'h19sol'),
+    'c_H_in_C2H6O_liquid': ('h(c2h6o)l', 'hetliq'),
+    'c_H_in_C2H6O_solid': ('h(c2h6o)s', 'hetsol'),
+    'c_H_in_C6H6_liquid': ('h(c6h6)l', 'hbzliq'),
+    'c_H_in_C6H6_solid': ('h(c6h6)s', 'hbzsol'),
+    'c_H_in_C7H8_liquid': ('h(c7h8)l', 'htlliq'),
+    'c_H_in_C7H8_solid': ('h(c7h8)s', 'htlsol'),
+    'c_H_in_C8H10_liquid': ('h(m-c8h10)l', 'hxyliq'),
+    'c_H_in_C8H10_solid': ('h(m-c8h10)s', 'hxysol'),
+    'c_H_in_C9H12_liquid': ('h(c9h12)l', 'hmsliq'),
+    'c_H_in_C9H12_solid': ('h(c9h12)s', 'hmssol'),
+    'c_H_in_CH2': ('hch2', 'poly', 'pol', 'h-poly', 'pol00', 'h(ch2)', 'h(c2h4)n r'),
+    'c_H_in_CH4_liquid': ('lch4', 'lmeth', 'l-ch4', 'h(ch4)l'),
+    'c_H_in_CH4_solid': ('sch4', 'smeth', 's-ch4', 'h(ch4)s'),
     'c_H_in_CH4_solid_phase_II': ('sch4p2',),
     'c_H_in_H2O': ('hh2o', 'h-h2o', 'lwtr', 'lw', 'lw00', 'h(h2o)'),
     'c_H_in_H2O_solid': ('hice', 'h-ice', 'ice00', 'h(ice-ih)', 'h(ice)'),
     'c_H_in_HF': ('hhf', 'h(hf)', 'h_hf'),
+    'c_H_in_KOH': ('h(koh)', 'hkoh'),
+    'c_H_in_LiH': ('h(lih)', 'hlih2'),
     'c_H_in_Mesitylene': ('mesi00', 'mesi', 'mesi-phii'),
+    'c_H_in_MgH2': ('h(mgh2)', 'hmgh2'),
+    'c_H_in_MgOH2': ('h(mgoh2)', 'hmgoh'),
+    'c_H_in_NaMgH3': ('h(namgh3)', 'hnamg'),
+    'c_H_in_NaOH': ('h(naoh)', 'hnaoh'),
     'c_H_in_ParaffinicOil': ('hparaf', 'h(paraffin', 'h(paraffini'),
+    'c_H_in_SrH2': ('h(srh2)', 'hsrh2'),
     'c_H_in_Toluene': ('tol00', 'tol', 'tolue-phii'),
     'c_H_in_UH3': ('huh3', 'h(uh3)'),
     'c_H_in_YH2': ('hyh2', 'h-yh2', 'h(yh2)'),
     'c_H_in_ZrH': ('hzrh', 'h-zrh', 'h-zr', 'h/zr', 'hzr', 'hzr00', 'h(zrh)'),
-    'c_H_in_ZrH2': ('hzrh2', 'h(zrh2)'),
-    'c_H_in_ZrHx': ('hzrhx', 'h(zrhx)'),
+    'c_H_in_ZrH2': ('hzrh2', 'h(zrh2)', 'h(zrh2) in'),
+    'c_H_in_ZrHx': ('hzrhx', 'h(zrhx)', 'h(zrh15) i'),
+    'c_I_in_NaI': ('i(nai)', 'inai'),
+    'c_K': ('k',),
+    'c_K_in_KOH': ('k(koh)', 'kkoh'),
     'c_Li_in_FLiBe': ('liflib', 'li(flibe)'),
     'c_Li_in_7LiD': ('lilid', '7li(7lid)'),
     'c_Li_in_7LiH': ('lilih', '7li(7lih)'),
+    'c_Li_in_LiF': ('li(lif)', 'lilif'),
+    'c_Li_in_LiH': ('li(lih)', 'lilih2'),
     'c_Mg24': ('mg', 'mg24', 'mg00', '24-mg'),
+    'c_Mg_in_MgD2': ('mg(mgd2)', 'mgmgd2'),
     'c_Mg_in_MgF2': ('mgmgf2', 'mg in mgf2'),
+    'c_Mg_in_MgH2': ('mg(mgh2)', 'mgmgh2'),
     'c_Mg_in_MgO': ('mgmgo', 'mg in mgo'),
+    'c_Mg_in_MgOH2': ('mg(mgoh2)', 'mgoh2'),
+    'c_Mg_in_NaMgH3': ('mg(namgh3)', 'mgnamg'),
+    'c_Mo': ('mo',),
+    'c_N_in_GaN': ('n(gan)', 'ngan'),
     'c_N_in_UN_100p': ('nun100', 'n-un-100p'),
     'c_N_in_UN_10p': ('nun10', 'n-un-10p'),
     'c_N_in_UN_5p': ('nun5', 'n-un-5p'),
     'c_N_in_UN': ('n-un', 'n(un)', 'n(un)    l', 'ninun'),
     'c_N_in_UN_HALEU': ('nunhal', 'n-un-haleu'),
     'c_N_in_UN_HEU': ('nunheu', 'n-un-heu'),
+    'c_Na': ('na',),
+    'c_Na_in_NaI': ('na(nai)', 'nanai'),
+    'c_Na_in_NaMgH3': ('na(namgh3)', 'nanamg'),
+    'c_Na_in_NaOH': ('na(naoh)', 'nanaoh'),
+    'c_Nb': ('nb',),
+    'c_Ni': ('ni',),
     'c_O_in_Al2O3': ('osap00', 'osap', 'o(al2o3)'),
     'c_O_in_BeO': ('obeo', 'o-beo', 'o-be', 'o/be', 'obeo00', 'o(beo)', 'o_beo'),
+    'c_O_in_C2H6O_liquid': ('o(c2h6o)l', 'oetliq'),
+    'c_O_in_C2H6O_solid': ('o(c2h6o)s', 'oetsol'),
     'c_O_in_C5O2H8': ('olucit', 'o(lucite)'),
+    'c_O_in_CaO2H2': ('o(caoh2)', 'ocaoh'),
     'c_O_in_D2O': ('od2o', 'o-d2o', 'ohw00', 'o(d2o)'),
+    'c_O_in_H2O': ('o(h2o)', 'oh2o'),
     'c_O_in_H2O_solid': ('oice', 'o-ice', 'o(ice-ih)'),
+    'c_O_in_Ge3Bi4O12': ('o(ge3bi4o1', 'ogbo'),
+    'c_O_in_KOH': ('o(koh)', 'okoh'),
     'c_O_in_MgO': ('omgo', 'o in mgo'),
+    'c_O_in_MgOH2': ('o(mgoh2)', 'omgoh'),
+    'c_O_in_NaOH': ('o(naoh)', 'onaoh'),
     'c_O_in_PuO2': ('opuo2', 'o in puo2'),
     'c_O_in_SiO2_alpha': ('osio2a', 'o_sio2a'),
     'c_O_in_UO2_100p': ('ouo200', 'o-uo2-100p'),
@@ -111,16 +190,26 @@ _THERMAL_NAMES = {
     'c_O_in_UO2': ('ouo2', 'o-uo2', 'o2-u', 'o2/u', 'ouo200', 'o(uo2)'),
     'c_O_in_UO2_HALEU': ('ouo2hl', 'ouo2-haleu'),
     'c_O_in_UO2_HEU': ('ouo2he', 'o_uo2-heu'),
+    'c_O_in_Y3Al5O12': ('o(y3al5o12', 'oyag'),
     'c_ortho_D': ('orthod', 'orthoD', 'dortho', 'od200', 'ortod', 'ortho-d'),
     'c_ortho_H': ('orthoh', 'orthoH', 'hortho', 'oh200', 'ortoh', 'ortho-h'),
     'c_para_D': ('parad', 'paraD', 'dpara', 'pd200', 'para-d'),
     'c_para_H': ('parah', 'paraH', 'hpara', 'ph200', 'para-h'),
+    'c_Pb': ('pb',),
+    'c_Pd': ('pd',),
+    'c_Pt': ('pt',),
     'c_Pu_in_PuO2': ('puo2', 'pu in puo2'),
     'c_Si28': ('si00', 'sili', 'si'),
     'c_Si_in_SiC': ('sisic', 'si-sic', 'si(3c-sic)', 'si_sic'),
     'c_Si_in_SiO2_alpha': ('si_o2a', 'si_sio2a'),
-    'c_SiO2_alpha': ('sio2', 'sio2a', 'sio2alpha'),
-    'c_SiO2_beta': ('sio2b', 'sio2beta'),
+    'c_SiO2_alpha': ('sio2', 'sio2a', 'sio2alpha', 'sio2-a'),
+    'c_SiO2_beta': ('sio2b', 'sio2beta', 'sio2-b'),
+    'c_S_in_ZnS': ('s(zns-spha', 'szns'),
+    'c_Se_in_GaSe': ('se(gase)', 'segase'),
+    'c_Sn': ('sn',),
+    'c_Sr_in_SrH2': ('sr(srh2)', 'srsrh2'),
+    'c_Te_in_GeTe': ('te(gete)', 'tegete'),
+    'c_Ti': ('ti',),
     'c_U_metal_100p': ('u-100p',),
     'c_U_metal_10p': ('u-10p',),
     'c_U_metal_5p': ('u-5p',),
@@ -145,11 +234,17 @@ _THERMAL_NAMES = {
     'c_U_in_UO2': ('uuo2', 'u-uo2', 'u-o2', 'u/o2', 'uuo200', 'u(uo2)'),
     'c_U_in_UO2_HALEU': ('uo2hal', 'uuo2-haleu'),
     'c_U_in_UO2_HEU': ('uo2heu', 'u_uo2-heu'),
+    'c_V': ('v',),
+    'c_W': ('w',),
+    'c_Y_in_Y3Al5O12': ('y(y3al5o12', 'yyag'),
     'c_Y_in_YH2': ('yyh2', 'y-yh2', 'y(yh2)'),
+    'c_Zn': ('zn',),
+    'c_Zn_in_ZnS': ('zn(zns-sph', 'znzns'),
+    'c_Zr': ('zr',),
     'c_Zr_in_ZrC': ('zrzrc', 'zr(zrc)'),
     'c_Zr_in_ZrH': ('zrzrh', 'zr-zrh', 'zr-h', 'zr/h', 'zr(zrh)'),
-    'c_Zr_in_ZrH2': ('zrzrh2', 'zr(zrh2)'),
-    'c_Zr_in_ZrHx': ('zrzrhx', 'zr(zrhx)'),
+    'c_Zr_in_ZrH2': ('zrzrh2', 'zr(zrh2)', 'zr(zrh2) i'),
+    'c_Zr_in_ZrHx': ('zrzrhx', 'zr(zrhx)', 'zr(zrh15)'),
 }
 
 
diff --git a/tests/unit_tests/test_data_thermal.py b/tests/unit_tests/test_data_thermal.py
index c444d0c58..7cd63ca71 100644
--- a/tests/unit_tests/test_data_thermal.py
+++ b/tests/unit_tests/test_data_thermal.py
@@ -6,6 +6,8 @@ import random
 import numpy as np
 import pytest
 import openmc.data
+from openmc.data.thermal import _THERMAL_NAMES
+from openmc.data.njoy import _THERMAL_DATA
 
 from . import needs_njoy
 
@@ -258,6 +260,27 @@ def test_get_thermal_name():
         assert f('boogie_monster') == 'c_boogie_monster'
 
 
+def test_thermal_names_data_consistency():
+    # Check that keys in _THERMAL_NAMES are also in _THERMAL_DATA
+    names_only = set(_THERMAL_NAMES.keys()) - set(_THERMAL_DATA.keys())
+    assert not names_only, f"Keys in _THERMAL_NAMES but not in _THERMAL_DATA: {names_only}"
+
+    # Check that keys in _THERMAL_DATA are also in _THERMAL_NAMES
+    data_only = set(_THERMAL_DATA.keys()) - set(_THERMAL_NAMES.keys())
+    assert not data_only, f"Keys in _THERMAL_DATA but not in _THERMAL_NAMES: {data_only}"
+
+    # Check that the name from each ThermalTuple in _THERMAL_DATA appears as
+    # a recognized alias in _THERMAL_NAMES for the same key
+    missing_aliases = []
+    for key, thermal_tuple in _THERMAL_DATA.items():
+        name = thermal_tuple.name
+        if name not in _THERMAL_NAMES[key]:
+            missing_aliases.append((key, name, _THERMAL_NAMES[key]))
+    assert not missing_aliases, (
+        f"ThermalTuple names not in _THERMAL_NAMES aliases: {missing_aliases}"
+    )
+
+
 @pytest.fixture
 def fake_mixed_elastic():
     fake_tsl = openmc.data.ThermalScattering("c_D_in_7LiD", 1.9968, 4.9, [0.0253])

From 9c91bddf0402ba7e9b1ff94da2b73a46cc750811 Mon Sep 17 00:00:00 2001
From: Paul Romano <paul.k.romano@gmail.com>
Date: Fri, 2 Jan 2026 06:43:25 -0500
Subject: [PATCH 192/203] Migrate to SciPy sparse arrays (#3613)

---
 openmc/_sparse_compat.py | 43 ++++++++++++++++++++++++++++++++++++++++
 openmc/cmfd.py           |  8 ++++----
 openmc/deplete/abc.py    |  6 +++---
 openmc/deplete/chain.py  | 20 +++++++++----------
 openmc/deplete/cram.py   |  8 ++++----
 openmc/deplete/pool.py   |  7 ++++---
 openmc/tallies.py        | 35 +++++++++++++-------------------
 7 files changed, 82 insertions(+), 45 deletions(-)
 create mode 100644 openmc/_sparse_compat.py

diff --git a/openmc/_sparse_compat.py b/openmc/_sparse_compat.py
new file mode 100644
index 000000000..c00777e19
--- /dev/null
+++ b/openmc/_sparse_compat.py
@@ -0,0 +1,43 @@
+"""Compatibility module for scipy.sparse arrays
+
+This module provides a compatibility layer for working with scipy.sparse arrays
+across different scipy versions. Sparse arrays were introduced gradually in
+scipy, with full support arriving in scipy 1.15. This module provides a unified
+API that uses sparse arrays when available and falls back to sparse matrices for
+older scipy versions.
+
+For more information on the migration from sparse matrices to sparse arrays,
+see: https://docs.scipy.org/doc/scipy/reference/sparse.migration_to_sparray.html
+"""
+
+import scipy
+from scipy import sparse as sp
+
+# Check scipy version for feature availability
+_SCIPY_VERSION = tuple(map(int, scipy.__version__.split('.')[:2]))
+
+if _SCIPY_VERSION >= (1, 15):
+    # Use sparse arrays
+    csr_array = sp.csr_array
+    csc_array = sp.csc_array
+    dok_array = sp.dok_array
+    lil_array = sp.lil_array
+    eye_array = sp.eye_array
+    block_array = sp.block_array
+else:
+    # Fall back to sparse matrices
+    csr_array = sp.csr_matrix
+    csc_array = sp.csc_matrix
+    dok_array = sp.dok_matrix
+    lil_array = sp.lil_matrix
+    eye_array = sp.eye
+    block_array = sp.bmat
+
+__all__ = [
+    'csr_array',
+    'csc_array',
+    'dok_array',
+    'lil_array',
+    'eye_array',
+    'block_array',
+]
diff --git a/openmc/cmfd.py b/openmc/cmfd.py
index eff6a151f..8595d1e02 100644
--- a/openmc/cmfd.py
+++ b/openmc/cmfd.py
@@ -25,6 +25,7 @@ import openmc.lib
 from .checkvalue import (check_type, check_length, check_value,
                          check_greater_than, check_less_than)
 from .exceptions import OpenMCError
+from ._sparse_compat import csr_array
 
 # See if mpi4py module can be imported, define have_mpi global variable
 try:
@@ -980,8 +981,7 @@ class CMFDRun:
         loss_row = self._loss_row
         loss_col = self._loss_col
         temp_data = np.ones(len(loss_row))
-        temp_loss = sparse.csr_matrix((temp_data, (loss_row, loss_col)),
-                                      shape=(n, n))
+        temp_loss = csr_array((temp_data, (loss_row, loss_col)), shape=(n, n))
         temp_loss.sort_indices()
 
         # Pass coremap as 1-d array of 32-bit integers
@@ -1585,7 +1585,7 @@ class CMFDRun:
         # Create csr matrix
         loss_row = self._loss_row
         loss_col = self._loss_col
-        loss = sparse.csr_matrix((data, (loss_row, loss_col)), shape=(n, n))
+        loss = csr_array((data, (loss_row, loss_col)), shape=(n, n))
         loss.sort_indices()
         return loss
 
@@ -1612,7 +1612,7 @@ class CMFDRun:
         # Create csr matrix
         prod_row = self._prod_row
         prod_col = self._prod_col
-        prod = sparse.csr_matrix((data, (prod_row, prod_col)), shape=(n, n))
+        prod = csr_array((data, (prod_row, prod_col)), shape=(n, n))
         prod.sort_indices()
         return prod
 
diff --git a/openmc/deplete/abc.py b/openmc/deplete/abc.py
index 32f468306..ee742f22b 100644
--- a/openmc/deplete/abc.py
+++ b/openmc/deplete/abc.py
@@ -600,7 +600,7 @@ class Integrator(ABC):
         User-supplied functions are expected to have the following signature:
         ``solver(A, n0, t) -> n1`` where
 
-            * ``A`` is a :class:`scipy.sparse.csc_matrix` making up the
+            * ``A`` is a :class:`scipy.sparse.csc_array` making up the
               depletion matrix
             * ``n0`` is a 1-D :class:`numpy.ndarray` of initial compositions
               for a given material in atoms/cm3
@@ -1134,7 +1134,7 @@ class SIIntegrator(Integrator):
         User-supplied functions are expected to have the following signature:
         ``solver(A, n0, t) -> n1`` where
 
-            * ``A`` is a :class:`scipy.sparse.csc_matrix` making up the
+            * ``A`` is a :class:`scipy.sparse.csc_array` making up the
               depletion matrix
             * ``n0`` is a 1-D :class:`numpy.ndarray` of initial compositions
               for a given material in atoms/cm3
@@ -1297,7 +1297,7 @@ class DepSystemSolver(ABC):
 
         Parameters
         ----------
-        A : scipy.sparse.csc_matrix
+        A : scipy.sparse.csc_array
             Sparse transmutation matrix ``A[j, i]`` describing rates at
             which isotope ``i`` transmutes to isotope ``j``
         n0 : numpy.ndarray
diff --git a/openmc/deplete/chain.py b/openmc/deplete/chain.py
index 873d7ca89..a835face7 100644
--- a/openmc/deplete/chain.py
+++ b/openmc/deplete/chain.py
@@ -17,13 +17,13 @@ from warnings import warn
 from typing import List
 
 import lxml.etree as ET
-import scipy.sparse as sp
 
 from openmc.checkvalue import check_type, check_greater_than, PathLike
 from openmc.data import gnds_name, zam
 from openmc.exceptions import DataError
 from .nuclide import FissionYieldDistribution, Nuclide
 from .._xml import get_text
+from .._sparse_compat import csc_array, dok_array
 import openmc.data
 
 
@@ -619,7 +619,7 @@ class Chain:
 
         Returns
         -------
-        scipy.sparse.csc_matrix
+        scipy.sparse.csc_array
             Sparse matrix representing depletion.
 
         See Also
@@ -713,7 +713,7 @@ class Chain:
                 reactions.clear()
 
         # Return CSC representation instead of DOK
-        return sp.csc_matrix((vals, (rows, cols)), shape=(n, n))
+        return csc_array((vals, (rows, cols)), shape=(n, n))
 
     def add_redox_term(self, matrix, buffer, oxidation_states):
         r"""Adds a redox term to the depletion matrix from data contained in
@@ -731,7 +731,7 @@ class Chain:
 
         Parameters
         ----------
-        matrix : scipy.sparse.csc_matrix
+        matrix : scipy.sparse.csc_array
             Sparse matrix representing depletion
         buffer : dict
             Dictionary of buffer nuclides used to maintain anoins net balance.
@@ -743,7 +743,7 @@ class Chain:
             states as integers (e.g., +1, 0).
         Returns
         -------
-        matrix : scipy.sparse.csc_matrix
+        matrix : scipy.sparse.csc_array
             Sparse matrix with redox term added
         """
         # Elements list with the same size as self.nuclides
@@ -769,7 +769,7 @@ class Chain:
         for nuc, idx in buffer_idx.items():
             array[idx] -= redox_change * buffer[nuc] / os[idx]
 
-        return sp.csc_matrix(array)
+        return csc_array(array)
 
     def form_rr_term(self, tr_rates, current_timestep, mats):
         """Function to form the transfer rate term matrices.
@@ -800,13 +800,13 @@ class Chain:
 
         Returns
         -------
-        scipy.sparse.csc_matrix
+        scipy.sparse.csc_array
             Sparse matrix representing transfer term.
 
         """
         # Use DOK as intermediate representation
         n = len(self)
-        matrix = sp.dok_matrix((n, n))
+        matrix = dok_array((n, n))
 
         for i, nuc in enumerate(self.nuclides):
             elm = re.split(r'\d+', nuc.name)[0]
@@ -857,7 +857,7 @@ class Chain:
 
         Returns
         -------
-        scipy.sparse.csc_matrix
+        scipy.sparse.csc_array
             Sparse vector representing external source term.
 
         """
@@ -865,7 +865,7 @@ class Chain:
             return
         # Use DOK as intermediate representation
         n = len(self)
-        vector = sp.dok_matrix((n, 1))
+        vector = dok_array((n, 1))
 
         for i, nuc in enumerate(self.nuclides):
             # Build source term vector
diff --git a/openmc/deplete/cram.py b/openmc/deplete/cram.py
index 53de83bb6..cecc388f4 100644
--- a/openmc/deplete/cram.py
+++ b/openmc/deplete/cram.py
@@ -6,11 +6,11 @@ Implements two different forms of CRAM for use in openmc.deplete.
 import numbers
 
 import numpy as np
-import scipy.sparse as sp
 import scipy.sparse.linalg as sla
 
 from openmc.checkvalue import check_type, check_length
 from .abc import DepSystemSolver
+from .._sparse_compat import csc_array, eye_array
 
 __all__ = ["CRAM16", "CRAM48", "Cram16Solver", "Cram48Solver", "IPFCramSolver"]
 
@@ -60,7 +60,7 @@ class IPFCramSolver(DepSystemSolver):
 
         Parameters
         ----------
-        A : scipy.sparse.csr_matrix
+        A : scipy.sparse.csc_array
             Sparse transmutation matrix ``A[j, i]`` desribing rates at
             which isotope ``i`` transmutes to isotope ``j``
         n0 : numpy.ndarray
@@ -75,9 +75,9 @@ class IPFCramSolver(DepSystemSolver):
             Final compositions after ``dt``
 
         """
-        A = dt * sp.csc_matrix(A, dtype=np.float64)
+        A = dt * csc_array(A, dtype=np.float64)
         y = n0.copy()
-        ident = sp.eye(A.shape[0], format='csc')
+        ident = eye_array(A.shape[0], format='csc')
         for alpha, theta in zip(self.alpha, self.theta):
             y += 2*np.real(alpha*sla.spsolve(A - theta*ident, y))
         return y * self.alpha0
diff --git a/openmc/deplete/pool.py b/openmc/deplete/pool.py
index aa348c02a..58f90894b 100644
--- a/openmc/deplete/pool.py
+++ b/openmc/deplete/pool.py
@@ -5,10 +5,11 @@ Provided to avoid some circular imports
 from itertools import repeat, starmap
 from multiprocessing import Pool
 
-from scipy.sparse import bmat, hstack, vstack, csc_matrix
 import numpy as np
+from scipy.sparse import hstack
 
 from openmc.mpi import comm
+from .._sparse_compat import block_array
 
 # Configurable switch that enables / disables the use of
 # multiprocessing routines during depletion
@@ -159,7 +160,7 @@ def deplete(func, chain, n, rates, dt, current_timestep=None, matrix_func=None,
                             cols.append(None)
 
                     rows.append(cols)
-                matrix = bmat(rows)
+                matrix = block_array(rows)
 
                 # Concatenate vectors of nuclides in one
                 n_multi = np.concatenate(n)
@@ -194,7 +195,7 @@ def deplete(func, chain, n, rates, dt, current_timestep=None, matrix_func=None,
         # of the nuclide vectors
         for i, matrix in enumerate(matrices):
             if not np.equal(*matrix.shape):
-                matrices[i] = vstack([matrix, csc_matrix([0]*matrix.shape[1])])
+                matrix.resize(matrix.shape[1], matrix.shape[1])
                 n[i] = np.append(n[i], 1.0)
 
     inputs = zip(matrices, n, repeat(dt))
diff --git a/openmc/tallies.py b/openmc/tallies.py
index 09365e525..7b1ef0219 100644
--- a/openmc/tallies.py
+++ b/openmc/tallies.py
@@ -12,11 +12,11 @@ import lxml.etree as ET
 import h5py
 import numpy as np
 import pandas as pd
-import scipy.sparse as sps
 from scipy.stats import chi2, norm
 
 import openmc
 import openmc.checkvalue as cv
+from ._sparse_compat import lil_array
 from ._xml import clean_indentation, get_elem_list, get_text
 from .mixin import IDManagerMixin
 from .mesh import MeshBase
@@ -435,10 +435,10 @@ class Tally(IDManagerMixin):
 
             # Convert NumPy arrays to SciPy sparse LIL matrices
             if self.sparse:
-                self._sum = sps.lil_matrix(self._sum.flatten(), self._sum.shape)
-                self._sum_sq = sps.lil_matrix(self._sum_sq.flatten(), self._sum_sq.shape)
-                self._sum_third = sps.lil_matrix(self._sum_third.flatten(), self._sum_third.shape)
-                self._sum_fourth = sps.lil_matrix(self.sum_fourth.flatten(), self._sum_fourth.shape)
+                self._sum = lil_array(self._sum.flatten(), self._sum.shape)
+                self._sum_sq = lil_array(self._sum_sq.flatten(), self._sum_sq.shape)
+                self._sum_third = lil_array(self._sum_third.flatten(), self._sum_third.shape)
+                self._sum_fourth = lil_array(self._sum_fourth.flatten(), self._sum_fourth.shape)
 
             # Read simulation time (needed for figure of merit)
             self._simulation_time = f["runtime"]["simulation"][()]
@@ -534,8 +534,7 @@ class Tally(IDManagerMixin):
 
             # Convert NumPy array to SciPy sparse LIL matrix
             if self.sparse:
-                self._mean = sps.lil_matrix(self._mean.flatten(),
-                                            self._mean.shape)
+                self._mean = lil_array(self._mean.flatten(), self._mean.shape)
 
         if self.sparse:
             return np.reshape(self._mean.toarray(), self.shape)
@@ -556,8 +555,7 @@ class Tally(IDManagerMixin):
 
             # Convert NumPy array to SciPy sparse LIL matrix
             if self.sparse:
-                self._std_dev = sps.lil_matrix(self._std_dev.flatten(),
-                                               self._std_dev.shape)
+                self._std_dev = lil_array(self._std_dev.flatten(), self._std_dev.shape)
 
             self.with_batch_statistics = True
 
@@ -588,7 +586,7 @@ class Tally(IDManagerMixin):
             self._vov[mask] = numerator[mask]/denominator[mask] - 1.0/n
 
             if self.sparse:
-                self._vov = sps.lil_matrix(self._vov.flatten(), self._vov.shape)
+                self._vov = lil_array(self._vov.flatten(), self._vov.shape)
 
         if self.sparse:
             return np.reshape(self._vov.toarray(), self.shape)
@@ -963,22 +961,17 @@ class Tally(IDManagerMixin):
         # Convert NumPy arrays to SciPy sparse LIL matrices
         if sparse and not self.sparse:
             if self._sum is not None:
-                self._sum = sps.lil_matrix(self._sum.flatten(), self._sum.shape)
+                self._sum = lil_array(self._sum.flatten(), self._sum.shape)
             if self._sum_sq is not None:
-                self._sum_sq = sps.lil_matrix(self._sum_sq.flatten(),
-                                              self._sum_sq.shape)
+                self._sum_sq = lil_array(self._sum_sq.flatten(), self._sum_sq.shape)
             if self._sum_third is not None:
-                self._sum_third = sps.lil_matrix(self._sum_third.flatten(),
-                                                 self._sum_third.shape)
+                self._sum_third = lil_array(self._sum_third.flatten(), self._sum_third.shape)
             if self._sum_fourth is not None:
-                self._sum_fourth = sps.lil_matrix(self._sum_fourth.flatten(),
-                                                  self._sum_fourth.shape)
+                self._sum_fourth = lil_array(self._sum_fourth.flatten(), self._sum_fourth.shape)
             if self._mean is not None:
-                self._mean = sps.lil_matrix(self._mean.flatten(),
-                                            self._mean.shape)
+                self._mean = lil_array(self._mean.flatten(), self._mean.shape)
             if self._std_dev is not None:
-                self._std_dev = sps.lil_matrix(self._std_dev.flatten(),
-                                               self._std_dev.shape)
+                self._std_dev = lil_array(self._std_dev.flatten(), self._std_dev.shape)
 
             self._sparse = True
 

From 60ddafa9b385490ac5935ca0420634c2bba398a7 Mon Sep 17 00:00:00 2001
From: Jonathan Shimwell <mail@jshimwell.com>
Date: Mon, 5 Jan 2026 21:57:05 +0100
Subject: [PATCH 193/203] Open dagmc model file within a context manager
 (#3706)

---
 openmc/dagmc.py | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/openmc/dagmc.py b/openmc/dagmc.py
index 3cb48ddf1..fd4258225 100644
--- a/openmc/dagmc.py
+++ b/openmc/dagmc.py
@@ -223,21 +223,19 @@ class DAGMCUniverse(openmc.UniverseBase):
 
     @property
     def material_names(self):
-        dagmc_file_contents = h5py.File(self.filename)
-        material_tags_hex = dagmc_file_contents['/tstt/tags/NAME'].get(
-            'values')
         material_tags_ascii = []
-        for tag in material_tags_hex:
-            candidate_tag = tag.tobytes().decode().replace('\x00', '')
-            # tags might be for temperature or reflective surfaces
-            if candidate_tag.startswith('mat:'):
-                # if name ends with _comp remove it, it is not parsed
-                if candidate_tag.endswith('_comp'):
-                   candidate_tag = candidate_tag[:-5]
-                # removes first 4 characters as openmc.Material name should be
-                # set without the 'mat:' part of the tag
-                material_tags_ascii.append(candidate_tag[4:])
-
+        with h5py.File(self.filename) as dagmc_file_contents:
+            material_tags_hex = dagmc_file_contents['/tstt/tags/NAME'].get('values')
+            for tag in material_tags_hex:
+                candidate_tag = tag.tobytes().decode().replace('\x00', '')
+                # tags might be for temperature or reflective surfaces
+                if candidate_tag.startswith('mat:'):
+                    # if name ends with _comp remove it, it is not parsed
+                    if candidate_tag.endswith('_comp'):
+                       candidate_tag = candidate_tag[:-5]
+                    # removes first 4 characters as openmc.Material name should be
+                    # set without the 'mat:' part of the tag
+                    material_tags_ascii.append(candidate_tag[4:])
         return sorted(set(material_tags_ascii))
 
     def _n_geom_elements(self, geom_type):

From 818fd11b18fa1d089a0c1ae648939e23b56aa185 Mon Sep 17 00:00:00 2001
From: GuySten <62616591+GuySten@users.noreply.github.com>
Date: Tue, 6 Jan 2026 11:29:46 +0200
Subject: [PATCH 194/203] Simplify rectangular lattice crossing and correctly
 handle corner checks (#3703)

Co-authored-by: Paul Romano <paul.k.romano@gmail.com>
---
 src/lattice.cpp                               |  54 ++---
 .../lattice_corner_crossing/__init__.py       |   0
 .../lattice_corner_crossing/inputs_true.dat   |  58 +++++
 .../lattice_corner_crossing/results_true.dat  | 201 ++++++++++++++++++
 .../lattice_corner_crossing/test.py           |  83 ++++++++
 5 files changed, 358 insertions(+), 38 deletions(-)
 create mode 100644 tests/regression_tests/lattice_corner_crossing/__init__.py
 create mode 100644 tests/regression_tests/lattice_corner_crossing/inputs_true.dat
 create mode 100644 tests/regression_tests/lattice_corner_crossing/results_true.dat
 create mode 100644 tests/regression_tests/lattice_corner_crossing/test.py

diff --git a/src/lattice.cpp b/src/lattice.cpp
index efbfcb216..92d451f61 100644
--- a/src/lattice.cpp
+++ b/src/lattice.cpp
@@ -260,46 +260,24 @@ std::pair<double, array<int, 3>> RectLattice::distance(
   // Determine the oncoming edge.
   double x0 {copysign(0.5 * pitch_[0], u.x)};
   double y0 {copysign(0.5 * pitch_[1], u.y)};
+  double z0;
 
-  // Left and right sides
-  double d {INFTY};
-  array<int, 3> lattice_trans;
-  if ((std::abs(x - x0) > FP_PRECISION) && u.x != 0) {
-    d = (x0 - x) / u.x;
-    if (u.x > 0) {
-      lattice_trans = {1, 0, 0};
-    } else {
-      lattice_trans = {-1, 0, 0};
-    }
-  }
-
-  // Front and back sides
-  if ((std::abs(y - y0) > FP_PRECISION) && u.y != 0) {
-    double this_d = (y0 - y) / u.y;
-    if (this_d < d) {
-      d = this_d;
-      if (u.y > 0) {
-        lattice_trans = {0, 1, 0};
-      } else {
-        lattice_trans = {0, -1, 0};
-      }
-    }
-  }
-
-  // Top and bottom sides
+  double d = std::min(
+    u.x != 0.0 ? (x0 - x) / u.x : INFTY, u.y != 0.0 ? (y0 - y) / u.y : INFTY);
   if (is_3d_) {
-    double z0 {copysign(0.5 * pitch_[2], u.z)};
-    if ((std::abs(z - z0) > FP_PRECISION) && u.z != 0) {
-      double this_d = (z0 - z) / u.z;
-      if (this_d < d) {
-        d = this_d;
-        if (u.z > 0) {
-          lattice_trans = {0, 0, 1};
-        } else {
-          lattice_trans = {0, 0, -1};
-        }
-      }
-    }
+    z0 = copysign(0.5 * pitch_[2], u.z);
+    d = std::min(d, u.z != 0.0 ? (z0 - z) / u.z : INFTY);
+  }
+
+  // Determine which lattice boundaries are being crossed
+  array<int, 3> lattice_trans = {0, 0, 0};
+  if (u.x != 0.0 && std::abs(x + u.x * d - x0) < FP_PRECISION)
+    lattice_trans[0] = copysign(1, u.x);
+  if (u.y != 0.0 && std::abs(y + u.y * d - y0) < FP_PRECISION)
+    lattice_trans[1] = copysign(1, u.y);
+  if (is_3d_) {
+    if (u.z != 0.0 && std::abs(z + u.z * d - z0) < FP_PRECISION)
+      lattice_trans[2] = copysign(1, u.z);
   }
 
   return {d, lattice_trans};
diff --git a/tests/regression_tests/lattice_corner_crossing/__init__.py b/tests/regression_tests/lattice_corner_crossing/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/regression_tests/lattice_corner_crossing/inputs_true.dat b/tests/regression_tests/lattice_corner_crossing/inputs_true.dat
new file mode 100644
index 000000000..4b49b1403
--- /dev/null
+++ b/tests/regression_tests/lattice_corner_crossing/inputs_true.dat
@@ -0,0 +1,58 @@
+<?xml version='1.0' encoding='utf-8'?>
+<model>
+  <materials>
+    <material id="1">
+      <density value="0.001" units="g/cm3"/>
+      <nuclide name="N14" ao="1.0"/>
+    </material>
+    <material id="2">
+      <density value="7.0" units="g/cm3"/>
+      <nuclide name="Fe56" ao="1.0"/>
+    </material>
+  </materials>
+  <geometry>
+    <cell id="1" material="2" universe="1"/>
+    <cell id="2" material="1" universe="2"/>
+    <cell id="3" material="1" region="-5 (-1 | 2 | -3 | 4)" universe="4"/>
+    <cell id="4" fill="3" region="1 -2 3 -4" universe="4"/>
+    <lattice id="3">
+      <pitch>10.0 10.0</pitch>
+      <dimension>2 2</dimension>
+      <lower_left>-10.0 -10.0</lower_left>
+      <universes>
+1 2 
+2 1 </universes>
+    </lattice>
+    <surface id="1" name="minimum x" type="x-plane" coeffs="-10.0"/>
+    <surface id="2" name="maximum x" type="x-plane" coeffs="10.0"/>
+    <surface id="3" name="minimum y" type="y-plane" coeffs="-10.0"/>
+    <surface id="4" name="maximum y" type="y-plane" coeffs="10.0"/>
+    <surface id="5" type="z-cylinder" boundary="vacuum" coeffs="0.0 0.0 20.0"/>
+  </geometry>
+  <settings>
+    <run_mode>fixed source</run_mode>
+    <particles>1000</particles>
+    <batches>10</batches>
+    <source type="independent" strength="1.0" particle="neutron">
+      <space type="point">
+        <parameters>-0.7071067811865476 -0.7071067811865475 0.0</parameters>
+      </space>
+      <angle type="monodirectional" reference_uvw="0.7071067811865476 0.7071067811865475 0.0"/>
+    </source>
+  </settings>
+  <tallies>
+    <mesh id="1">
+      <dimension>10 10</dimension>
+      <lower_left>-20.0 -20.0</lower_left>
+      <upper_right>20.0 20.0</upper_right>
+    </mesh>
+    <filter id="1" type="mesh">
+      <bins>1</bins>
+    </filter>
+    <tally id="1">
+      <filters>1</filters>
+      <scores>flux</scores>
+      <estimator>tracklength</estimator>
+    </tally>
+  </tallies>
+</model>
diff --git a/tests/regression_tests/lattice_corner_crossing/results_true.dat b/tests/regression_tests/lattice_corner_crossing/results_true.dat
new file mode 100644
index 000000000..bd81cf535
--- /dev/null
+++ b/tests/regression_tests/lattice_corner_crossing/results_true.dat
@@ -0,0 +1,201 @@
+tally 1:
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+2.648775E-03
+7.016009E-06
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+2.981847E-03
+8.891414E-06
+3.331677E-03
+1.110007E-05
+6.742237E-03
+4.545776E-05
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+4.388206E-03
+1.925636E-05
+2.032104E-03
+4.129446E-06
+3.014946E-03
+9.089898E-06
+7.058968E-03
+4.982903E-05
+9.013188E-04
+8.123755E-07
+7.501461E-04
+5.627191E-07
+0.000000E+00
+0.000000E+00
+5.134898E-03
+2.636718E-05
+1.207302E-03
+1.457579E-06
+3.045925E-03
+9.277657E-06
+4.132399E-03
+1.707672E-05
+1.055271E-02
+5.829711E-05
+4.014909E-03
+1.611949E-05
+2.698215E-03
+7.280363E-06
+1.751215E-02
+1.073504E-04
+1.356908E-02
+9.589157E-05
+5.451466E-03
+2.971848E-05
+3.165676E-04
+1.002151E-07
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+3.724938E-03
+1.387516E-05
+2.812863E-03
+7.278837E-06
+1.000700E+01
+1.001402E+01
+2.345904E-02
+2.127641E-04
+2.451653E-02
+1.750725E-04
+8.695904E-03
+5.553981E-05
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+4.947565E-03
+2.447840E-05
+1.725721E-02
+8.878803E-05
+5.656444E+01
+3.199538E+02
+2.159961E-02
+1.034364E-04
+3.091063E-02
+5.543317E-04
+4.232209E-03
+1.791159E-05
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+4.716170E-03
+2.224226E-05
+1.321855E-02
+5.288265E-05
+5.309576E-02
+7.984865E-04
+5.656179E+01
+3.199238E+02
+2.399311E-02
+2.936670E-04
+4.680753E-02
+9.526509E-04
+1.074699E-02
+1.154978E-04
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+4.526425E-03
+2.048853E-05
+3.983003E-03
+9.553596E-06
+1.726789E-02
+9.579848E-05
+3.355605E-02
+3.331438E-04
+3.578422E-02
+3.560242E-04
+5.649209E+01
+3.191358E+02
+2.591495E-02
+4.169753E-04
+9.484744E-03
+8.065715E-05
+0.000000E+00
+0.000000E+00
+4.232587E-03
+9.113263E-06
+5.787378E-03
+2.194940E-05
+6.193626E-03
+2.357423E-05
+4.552787E-03
+6.987360E-06
+9.641308E-03
+3.506339E-05
+1.303892E-02
+4.378408E-05
+1.831744E-02
+8.836683E-05
+3.024725E+01
+9.148969E+01
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
+1.488204E-03
+2.214752E-06
+5.067487E-03
+1.520987E-05
+7.550927E-03
+2.993991E-05
+3.215559E-03
+1.033982E-05
+4.258525E-03
+1.205064E-05
+2.115487E-03
+4.475286E-06
+0.000000E+00
+0.000000E+00
+0.000000E+00
+0.000000E+00
diff --git a/tests/regression_tests/lattice_corner_crossing/test.py b/tests/regression_tests/lattice_corner_crossing/test.py
new file mode 100644
index 000000000..4684d144e
--- /dev/null
+++ b/tests/regression_tests/lattice_corner_crossing/test.py
@@ -0,0 +1,83 @@
+"""
+This test is designed to ensure that we account for potential corner crossings
+in floating point precision.
+
+"""
+
+from math import pi, cos, sin
+
+import openmc
+import pytest
+
+from tests.testing_harness import PyAPITestHarness
+
+
+@pytest.fixture
+def model():
+    model = openmc.Model()
+
+    # Length of lattice on each side
+    lat_size = 20.0
+
+    # Angle that we're crossing the corner at
+    phi = pi/4.0
+
+    air = openmc.Material()
+    air.set_density('g/cm3', 0.001)
+    air.add_nuclide('N14', 1.0)
+    metal = openmc.Material()
+    metal.set_density('g/cm3', 7.0)
+    metal.add_nuclide('Fe56', 1.0)
+
+    metal_cell = openmc.Cell(fill=metal)
+    metal_uni = openmc.Universe(cells=[metal_cell])
+
+    air_cell = openmc.Cell(fill=air)
+    air_uni = openmc.Universe(cells=[air_cell])
+
+    # Define a checkerboard lattice
+    lattice = openmc.RectLattice()
+    lattice.lower_left = (-lat_size/2.0, -lat_size/2.0)
+    lattice.pitch = (lat_size/2, lat_size/2)
+    lattice.universes = [
+        [metal_uni, air_uni],
+        [air_uni, metal_uni]
+    ]
+
+    box = openmc.model.RectangularPrism(lat_size, lat_size)
+    cyl = openmc.ZCylinder(r=lat_size, boundary_type='vacuum')
+    outside_lattice = openmc.Cell(region=-cyl & +box, fill=air)
+    inside_lattice = openmc.Cell(region=-box, fill=lattice)
+
+    model.geometry = openmc.Geometry([outside_lattice, inside_lattice])
+
+    # Set all runtime parameters
+    model.settings.run_mode = 'fixed source'
+    model.settings.batches = 10
+    model.settings.particles = 1000
+
+    # Define a source located outside the lattice and pointing straight into its
+    # corner at 45 degrees
+    model.settings.source = openmc.IndependentSource(
+        space=openmc.stats.Point((-cos(phi), -sin(phi), 0.0)),
+        angle=openmc.stats.Monodirectional((cos(phi), sin(phi), 0.0))
+    )
+
+    # Create a mesh tally
+    mesh = openmc.RegularMesh()
+    mesh.dimension = (10, 10)
+    mesh.lower_left = (-lat_size, -lat_size)
+    mesh.upper_right = (lat_size, lat_size)
+    mesh_filter = openmc.MeshFilter(mesh)
+    tally = openmc.Tally(tally_id=1)
+    tally.filters = [mesh_filter]
+    tally.scores = ['flux']
+    tally.estimator = 'tracklength'
+    model.tallies = [tally]
+
+    return model
+
+
+def test_lattice_corner_crossing(model):
+    harness = PyAPITestHarness('statepoint.10.h5', model)
+    harness.main()

From c7d7fa4613146e97e22a5b616b4b70ca7640629d Mon Sep 17 00:00:00 2001
From: GuySten <62616591+GuySten@users.noreply.github.com>
Date: Tue, 6 Jan 2026 15:29:40 +0200
Subject: [PATCH 195/203] Fix a bug in rotational periodic boundary conditions
 (#3692)

Co-authored-by: Paul Romano <paul.k.romano@gmail.com>
---
 include/openmc/boundary_condition.h           |  2 +
 include/openmc/surface.h                      | 35 ++++++++-
 src/boundary_condition.cpp                    | 73 +++++++------------
 src/geometry_aux.cpp                          |  7 +-
 src/particle.cpp                              |  4 +-
 src/surface.cpp                               | 39 ++++++++--
 .../{ => False-False}/inputs_true.dat         |  0
 .../{ => False-False}/results_true.dat        |  0
 .../periodic_6fold/False-True/inputs_true.dat | 34 +++++++++
 .../False-True/results_true.dat               |  2 +
 .../periodic_6fold/True-False/inputs_true.dat | 34 +++++++++
 .../True-False/results_true.dat               |  2 +
 .../periodic_6fold/True-True/inputs_true.dat  | 34 +++++++++
 .../periodic_6fold/True-True/results_true.dat |  2 +
 tests/regression_tests/periodic_6fold/test.py | 55 ++++++++++----
 tests/unit_tests/test_periodic_bc.py          | 47 ++++++++++++
 16 files changed, 297 insertions(+), 73 deletions(-)
 rename tests/regression_tests/periodic_6fold/{ => False-False}/inputs_true.dat (100%)
 rename tests/regression_tests/periodic_6fold/{ => False-False}/results_true.dat (100%)
 create mode 100644 tests/regression_tests/periodic_6fold/False-True/inputs_true.dat
 create mode 100644 tests/regression_tests/periodic_6fold/False-True/results_true.dat
 create mode 100644 tests/regression_tests/periodic_6fold/True-False/inputs_true.dat
 create mode 100644 tests/regression_tests/periodic_6fold/True-False/results_true.dat
 create mode 100644 tests/regression_tests/periodic_6fold/True-True/inputs_true.dat
 create mode 100644 tests/regression_tests/periodic_6fold/True-True/results_true.dat
 create mode 100644 tests/unit_tests/test_periodic_bc.py

diff --git a/include/openmc/boundary_condition.h b/include/openmc/boundary_condition.h
index 5a14239e8..89bf7ca8b 100644
--- a/include/openmc/boundary_condition.h
+++ b/include/openmc/boundary_condition.h
@@ -152,6 +152,8 @@ public:
 protected:
   //! Angle about the axis by which particle coordinates will be rotated
   double angle_;
+  //! Do we need to flip surfaces senses when applying the transformation?
+  bool flip_sense_;
   //! Ensure that choice of axes is right handed. axis_1_idx_ corresponds to the
   //! independent axis and axis_2_idx_ corresponds to the dependent axis in the
   //! 2D plane  perpendicular to the planes' axis of rotation
diff --git a/include/openmc/surface.h b/include/openmc/surface.h
index 549e8f6ab..2d8580345 100644
--- a/include/openmc/surface.h
+++ b/include/openmc/surface.h
@@ -2,6 +2,7 @@
 #define OPENMC_SURFACE_H
 
 #include <limits> // For numeric_limits
+#include <set>
 #include <string>
 #include <unordered_map>
 
@@ -378,7 +379,39 @@ public:
 // Non-member functions
 //==============================================================================
 
-void read_surfaces(pugi::xml_node node);
+//! Read surface definitions from XML and populate the global surfaces vector.
+//!
+//! This function parses surface elements from the XML input, creates the
+//! appropriate surface objects, and identifies periodic surfaces along with
+//! their albedo values and sense information.
+//!
+//! \param node XML node containing surface definitions
+//! \param[out] periodic_pairs Set of surface ID pairs representing periodic
+//!   boundary conditions
+//! \param[out] albedo_map Map of surface IDs to albedo values for periodic
+//!   surfaces
+//! \param[out] periodic_sense_map Map of surface IDs to their sense values
+//!   (used to determine orientation for periodic BCs)
+void read_surfaces(pugi::xml_node node,
+  std::set<std::pair<int, int>>& periodic_pairs,
+  std::unordered_map<int, double>& albedo_map,
+  std::unordered_map<int, int>& periodic_sense_map);
+
+//! Resolve periodic surface pairs and assign boundary conditions.
+//!
+//! This function completes the setup of periodic boundary conditions by
+//! resolving unpaired periodic surfaces, determining whether each pair
+//! represents translational or rotational periodicity based on surface
+//! normals, and assigning the appropriate boundary condition objects.
+//!
+//! \param[inout] periodic_pairs Set of surface ID pairs representing periodic
+//!   boundary conditions; unpaired entries are resolved
+//! \param albedo_map Map of surface IDs to albedo values for periodic surfaces
+//! \param periodic_sense_map Map of surface IDs to their sense values (used to
+//!   determine orientation for periodic BCs)
+void prepare_boundary_conditions(std::set<std::pair<int, int>>& periodic_pairs,
+  std::unordered_map<int, double>& albedo_map,
+  std::unordered_map<int, int>& periodic_sense_map);
 
 void free_memory_surfaces();
 
diff --git a/src/boundary_condition.cpp b/src/boundary_condition.cpp
index 2840b3c7d..eb095d8c5 100644
--- a/src/boundary_condition.cpp
+++ b/src/boundary_condition.cpp
@@ -160,7 +160,7 @@ void TranslationalPeriodicBC::handle_particle(
 
 RotationalPeriodicBC::RotationalPeriodicBC(
   int i_surf, int j_surf, PeriodicAxis axis)
-  : PeriodicBC(i_surf, j_surf)
+  : PeriodicBC(std::abs(i_surf) - 1, std::abs(j_surf) - 1)
 {
   Surface& surf1 {*model::surfaces[i_surf_]};
   Surface& surf2 {*model::surfaces[j_surf_]};
@@ -173,14 +173,9 @@ RotationalPeriodicBC::RotationalPeriodicBC(
     axis_2_idx_ = 2;    // z component dependent
     break;
   case y:
-    // for a right handed coordinate system, z should be the independent axis
-    // but this would cause the y-rotation case to be different than the other
-    // two. using a left handed coordinate system and a negative rotation the
-    // compute angle and rotation matrix behavior mimics that of the x and z
-    // cases
     zero_axis_idx_ = 1; // y component of plane must be zero
-    axis_1_idx_ = 0;    // x component independent
-    axis_2_idx_ = 2;    // z component dependent
+    axis_1_idx_ = 2;    // z component independent
+    axis_2_idx_ = 0;    // x component dependent
     break;
   case z:
     zero_axis_idx_ = 2; // z component of plane must be zero
@@ -192,10 +187,16 @@ RotationalPeriodicBC::RotationalPeriodicBC(
       fmt::format("You've specified an axis that is not x, y, or z."));
   }
 
+  Direction ax = {0.0, 0.0, 0.0};
+  ax[zero_axis_idx_] = 1.0;
+
+  auto i_sign = std::copysign(1, i_surf);
+  auto j_sign = -std::copysign(1, j_surf);
+
   // Compute the surface normal vectors and make sure they are perpendicular
   // to the correct axis
-  Direction norm1 = surf1.normal({0, 0, 0});
-  Direction norm2 = surf2.normal({0, 0, 0});
+  Direction norm1 = i_sign * surf1.normal({0, 0, 0});
+  Direction norm2 = j_sign * surf2.normal({0, 0, 0});
   // Make sure both surfaces intersect the origin
   if (std::abs(surf1.evaluate({0, 0, 0})) > FP_COINCIDENT) {
     throw std::invalid_argument(fmt::format(
@@ -212,8 +213,15 @@ RotationalPeriodicBC::RotationalPeriodicBC(
       surf2.id_));
   }
 
-  angle_ = compute_periodic_rotation(norm1[axis_2_idx_], norm1[axis_1_idx_],
-    norm2[axis_2_idx_], norm2[axis_1_idx_]);
+  // Compute the signed rotation angle about the periodic axis. Note that
+  // (n1×n2)·a = |n1||n2|sin(θ) and n1·n2 = |n1||n2|cos(θ), where a is the axis
+  // of rotation.
+  auto c = norm1.cross(norm2);
+  angle_ = std::atan2(c.dot(ax), norm1.dot(norm2));
+
+  // If the normals point in the same general direction, the surface sense
+  // should change when crossing the boundary
+  flip_sense_ = (i_sign * j_sign > 0.0);
 
   // Warn the user if the angle does not evenly divide a circle
   double rem = std::abs(std::remainder((2 * PI / angle_), 1.0));
@@ -225,47 +233,18 @@ RotationalPeriodicBC::RotationalPeriodicBC(
   }
 }
 
-double RotationalPeriodicBC::compute_periodic_rotation(
-  double rise_1, double run_1, double rise_2, double run_2) const
-{
-  // Compute the BC rotation angle.  Here it is assumed that both surface
-  // normal vectors point inwards---towards the valid geometry region.
-  // Consequently, the rotation angle is not the difference between the two
-  // normals, but is instead the difference between one normal and one
-  // anti-normal.  (An incident ray on one surface must be an outgoing ray on
-  // the other surface after rotation hence the anti-normal.)
-  double theta1 = std::atan2(rise_1, run_1);
-  double theta2 = std::atan2(rise_2, run_2) + PI;
-  return theta2 - theta1;
-}
-
 void RotationalPeriodicBC::handle_particle(
   Particle& p, const Surface& surf) const
 {
-  int i_particle_surf = p.surface_index();
+  int new_surface = p.surface() > 0 ? -(j_surf_ + 1) : j_surf_ + 1;
+  if (flip_sense_)
+    new_surface = -new_surface;
 
-  // Figure out which of the two BC surfaces were struck to figure out if a
-  // forward or backward rotation is required.  Specify the other surface as
-  // the particle's new surface.
-  double theta;
-  int new_surface;
-  if (i_particle_surf == i_surf_) {
-    theta = angle_;
-    new_surface = p.surface() > 0 ? -(j_surf_ + 1) : j_surf_ + 1;
-  } else if (i_particle_surf == j_surf_) {
-    theta = -angle_;
-    new_surface = p.surface() > 0 ? -(i_surf_ + 1) : i_surf_ + 1;
-  } else {
-    throw std::runtime_error(
-      "Called BoundaryCondition::handle_particle after "
-      "hitting a surface, but that surface is not recognized by the BC.");
-  }
-
-  // Rotate the particle's position and direction about the z-axis.
+  // Rotate the particle's position and direction.
   Position r = p.r();
   Direction u = p.u();
-  double cos_theta = std::cos(theta);
-  double sin_theta = std::sin(theta);
+  double cos_theta = std::cos(angle_);
+  double sin_theta = std::sin(angle_);
 
   Position new_r;
   new_r[zero_axis_idx_] = r[zero_axis_idx_];
diff --git a/src/geometry_aux.cpp b/src/geometry_aux.cpp
index 8a145fb1f..a740740c1 100644
--- a/src/geometry_aux.cpp
+++ b/src/geometry_aux.cpp
@@ -55,8 +55,13 @@ void read_geometry_xml()
 void read_geometry_xml(pugi::xml_node root)
 {
   // Read surfaces, cells, lattice
-  read_surfaces(root);
+  std::set<std::pair<int, int>> periodic_pairs;
+  std::unordered_map<int, double> albedo_map;
+  std::unordered_map<int, int> periodic_sense_map;
+
+  read_surfaces(root, periodic_pairs, albedo_map, periodic_sense_map);
   read_cells(root);
+  prepare_boundary_conditions(periodic_pairs, albedo_map, periodic_sense_map);
   read_lattices(root);
 
   // Check to make sure a boundary condition was applied to at least one
diff --git a/src/particle.cpp b/src/particle.cpp
index 2d70d715e..b9f9c8f86 100644
--- a/src/particle.cpp
+++ b/src/particle.cpp
@@ -744,9 +744,7 @@ void Particle::cross_periodic_bc(
   if (!neighbor_list_find_cell(*this)) {
     mark_as_lost("Couldn't find particle after hitting periodic "
                  "boundary on surface " +
-                 std::to_string(surf.id_) +
-                 ". The normal vector "
-                 "of one periodic surface may need to be reversed.");
+                 std::to_string(surf.id_) + ".");
     return;
   }
 
diff --git a/src/surface.cpp b/src/surface.cpp
index bc9c7f4a9..9ac1c41b4 100644
--- a/src/surface.cpp
+++ b/src/surface.cpp
@@ -9,6 +9,7 @@
 #include <fmt/core.h>
 
 #include "openmc/array.h"
+#include "openmc/cell.h"
 #include "openmc/container_util.h"
 #include "openmc/error.h"
 #include "openmc/external/quartic_solver.h"
@@ -1169,7 +1170,10 @@ Direction SurfaceZTorus::normal(Position r) const
 
 //==============================================================================
 
-void read_surfaces(pugi::xml_node node)
+void read_surfaces(pugi::xml_node node,
+  std::set<std::pair<int, int>>& periodic_pairs,
+  std::unordered_map<int, double>& albedo_map,
+  std::unordered_map<int, int>& periodic_sense_map)
 {
   // Count the number of surfaces
   int n_surfaces = 0;
@@ -1180,8 +1184,6 @@ void read_surfaces(pugi::xml_node node)
   // Loop over XML surface elements and populate the array.  Keep track of
   // periodic surfaces and their albedos.
   model::surfaces.reserve(n_surfaces);
-  std::set<std::pair<int, int>> periodic_pairs;
-  std::unordered_map<int, double> albedo_map;
   {
     pugi::xml_node surf_node;
     int i_surf;
@@ -1244,6 +1246,7 @@ void read_surfaces(pugi::xml_node node)
       if (check_for_node(surf_node, "boundary")) {
         std::string surf_bc = get_node_value(surf_node, "boundary", true, true);
         if (surf_bc == "periodic") {
+          periodic_sense_map[model::surfaces.back()->id_] = 0;
           // Check for surface albedo. Skip sanity check as it is already done
           // in the Surface class's constructor.
           if (check_for_node(surf_node, "albedo")) {
@@ -1275,6 +1278,28 @@ void read_surfaces(pugi::xml_node node)
         fmt::format("Two or more surfaces use the same unique ID: {}", id));
     }
   }
+}
+
+void prepare_boundary_conditions(std::set<std::pair<int, int>>& periodic_pairs,
+  std::unordered_map<int, double>& albedo_map,
+  std::unordered_map<int, int>& periodic_sense_map)
+{
+  // Fill the senses map for periodic surfaces
+  auto n_periodic = periodic_sense_map.size();
+  for (const auto& cell : model::cells) {
+    if (n_periodic == 0)
+      break; // Early exit once all periodic surfaces found
+
+    for (auto s : cell->surfaces()) {
+      auto surf_idx = std::abs(s) - 1;
+      auto id = model::surfaces[surf_idx]->id_;
+
+      if (periodic_sense_map.count(id)) {
+        periodic_sense_map[id] = std::copysign(1, s);
+        --n_periodic;
+      }
+    }
+  }
 
   // Resolve unpaired periodic surfaces.  A lambda function is used with
   // std::find_if to identify the unpaired surfaces.
@@ -1370,8 +1395,12 @@ void read_surfaces(pugi::xml_node node)
           "indicates that the two planes are not periodic about the X, Y, or Z "
           "axis, which is not supported."));
       }
-      surf1.bc_ = make_unique<RotationalPeriodicBC>(i_surf, j_surf, axis);
-      surf2.bc_ = make_unique<RotationalPeriodicBC>(i_surf, j_surf, axis);
+      auto i_sign = periodic_sense_map[periodic_pair.first];
+      auto j_sign = periodic_sense_map[periodic_pair.second];
+      surf1.bc_ = make_unique<RotationalPeriodicBC>(
+        i_sign * (i_surf + 1), j_sign * (j_surf + 1), axis);
+      surf2.bc_ = make_unique<RotationalPeriodicBC>(
+        j_sign * (j_surf + 1), i_sign * (i_surf + 1), axis);
     }
 
     // If albedo data is present in albedo map, set the boundary albedo.
diff --git a/tests/regression_tests/periodic_6fold/inputs_true.dat b/tests/regression_tests/periodic_6fold/False-False/inputs_true.dat
similarity index 100%
rename from tests/regression_tests/periodic_6fold/inputs_true.dat
rename to tests/regression_tests/periodic_6fold/False-False/inputs_true.dat
diff --git a/tests/regression_tests/periodic_6fold/results_true.dat b/tests/regression_tests/periodic_6fold/False-False/results_true.dat
similarity index 100%
rename from tests/regression_tests/periodic_6fold/results_true.dat
rename to tests/regression_tests/periodic_6fold/False-False/results_true.dat
diff --git a/tests/regression_tests/periodic_6fold/False-True/inputs_true.dat b/tests/regression_tests/periodic_6fold/False-True/inputs_true.dat
new file mode 100644
index 000000000..cbc1e9100
--- /dev/null
+++ b/tests/regression_tests/periodic_6fold/False-True/inputs_true.dat
@@ -0,0 +1,34 @@
+<?xml version='1.0' encoding='utf-8'?>
+<model>
+  <materials>
+    <material id="5">
+      <density value="1.0" units="g/cc"/>
+      <nuclide name="H1" ao="2.0"/>
+      <nuclide name="O16" ao="1.0"/>
+      <sab name="c_H_in_H2O"/>
+    </material>
+    <material id="6" depletable="true">
+      <density value="4.5" units="g/cc"/>
+      <nuclide name="U235" ao="1.0"/>
+    </material>
+  </materials>
+  <geometry>
+    <cell id="1" material="5" region="9 -10 -11 12" universe="0"/>
+    <cell id="2" material="6" region="9 -10 -12" universe="0"/>
+    <surface id="9" type="plane" boundary="periodic" coeffs="0.4999999999999999 0.8660254037844387 0.0 0.0"/>
+    <surface id="10" type="plane" boundary="periodic" coeffs="-0.4999999999999999 0.8660254037844387 0.0 0.0"/>
+    <surface id="11" type="x-plane" boundary="reflective" coeffs="5.0"/>
+    <surface id="12" type="z-cylinder" coeffs="2.598076211353316 1.4999999999999998 2.0"/>
+  </geometry>
+  <settings>
+    <run_mode>eigenvalue</run_mode>
+    <particles>1000</particles>
+    <batches>4</batches>
+    <inactive>0</inactive>
+    <source type="independent" strength="1.0" particle="neutron">
+      <space type="box">
+        <parameters>0 0 0 5 5 0</parameters>
+      </space>
+    </source>
+  </settings>
+  </model>
diff --git a/tests/regression_tests/periodic_6fold/False-True/results_true.dat b/tests/regression_tests/periodic_6fold/False-True/results_true.dat
new file mode 100644
index 000000000..04aa30878
--- /dev/null
+++ b/tests/regression_tests/periodic_6fold/False-True/results_true.dat
@@ -0,0 +1,2 @@
+k-combined:
+1.848492E+00 2.933785E-03
diff --git a/tests/regression_tests/periodic_6fold/True-False/inputs_true.dat b/tests/regression_tests/periodic_6fold/True-False/inputs_true.dat
new file mode 100644
index 000000000..675a8b300
--- /dev/null
+++ b/tests/regression_tests/periodic_6fold/True-False/inputs_true.dat
@@ -0,0 +1,34 @@
+<?xml version='1.0' encoding='utf-8'?>
+<model>
+  <materials>
+    <material id="3">
+      <density value="1.0" units="g/cc"/>
+      <nuclide name="H1" ao="2.0"/>
+      <nuclide name="O16" ao="1.0"/>
+      <sab name="c_H_in_H2O"/>
+    </material>
+    <material id="4" depletable="true">
+      <density value="4.5" units="g/cc"/>
+      <nuclide name="U235" ao="1.0"/>
+    </material>
+  </materials>
+  <geometry>
+    <cell id="1" material="3" region="-5 6 -7 8" universe="0"/>
+    <cell id="2" material="4" region="-5 6 -8" universe="0"/>
+    <surface id="5" type="plane" boundary="periodic" coeffs="-0.4999999999999999 -0.8660254037844387 0.0 0.0"/>
+    <surface id="6" type="plane" boundary="periodic" coeffs="0.4999999999999999 -0.8660254037844387 0.0 0.0"/>
+    <surface id="7" type="x-plane" boundary="reflective" coeffs="5.0"/>
+    <surface id="8" type="z-cylinder" coeffs="2.598076211353316 1.4999999999999998 2.0"/>
+  </geometry>
+  <settings>
+    <run_mode>eigenvalue</run_mode>
+    <particles>1000</particles>
+    <batches>4</batches>
+    <inactive>0</inactive>
+    <source type="independent" strength="1.0" particle="neutron">
+      <space type="box">
+        <parameters>0 0 0 5 5 0</parameters>
+      </space>
+    </source>
+  </settings>
+  </model>
diff --git a/tests/regression_tests/periodic_6fold/True-False/results_true.dat b/tests/regression_tests/periodic_6fold/True-False/results_true.dat
new file mode 100644
index 000000000..04aa30878
--- /dev/null
+++ b/tests/regression_tests/periodic_6fold/True-False/results_true.dat
@@ -0,0 +1,2 @@
+k-combined:
+1.848492E+00 2.933785E-03
diff --git a/tests/regression_tests/periodic_6fold/True-True/inputs_true.dat b/tests/regression_tests/periodic_6fold/True-True/inputs_true.dat
new file mode 100644
index 000000000..e5ac03b48
--- /dev/null
+++ b/tests/regression_tests/periodic_6fold/True-True/inputs_true.dat
@@ -0,0 +1,34 @@
+<?xml version='1.0' encoding='utf-8'?>
+<model>
+  <materials>
+    <material id="7">
+      <density value="1.0" units="g/cc"/>
+      <nuclide name="H1" ao="2.0"/>
+      <nuclide name="O16" ao="1.0"/>
+      <sab name="c_H_in_H2O"/>
+    </material>
+    <material id="8" depletable="true">
+      <density value="4.5" units="g/cc"/>
+      <nuclide name="U235" ao="1.0"/>
+    </material>
+  </materials>
+  <geometry>
+    <cell id="1" material="7" region="-13 -14 -15 16" universe="0"/>
+    <cell id="2" material="8" region="-13 -14 -16" universe="0"/>
+    <surface id="13" type="plane" boundary="periodic" coeffs="-0.4999999999999999 -0.8660254037844387 0.0 0.0"/>
+    <surface id="14" type="plane" boundary="periodic" coeffs="-0.4999999999999999 0.8660254037844387 0.0 0.0"/>
+    <surface id="15" type="x-plane" boundary="reflective" coeffs="5.0"/>
+    <surface id="16" type="z-cylinder" coeffs="2.598076211353316 1.4999999999999998 2.0"/>
+  </geometry>
+  <settings>
+    <run_mode>eigenvalue</run_mode>
+    <particles>1000</particles>
+    <batches>4</batches>
+    <inactive>0</inactive>
+    <source type="independent" strength="1.0" particle="neutron">
+      <space type="box">
+        <parameters>0 0 0 5 5 0</parameters>
+      </space>
+    </source>
+  </settings>
+  </model>
diff --git a/tests/regression_tests/periodic_6fold/True-True/results_true.dat b/tests/regression_tests/periodic_6fold/True-True/results_true.dat
new file mode 100644
index 000000000..04aa30878
--- /dev/null
+++ b/tests/regression_tests/periodic_6fold/True-True/results_true.dat
@@ -0,0 +1,2 @@
+k-combined:
+1.848492E+00 2.933785E-03
diff --git a/tests/regression_tests/periodic_6fold/test.py b/tests/regression_tests/periodic_6fold/test.py
index 272c65df5..bded1c465 100644
--- a/tests/regression_tests/periodic_6fold/test.py
+++ b/tests/regression_tests/periodic_6fold/test.py
@@ -1,14 +1,16 @@
 from math import sin, cos, pi
 
 import openmc
+from openmc.utility_funcs import change_directory
 import pytest
 
 from tests.testing_harness import PyAPITestHarness
 
 
-@pytest.fixture
-def model():
-    model = openmc.model.Model()
+@pytest.mark.parametrize("flip1", [False, True])
+@pytest.mark.parametrize("flip2", [False, True])
+def test_periodic(flip1, flip2):
+    model = openmc.Model()
 
     # Define materials
     water = openmc.Material()
@@ -27,31 +29,52 @@ def model():
     # answers.
     theta1 = (-1/6 + 1/2) * pi
     theta2 = (1/6 - 1/2) * pi
-    plane1 = openmc.Plane(a=cos(theta1), b=sin(theta1), boundary_type='periodic')
-    plane2 = openmc.Plane(a=cos(theta2), b=sin(theta2), boundary_type='periodic')
+    if flip1:
+        plane1 = openmc.Plane(a=-cos(theta1), b=-sin(theta1), boundary_type='periodic')
+    else:
+        plane1 = openmc.Plane(a=cos(theta1), b=sin(theta1), boundary_type='periodic')
+    if flip2:
+        plane2 = openmc.Plane(a=-cos(theta2), b=-sin(theta2), boundary_type='periodic')
+    else:
+        plane2 = openmc.Plane(a=cos(theta2), b=sin(theta2), boundary_type='periodic')
 
     x_max = openmc.XPlane(5., boundary_type='reflective')
 
     z_cyl = openmc.ZCylinder(x0=3*cos(pi/6), y0=3*sin(pi/6), r=2.0)
 
-    outside_cyl = openmc.Cell(1, fill=water, region=(
-        +plane1 & +plane2 & -x_max & +z_cyl))
-    inside_cyl = openmc.Cell(2, fill=fuel, region=(
-        +plane1 & +plane2 & -z_cyl))
+    match (flip1, flip2):
+        case (False, False):
+            outside_cyl = openmc.Cell(1, fill=water, region=(
+                          +plane1 & +plane2 & -x_max & +z_cyl))
+            inside_cyl = openmc.Cell(2, fill=fuel, region=(
+                          +plane1 & +plane2 & -z_cyl))
+        case (False, True):
+            outside_cyl = openmc.Cell(1, fill=water, region=(
+                          +plane1 & -plane2 & -x_max & +z_cyl))
+            inside_cyl = openmc.Cell(2, fill=fuel, region=(
+                          +plane1 & -plane2 & -z_cyl))
+        case (True, False):
+            outside_cyl = openmc.Cell(1, fill=water, region=(
+                          -plane1 & +plane2 & -x_max & +z_cyl))
+            inside_cyl = openmc.Cell(2, fill=fuel, region=(
+                          -plane1 & +plane2 & -z_cyl))
+        case (True, True):
+            outside_cyl = openmc.Cell(1, fill=water, region=(
+                          -plane1 & -plane2 & -x_max & +z_cyl))
+            inside_cyl = openmc.Cell(2, fill=fuel, region=(
+                          -plane1 & -plane2 & -z_cyl))
     root_universe = openmc.Universe(0, cells=(outside_cyl, inside_cyl))
     model.geometry = openmc.Geometry(root_universe)
 
     # Define settings
-    model.settings = openmc.Settings()
     model.settings.particles = 1000
     model.settings.batches = 4
     model.settings.inactive = 0
-    model.settings.source = openmc.IndependentSource(space=openmc.stats.Box(
-        (0, 0, 0), (5, 5, 0))
+    model.settings.source = openmc.IndependentSource(
+        space=openmc.stats.Box((0, 0, 0), (5, 5, 0))
     )
-    return model
 
+    with change_directory(f'{flip1}-{flip2}'):
+        harness = PyAPITestHarness('statepoint.4.h5', model)
+        harness.main()
 
-def test_periodic(model):
-    harness = PyAPITestHarness('statepoint.4.h5', model)
-    harness.main()
diff --git a/tests/unit_tests/test_periodic_bc.py b/tests/unit_tests/test_periodic_bc.py
new file mode 100644
index 000000000..4cc126abc
--- /dev/null
+++ b/tests/unit_tests/test_periodic_bc.py
@@ -0,0 +1,47 @@
+from math import cos, sin, radians
+import random
+
+import openmc
+import pytest
+
+
+@pytest.mark.parametrize("angle", [30., 45., 60., 90., 120.])
+def test_rotational_periodic_bc(angle):
+    # Pick random starting angle
+    start = random.uniform(0., 360.)
+    degrees = angle
+    ang1 = radians(start)
+    ang2 = radians(start + degrees)
+
+    # Define three points on each plane and then randomly shuffle them
+    p1_points = [(0., 0., 0.), (cos(ang1), sin(ang1), 0.), (0., 0., 1.)]
+    p2_points = [(0., 0., 0.), (cos(ang2), sin(ang2), 0.), (0., 0., 1.)]
+    random.shuffle(p1_points)
+    random.shuffle(p2_points)
+
+    # Create periodic planes and a cylinder
+    p1 = openmc.Plane.from_points(*p1_points, boundary_type='periodic')
+    p2 = openmc.Plane.from_points(*p2_points, boundary_type='periodic')
+    p1.periodic_surface = p2
+    zcyl = openmc.ZCylinder(r=5., boundary_type='vacuum')
+
+    # Figure out which side of planes to use based on a point in the middle
+    ang_mid = radians(start + degrees/2.)
+    mid_point = (cos(ang_mid), sin(ang_mid), 0.)
+    r1 = -p1 if mid_point in -p1 else +p1
+    r2 = -p2 if mid_point in -p2 else +p2
+
+    # Create one cell bounded by the two planes and the cylinder
+    mat = openmc.Material(density=1.0, density_units='g/cm3', components={'U235': 1.0})
+    cell = openmc.Cell(fill=mat, region=r1 & r2 & -zcyl)
+
+    # Make the model complete
+    model = openmc.Model()
+    model.geometry = openmc.Geometry([cell])
+    model.settings.source = openmc.IndependentSource(space=openmc.stats.Point(mid_point))
+    model.settings.particles = 1000
+    model.settings.batches = 10
+    model.settings.inactive = 5
+
+    # Run the model
+    model.run()

From 10f2b7534c44104324b2baeabc89330fc39bd9fb Mon Sep 17 00:00:00 2001
From: Jonathan Shimwell <mail@jshimwell.com>
Date: Tue, 6 Jan 2026 21:18:23 +0100
Subject: [PATCH 196/203] Fixing group names in MGXS HDF5 file (#3708)

---
 openmc/mgxs/mgxs.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openmc/mgxs/mgxs.py b/openmc/mgxs/mgxs.py
index f621db092..12b8f6a75 100644
--- a/openmc/mgxs/mgxs.py
+++ b/openmc/mgxs/mgxs.py
@@ -1923,7 +1923,7 @@ class MGXS:
 
             # Create an HDF5 group for the subdomain
             if self.domain_type == 'distribcell':
-                group_name = ''.zfill(num_digits)
+                group_name = str(subdomain).zfill(num_digits)
                 subdomain_group = domain_group.require_group(group_name)
             else:
                 subdomain_group = domain_group

From 7dceb1d80a1412cdf9c7a893b48ef16af379ead5 Mon Sep 17 00:00:00 2001
From: Jonathan Shimwell <mail@jshimwell.com>
Date: Tue, 6 Jan 2026 23:59:38 +0100
Subject: [PATCH 197/203] closing mgxs h5py file with context manager (#3707)

Co-authored-by: GuySten <62616591+GuySten@users.noreply.github.com>
---
 openmc/mgxs_library.py | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/openmc/mgxs_library.py b/openmc/mgxs_library.py
index 4bc2d4a5a..414bf7cbd 100644
--- a/openmc/mgxs_library.py
+++ b/openmc/mgxs_library.py
@@ -2554,20 +2554,20 @@ class MGXSLibrary:
                              "must be set")
 
         check_type('filename', filename, (str, PathLike))
-        file = h5py.File(filename, 'r')
+        with h5py.File(filename, 'r') as file:
 
-        # Check filetype and version
-        check_filetype_version(file, _FILETYPE_MGXS_LIBRARY,
-                               _VERSION_MGXS_LIBRARY)
+            # Check filetype and version
+            check_filetype_version(file, _FILETYPE_MGXS_LIBRARY,
+                                   _VERSION_MGXS_LIBRARY)
 
-        group_structure = file.attrs['group structure']
-        num_delayed_groups = file.attrs['delayed_groups']
-        energy_groups = openmc.mgxs.EnergyGroups(group_structure)
-        data = cls(energy_groups, num_delayed_groups)
+            group_structure = file.attrs['group structure']
+            num_delayed_groups = file.attrs['delayed_groups']
+            energy_groups = openmc.mgxs.EnergyGroups(group_structure)
+            data = cls(energy_groups, num_delayed_groups)
 
-        for group_name, group in file.items():
-            data.add_xsdata(openmc.XSdata.from_hdf5(group, group_name,
-                                                    energy_groups,
-                                                    num_delayed_groups))
+            for group_name, group in file.items():
+                data.add_xsdata(openmc.XSdata.from_hdf5(group, group_name,
+                                                        energy_groups,
+                                                        num_delayed_groups))
 
         return data

From 830f075b5c2d5af125f5a947ed98951a9530d0a4 Mon Sep 17 00:00:00 2001
From: Paul Romano <paul.k.romano@gmail.com>
Date: Tue, 6 Jan 2026 16:59:58 -0600
Subject: [PATCH 198/203] Update documentation describing HexLattice
 orientation (#3709)

---
 docs/source/io_formats/geometry.rst |  7 ++++---
 docs/source/usersguide/geometry.rst | 10 +++++-----
 openmc/lattice.py                   |  7 +++++--
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/docs/source/io_formats/geometry.rst b/docs/source/io_formats/geometry.rst
index dda1efa9a..cef3bb79c 100644
--- a/docs/source/io_formats/geometry.rst
+++ b/docs/source/io_formats/geometry.rst
@@ -316,9 +316,10 @@ the following attributes or sub-elements:
     *Default*: None
 
   :orientation:
-    The orientation of the hexagonal lattice. The string "x" indicates that two
-    sides of the lattice are parallel to the x-axis, whereas the string "y"
-    indicates that two sides are parallel to the y-axis.
+    The orientation of the hexagonal lattice. The string "x" indicates that each
+    lattice element has two faces that are perpendicular to the x-axis, whereas
+    the string "y" indicates that each lattice element has two faces that are
+    perpendicular to the y-axis.
 
     *Default*: "y"
 
diff --git a/docs/source/usersguide/geometry.rst b/docs/source/usersguide/geometry.rst
index f51fbd73c..3224d5fff 100644
--- a/docs/source/usersguide/geometry.rst
+++ b/docs/source/usersguide/geometry.rst
@@ -415,11 +415,11 @@ to help figure out how to place universes::
 
 
 Note that by default, hexagonal lattices are positioned such that each lattice
-element has two faces that are parallel to the :math:`y` axis. As one example,
-to create a three-ring lattice centered at the origin with a pitch of 10 cm
-where all the lattice elements centered along the :math:`y` axis are filled with
-universe ``u`` and the remainder are filled with universe ``q``, the following
-code would work::
+element has two faces that are perpendicular to the :math:`y` axis. As one
+example, to create a three-ring lattice centered at the origin with a pitch of
+10 cm where all the lattice elements centered along the :math:`y` axis are
+filled with universe ``u`` and the remainder are filled with universe ``q``, the
+following code would work::
 
   hexlat = openmc.HexLattice()
   hexlat.center = (0, 0)
diff --git a/openmc/lattice.py b/openmc/lattice.py
index f0e8b40b0..21849ec40 100644
--- a/openmc/lattice.py
+++ b/openmc/lattice.py
@@ -1083,8 +1083,11 @@ class HexLattice(Lattice):
         from the outermost ring), and i is the index with a ring starting from
         the top and proceeding clockwise.
     orientation : {'x', 'y'}
-        str by default 'y' orientation of main lattice diagonal another option
-        - 'x'
+        The orientation of the lattice. The 'x' orientation means that each
+        lattice element has two faces that are perpendicular to the x-axis,
+        while the 'y' orientation means that each lattice element has two faces
+        that are perpendicular to the y-axis. By default, the orientation is
+        'y'.
     num_rings : int
         Number of radial ring positions in the xy-plane
     num_axial : int

From dfc80c70694c238ee64206106843879042e12d6a Mon Sep 17 00:00:00 2001
From: Jonathan Shimwell <mail@jshimwell.com>
Date: Wed, 7 Jan 2026 11:54:57 +0100
Subject: [PATCH 199/203] fixing temperatures setting for mgxs (#3712)

---
 openmc/mgxs_library.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/openmc/mgxs_library.py b/openmc/mgxs_library.py
index 414bf7cbd..c1a15998e 100644
--- a/openmc/mgxs_library.py
+++ b/openmc/mgxs_library.py
@@ -484,7 +484,8 @@ class XSdata:
 
         check_type('temperature', temperature, Real)
 
-        temp_store = self.temperatures.tolist().append(temperature)
+        temp_store = self.temperatures.tolist()
+        temp_store.append(temperature)
         self.temperatures = temp_store
 
         self._total.append(None)

From 551bf0730bacdb5e00ffa5f55e4e2329c448ecf0 Mon Sep 17 00:00:00 2001
From: GuySten <62616591+GuySten@users.noreply.github.com>
Date: Fri, 9 Jan 2026 15:56:40 +0200
Subject: [PATCH 200/203] Simplify translational periodic boundary conditions
 (#3697)

---
 src/boundary_condition.cpp | 19 ++-----------------
 src/surface.cpp            |  2 +-
 2 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/src/boundary_condition.cpp b/src/boundary_condition.cpp
index eb095d8c5..5bbda4830 100644
--- a/src/boundary_condition.cpp
+++ b/src/boundary_condition.cpp
@@ -129,23 +129,8 @@ TranslationalPeriodicBC::TranslationalPeriodicBC(int i_surf, int j_surf)
 void TranslationalPeriodicBC::handle_particle(
   Particle& p, const Surface& surf) const
 {
-  int i_particle_surf = p.surface_index();
-
-  // Figure out which of the two BC surfaces were struck then find the
-  // particle's new location and surface.
-  Position new_r;
-  int new_surface;
-  if (i_particle_surf == i_surf_) {
-    new_r = p.r() + translation_;
-    new_surface = p.surface() > 0 ? j_surf_ + 1 : -(j_surf_ + 1);
-  } else if (i_particle_surf == j_surf_) {
-    new_r = p.r() - translation_;
-    new_surface = p.surface() > 0 ? i_surf_ + 1 : -(i_surf_ + 1);
-  } else {
-    throw std::runtime_error(
-      "Called BoundaryCondition::handle_particle after "
-      "hitting a surface, but that surface is not recognized by the BC.");
-  }
+  auto new_r = p.r() + translation_;
+  int new_surface = p.surface() > 0 ? j_surf_ + 1 : -(j_surf_ + 1);
 
   // Handle the effects of the surface albedo on the particle's weight.
   BoundaryCondition::handle_albedo(p, surf);
diff --git a/src/surface.cpp b/src/surface.cpp
index 9ac1c41b4..81b756dea 100644
--- a/src/surface.cpp
+++ b/src/surface.cpp
@@ -1357,7 +1357,7 @@ void prepare_boundary_conditions(std::set<std::pair<int, int>>& periodic_pairs,
     // condition.  Otherwise, it is a rotational periodic BC.
     if (std::abs(1.0 - dot_prod) < FP_PRECISION) {
       surf1.bc_ = make_unique<TranslationalPeriodicBC>(i_surf, j_surf);
-      surf2.bc_ = make_unique<TranslationalPeriodicBC>(i_surf, j_surf);
+      surf2.bc_ = make_unique<TranslationalPeriodicBC>(j_surf, i_surf);
     } else {
       // check that both normals have at least one 0 component
       if (std::abs(norm1.x) > FP_PRECISION &&

From 8c8867ea1c1ae0ffe387f657726557898ff688f5 Mon Sep 17 00:00:00 2001
From: Paul Romano <paul.k.romano@gmail.com>
Date: Fri, 9 Jan 2026 14:05:51 -0600
Subject: [PATCH 201/203] Add --merge-mode-functions=separate to gcovr call in
 CI (#3716)

---
 .github/workflows/ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 8a9c7322e..6fc130947 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -186,6 +186,7 @@ jobs:
             --gcov-ignore-errors source_not_found \
             --gcov-ignore-errors output_error \
             --gcov-ignore-parse-errors suspicious_hits.warn \
+            --merge-mode-functions=separate \
             --print-summary \
             --lcov -o coverage-cpp.lcov || true
 

From 37e2feb34b5d8665d28abdc64ec18e8a2b007734 Mon Sep 17 00:00:00 2001
From: Perry <100789850+yrrepy@users.noreply.github.com>
Date: Sat, 10 Jan 2026 12:04:47 -0800
Subject: [PATCH 202/203] Flux Energy Group Conversion using lethargy-weighted
 redistribution (#3705)

Co-authored-by: GuySten <62616591+GuySten@users.noreply.github.com>
---
 docs/source/pythonapi/mgxs.rst             |  10 ++
 openmc/mgxs/__init__.py                    |   2 +-
 openmc/mgxs/groups.py                      | 136 +++++++++++++++++++++
 tests/fns_flux_709.npy                     | Bin 0 -> 5800 bytes
 tests/unit_tests/test_mgxs_convert_flux.py |  62 ++++++++++
 5 files changed, 209 insertions(+), 1 deletion(-)
 create mode 100644 tests/fns_flux_709.npy
 create mode 100644 tests/unit_tests/test_mgxs_convert_flux.py

diff --git a/docs/source/pythonapi/mgxs.rst b/docs/source/pythonapi/mgxs.rst
index 392914b36..4141aa0a0 100644
--- a/docs/source/pythonapi/mgxs.rst
+++ b/docs/source/pythonapi/mgxs.rst
@@ -11,6 +11,16 @@ Module Variables
 .. autodata:: openmc.mgxs.GROUP_STRUCTURES
     :annotation:
 
+Functions 
++++++++++
+
+.. autosummary::
+    :toctree: generated
+    :nosignatures:
+    :template: myfunction.rst
+
+    openmc.mgxs.convert_flux_groups
+
 Classes
 +++++++
 
diff --git a/openmc/mgxs/__init__.py b/openmc/mgxs/__init__.py
index 682b5d550..5adbac9c4 100644
--- a/openmc/mgxs/__init__.py
+++ b/openmc/mgxs/__init__.py
@@ -1,6 +1,6 @@
 import numpy as np
 
-from openmc.mgxs.groups import EnergyGroups
+from openmc.mgxs.groups import EnergyGroups, convert_flux_groups
 from openmc.mgxs.library import Library
 from openmc.mgxs.mgxs import *
 from openmc.mgxs.mdgxs import *
diff --git a/openmc/mgxs/groups.py b/openmc/mgxs/groups.py
index 182402ed7..8910c7d42 100644
--- a/openmc/mgxs/groups.py
+++ b/openmc/mgxs/groups.py
@@ -300,3 +300,139 @@ class EnergyGroups:
         # Assign merged edges to merged groups
         merged_groups.group_edges = list(merged_edges)
         return merged_groups
+
+
+def convert_flux_groups(flux, source_groups, target_groups):
+    """Convert flux spectrum between energy group structures.
+
+    Uses flux-per-unit-lethargy conservation, which assumes constant flux per
+    unit lethargy within each source group and distributes flux to target
+    groups proportionally to their lethargy width.
+
+    .. versionadded:: 0.15.4
+
+    Parameters
+    ----------
+    flux : Iterable of float
+        Flux values for source groups. Length must equal
+        source_groups.num_groups.
+    source_groups : EnergyGroups or str
+        Energy group structure of the input flux with boundaries in [eV].
+        Can be an EnergyGroups instance or the name of a group structure
+        (e.g., 'CCFE-709').
+    target_groups : EnergyGroups or str
+        Target energy group structure with boundaries in [eV]. Can be an
+        EnergyGroups instance or the name of a group structure
+        (e.g., 'UKAEA-1102').
+
+    Returns
+    -------
+    numpy.ndarray
+        Flux values for target groups. Total flux is conserved for
+        overlapping energy regions.
+
+    Raises
+    ------
+    TypeError
+        If source_groups or target_groups is not EnergyGroups or str
+    ValueError
+        If flux length doesn't match source_groups, or flux contains
+        negative, NaN, or infinite values
+
+    See Also
+    --------
+    EnergyGroups : Energy group structure class
+
+    Notes
+    -----
+    The assumption of constant flux per unit lethargy within each source
+    group is physically reasonable for most reactor spectra but is not
+    exact. For best accuracy, use source spectra with sufficiently fine
+    energy resolution.
+
+    Examples
+    --------
+    Convert FNS 709-group flux to UKAEA-1102 structure:
+
+    >>> import numpy as np
+    >>> flux_709 = np.load('tests/fns_flux_709.npy')
+    >>> flux_1102 = openmc.mgxs.convert_flux_groups(flux_709, 'CCFE-709', 'UKAEA-1102')
+
+    Convert using EnergyGroups instances:
+
+    >>> source = openmc.mgxs.EnergyGroups([1.0, 10.0, 100.0])
+    >>> target = openmc.mgxs.EnergyGroups([1.0, 5.0, 10.0, 50.0, 100.0])
+    >>> flux_target = openmc.mgxs.convert_flux_groups([1e8, 2e8], source, target)
+
+    References
+    ----------
+    .. [1] J. J. Duderstadt and L. J. Hamilton, "Nuclear Reactor Analysis,"
+       John Wiley & Sons, 1976.
+    .. [2] M. Fleming and J.-Ch. Sublet, "FISPACT-II User Manual,"
+       UKAEA-R(18)001, UK Atomic Energy Authority, 2018. See GRPCONVERT keyword.
+
+    """
+    # Handle string group structure names
+    if isinstance(source_groups, str):
+        source_groups = EnergyGroups(source_groups)
+    if isinstance(target_groups, str):
+        target_groups = EnergyGroups(target_groups)
+
+    # Type validation
+    cv.check_type('source_groups', source_groups, EnergyGroups)
+    cv.check_type('target_groups', target_groups, EnergyGroups)
+
+    # Convert flux to numpy array
+    flux = np.asarray(flux, dtype=np.float64)
+    if flux.ndim != 1:
+        raise ValueError(f'flux must be 1-dimensional, got shape {flux.shape}')
+
+    # Validate flux length matches source groups
+    if len(flux) != source_groups.num_groups:
+        raise ValueError(
+            f'Length of flux ({len(flux)}) must equal number of source '
+            f'groups ({source_groups.num_groups})'
+        )
+
+    # Check for invalid flux values
+    if np.any(np.isnan(flux)):
+        raise ValueError('flux contains NaN values')
+    if np.any(np.isinf(flux)):
+        raise ValueError('flux contains infinite values')
+    if np.any(flux < 0):
+        raise ValueError('flux values must be non-negative')
+
+    # Get energy edges
+    source_edges = source_groups.group_edges
+    target_edges = target_groups.group_edges
+    num_target = target_groups.num_groups
+
+    # Initialize output array
+    flux_target = np.zeros(num_target)
+
+    # Main conversion loop: distribute flux using lethargy weighting
+    for idx_src, flux_src in enumerate(flux):
+        if flux_src == 0:
+            continue
+
+        e_low_src = source_edges[idx_src]
+        e_high_src = source_edges[idx_src + 1]
+        lethargy_src = np.log(e_high_src / e_low_src)
+
+        for idx_tgt in range(num_target):
+            e_low_tgt = target_edges[idx_tgt]
+            e_high_tgt = target_edges[idx_tgt + 1]
+
+            # Skip non-overlapping groups
+            if e_high_tgt <= e_low_src or e_low_tgt >= e_high_src:
+                continue
+
+            # Calculate overlap region
+            e_low_overlap = max(e_low_src, e_low_tgt)
+            e_high_overlap = min(e_high_src, e_high_tgt)
+            lethargy_overlap = np.log(e_high_overlap / e_low_overlap)
+
+            # Distribute flux proportionally to lethargy fraction
+            flux_target[idx_tgt] += flux_src * (lethargy_overlap / lethargy_src)
+
+    return flux_target
diff --git a/tests/fns_flux_709.npy b/tests/fns_flux_709.npy
new file mode 100644
index 0000000000000000000000000000000000000000..62c6128422fd8d0014533727b0eee96d369c18a0
GIT binary patch
literal 5800
zcmeIve@v8h90%|x1;f1L5-pa^&Ia8X7oMhw4C|4E0V*CKpyCfmzyk>g&@d4mjfe;u
zi!$fT9boFRA3(FL%$PrNX&Qne3hB)>lqMhz#GmE8-_QNQP41ZgG`G8dUVDE&@B7|!
z-={n*YOa3aBf@H7tvVqwYk8*HPo?%x@>Oe9>ZJ6{?9BMIW$Bp-iRO7wd}>zWy?K@)
zJ|pp7)=bk)*G|x?)~O!&^O)fHIBvjk1CASbm~J5Cu!zT%m8`O0XKvX$?0=6BdLNSE
zDBg!fA-R9HH@EB`8b6T#-}2x1zwLSF2zyz!6)NO&bB?obN1^g}_Udh0H|zv^YZ`33
zLEaahX3vhIZxeg7PT5rOW=~w&!k!)L3YytVk)LA##nx8z;)Y!sltR*<=!qUwC2PqR
z<Mv%ZPvvLZxEb6F;TO@jtJ`1b#Vu}wqLr4pv|ZlMyTYD5HSOpbb8Rc0{Tn@%wzHq2
zoUIk!<ay$E@^cKJ@nfDVI(P7S2T&Nvec7aL^z5qaK~Jf@ZqtmKUhJjLf9`9U^?W7I
zQyuO@zfRUVo2qYMZ)(3aIE8<CUcPMwcVVV*?_+#_ke10kJL(FD;9T+gP@9^%x$kNo
zoT|M}I8Qgm*`~r_?)7gyik{I*>$(2j;phpiw7TW~S?4+ey{<|H&mBPh4(^L;mFU^C
ze%}*3w_p_PGf`!-8?s9k4Sr=b_Y$+NfZ1YEHNPjWrurLW(63wc6jWAFsinWBqs$qf
z4bGgm-Em&o4r;K{GT)T{G<uq=&)C$|!M$?)vwTijU)dr_g?VlR4ZcmY$BxImNY*-!
zF6RF7C=c}PsXN17iP{tW`5L-u&hz~JD{83kre!f2<SjR;bnOM?%RSnDx{R5K+|~FZ
zRIF#;TBX7Z`-~Odut3(uo8Q;uQYnvaTR#cCO~Pd8e(L_35~pCVxIPs&AMowx$+gpw
zjlG=b^!XrLGz4((6ylG$#rZ$ZV6TmSwNXUA_)P#@Q1vPd3!%9!Gm(Shxi|d8e9kiv
z^RuUe;1ItM7;%&elWFLpP|UkiX2Wq)=D@{OVerxcJuEs;zsw3pKCX;_b6g|gOR|ki
zqL9CDqKepPWRqVEbh<+;=Pf`s&Rhti!eU{AM0<Z;jNI6>1Zt)&H7o7X#39#ir@MpW
zk(a1n!#;Z}6ju2x$9!5F-8(%2`3DodoS%ri{<$RBdxU;;cLlPys{x)1q@gv``4-)I
zC>i^b%_%VTR~mVNmgcX-y!1AWDWYCJshG#^qQ!ft>xkDe_Ya`6^XM_xG|cZ5Gb?5>
z2d<$Zp7hC1?sH?AeK#_1%VTceLcboFj`Q68Y4kg^bw910kYV0ShH~mP6$%sU`Te=U
z>>VqFQfoAOXWZ%TaqM3^`38QcIVBUOML?;%19Qn^KljBqsqs_xHf+g4-z{Mkzn_5j
zCvA4(dt6pZKbg<>7}vwB)H1&}lzM;8`M7n=g#py<D(4MNeE;Pe`Mz^P`Q9dd!F%)c
z;{WaZ7FjxYg3p~-k&WjXJA9qly7;~lvkOWdKVWvJrl|pL4R15+{zub!<Veq7%+|l$
Ya>(qSyB|W6%fT9Rc6=N+@W0)_f9fba_5c6?

literal 0
HcmV?d00001

diff --git a/tests/unit_tests/test_mgxs_convert_flux.py b/tests/unit_tests/test_mgxs_convert_flux.py
new file mode 100644
index 000000000..e235f88e0
--- /dev/null
+++ b/tests/unit_tests/test_mgxs_convert_flux.py
@@ -0,0 +1,62 @@
+"""Tests for openmc.mgxs.convert_flux_groups function."""
+
+import numpy as np
+import pytest
+from pytest import approx
+
+import openmc.mgxs
+
+
+def test_coarse_to_fine():
+    """Test coarse to fine conversion with flux conservation."""
+    source = openmc.mgxs.EnergyGroups([1.0, 10.0, 100.0])
+    target = openmc.mgxs.EnergyGroups([1.0, 5.0, 10.0, 50.0, 100.0])
+    flux_source = np.array([1e8, 2e8])
+
+    flux_target = openmc.mgxs.convert_flux_groups(flux_source, source, target)
+
+    # Check conservation
+    assert np.sum(flux_target) == approx(np.sum(flux_source))
+    assert len(flux_target) == 4
+    assert np.all(flux_target >= 0)
+
+
+def test_fine_to_coarse():
+    """Test fine to coarse conversion (reverse direction)."""
+    source = openmc.mgxs.EnergyGroups([1.0, 5.0, 10.0, 50.0, 100.0])
+    target = openmc.mgxs.EnergyGroups([1.0, 10.0, 100.0])
+    flux_source = np.array([1e7, 2e7, 3e7, 4e7])
+
+    flux_target = openmc.mgxs.convert_flux_groups(flux_source, source, target)
+
+    assert np.sum(flux_target) == approx(np.sum(flux_source))
+    assert len(flux_target) == 2
+
+
+def test_lethargy_distribution():
+    """Test that flux is distributed by lethargy, not linear energy."""
+    # Single group from 1 to 100 eV
+    source = openmc.mgxs.EnergyGroups([1.0, 100.0])
+    # Split into two groups: 1-10 eV and 10-100 eV
+    target = openmc.mgxs.EnergyGroups([1.0, 10.0, 100.0])
+    flux_source = np.array([1e8])
+
+    flux_target = openmc.mgxs.convert_flux_groups(flux_source, source, target)
+
+    # Each target group spans one decade (ln(10) lethargy each)
+    # So flux should be split 50/50 by lethargy
+    assert flux_target[0] == approx(5e7)
+    assert flux_target[1] == approx(5e7)
+
+
+def test_fns_ccfe709_to_ukaea1102():
+    """Test CCFE-709 to UKAEA-1102 conversion with real FNS flux spectrum."""
+    from pathlib import Path
+    flux_file = Path(__file__).parent.parent / 'fns_flux_709.npy'
+    fns_flux_709 = np.load(flux_file)
+
+    flux_1102 = openmc.mgxs.convert_flux_groups(fns_flux_709, 'CCFE-709', 'UKAEA-1102')
+
+    assert len(flux_1102) == 1102
+    assert np.sum(flux_1102) == approx(np.sum(fns_flux_709), rel=1e-10)
+    assert np.all(flux_1102 >= 0)

From 0486e433d2c362253e2be27ffdaa8486376b518a Mon Sep 17 00:00:00 2001
From: Jack Fletcher <115663563+j-fletcher@users.noreply.github.com>
Date: Mon, 12 Jan 2026 10:51:12 -0500
Subject: [PATCH 203/203] Source biasing capabilities (#3460)

Co-authored-by: Paul Romano <paul.k.romano@gmail.com>
---
 docs/source/io_formats/settings.rst           |  34 +-
 docs/source/methods/variance_reduction.rst    |  82 ++-
 docs/source/usersguide/settings.rst           |   6 +
 docs/source/usersguide/variance_reduction.rst | 155 ++++-
 include/openmc/distribution.h                 | 188 ++++--
 include/openmc/distribution_multi.h           |  43 +-
 include/openmc/distribution_spatial.h         |  37 +-
 include/openmc/source.h                       |   4 +-
 openmc/filter.py                              |   2 +-
 openmc/settings.py                            |   9 +-
 openmc/stats/multivariate.py                  | 142 ++++-
 openmc/stats/univariate.py                    | 574 ++++++++++++++++--
 src/chain.cpp                                 |   4 +-
 src/distribution.cpp                          | 288 +++++++--
 src/distribution_angle.cpp                    |   2 +-
 src/distribution_multi.cpp                    |  69 ++-
 src/distribution_spatial.cpp                  | 106 +++-
 src/secondary_correlated.cpp                  |   4 +-
 src/source.cpp                                |  24 +-
 tests/cpp_unit_tests/test_distribution.cpp    |   4 +-
 .../regression_tests/source/results_true.dat  |   2 +-
 tests/unit_tests/__init__.py                  |   9 +
 tests/unit_tests/test_source_biasing.py       | 276 +++++++++
 tests/unit_tests/test_stats.py                | 191 +++++-
 24 files changed, 2003 insertions(+), 252 deletions(-)
 create mode 100644 tests/unit_tests/test_source_biasing.py

diff --git a/docs/source/io_formats/settings.rst b/docs/source/io_formats/settings.rst
index b7874fcf2..b986a526a 100644
--- a/docs/source/io_formats/settings.rst
+++ b/docs/source/io_formats/settings.rst
@@ -844,13 +844,18 @@ attributes/sub-elements:
       relative source strength of each mesh element or each point in the cloud.
 
     :volume_normalized:
-      For "mesh" spatial distrubtions, this optional boolean element specifies
+      For "mesh" spatial distributions, this optional boolean element specifies
       whether the vector of relative strengths should be multiplied by the mesh
       element volume. This is most common if the strengths represent a source
       per unit volume.
 
       *Default*: false
 
+    :bias:
+      For "mesh" and "cloud" spatial distributions, this optional element
+      specifies floating point values corresponding to alternative probabilities
+      for each value/component to use for biased sampling.
+
   :angle:
     An element specifying the angular distribution of source sites. This element
     has the following attributes:
@@ -883,6 +888,10 @@ attributes/sub-elements:
       are those of a univariate probability distribution (see the description in
       :ref:`univariate`).
 
+    :bias:
+      For "isotropic" angular distributions, this optional element specifies a
+      "mu-phi" angular distribution used for biased sampling.
+
   :energy:
     An element specifying the energy distribution of source sites. The necessary
     sub-elements/attributes are those of a univariate probability distribution
@@ -906,6 +915,10 @@ attributes/sub-elements:
     mesh element and follows the format for :ref:`source_element`. The number of
     ``<source>`` sub-elements should correspond to the number of mesh elements.
 
+  .. note:: Biased sampling can be applied to the spatial and energy distributions
+            of a source by using the ``<bias>`` sub-element (see
+            :ref:`univariate` for details on how to specify bias distributions).
+
   :constraints:
     This sub-element indicates the presence of constraints on sampled source
     sites (see :ref:`usersguide_source_constraints` for details). It may have
@@ -998,13 +1011,26 @@ variable and whose sub-elements/attributes are as follows:
   *Default*: histogram
 
 :pair:
-  For a "mixture" distribution, this element provides a distribution and its corresponding probability.
+  For a "mixture" distribution, this element provides a distribution and its
+  corresponding probability.
 
   :probability:
-    An attribute or ``pair`` that provides the probability of a univariate distribution within a "mixture" distribution.
+    An attribute or ``pair`` that provides the probability of a univariate
+    distribution within a "mixture" distribution.
 
   :dist:
-    This sub-element of a ``pair`` element provides information on the corresponding univariate distribution.
+    This sub-element of a ``pair`` element provides information on the
+    corresponding univariate distribution.
+
+:bias:
+  This optional element specifies a biased distribution for importance sampling.
+  For continuous distributions, the ``bias`` element should contain another
+  univariate distribution with the same support (interval) as the parent
+  distribution. For discrete distributions, the ``bias`` element should contain
+  floating point values corresponding to alternative probabilities for each
+  value/component to be used for biased sampling.
+
+  *Default*: None
 
 ---------------------------------------
 ``<source_rejection_fraction>`` Element
diff --git a/docs/source/methods/variance_reduction.rst b/docs/source/methods/variance_reduction.rst
index 353ae5077..cdda5ea92 100644
--- a/docs/source/methods/variance_reduction.rst
+++ b/docs/source/methods/variance_reduction.rst
@@ -22,12 +22,14 @@ not experience a single scoring event, even after billions of analog histories.
 Variance reduction techniques aim to either flatten the global uncertainty
 distribution, such that all regions of phase space have a fairly similar
 uncertainty, or to reduce the uncertainty in specific locations (such as a
-detector). There are two strategies available in OpenMC for variance reduction:
-the Monte Carlo MAGIC method and the FW-CADIS method. Both strategies work by
-developing a weight window mesh that can be utilized by subsequent Monte Carlo
-solves to split particles heading towards areas of lower flux densities while
-terminating particles in higher flux regions---all while maintaining a fair
-game.
+detector). There are three strategies available in OpenMC for variance
+reduction: weight windows generated via the MAGIC method or the FW-CADIS method,
+and source biasing. Both weight windowing strategies work by developing a mesh
+that can be utilized by subsequent Monte Carlo solves to split particles heading
+towards areas of lower flux densities while terminating particles in higher flux
+regions. In contrast, source biasing modifies source site sampling behavior to
+preferentially track particles more likely to reach phase space regions of
+interest.
 
 ------------
 MAGIC Method
@@ -132,3 +134,71 @@ aware of this.
     :label: variance_fom
 
     \text{FOM} = \frac{1}{\text{Time} \times \sigma^2}
+
+.. _methods_source_biasing:
+
+--------------
+Source Biasing
+--------------
+
+In contrast to the previous two methods that introduce population controls
+during transport, source biasing modifies the sampling of the external source
+distribution. The basic premise of the technique is that for each spatial,
+angular, energy, or time distribution of a source, an additional distribution
+can be specified provided that the two share a common support (set of points
+where the distribution is nonzero). Samples are then drawn from this "bias"
+distribution, which can be chosen to preferentially direct particles towards
+phase space regions of interest. In order to avoid biasing the tally results,
+however, a weight adjustment is applied to each sampled site as described below.
+
+Assume that the unbiased probability density function of a random variable
+:math:`X:x \rightarrow \mathbb{R}` is given by :math:`f(x)`, but that using the
+biased distribution :math:`g(x)` will result in a greater number of particle
+trajectories reaching some phase space region of interest. Then a sample
+:math:`x_0` may be drawn from :math:`g(x)` while maintaining a fair game,
+provided that its weight is adjusted as:
+
+.. math::
+    :label: source_bias
+
+    w = w_0 \times \frac{f(x_0)}{g(x_0)}
+
+where :math:`w_0` is the weight of an unbiased sample from :math:`f(x)`,
+typically unity.
+
+Returning now to Equation :eq:`source_bias`, the requirement for common support
+becomes evident. If :math:`\mathrm{supp} (g)` fully contains but is not
+identical to :math:`\mathrm{supp} (f)`, then some samples from :math:`g(x)` will
+correspond to points where :math:`f(x) = 0`. Thus these source sites would be
+assigned a starting weight of 0, meaning the particles would be killed
+immediately upon transport, effectively wasting computation time. Conversely, if
+:math:`\mathrm{supp} (g)` is fully contained by but not identical to
+:math:`\mathrm{supp} (f)`, the contributions of some regions outside
+:math:`\mathrm{supp} (g)` will not be counted towards the integral, potentially
+biasing the tally. The weight assigned to such points would be undefined since
+:math:`g(x) = \mathbf{0}` at these points.
+
+When an independent source is sampled in OpenMC, the particle's coordinate in
+each variable of phase space :math:`(\mathbf{r},\mathbf{\Omega},E,t)` is
+successively drawn from an independent probability distribution. Multiple
+variables can be biased, in which case the resultant weight :math:`w` applied to
+the particle is the product of the weights assigned from all sampled
+distributions: space, angle, energy, and time, as shown in Equation
+:eq:`tot_wgt`.
+
+.. math::
+    :label: tot_wgt
+
+    w = w_r \times w_{\Omega} \times w_E \times w_t
+
+Finally, source biasing and weight windows serve different purposes. Source
+biasing changes how particles are born, allowing the initial source sites to be
+sampled preferentially from important regions of phase space (space, angle,
+energy, and time) with an accompanying weight adjustment. Weight windows, by
+contrast, apply population control during transport (splitting and Russian
+roulette) to help particles reach and contribute in important regions as they
+move through the system. Because particle transport proceeds as usual after a
+biased source is sampled, particle attenuation in optically thick regions
+outside the source volume will not be affected by source biasing; in such
+scenarios, transport biasing techniques such as weight windows are often more
+effective.
diff --git a/docs/source/usersguide/settings.rst b/docs/source/usersguide/settings.rst
index f973f1465..b9c693ba1 100644
--- a/docs/source/usersguide/settings.rst
+++ b/docs/source/usersguide/settings.rst
@@ -272,6 +272,12 @@ option::
   settings.source = [src1, src2]
   settings.uniform_source_sampling = True
 
+Additionally, sampling from an :class:`openmc.IndependentSource` may be biased
+for local or global variance reduction by modifying the
+:attr:`~openmc.IndependentSource.bias` attribute of each of its four main
+distributions. Further discussion of source biasing can be found in
+:ref:`source_biasing`.
+
 Finally, the :attr:`IndependentSource.particle` attribute can be used to
 indicate the source should be composed of particles other than neutrons. For
 example, the following would generate a photon source::
diff --git a/docs/source/usersguide/variance_reduction.rst b/docs/source/usersguide/variance_reduction.rst
index 93321e107..8d41807e1 100644
--- a/docs/source/usersguide/variance_reduction.rst
+++ b/docs/source/usersguide/variance_reduction.rst
@@ -5,10 +5,12 @@ Variance Reduction
 ==================
 
 Global variance reduction in OpenMC is accomplished by weight windowing
-techniques. OpenMC is capable of generating weight windows using either the
-MAGIC or FW-CADIS methods. Both techniques will produce a ``weight_windows.h5``
-file that can be loaded and used later on. In this section, we break down the
-steps required to both generate and then apply weight windows.
+or source biasing techniques, the latter of which additionally provides a
+local variance reduction capability. OpenMC is capable of generating weight
+windows using either the MAGIC or FW-CADIS methods. Both techniques will
+produce a ``weight_windows.h5`` file that can be loaded and used later on. In
+this section, we first break down the steps required to generate and apply
+weight windows, then describe how source biasing may be applied.
 
 .. _ww_generator:
 
@@ -172,3 +174,148 @@ Weight window mesh information is embedded into the weight window file, so the
 mesh does not need to be redefined. Monte Carlo solves that load a weight window
 file as above will utilize weight windows to reduce the variance of the
 simulation.
+
+.. _source_biasing:
+
+--------------
+Source Biasing
+--------------
+
+In fixed source problems, source biasing provides a means to reduce the variance
+on global or localized responses, depending on the biasing scheme. In either
+case, the premise of the method is to sample source sites from a biased
+distribution that directs a larger fraction of the simulated histories towards
+phase space regions of interest than would be found there under analog sampling.
+In order to preserve an unbiased estimate of the tally mean, the weight of these
+with analog sampling, divided by the probability assigned by the biased
+distribution. While the assignment of statistical weights is outlined in the
+:ref:`methods section <methods_source_biasing>`, this section demonstrates the
+implementation of source biasing to problems in OpenMC.
+
+Source biasing in OpenMC is accomplished by applying a distribution to the
+:attr:`bias` attribute of one or more of the univariate or independent
+multivariate distributions which make up an :class:`~openmc.IndependentSource`
+instance as follows::
+
+    # First create the biased distribution
+    biased_dist = openmc.stats.PowerLaw(a=0, b=3, n=3)
+
+    # Construct a new distribution with the bias applied
+    dist = openmc.stats.PowerLaw(a=0, b=3, n=2, bias=biased_dist)
+
+    # The bias attribute can also be set on an existing "analog" distribution:
+    sphere_dist = openmc.stats.spherical_uniform(r_outer=3)
+    sphere_dist.r.bias = biased_dist
+
+Univariate distributions may be sampled via the Python API, returning the
+sample(s) along with the associated weight(s)::
+
+    sample_vec, wgt_vec = dist.sample(n_samples=100)
+
+Here, if the distribution is unbiased, the weight of each sample will be unity.
+Finally, :class:`~openmc.IndependentSource` instances can be constructed with
+biased distributions::
+
+    # Create a source with a biased spatial distribution
+    source = openmc.IndependentSource(space=sphere_dist)
+
+During the simulation, source sites are then sampled using the biased
+distributions where available and given starting statistical weights
+corresponding to the cumulative product of the weights assigned by each
+distribution in the source object. Hence multiple source variables (e.g.,
+direction and energy) may be biased and the resulting source sites will have
+their weights adjusted accordingly.
+
+.. note::
+    Combining source biasing with weight windows can be a powerful variance
+    reduction technique if each is constructed appropriately for the response
+    of interest. For example, if a source biasing scheme is devised for
+    variance reduction of a specific localized response, the user may be able
+    to specify their own weight window structure that results in more efficient
+    transport than if weight windows were generated by either of OpenMC's
+    automatic weight window generators, which are intended for global variance
+    reduction.
+
+Biased distributions that could result in degenerate weight mappings are not
+recommended; this is most commonly seen when biasing the :math:`\phi`-coordinate
+of spherical or cylindrical independent multivariate distributions. In such
+cases degenerate behavior will be observed at the pole about which :math:`\phi`
+is measured, with all values of :math:`\phi` (hence many possible statistical
+weights) mapping to the same point for :math:`r=0` or :math:`\mu=0`, and large
+weight gradients in the vicinity. In most cases requiring a spherical
+independent source, it would be preferable to reorient the reference vector of
+the distribution such that biasing could be applied to the
+:math:`\mu`-coordinate instead.
+
+When biasing a distribution, care should also be taken to ensure that both the
+unbiased and biased distribution share a common support---that is, every region
+of phase space mapped to a nonzero probability density by the unbiased
+distribution should likewise map to nonzero probability under the biased
+distribution, and vice versa. In OpenMC, this places restrictions on the set of
+compatible distributions that may be used to bias sampling of each distribution
+type. The following table summarizes the method for each distribution in OpenMC
+that permits biased sampling.
+
+.. list-table:: **Distributions that support biased sampling**
+   :header-rows: 1
+   :widths: 35 65
+
+   * - Discrete Univariate PDFs
+     - Biasing Method
+   * - :class:`openmc.stats.Discrete`
+     - Apply a vector of alternative probabilities to the :attr:`bias`
+       attribute
+
+.. list-table::
+   :header-rows: 1
+   :widths: 35 65
+
+   * - Continuous Univariate PDFs
+     - Biasing Method
+   * - :class:`openmc.stats.Uniform`,
+       :class:`openmc.stats.PowerLaw`,
+       :class:`openmc.stats.Maxwell`,
+       :class:`openmc.stats.Watt`,
+       :class:`openmc.stats.Normal`,
+       :class:`openmc.stats.Tabular`
+     - Apply a second, unbiased continous univariate PDF to the :attr:`bias`
+       attribute, ensuring that the :attr:`support` attribute of each
+       distribution is the same
+
+.. list-table::
+   :header-rows: 1
+   :widths: 35 65
+
+   * - Mixed Univariate PDFs
+     - Biasing Method
+   * - :class:`openmc.stats.Mixture`
+     - May be constructed from multiple biased univariate distributions, or a
+       second, unbiased continous univariate PDF may be applied to the
+       :attr:`bias` attribute
+
+.. list-table::
+   :header-rows: 1
+   :widths: 35 65
+
+   * - Discrete Multivariate PDFs
+     - Biasing Method
+   * - :class:`openmc.stats.PointCloud`,
+       :class:`openmc.stats.MeshSpatial`
+     - Apply a vector of the new relative probabilities of each point or mesh
+       element under biased sampling to the :attr:`bias` attribute
+
+.. list-table::
+   :header-rows: 1
+   :widths: 35 65
+
+   * - Continuous Multivariate PDFs
+     - Biasing Method
+   * - :class:`openmc.stats.CartesianIndependent`,
+       :class:`openmc.stats.CylindricalIndependent`,
+       :class:`openmc.stats.SphericalIndependent`,
+       :class:`openmc.stats.PolarAzimuthal`
+     - Construct from biased univariate distributions for :attr:`x`, :attr:`y`,
+       :attr:`z`, etc.
+   * - :class:`openmc.stats.Isotropic`
+     - Apply an unbiased :class:`openmc.stats.PolarAzimuthal` to the
+       :attr:`bias` attribute
diff --git a/include/openmc/distribution.h b/include/openmc/distribution.h
index 854cf7d77..80fe70bae 100644
--- a/include/openmc/distribution.h
+++ b/include/openmc/distribution.h
@@ -15,6 +15,17 @@
 
 namespace openmc {
 
+//==============================================================================
+// Helper function for computing importance weights from biased sampling
+//==============================================================================
+
+//! Compute importance weights for biased sampling
+//! \param p Unnormalized original probability vector
+//! \param b Unnormalized bias probability vector
+//! \return Vector of importance weights (p_norm[i] / b_norm[i])
+vector<double> compute_importance_weights(
+  const vector<double>& p, const vector<double>& b);
+
 //==============================================================================
 //! Abstract class representing a univariate probability distribution
 //==============================================================================
@@ -22,11 +33,41 @@ namespace openmc {
 class Distribution {
 public:
   virtual ~Distribution() = default;
-  virtual double sample(uint64_t* seed) const = 0;
+
+  //! Sample a value from the distribution, handling biasing automatically
+  //! \param seed Pseudorandom number seed pointer
+  //! \return (sampled value, importance weight)
+  virtual std::pair<double, double> sample(uint64_t* seed) const;
+
+  //! Evaluate probability density, f(x), at a point
+  //! \param x Point to evaluate f(x)
+  //! \return f(x)
+  virtual double evaluate(double x) const;
 
   //! Return integral of distribution
   //! \return Integral of distribution
   virtual double integral() const { return 1.0; };
+
+  //! Set bias distribution
+  virtual void set_bias(std::unique_ptr<Distribution> bias)
+  {
+    bias_ = std::move(bias);
+  }
+
+  const Distribution* bias() const { return bias_.get(); }
+
+protected:
+  //! Sample a value (unbiased) from the distribution
+  //! \param seed Pseudorandom number seed pointer
+  //! \return Sampled value
+  virtual double sample_unbiased(uint64_t* seed) const = 0;
+
+  //! Read bias distribution from XML
+  //! \param node XML node that may contain a bias child element
+  void read_bias_from_xml(pugi::xml_node node);
+
+  // Biasing distribution
+  unique_ptr<Distribution> bias_;
 };
 
 using UPtrDist = unique_ptr<Distribution>;
@@ -50,7 +91,7 @@ public:
 
   //! Sample a value from the distribution
   //! \param seed Pseudorandom number seed pointer
-  //! \return Sampled value
+  //! \return Sampled index
   size_t sample(uint64_t* seed) const;
 
   // Properties
@@ -67,7 +108,7 @@ private:
   //! Normalize distribution so that probabilities sum to unity
   void normalize();
 
-  //! Initialize alias tables for distribution
+  //! Initialize alias table for sampling
   void init_alias();
 };
 
@@ -82,20 +123,30 @@ public:
 
   //! Sample a value from the distribution
   //! \param seed Pseudorandom number seed pointer
-  //! \return Sampled value
-  double sample(uint64_t* seed) const override;
+  //! \return (sampled value, sample weight)
+  std::pair<double, double> sample(uint64_t* seed) const override;
 
   double integral() const override { return di_.integral(); };
 
+  //! Override set_bias as no-op (bias handled in constructor)
+  void set_bias(std::unique_ptr<Distribution> bias) override {}
+
   // Properties
   const vector<double>& x() const { return x_; }
   const vector<double>& prob() const { return di_.prob(); }
   const vector<size_t>& alias() const { return di_.alias(); }
+  const vector<double>& weight() const { return weight_; }
+
+protected:
+  //! Sample a value (unbiased) from the distribution
+  //! \param seed Pseudorandom number seed pointer
+  //! \return Sampled value
+  double sample_unbiased(uint64_t* seed) const override;
 
 private:
-  vector<double> x_; //!< Possible outcomes
-  DiscreteIndex di_; //!< discrete probability distribution of
-                     //!< outcome indices
+  vector<double> x_;      //!< Possible outcomes
+  vector<double> weight_; //!< Importance weights (empty if unbiased)
+  DiscreteIndex di_; //!< Discrete probability distribution of outcome indices
 };
 
 //==============================================================================
@@ -107,14 +158,20 @@ public:
   explicit Uniform(pugi::xml_node node);
   Uniform(double a, double b) : a_ {a}, b_ {b} {};
 
-  //! Sample a value from the distribution
-  //! \param seed Pseudorandom number seed pointer
-  //! \return Sampled value
-  double sample(uint64_t* seed) const override;
+  //! Evaluate probability density, f(x), at a point
+  //! \param x Point to evaluate f(x)
+  //! \return f(x)
+  double evaluate(double x) const override;
 
   double a() const { return a_; }
   double b() const { return b_; }
 
+protected:
+  //! Sample a value (unbiased) from the distribution
+  //! \param seed Pseudorandom number seed pointer
+  //! \return Sampled value
+  double sample_unbiased(uint64_t* seed) const override;
+
 private:
   double a_; //!< Lower bound of distribution
   double b_; //!< Upper bound of distribution
@@ -131,15 +188,21 @@ public:
     : offset_ {std::pow(a, n + 1)}, span_ {std::pow(b, n + 1) - offset_},
       ninv_ {1 / (n + 1)} {};
 
-  //! Sample a value from the distribution
-  //! \param seed Pseudorandom number seed pointer
-  //! \return Sampled value
-  double sample(uint64_t* seed) const override;
+  //! Evaluate probability density, f(x), at a point
+  //! \param x Point to evaluate f(x)
+  //! \return f(x)
+  double evaluate(double x) const override;
 
   double a() const { return std::pow(offset_, ninv_); }
   double b() const { return std::pow(offset_ + span_, ninv_); }
   double n() const { return 1 / ninv_ - 1; }
 
+protected:
+  //! Sample a value (unbiased) from the distribution
+  //! \param seed Pseudorandom number seed pointer
+  //! \return Sampled value
+  double sample_unbiased(uint64_t* seed) const override;
+
 private:
   //! Store processed values in object to allow for faster sampling
   double offset_; //!< a^(n+1)
@@ -156,13 +219,19 @@ public:
   explicit Maxwell(pugi::xml_node node);
   Maxwell(double theta) : theta_ {theta} {};
 
-  //! Sample a value from the distribution
-  //! \param seed Pseudorandom number seed pointer
-  //! \return Sampled value
-  double sample(uint64_t* seed) const override;
+  //! Evaluate probability density, f(x), at a point
+  //! \param x Point to evaluate f(x)
+  //! \return f(x)
+  double evaluate(double x) const override;
 
   double theta() const { return theta_; }
 
+protected:
+  //! Sample a value (unbiased) from the distribution
+  //! \param seed Pseudorandom number seed pointer
+  //! \return Sampled value
+  double sample_unbiased(uint64_t* seed) const override;
+
 private:
   double theta_; //!< Factor in exponential [eV]
 };
@@ -176,14 +245,20 @@ public:
   explicit Watt(pugi::xml_node node);
   Watt(double a, double b) : a_ {a}, b_ {b} {};
 
-  //! Sample a value from the distribution
-  //! \param seed Pseudorandom number seed pointer
-  //! \return Sampled value
-  double sample(uint64_t* seed) const override;
+  //! Evaluate probability density, f(x), at a point
+  //! \param x Point to evaluate f(x)
+  //! \return f(x)
+  double evaluate(double x) const override;
 
   double a() const { return a_; }
   double b() const { return b_; }
 
+protected:
+  //! Sample a value (unbiased) from the distribution
+  //! \param seed Pseudorandom number seed pointer
+  //! \return Sampled value
+  double sample_unbiased(uint64_t* seed) const override;
+
 private:
   double a_; //!< Factor in exponential [eV]
   double b_; //!< Factor in square root [1/eV]
@@ -200,14 +275,20 @@ public:
   Normal(double mean_value, double std_dev)
     : mean_value_ {mean_value}, std_dev_ {std_dev} {};
 
-  //! Sample a value from the distribution
-  //! \param seed Pseudorandom number seed pointer
-  //! \return Sampled value
-  double sample(uint64_t* seed) const override;
+  //! Evaluate probability density, f(x), at a point
+  //! \param x Point to evaluate f(x)
+  //! \return f(x)
+  double evaluate(double x) const override;
 
   double mean_value() const { return mean_value_; }
   double std_dev() const { return std_dev_; }
 
+protected:
+  //! Sample a value (unbiased) from the distribution
+  //! \param seed Pseudorandom number seed pointer
+  //! \return Sampled value
+  double sample_unbiased(uint64_t* seed) const override;
+
 private:
   double mean_value_; //!< middle of distribution [eV]
   double std_dev_;    //!< standard deviation [eV]
@@ -223,10 +304,10 @@ public:
   Tabular(const double* x, const double* p, int n, Interpolation interp,
     const double* c = nullptr);
 
-  //! Sample a value from the distribution
-  //! \param seed Pseudorandom number seed pointer
-  //! \return Sampled value
-  double sample(uint64_t* seed) const override;
+  //! Evaluate probability density, f(x), at a point
+  //! \param x Point to evaluate f(x)
+  //! \return f(x)
+  double evaluate(double x) const override;
 
   // properties
   vector<double>& x() { return x_; }
@@ -235,6 +316,12 @@ public:
   Interpolation interp() const { return interp_; }
   double integral() const override { return integral_; };
 
+protected:
+  //! Sample a value (unbiased) from the distribution
+  //! \param seed Pseudorandom number seed pointer
+  //! \return Sampled value
+  double sample_unbiased(uint64_t* seed) const override;
+
 private:
   vector<double> x_;     //!< tabulated independent variable
   vector<double> p_;     //!< tabulated probability density
@@ -259,13 +346,19 @@ public:
   explicit Equiprobable(pugi::xml_node node);
   Equiprobable(const double* x, int n) : x_ {x, x + n} {};
 
-  //! Sample a value from the distribution
-  //! \param seed Pseudorandom number seed pointer
-  //! \return Sampled value
-  double sample(uint64_t* seed) const override;
+  //! Evaluate probability density, f(x), at a point
+  //! \param x Point to evaluate f(x)
+  //! \return f(x)
+  double evaluate(double x) const override;
 
   const vector<double>& x() const { return x_; }
 
+protected:
+  //! Sample a value (unbiased) from the distribution
+  //! \param seed Pseudorandom number seed pointer
+  //! \return Sampled value
+  double sample_unbiased(uint64_t* seed) const override;
+
 private:
   vector<double> x_; //! Possible outcomes
 };
@@ -280,18 +373,25 @@ public:
 
   //! Sample a value from the distribution
   //! \param seed Pseudorandom number seed pointer
-  //! \return Sampled value
-  double sample(uint64_t* seed) const override;
+  //! \return (sampled value, sample weight)
+  std::pair<double, double> sample(uint64_t* seed) const override;
 
   double integral() const override { return integral_; }
 
-private:
-  // Storrage for probability + distribution
-  using DistPair = std::pair<double, UPtrDist>;
+  //! Override set_bias as no-op (bias handled in constructor)
+  void set_bias(std::unique_ptr<Distribution> bias) override {}
 
-  vector<DistPair>
-    distribution_;  //!< sub-distributions + cummulative probabilities
-  double integral_; //!< integral of distribution
+protected:
+  //! Sample a value (unbiased) from the distribution
+  //! \param seed Pseudorandom number seed pointer
+  //! \return Sampled value
+  double sample_unbiased(uint64_t* seed) const override;
+
+private:
+  vector<UPtrDist> distribution_; //!< Sub-distributions
+  vector<double> weight_; //!< Importance weights for component selection
+  DiscreteIndex di_;      //!< Discrete probability distribution of indices
+  double integral_;       //!< Integral of distribution
 };
 
 } // namespace openmc
diff --git a/include/openmc/distribution_multi.h b/include/openmc/distribution_multi.h
index 75126593f..7b9c2abf8 100644
--- a/include/openmc/distribution_multi.h
+++ b/include/openmc/distribution_multi.h
@@ -26,8 +26,8 @@ public:
 
   //! Sample a direction from the distribution
   //! \param seed Pseudorandom number seed pointer
-  //! \return Direction sampled
-  virtual Direction sample(uint64_t* seed) const = 0;
+  //! \return (sampled Direction, sample weight)
+  virtual std::pair<Direction, double> sample(uint64_t* seed) const = 0;
 
   Direction u_ref_ {0.0, 0.0, 1.0}; //!< reference direction
 };
@@ -43,14 +43,28 @@ public:
 
   //! Sample a direction from the distribution
   //! \param seed Pseudorandom number seed pointer
-  //! \return Direction sampled
-  Direction sample(uint64_t* seed) const override;
+  //! \return (sampled Direction, sample weight)
+  std::pair<Direction, double> sample(uint64_t* seed) const override;
+
+  //! Sample a direction and return evaluation of the PDF for biased sampling.
+  //! Note that bias distributions are intended to return unit-weight samples.
+  //! \param seed Pseudorandom number seed points
+  //! \return (sampled Direction, value of the PDF at this Direction)
+  std::pair<Direction, double> sample_as_bias(uint64_t* seed) const;
 
   // Observing pointers
   Distribution* mu() const { return mu_.get(); }
   Distribution* phi() const { return phi_.get(); }
 
 private:
+  //! Common sampling implementation
+  //! \param seed Pseudorandom number seed pointer
+  //! \param return_pdf If true, return PDF evaluation; if false, return
+  //!        importance weight
+  //! \return (sampled Direction, weight or PDF value)
+  std::pair<Direction, double> sample_impl(
+    uint64_t* seed, bool return_pdf) const;
+
   Direction v_ref_ {1.0, 0.0, 0.0}; //!< reference direction
   Direction w_ref_;
   UPtrDist mu_;  //!< Distribution of polar angle
@@ -66,11 +80,24 @@ Direction isotropic_direction(uint64_t* seed);
 class Isotropic : public UnitSphereDistribution {
 public:
   Isotropic() {};
+  explicit Isotropic(pugi::xml_node node);
 
   //! Sample a direction from the distribution
   //! \param seed Pseudorandom number seed pointer
-  //! \return Sampled direction
-  Direction sample(uint64_t* seed) const override;
+  //! \return (sampled direction, sample weight)
+  std::pair<Direction, double> sample(uint64_t* seed) const override;
+
+  // Set or get bias distribution
+  void set_bias(std::unique_ptr<PolarAzimuthal> bias)
+  {
+    bias_ = std::move(bias);
+  }
+
+  const PolarAzimuthal* bias() const { return bias_.get(); }
+
+protected:
+  // Biasing distribution
+  unique_ptr<PolarAzimuthal> bias_;
 };
 
 //==============================================================================
@@ -85,8 +112,8 @@ public:
 
   //! Sample a direction from the distribution
   //! \param seed Pseudorandom number seed pointer
-  //! \return Sampled direction
-  Direction sample(uint64_t* seed) const override;
+  //! \return (sampled direction, sample weight)
+  std::pair<Direction, double> sample(uint64_t* seed) const override;
 };
 
 using UPtrAngle = unique_ptr<UnitSphereDistribution>;
diff --git a/include/openmc/distribution_spatial.h b/include/openmc/distribution_spatial.h
index 9c3bc743f..26f106fca 100644
--- a/include/openmc/distribution_spatial.h
+++ b/include/openmc/distribution_spatial.h
@@ -19,7 +19,9 @@ public:
   virtual ~SpatialDistribution() = default;
 
   //! Sample a position from the distribution
-  virtual Position sample(uint64_t* seed) const = 0;
+  //! \param seed Pseudorandom number seed pointer
+  //! \return Sampled (position, importance weight)
+  virtual std::pair<Position, double> sample(uint64_t* seed) const = 0;
 
   static unique_ptr<SpatialDistribution> create(pugi::xml_node node);
 };
@@ -34,8 +36,8 @@ public:
 
   //! Sample a position from the distribution
   //! \param seed Pseudorandom number seed pointer
-  //! \return Sampled position
-  Position sample(uint64_t* seed) const override;
+  //! \return Sampled (position, importance weight)
+  std::pair<Position, double> sample(uint64_t* seed) const override;
 
   // Observer pointers
   Distribution* x() const { return x_.get(); }
@@ -58,8 +60,8 @@ public:
 
   //! Sample a position from the distribution
   //! \param seed Pseudorandom number seed pointer
-  //! \return Sampled position
-  Position sample(uint64_t* seed) const override;
+  //! \return Sampled (position, importance weight)
+  std::pair<Position, double> sample(uint64_t* seed) const override;
 
   Distribution* r() const { return r_.get(); }
   Distribution* phi() const { return phi_.get(); }
@@ -83,8 +85,8 @@ public:
 
   //! Sample a position from the distribution
   //! \param seed Pseudorandom number seed pointer
-  //! \return Sampled position
-  Position sample(uint64_t* seed) const override;
+  //! \return Sampled (position, importance weight)
+  std::pair<Position, double> sample(uint64_t* seed) const override;
 
   Distribution* r() const { return r_.get(); }
   Distribution* cos_theta() const { return cos_theta_.get(); }
@@ -109,8 +111,8 @@ public:
 
   //! Sample a position from the distribution
   //! \param seed Pseudorandom number seed pointer
-  //! \return Sampled position
-  Position sample(uint64_t* seed) const override;
+  //! \return Sampled (position, importance weight)
+  std::pair<Position, double> sample(uint64_t* seed) const override;
 
   //! Sample the mesh for an element and position within that element
   //! \param seed Pseudorandom number seed pointer
@@ -133,8 +135,8 @@ public:
 
 private:
   int32_t mesh_idx_ {C_NONE};
-  DiscreteIndex elem_idx_dist_; //!< Distribution of
-                                //!< mesh element indices
+  DiscreteIndex elem_idx_dist_; //!< Distribution of mesh element indices
+  vector<double> weight_;       //!< Importance weights (empty if unbiased)
 };
 
 //==============================================================================
@@ -149,12 +151,13 @@ public:
 
   //! Sample a position from the distribution
   //! \param seed Pseudorandom number seed pointer
-  //! \return Sampled position
-  Position sample(uint64_t* seed) const override;
+  //! \return Sampled (position, importance weight)
+  std::pair<Position, double> sample(uint64_t* seed) const override;
 
 private:
   std::vector<Position> point_cloud_;
   DiscreteIndex point_idx_dist_; //!< Distribution of Position indices
+  vector<double> weight_;        //!< Importance weights (empty if unbiased)
 };
 
 //==============================================================================
@@ -167,8 +170,8 @@ public:
 
   //! Sample a position from the distribution
   //! \param seed Pseudorandom number seed pointer
-  //! \return Sampled position
-  Position sample(uint64_t* seed) const override;
+  //! \return Sampled (position, importance weight)
+  std::pair<Position, double> sample(uint64_t* seed) const override;
 
   // Properties
   bool only_fissionable() const { return only_fissionable_; }
@@ -193,8 +196,8 @@ public:
 
   //! Sample a position from the distribution
   //! \param seed Pseudorandom number seed pointer
-  //! \return Sampled position
-  Position sample(uint64_t* seed) const override;
+  //! \return Sampled (position, importance weight)
+  std::pair<Position, double> sample(uint64_t* seed) const override;
 
   Position r() const { return r_; }
 
diff --git a/include/openmc/source.h b/include/openmc/source.h
index 1fbd31904..36c821fc0 100644
--- a/include/openmc/source.h
+++ b/include/openmc/source.h
@@ -217,8 +217,8 @@ public:
 
   //! Sample a position from the distribution
   //! \param seed Pseudorandom number seed pointer
-  //! \return Sampled position
-  Position sample(uint64_t* seed) const override;
+  //! \return (sampled position, importance weight)
+  std::pair<Position, double> sample(uint64_t* seed) const override;
 
 private:
   int32_t mesh_index_ {C_NONE}; //!< Index in global meshes array
diff --git a/openmc/filter.py b/openmc/filter.py
index 39844798d..e7c54f2f0 100644
--- a/openmc/filter.py
+++ b/openmc/filter.py
@@ -815,7 +815,7 @@ class ParentNuclideFilter(ParticleFilter):
 
 
 class MeshFilter(Filter):
-    """Bins tally event locations by mesh elements.
+    r"""Bins tally event locations by mesh elements.
 
     Parameters
     ----------
diff --git a/openmc/settings.py b/openmc/settings.py
index 76e191c5e..a022b045f 100644
--- a/openmc/settings.py
+++ b/openmc/settings.py
@@ -10,7 +10,7 @@ import warnings
 import openmc
 import openmc.checkvalue as cv
 from openmc.checkvalue import PathLike
-from openmc.stats.multivariate import MeshSpatial
+from openmc.stats.multivariate import MeshSpatial, Box, PolarAzimuthal, Isotropic
 from ._xml import clean_indentation, get_elem_list, get_text
 from .mesh import _read_meshes, RegularMesh, MeshBase
 from .source import SourceBase, MeshSource, IndependentSource
@@ -1877,7 +1877,11 @@ class Settings:
             for key, value in self._random_ray.items():
                 if key == 'ray_source' and isinstance(value, SourceBase):
                     source_element = value.to_xml_element()
+                    if source_element.find('bias') is not None:
+                        raise RuntimeError(
+                            "Ray source distributions should not be biased.")
                     element.append(source_element)
+
                 elif key == 'source_region_meshes':
                     subelement = ET.SubElement(element, 'source_region_meshes')
                     for mesh, domains in value:
@@ -2324,6 +2328,9 @@ class Settings:
                     self.random_ray[child.tag] = float(child.text)
                 elif child.tag == 'source':
                     source = SourceBase.from_xml_element(child)
+                    if child.find('bias') is not None:
+                        raise RuntimeError(
+                            "Ray source distributions should not be biased.")
                     self.random_ray['ray_source'] = source
                 elif child.tag == 'volume_estimator':
                     self.random_ray['volume_estimator'] = child.text
diff --git a/openmc/stats/multivariate.py b/openmc/stats/multivariate.py
index 1ce998758..2057f4a49 100644
--- a/openmc/stats/multivariate.py
+++ b/openmc/stats/multivariate.py
@@ -81,7 +81,7 @@ class PolarAzimuthal(UnitSphere):
         z-direction.
     reference_vwu : Iterable of float
         Direction from which azimuthal angle is measured. Defaults to the positive
-        x-direction.    
+        x-direction.
 
     Attributes
     ----------
@@ -104,7 +104,7 @@ class PolarAzimuthal(UnitSphere):
             self.phi = phi
         else:
             self.phi = Uniform(0., 2*pi)
-            
+
     @property
     def reference_vwu(self):
         return self._reference_vwu
@@ -114,8 +114,8 @@ class PolarAzimuthal(UnitSphere):
         cv.check_type('reference v direction', vwu, Iterable, Real)
         vwu = np.asarray(vwu)
         uvw = self.reference_uvw
-        cv.check_greater_than('reference v direction must not be parallel to reference u direction', np.linalg.norm(np.cross(vwu,uvw)), 1e-6*np.linalg.norm(vwu))        
-        vwu -= vwu.dot(uvw)*uvw        
+        cv.check_greater_than('reference v direction must not be parallel to reference u direction', np.linalg.norm(np.cross(vwu,uvw)), 1e-6*np.linalg.norm(vwu))
+        vwu -= vwu.dot(uvw)*uvw
         cv.check_less_than('reference v direction must be orthogonal to reference u direction', np.abs(vwu.dot(uvw)), 1e-6)
         self._reference_vwu = vwu/np.linalg.norm(vwu)
 
@@ -137,21 +137,30 @@ class PolarAzimuthal(UnitSphere):
         cv.check_type('azimuthal angle', phi, Univariate)
         self._phi = phi
 
-    def to_xml_element(self):
+    def to_xml_element(self, element_name: str = None):
         """Return XML representation of the angular distribution
 
+        Parameters
+        ----------
+        element_name : str, optional
+            XML element name
+
         Returns
         -------
         element : lxml.etree._Element
             XML element containing angular distribution data
 
         """
-        element = ET.Element('angle')
+        if element_name is not None:
+            element = ET.Element(element_name)
+        else:
+            element = ET.Element('angle')
+
         element.set("type", "mu-phi")
         if self.reference_uvw is not None:
             element.set("reference_uvw", ' '.join(map(str, self.reference_uvw)))
         if self.reference_vwu is not None:
-            element.set("reference_vwu", ' '.join(map(str, self.reference_vwu)))    
+            element.set("reference_vwu", ' '.join(map(str, self.reference_vwu)))
         element.append(self.mu.to_xml_element('mu'))
         element.append(self.phi.to_xml_element('phi'))
         return element
@@ -177,17 +186,48 @@ class PolarAzimuthal(UnitSphere):
             mu_phi.reference_uvw = uvw
         vwu = get_elem_list(elem, "reference_vwu", float)
         if vwu is not None:
-            mu_phi.reference_vwu = vwu            
+            mu_phi.reference_vwu = vwu
         mu_phi.mu = Univariate.from_xml_element(elem.find('mu'))
         mu_phi.phi = Univariate.from_xml_element(elem.find('phi'))
         return mu_phi
 
 
 class Isotropic(UnitSphere):
-    """Isotropic angular distribution."""
+    """Isotropic angular distribution.
 
-    def __init__(self):
+    Parameters
+    ----------
+    bias : openmc.stats.PolarAzimuthal, optional
+        Distribution for biased sampling.
+
+    Attributes
+    ----------
+    bias : openmc.stats.PolarAzimuthal or None
+        Distribution for biased sampling
+
+    """
+
+    def __init__(self, bias: PolarAzimuthal | None = None):
         super().__init__()
+        self.bias = bias
+
+    @property
+    def bias(self):
+        return self._bias
+
+    @bias.setter
+    def bias(self, bias):
+        cv.check_type('Biasing distribution', bias, PolarAzimuthal, none_ok=True)
+        if bias is not None:
+            if (bias.mu.bias is not None) or (bias.phi.bias is not None):
+                raise RuntimeError('Biasing distributions should not have their own bias.')
+            elif (bias.mu.support != (-1., 1.)
+                or not np.all(np.isclose(bias.phi.support, (0., 2*np.pi)))):
+                raise ValueError("Biasing distribution for an isotropic "
+                                 "distribution should be supported on "
+                                 "mu=(-1.0,1.0) and phi=(0.0,2*pi).")
+
+        self._bias = bias
 
     def to_xml_element(self):
         """Return XML representation of the isotropic distribution
@@ -200,6 +240,15 @@ class Isotropic(UnitSphere):
         """
         element = ET.Element('angle')
         element.set("type", "isotropic")
+
+        if self.bias is not None:
+            bias_dist = self.bias
+            if (bias_dist.mu.bias is not None) or (bias_dist.phi.bias is not None):
+                raise RuntimeError('Biasing distributions should not have their own bias!')
+            else:
+                bias_elem = self.bias.to_xml_element("bias")
+                element.append(bias_elem)
+
         return element
 
     @classmethod
@@ -217,7 +266,13 @@ class Isotropic(UnitSphere):
             Isotropic distribution generated from XML element
 
         """
-        return cls()
+        bias_elem = elem.find('bias')
+        if bias_elem is not None:
+            bias_dist = PolarAzimuthal.from_xml_element(bias_elem)
+            return cls(bias=bias_dist)
+        else:
+            return cls()
+
 
 
 class Monodirectional(UnitSphere):
@@ -672,6 +727,9 @@ class MeshSpatial(Spatial):
     volume_normalized : bool, optional
         Whether or not the strengths will be multiplied by element volumes at
         runtime. Default is True.
+    bias : iterable of float, optional
+        An iterable of values giving the selection weights assigned to each
+        element during biased sampling.
 
     Attributes
     ----------
@@ -682,12 +740,16 @@ class MeshSpatial(Spatial):
     volume_normalized : bool
         Whether or not the strengths will be multiplied by element volumes at
         runtime.
+    bias : numpy.ndarray or None
+        Distribution for biased sampling
     """
 
-    def __init__(self, mesh, strengths=None, volume_normalized=True):
+    def __init__(self, mesh, strengths=None, volume_normalized=True,
+                 bias: Sequence[float] | None = None):
         self.mesh = mesh
         self.strengths = strengths
         self.volume_normalized = volume_normalized
+        self.bias = bias
 
     @property
     def mesh(self):
@@ -720,6 +782,23 @@ class MeshSpatial(Spatial):
         else:
             self._strengths = None
 
+    @property
+    def bias(self):
+        return self._bias
+
+    @bias.setter
+    def bias(self, given_bias):
+        if given_bias is not None:
+            cv.check_type('Biasing strengths array', given_bias, Iterable, Real)
+            bias_array = np.asarray(given_bias, dtype=float).flatten()
+            if bias_array.size != self.strengths.size:
+                raise ValueError(
+                    'Bias strengths array must have same size as strengths array.')
+            else:
+                self._bias = bias_array
+        else:
+            self._bias = None
+
     @property
     def num_strength_bins(self):
         if self.strengths is None:
@@ -745,6 +824,9 @@ class MeshSpatial(Spatial):
             subelement = ET.SubElement(element, 'strengths')
             subelement.text = ' '.join(str(e) for e in self.strengths)
 
+        if self.bias is not None:
+            Univariate._append_array_bias_to_xml(self, element)
+
         return element
 
     @classmethod
@@ -774,7 +856,8 @@ class MeshSpatial(Spatial):
 
         volume_normalized = get_text(elem, 'volume_normalized').lower() == 'true'
         strengths = get_elem_list(elem, 'strengths', float)
-        return cls(meshes[mesh_id], strengths, volume_normalized)
+        bias_strengths = Univariate._read_array_bias_from_xml(elem)
+        return cls(meshes[mesh_id], strengths, volume_normalized, bias=bias_strengths)
 
 
 class PointCloud(Spatial):
@@ -792,6 +875,9 @@ class PointCloud(Spatial):
     strengths : iterable of float, optional
         An iterable of values that represents the relative probabilty of each
         point.
+    bias : iterable of float, optional
+        An iterable of values representing the relative probability of each
+        point under biased sampling.
 
     Attributes
     ----------
@@ -799,15 +885,19 @@ class PointCloud(Spatial):
         The points in space to be sampled with shape (N, 3)
     strengths : numpy.ndarray or None
         An array of relative probabilities for each mesh point
+    bias : numpy.ndarray or None
+        An array of relative probabilities for biased sampling of mesh points
     """
 
     def __init__(
         self,
         positions: Sequence[Sequence[float]],
-        strengths: Sequence[float] | None = None
+        strengths: Sequence[float] | None = None,
+        bias: Sequence[float] | None = None
     ):
         self.positions = positions
         self.strengths = strengths
+        self.bias = bias
 
     @property
     def positions(self) -> np.ndarray:
@@ -836,6 +926,23 @@ class PointCloud(Spatial):
                 raise ValueError('strengths must have the same length as positions')
         self._strengths = strengths
 
+    @property
+    def bias(self):
+        return self._bias
+
+    @bias.setter
+    def bias(self, given_bias):
+        if given_bias is not None:
+            cv.check_type('Biasing strengths array', given_bias, Iterable, Real)
+            bias_array = np.asarray(given_bias, dtype=float).flatten()
+            if bias_array.size != self.strengths.size:
+                raise ValueError(
+                    'Bias strengths array must have same size as strengths array.')
+            else:
+                self._bias = bias_array
+        else:
+            self._bias = None
+
     @property
     def num_strength_bins(self) -> int:
         if self.strengths is None:
@@ -861,6 +968,9 @@ class PointCloud(Spatial):
             subelement = ET.SubElement(element, 'strengths')
             subelement.text = ' '.join(str(e) for e in self.strengths)
 
+        if self.bias is not None:
+            Univariate._append_array_bias_to_xml(self, element)
+
         return element
 
     @classmethod
@@ -883,8 +993,8 @@ class PointCloud(Spatial):
         positions = np.array(coord_data).reshape((-1, 3))
 
         strengths = get_elem_list(elem, 'strengths', float)
-
-        return cls(positions, strengths)
+        bias_strengths = Univariate._read_array_bias_from_xml(elem)
+        return cls(positions, strengths, bias=bias_strengths)
 
 
 class Box(Spatial):
diff --git a/openmc/stats/univariate.py b/openmc/stats/univariate.py
index c48cc0075..272367f6f 100644
--- a/openmc/stats/univariate.py
+++ b/openmc/stats/univariate.py
@@ -1,15 +1,16 @@
 from __future__ import annotations
-import math
 from abc import ABC, abstractmethod
 from collections import defaultdict
 from collections.abc import Iterable, Sequence
 from copy import deepcopy
+from math import sqrt, pi, exp
 from numbers import Real
 from warnings import warn
 
 import lxml.etree as ET
 import numpy as np
 from scipy.integrate import trapezoid
+import scipy
 
 import openmc.checkvalue as cv
 from .._xml import get_elem_list, get_text
@@ -30,7 +31,55 @@ class Univariate(EqualityMixin, ABC):
     The Univariate class is an abstract class that can be derived to implement a
     specific probability distribution.
 
+    Parameters
+    ----------
+    bias : Iterable of float, optional
+        Distribution or discrete probabilities for biased sampling or discrete
+        probabilities for biased sampling.
+
     """
+    def __init__(self, bias: Univariate | Sequence[float] | None = None):
+        self.bias = bias
+
+    @property
+    def bias(self):
+        return self._bias
+
+    @bias.setter
+    def bias(self, bias):
+        check_bias_support(self, bias)
+        self._bias = bias
+
+    def _append_bias_to_xml(self, element: ET.Element) -> None:
+        """Append bias distribution element to XML if present."""
+        if self.bias is not None:
+            if self.bias.bias is not None:
+                raise RuntimeError('Biasing distributions should not have their own bias.')
+            bias_elem = self.bias.to_xml_element("bias")
+            element.append(bias_elem)
+
+    @classmethod
+    def _read_bias_from_xml(cls, elem: ET.Element):
+        """Read bias distribution from XML element if present."""
+        bias_elem = elem.find('bias')
+        if bias_elem is not None:
+            return Univariate.from_xml_element(bias_elem)
+        return None
+
+    def _append_array_bias_to_xml(self, element: ET.Element) -> None:
+        """Append array-based bias probabilities to XML."""
+        if self.bias is not None:
+            bias_elem = ET.SubElement(element, "bias")
+            bias_elem.text = ' '.join(map(str, self.bias))
+
+    @classmethod
+    def _read_array_bias_from_xml(cls, elem: ET.Element):
+        """Read array-based bias probabilities from XML."""
+        bias_elem = elem.find('bias')
+        if bias_elem is not None:
+            return get_elem_list(elem, "bias", float)
+        return None
+
     @abstractmethod
     def to_xml_element(self, element_name):
         return ''
@@ -66,8 +115,8 @@ class Univariate(EqualityMixin, ABC):
             return Mixture.from_xml_element(elem)
 
     @abstractmethod
-    def sample(n_samples: int = 1, seed: int | None = None):
-        """Sample the univariate distribution
+    def _sample_unbiased(self, n_samples: int = 1, seed: int | None = None):
+        """Sample without bias handling.
 
         Parameters
         ----------
@@ -79,10 +128,35 @@ class Univariate(EqualityMixin, ABC):
         Returns
         -------
         numpy.ndarray
-            A 1-D array of sampled values
+            The array of sampled values
         """
         pass
 
+    def sample(self, n_samples: int = 1, seed: int | None = None):
+        """Sample the univariate distribution, handling biasing automatically.
+
+        Parameters
+        ----------
+        n_samples : int
+            Number of sampled values to generate
+        seed : int or None
+            Initial random number seed.
+
+        Returns
+        -------
+        tuple of numpy.ndarray
+            A tuple of (samples, weights)
+        """
+        if self.bias is None:
+            x = self._sample_unbiased(n_samples, seed)
+            return x, np.ones_like(x)
+        else:
+            if self.bias.bias is not None:
+                raise RuntimeError('Biasing distributions should not have their own bias.')
+            x, _ = self.bias.sample(n_samples=n_samples, seed=seed)
+            weight = self.evaluate(x) / self.bias.evaluate(x)
+            return x, weight
+
     def integral(self):
         """Return integral of distribution
 
@@ -95,6 +169,36 @@ class Univariate(EqualityMixin, ABC):
         """
         return 1.0
 
+    @abstractmethod
+    def evaluate(self, x: float | Sequence[float]):
+        """Evaluate the probability density at the provided value.
+
+        Parameters
+        ----------
+        x : float or sequence of float
+            Location to evaluate p(x)
+
+        Returns
+        -------
+        float or numpy.ndarray
+            Value of p(x)
+        """
+        pass
+
+    @property
+    @abstractmethod
+    def support(self):
+        """Return the support of the probability distribution.
+
+        Returns
+        -------
+        set or tuple of float or dict
+            Returns the set of unique points assigned probability mass in a
+            discrete distribution, the sampling interval for a continuous
+            distribution, or a dictionary storing the discrete and continuous
+            parts of the support of a mixed random variable
+        """
+        pass
 
 def _intensity_clip(intensity: Sequence[float], tolerance: float = 1e-6) -> np.ndarray:
     """Clip low-importance points from an array of intensities.
@@ -148,6 +252,9 @@ class Discrete(Univariate):
         Values of the random variable
     p : Iterable of float
         Discrete probability for each value
+    bias : Iterable of float, optional
+        Alternative discrete probabilities for biased sampling. Defaults to
+        None for unbiased sampling.
 
     Attributes
     ----------
@@ -155,12 +262,18 @@ class Discrete(Univariate):
         Values of the random variable
     p : numpy.ndarray
         Discrete probability for each value
+    support : set
+        Values of the random variable over which the distribution is
+        nonzero-valued
+    bias : numpy.ndarray or None
+        Discrete probabilities for biased sampling
 
     """
 
-    def __init__(self, x, p):
+    def __init__(self, x, p, bias=None):
         self.x = x
         self.p = p
+        super().__init__(bias)
 
     def __len__(self):
         return len(self.x)
@@ -189,10 +302,42 @@ class Discrete(Univariate):
             cv.check_greater_than('discrete probability', pk, 0.0, True)
         self._p = np.array(p, dtype=float)
 
+    @property
+    def support(self):
+        return set(np.unique(self._x))
+
+    @Univariate.bias.setter
+    def bias(self, bias):
+        if bias is None:
+            self._bias = bias
+        else:
+            if isinstance(bias, Real):
+                bias = [bias]
+            cv.check_type('discrete bias probabilities', bias, Iterable, Real)
+            for bk in bias:
+                cv.check_greater_than('discrete probability', bk, 0.0, True)
+            if len(bias) != len(self.x):
+                raise RuntimeError("Discrete distribution has unequal number of "
+                                   "biased and unbiased probability entries.")
+            self._bias = np.array(bias, dtype=float)
+
     def cdf(self):
         return np.insert(np.cumsum(self.p), 0, 0.0)
 
     def sample(self, n_samples=1, seed=None):
+        if self.bias is None:
+            samples = self._sample_unbiased(n_samples, seed)
+            return samples, np.ones_like(samples)
+        else:
+            rng = np.random.RandomState(seed)
+            p = self.p / self.p.sum()
+            b = self.bias / self.bias.sum()
+            indices = rng.choice(self.x.size, n_samples, p=b)
+            biased_sample = self.x[indices]
+            wgt = p[indices] / b[indices]
+            return biased_sample, wgt
+
+    def _sample_unbiased(self, n_samples=1, seed=None):
         rng = np.random.RandomState(seed)
         p = self.p / self.p.sum()
         return rng.choice(self.x, n_samples, p=p)
@@ -202,6 +347,9 @@ class Discrete(Univariate):
         norm = sum(self.p)
         self.p = [val / norm for val in self.p]
 
+    def evaluate(self, x):
+        raise NotImplementedError
+
     def to_xml_element(self, element_name):
         """Return XML representation of the discrete distribution
 
@@ -221,7 +369,7 @@ class Discrete(Univariate):
 
         params = ET.SubElement(element, "parameters")
         params.text = ' '.join(map(str, self.x)) + ' ' + ' '.join(map(str, self.p))
-
+        self._append_array_bias_to_xml(element)
         return element
 
     @classmethod
@@ -242,7 +390,8 @@ class Discrete(Univariate):
         params = get_elem_list(elem, "parameters", float)
         x = params[:len(params)//2]
         p = params[len(params)//2:]
-        return cls(x, p)
+        bias_dist = cls._read_array_bias_from_xml(elem)
+        return cls(x, p, bias=bias_dist)
 
     @classmethod
     def merge(
@@ -270,18 +419,52 @@ class Discrete(Univariate):
         if len(dists) != len(probs):
             raise ValueError("Number of distributions and probabilities must match.")
 
+        biasing = False
+        for d in dists:
+            if d.bias is not None:
+                # If we find that at least one distribution is biased, all
+                # distributions which are not biased will be assigned their
+                # default probability vector as a "bias" so that biased
+                # sampling can occur on the merged distribution.
+                biasing = True
+                break
+
         # Combine distributions accounting for duplicate x values
         x_merged = set()
         p_merged = defaultdict(float)
-        for dist, p_dist in zip(dists, probs):
-            for x, p in zip(dist.x, dist.p):
-                x_merged.add(x)
-                p_merged[x] += p*p_dist
+        new_bias = None
 
-        # Create values and probabilities as arrays
-        x_arr = np.array(sorted(x_merged))
+        if biasing:
+            b_merged = defaultdict(float)
+
+            # Generate any missing bias distributions
+            dists = dists.copy()
+            for i, d in enumerate(dists):
+                if d.bias is None:
+                    dists[i] = Discrete(d.x, d.p, bias=d.p)
+
+            for dist, p_dist in zip(dists, probs):
+                for x, p, b in zip(dist.x, dist.p, dist.bias):
+                    x_merged.add(x)
+                    p_merged[x] += p*p_dist
+                    b_merged[x] += b*p_dist
+
+            # Create values and bias probabilities as arrays
+            x_arr = np.array(sorted(x_merged))
+            new_bias = np.array([b_merged[x] for x in x_arr])
+
+        else:
+            for dist, p_dist in zip(dists, probs):
+                for x, p in zip(dist.x, dist.p):
+                    x_merged.add(x)
+                    p_merged[x] += p*p_dist
+
+            # Create values as array
+            x_arr = np.array(sorted(x_merged))
+
+        # Create probabilities as array
         p_arr = np.array([p_merged[x] for x in x_arr])
-        return cls(x_arr, p_arr)
+        return cls(x_arr, p_arr, new_bias)
 
     def integral(self):
         """Return integral of distribution
@@ -318,6 +501,9 @@ class Discrete(Univariate):
         function will remove any low-importance points such that :math:`\sum_i
         x_i p_i` is preserved to within some threshold.
 
+        For biased distributions, clipping should be performed before the bias
+        probabilities are added.
+
         .. versionadded:: 0.14.0
 
         Parameters
@@ -332,6 +518,10 @@ class Discrete(Univariate):
         Discrete distribution with low-importance points removed
 
         """
+        if self.bias is not None:
+            raise RuntimeError("Biased discrete distributions should be clipped "
+                               "before applying bias.")
+
         cv.check_less_than("tolerance", tolerance, 1.0, equality=True)
         cv.check_greater_than("tolerance", tolerance, 0.0, equality=True)
 
@@ -382,6 +572,8 @@ class Uniform(Univariate):
         Lower bound of the sampling interval. Defaults to zero.
     b : float, optional
         Upper bound of the sampling interval. Defaults to unity.
+    bias : openmc.stats.Univariate, optional
+        Distribution for biased sampling.
 
     Attributes
     ----------
@@ -389,12 +581,19 @@ class Uniform(Univariate):
         Lower bound of the sampling interval
     b : float
         Upper bound of the sampling interval
+    support : tuple of float
+        A 2-tuple (lower, upper) defining the interval over which the
+        distribution is nonzero-valued
+    bias : openmc.stats.Univariate or None
+        Distribution for biased sampling
 
     """
 
-    def __init__(self, a: float = 0.0, b: float = 1.0):
+    def __init__(self, a: float = 0.0, b: float = 1.0,
+                 bias: Univariate | None = None):
         self.a = a
         self.b = b
+        super().__init__(bias)
 
     def __len__(self):
         return 2
@@ -417,16 +616,25 @@ class Uniform(Univariate):
         cv.check_type('Uniform b', b, Real)
         self._b = b
 
+    @property
+    def support(self):
+        return (self._a, self._b)
+
     def to_tabular(self):
+        if self.bias is not None:
+            raise RuntimeError("to_tabular() is not permitted for biased distributions.")
         prob = 1./(self.b - self.a)
         t = Tabular([self.a, self.b], [prob, prob], 'histogram')
         t.c = [0., 1.]
         return t
 
-    def sample(self, n_samples=1, seed=None):
+    def _sample_unbiased(self, n_samples=1, seed=None):
         rng = np.random.RandomState(seed)
         return rng.uniform(self.a, self.b, n_samples)
 
+    def evaluate(self, x):
+        return np.where((self.a <= x) & (x <= self.b), 1/(self.b - self.a), 0.0)
+
     def mean(self) -> float:
         """Return mean of the uniform distribution
 
@@ -456,6 +664,7 @@ class Uniform(Univariate):
         element = ET.Element(element_name)
         element.set("type", "uniform")
         element.set("parameters", f'{self.a} {self.b}')
+        self._append_bias_to_xml(element)
         return element
 
     @classmethod
@@ -474,7 +683,8 @@ class Uniform(Univariate):
 
         """
         params = get_elem_list(elem, "parameters", float)
-        return cls(*params)
+        bias_dist = cls._read_bias_from_xml(elem)
+        return cls(*params, bias=bias_dist)
 
 
 class PowerLaw(Univariate):
@@ -493,6 +703,8 @@ class PowerLaw(Univariate):
     n : float, optional
         Power law exponent. Defaults to zero, which is equivalent to a uniform
         distribution.
+    bias : openmc.stats.Univariate, optional
+        Distribution for biased sampling.
 
     Attributes
     ----------
@@ -502,16 +714,23 @@ class PowerLaw(Univariate):
         Upper bound of the sampling interval
     n : float
         Power law exponent
+    support : tuple of float
+        A 2-tuple (lower, upper) defining the interval over which the
+        distribution is nonzero-valued
+    bias : openmc.stats.Univariate or None
+        Distribution for biased sampling
 
     """
 
-    def __init__(self, a: float = 0.0, b: float = 1.0, n: float = 0.):
+    def __init__(self, a: float = 0.0, b: float = 1.0, n: float = 0.,
+                 bias: Univariate | None = None):
         if a >= b:
             raise ValueError(
                 "Lower bound of sampling interval must be less than upper bound.")
         self.a = a
         self.b = b
         self.n = n
+        super().__init__(bias)
 
     def __len__(self):
         return 3
@@ -549,7 +768,11 @@ class PowerLaw(Univariate):
         cv.check_type('power law exponent', n, Real)
         self._n = n
 
-    def sample(self, n_samples=1, seed=None):
+    @property
+    def support(self):
+        return (self._a, self._b)
+
+    def _sample_unbiased(self, n_samples=1, seed=None):
         rng = np.random.RandomState(seed)
         xi = rng.random(n_samples)
         pwr = self.n + 1
@@ -557,6 +780,10 @@ class PowerLaw(Univariate):
         span = self.b**pwr - offset
         return np.power(offset + xi * span, 1/pwr)
 
+    def evaluate(self, x):
+        c = (self.n + 1)/(self.b**(self.n + 1) - self.a**(self.n + 1))
+        return np.where((self.a <= x) & (x <= self.b), c * np.abs(x)**self.n, 0.0)
+
     def to_xml_element(self, element_name: str):
         """Return XML representation of the power law distribution
 
@@ -574,6 +801,7 @@ class PowerLaw(Univariate):
         element = ET.Element(element_name)
         element.set("type", "powerlaw")
         element.set("parameters", f'{self.a} {self.b} {self.n}')
+        self._append_bias_to_xml(element)
         return element
 
     @classmethod
@@ -592,7 +820,8 @@ class PowerLaw(Univariate):
 
         """
         params = get_elem_list(elem, "parameters", float)
-        return cls(*params)
+        bias_dist = cls._read_bias_from_xml(elem)
+        return cls(*map(float, params), bias=bias_dist)
 
 
 class Maxwell(Univariate):
@@ -606,16 +835,24 @@ class Maxwell(Univariate):
     ----------
     theta : float
         Effective temperature for distribution in eV
+    bias : openmc.stats.Univariate, optional
+        Distribution for biased sampling.
 
     Attributes
     ----------
     theta : float
         Effective temperature for distribution in eV
+    support : tuple of float
+        A 2-tuple (lower, upper) defining the interval over which the
+        distribution is nonzero-valued
+    bias : openmc.stats.Univariate or None
+        Distribution for biased sampling
 
     """
 
-    def __init__(self, theta):
+    def __init__(self, theta, bias: Univariate | None = None):
         self.theta = theta
+        super().__init__(bias)
 
     def __len__(self):
         return 1
@@ -630,7 +867,11 @@ class Maxwell(Univariate):
         cv.check_greater_than('Maxwell temperature', theta, 0.0)
         self._theta = theta
 
-    def sample(self, n_samples=1, seed=None):
+    @property
+    def support(self):
+        return (0.0, np.inf)
+
+    def _sample_unbiased(self, n_samples=1, seed=None):
         rng = np.random.RandomState(seed)
         return self.sample_maxwell(self.theta, n_samples, rng=rng)
 
@@ -638,9 +879,10 @@ class Maxwell(Univariate):
     def sample_maxwell(t, n_samples: int, rng=None):
         if rng is None:
             rng = np.random.default_rng()
-        r1, r2, r3 = rng.random((3, n_samples))
-        c = np.cos(0.5 * np.pi * r3)
-        return -t * (np.log(r1) + np.log(r2) * c * c)
+        return rng.gamma(1.5, t, n_samples)
+
+    def evaluate(self, E):
+        return scipy.stats.gamma.pdf(E, 1.5, scale=self.theta)
 
     def to_xml_element(self, element_name: str):
         """Return XML representation of the Maxwellian distribution
@@ -659,6 +901,7 @@ class Maxwell(Univariate):
         element = ET.Element(element_name)
         element.set("type", "maxwell")
         element.set("parameters", str(self.theta))
+        self._append_bias_to_xml(element)
         return element
 
     @classmethod
@@ -677,7 +920,8 @@ class Maxwell(Univariate):
 
         """
         theta = float(get_text(elem, 'parameters'))
-        return cls(theta)
+        bias_dist = cls._read_bias_from_xml(elem)
+        return cls(theta, bias=bias_dist)
 
 
 class Watt(Univariate):
@@ -693,6 +937,8 @@ class Watt(Univariate):
         First parameter of distribution in units of eV
     b : float
         Second parameter of distribution in units of 1/eV
+    bias : openmc.stats.Univariate, optional
+        Distribution for biased sampling.
 
     Attributes
     ----------
@@ -700,12 +946,18 @@ class Watt(Univariate):
         First parameter of distribution in units of eV
     b : float
         Second parameter of distribution in units of 1/eV
+    support : tuple of float
+        A 2-tuple (lower, upper) defining the interval over which the
+        distribution is nonzero-valued
+    bias : openmc.stats.Univariate or None
+        Distribution for biased sampling
 
     """
 
-    def __init__(self, a=0.988e6, b=2.249e-6):
+    def __init__(self, a=0.988e6, b=2.249e-6, bias: Univariate | None = None):
         self.a = a
         self.b = b
+        super().__init__(bias)
 
     def __len__(self):
         return 2
@@ -730,13 +982,21 @@ class Watt(Univariate):
         cv.check_greater_than('Watt b', b, 0.0)
         self._b = b
 
-    def sample(self, n_samples=1, seed=None):
+    @property
+    def support(self):
+        return (0.0, np.inf)
+
+    def _sample_unbiased(self, n_samples=1, seed=None):
         rng = np.random.RandomState(seed)
         w = Maxwell.sample_maxwell(self.a, n_samples, rng=rng)
         u = rng.uniform(-1., 1., n_samples)
         aab = self.a * self.a * self.b
         return w + 0.25*aab + u*np.sqrt(aab*w)
 
+    def evaluate(self, E):
+        c = 2.0/(sqrt(pi * self.b) * (self.a**1.5) * exp(self.a*self.b/4))
+        return c*np.exp(-E/self.a)*np.sinh(np.sqrt(self.b*E))
+
     def to_xml_element(self, element_name: str):
         """Return XML representation of the Watt distribution
 
@@ -754,6 +1014,7 @@ class Watt(Univariate):
         element = ET.Element(element_name)
         element.set("type", "watt")
         element.set("parameters", f'{self.a} {self.b}')
+        self._append_bias_to_xml(element)
         return element
 
     @classmethod
@@ -772,7 +1033,8 @@ class Watt(Univariate):
 
         """
         params = get_elem_list(elem, "parameters", float)
-        return cls(*params)
+        bias_dist = cls._read_bias_from_xml(elem)
+        return cls(*map(float, params), bias=bias_dist)
 
 
 class Normal(Univariate):
@@ -788,6 +1050,8 @@ class Normal(Univariate):
         Mean value of the  distribution
     std_dev : float
         Standard deviation of the Normal distribution
+    bias : openmc.stats.Univariate, optional
+        Distribution for biased sampling.
 
     Attributes
     ----------
@@ -795,11 +1059,17 @@ class Normal(Univariate):
         Mean of the Normal distribution
     std_dev : float
         Standard deviation of the Normal distribution
+    support : tuple of float
+        A 2-tuple (lower, upper) defining the interval over which the
+        distribution is nonzero-valued
+    bias : openmc.stats.Univariate or None
+        Distribution for biased sampling
     """
 
-    def __init__(self, mean_value, std_dev):
+    def __init__(self, mean_value, std_dev, bias: Univariate | None = None):
         self.mean_value = mean_value
         self.std_dev = std_dev
+        super().__init__(bias)
 
     def __len__(self):
         return 2
@@ -823,10 +1093,17 @@ class Normal(Univariate):
         cv.check_greater_than('Normal std_dev', std_dev, 0.0)
         self._std_dev = std_dev
 
-    def sample(self, n_samples=1, seed=None):
+    @property
+    def support(self):
+        return (-np.inf, np.inf)
+
+    def _sample_unbiased(self, n_samples=1, seed=None):
         rng = np.random.RandomState(seed)
         return rng.normal(self.mean_value, self.std_dev, n_samples)
 
+    def evaluate(self, x):
+        return scipy.stats.norm.pdf(x, self.mean_value, self.std_dev)
+
     def to_xml_element(self, element_name: str):
         """Return XML representation of the Normal distribution
 
@@ -844,6 +1121,7 @@ class Normal(Univariate):
         element = ET.Element(element_name)
         element.set("type", "normal")
         element.set("parameters", f'{self.mean_value} {self.std_dev}')
+        self._append_bias_to_xml(element)
         return element
 
     @classmethod
@@ -862,10 +1140,11 @@ class Normal(Univariate):
 
         """
         params = get_elem_list(elem, "parameters", float)
-        return cls(*params)
+        bias_dist = cls._read_bias_from_xml(elem)
+        return cls(*map(float, params), bias=bias_dist)
 
 
-def muir(e0: float, m_rat: float, kt: float):
+def muir(e0: float, m_rat: float, kt: float, bias: Univariate | None = None):
     """Generate a Muir energy spectrum
 
     The Muir energy spectrum is a normal distribution, but for convenience
@@ -883,6 +1162,8 @@ def muir(e0: float, m_rat: float, kt: float):
         Ratio of the sum of the masses of the reaction inputs to 1 amu
     kt : float
          Ion temperature for the Muir distribution in [eV]
+    bias : openmc.stats.Univariate, optional
+        Distribution for biased sampling.
 
     Returns
     -------
@@ -891,8 +1172,8 @@ def muir(e0: float, m_rat: float, kt: float):
 
     """
     # https://permalink.lanl.gov/object/tr?what=info:lanl-repo/lareport/LA-05411-MS
-    std_dev = math.sqrt(2 * e0 * kt / m_rat)
-    return Normal(e0, std_dev)
+    std_dev = sqrt(2 * e0 * kt / m_rat)
+    return Normal(e0, std_dev, bias)
 
 
 # Retain deprecated name for the time being
@@ -926,6 +1207,8 @@ class Tabular(Univariate):
         points. Defaults to 'linear-linear'.
     ignore_negative : bool
         Ignore negative probabilities
+    bias : openmc.stats.Univariate, optional
+        Distribution for biased sampling.
 
     Attributes
     ----------
@@ -936,6 +1219,11 @@ class Tabular(Univariate):
     interpolation : {'histogram', 'linear-linear', 'linear-log', 'log-linear', 'log-log'}
         Indicates how the density function is interpolated between tabulated
         points. Defaults to 'linear-linear'.
+    support : tuple of float
+        A 2-tuple (lower, upper) defining the interval over which the
+        distribution is nonzero-valued
+    bias : openmc.stats.Univariate or None
+        Distribution for biased sampling
 
     Notes
     -----
@@ -953,7 +1241,8 @@ class Tabular(Univariate):
             x: Sequence[float],
             p: Sequence[float],
             interpolation: str = 'linear-linear',
-            ignore_negative: bool = False
+            ignore_negative: bool = False,
+            bias: Univariate | None = None
         ):
         self.interpolation = interpolation
 
@@ -975,6 +1264,7 @@ class Tabular(Univariate):
 
         self._x = x
         self._p = p
+        super().__init__(bias)
 
     def __len__(self):
         return self.p.size
@@ -996,6 +1286,10 @@ class Tabular(Univariate):
         cv.check_value('interpolation', interpolation, _INTERPOLATION_SCHEMES)
         self._interpolation = interpolation
 
+    @property
+    def support(self):
+        return (self._x[0], self._x[-1])
+
     def cdf(self):
         c = np.zeros_like(self.x)
         x = self.x
@@ -1049,7 +1343,7 @@ class Tabular(Univariate):
         """Normalize the probabilities stored on the distribution"""
         self._p /= self.cdf().max()
 
-    def sample(self, n_samples: int = 1, seed: int | None = None):
+    def _sample_unbiased(self, n_samples: int = 1, seed: int | None = None):
         rng = np.random.RandomState(seed)
         xi = rng.random(n_samples)
 
@@ -1110,6 +1404,39 @@ class Tabular(Univariate):
         assert all(samples_out < self.x[-1])
         return samples_out
 
+    def sample(self, n_samples: int = 1, seed: int | None = None):
+        if self.bias is None:
+            samples = self._sample_unbiased(n_samples, seed)
+            return samples, np.ones_like(samples)
+        else:
+            if self.bias.bias is not None:
+                raise RuntimeError('Biasing distributions should not have their own bias.')
+            biased_sample, _ = self.bias.sample(n_samples=n_samples, seed=seed)
+            self.normalize()  # must have normalized probabilities to apply correct weights
+            wgt = np.array([self.evaluate(s) / self.bias.evaluate(s) for s in biased_sample])
+            return biased_sample, wgt
+
+    def evaluate(self, x):
+        if self.interpolation == 'linear-linear':
+            i = np.searchsorted(self.x, x, side='left') - 1
+            if i < 0 or i >= len(self.p) - 1:
+                return 0.0
+            x0, x1 = self.x[i], self.x[i + 1]
+            p0, p1 = self.p[i], self.p[i + 1]
+            t = (x - x0) / (x1 - x0)
+            return (1 - t) * p0 + t * p1
+
+        elif self.interpolation == 'histogram':
+            i = np.searchsorted(self.x, x, side='right') - 1
+            if i < 0 or i >= len(self.p):
+                return 0.0
+            return self.p[i]
+
+        else:
+            raise NotImplementedError('Can only evaluate tabular '
+                                      'distributions using histogram '
+                                      'or linear-linear interpolation.')
+
     def to_xml_element(self, element_name: str):
         """Return XML representation of the tabular distribution
 
@@ -1130,7 +1457,7 @@ class Tabular(Univariate):
 
         params = ET.SubElement(element, "parameters")
         params.text = ' '.join(map(str, self.x)) + ' ' + ' '.join(map(str, self.p))
-
+        self._append_bias_to_xml(element)
         return element
 
     @classmethod
@@ -1153,7 +1480,8 @@ class Tabular(Univariate):
         m = (len(params) + 1)//2  # +1 for when len(params) is odd
         x = params[:m]
         p = params[m:]
-        return cls(x, p, interpolation)
+        bias_dist = cls._read_bias_from_xml(elem)
+        return cls(x, p, interpolation, bias=bias_dist)
 
     def integral(self):
         """Return integral of distribution
@@ -1183,16 +1511,24 @@ class Legendre(Univariate):
     coefficients : Iterable of Real
         Expansion coefficients :math:`a_\ell`. Note that the :math:`(2\ell +
         1)/2` factor should not be included.
+    bias : openmc.stats.Univariate or None, optional
+        Distribution for biased sampling.
 
     Attributes
     ----------
     coefficients : Iterable of Real
         Expansion coefficients :math:`a_\ell`. Note that the :math:`(2\ell +
         1)/2` factor should not be included.
+    support : tuple of float
+        A 2-tuple (lower, upper) defining the interval over which the
+        distribution is nonzero-valued
+    bias : openmc.stats.Univariate or None
+        Distribution for biased sampling
 
     """
 
-    def __init__(self, coefficients: Sequence[float]):
+    def __init__(self, coefficients: Sequence[float], bias: Univariate | None = None):
+        super().__init__(bias)
         self.coefficients = coefficients
         self._legendre_poly = None
 
@@ -1216,9 +1552,19 @@ class Legendre(Univariate):
     def coefficients(self, coefficients):
         self._coefficients = np.asarray(coefficients)
 
+    @property
+    def support(self):
+        raise NotImplementedError
+
+    def _sample_unbiased(self, n_samples=1, seed=None):
+        raise NotImplementedError
+
     def sample(self, n_samples=1, seed=None):
         raise NotImplementedError
 
+    def evaluate(self, x):
+        raise NotImplementedError
+
     def to_xml_element(self, element_name):
         raise NotImplementedError
 
@@ -1236,6 +1582,9 @@ class Mixture(Univariate):
         Probability of selecting a particular distribution
     distribution : Iterable of Univariate
         List of distributions with corresponding probabilities
+    bias : Iterable of Real, optional
+        Probability of selecting a particular distribution under biased
+        sampling
 
     Attributes
     ----------
@@ -1243,14 +1592,20 @@ class Mixture(Univariate):
         Probability of selecting a particular distribution
     distribution : Iterable of Univariate
         List of distributions with corresponding probabilities
+    support : dict
+        Dictionary containing discrete and continuous parts of the support
+    bias : numpy.ndarray or None
+        Probability of selecting each distribution under biased sampling
 
     """
 
     def __init__(
         self,
         probability: Sequence[float],
-        distribution: Sequence[Univariate]
+        distribution: Sequence[Univariate],
+        bias: Sequence[float] | None = None
     ):
+        super().__init__(bias)
         self.probability = probability
         self.distribution = distribution
 
@@ -1280,10 +1635,52 @@ class Mixture(Univariate):
                       Iterable, Univariate)
         self._distribution = distribution
 
+    @Univariate.bias.setter
+    def bias(self, bias):
+        if bias is None:
+            self._bias = bias
+        else:
+            cv.check_type('biased mixture distribution probabilities', bias,
+                          Iterable, Real)
+            for b in bias:
+                cv.check_greater_than('biased mixture distribution probabilities',
+                                      b, 0.0, True)
+            self._bias = np.array(bias, dtype=float)
+
+    @property
+    def support(self):
+        discrete_points = set()
+        intervals = []
+
+        for dist in self.distribution:
+            if isinstance(dist, Discrete):
+                discrete_points |= dist.support
+            else:
+                intervals.append(tuple(dist.support))
+
+        if intervals:
+            # simplify union by combining intervals when able
+            sorted_intervals = sorted(intervals, key=lambda x: x[0])
+            merged = [sorted_intervals[0]]
+
+            for current in sorted_intervals[1:]:
+                prev_start, prev_end = merged[-1]
+                curr_start, curr_end = current
+
+                if curr_start <= prev_end:
+                    merged[-1] = (prev_start, max(prev_end, curr_end))
+                else:
+                    merged.append(current)
+
+            intervals = merged
+
+        return {"discrete": discrete_points, "continuous": intervals}
+
     def cdf(self):
         return np.insert(np.cumsum(self.probability), 0, 0.0)
 
-    def sample(self, n_samples=1, seed=None):
+    def _sample_unbiased(self, n_samples=1, seed=None):
+        # Mixture uses internal bias mechanism, not base class bias
         rng = np.random.RandomState(seed)
 
         # Get probability of each distribution accounting for its intensity
@@ -1296,11 +1693,49 @@ class Mixture(Univariate):
 
         # Draw samples from the distributions sampled above
         out = np.empty_like(idx, dtype=float)
+        out_wgt = np.empty_like(idx, dtype=float)
         for i in np.unique(idx):
             n_dist_samples = np.count_nonzero(idx == i)
-            samples = self.distribution[i].sample(n_dist_samples)
+            samples, weights = self.distribution[i].sample(n_dist_samples)
             out[idx == i] = samples
-        return out
+            out_wgt[idx == i] = weights
+        return out, out_wgt
+
+    def sample(self, n_samples=1, seed=None):
+        # Mixture uses internal bias mechanism, not base class bias
+        if self.bias is None:
+            return self._sample_unbiased(n_samples, seed)
+
+        rng = np.random.RandomState(seed)
+
+        # Get probability of each distribution accounting for its intensity
+        p = np.array([prob*dist.integral() for prob, dist in
+                      zip(self.probability, self.distribution)])
+        p /= p.sum()
+
+        b = np.array([prob*dist.integral() for prob, dist in
+                      zip(self.bias, self.distribution)])
+        b /= b.sum()
+
+        # Sample from the distributions using biased probabilities
+        idx = rng.choice(range(len(self.distribution)), n_samples, p=b)
+        idx_wgt = np.ones(n_samples)
+        for i in np.unique(idx):
+            idx_wgt[idx == i] = p[i]/b[i]
+
+        # Draw samples from the distributions sampled above
+        out = np.empty_like(idx, dtype=float)
+        out_wgt = np.empty_like(idx, dtype=float)
+        for i in np.unique(idx):
+            n_dist_samples = np.count_nonzero(idx == i)
+            samples, weights = self.distribution[i].sample(n_dist_samples)
+            out[idx == i] = samples
+            out_wgt[idx == i] = weights * idx_wgt[idx == i]
+        return out, out_wgt
+
+    def evaluate(self, x):
+        raise NotImplementedError(
+            "evaluate() is undefined for Mixture distributions")
 
     def normalize(self):
         """Normalize the probabilities stored on the distribution"""
@@ -1331,6 +1766,7 @@ class Mixture(Univariate):
           data.set("probability", str(p))
           data.append(d.to_xml_element("dist"))
 
+        self._append_array_bias_to_xml(element)
         return element
 
     @classmethod
@@ -1356,7 +1792,8 @@ class Mixture(Univariate):
             probability.append(float(get_text(pair, 'probability')))
             distribution.append(Univariate.from_xml_element(pair.find("dist")))
 
-        return cls(probability, distribution)
+        bias_dist = cls._read_array_bias_from_xml(elem)
+        return cls(probability, distribution, bias=bias_dist)
 
     def integral(self):
         """Return integral of the distribution
@@ -1510,3 +1947,50 @@ def combine_distributions(
         dist_list[:] = [Mixture(probs, dist_list.copy())]
 
     return dist_list[0]
+
+
+def check_bias_support(parent: Univariate, bias: Univariate | None):
+    """Ensure that bias distributions share the support of the univariate
+    distribution they are biasing.
+
+    Parameters
+    ----------
+    parent : openmc.stats.Univariate
+        Distributions to be biased
+    bias : openmc.stats.Univariate or None
+        Proposed bias distribution
+
+    """
+    if bias is None:
+        return
+
+    def mismatch_error(err_type, msg):
+        raise err_type(f"Support of parent {type(parent).__name__} and bias "
+                       f"{type(bias).__name__} distributions do not match. "
+                       f"{msg}")
+
+    p_sup, b_sup = parent.support, bias.support
+
+    if isinstance(p_sup, set) or isinstance(b_sup, set):
+        raise RuntimeError("Discrete distributions cannot be used as biasing "
+                           "distributions or be biased by another Univariate "
+                           "distribution. Instead, assign a vector of "
+                           "alternate probabilities to the bias attribute.")
+
+    elif isinstance(p_sup, dict) or isinstance (b_sup, dict):
+        raise RuntimeError("Mixture distributions cannot be used as biasing "
+                           "distributions or be biased by another Univariate "
+                           "distribution. Instead, instantiate the Mixture "
+                           "object using biased member distributions, or "
+                           "assign a vector of alternative probabilities to "
+                           "the bias attribute.")
+
+    elif isinstance(p_sup, tuple):
+        if isinstance(b_sup, tuple):
+            if p_sup != b_sup:
+                mismatch_error(ValueError, "")
+        else:
+            mismatch_error(TypeError, "Incompatible support types.")
+
+    else:
+        raise TypeError("Unrecognized type for parent distribution support")
diff --git a/src/chain.cpp b/src/chain.cpp
index e279d1f59..a60ef12cd 100644
--- a/src/chain.cpp
+++ b/src/chain.cpp
@@ -70,8 +70,8 @@ ChainNuclide::~ChainNuclide()
 void DecayPhotonAngleEnergy::sample(
   double E_in, double& E_out, double& mu, uint64_t* seed) const
 {
-  E_out = photon_energy_->sample(seed);
-  mu = Uniform(-1., 1.).sample(seed);
+  E_out = photon_energy_->sample(seed).first;
+  mu = Uniform(-1., 1.).sample(seed).first;
 }
 
 //==============================================================================
diff --git a/src/distribution.cpp b/src/distribution.cpp
index ca00cbde4..537a56171 100644
--- a/src/distribution.cpp
+++ b/src/distribution.cpp
@@ -8,6 +8,7 @@
 #include <stdexcept> // for runtime_error
 #include <string>    // for string, stod
 
+#include "openmc/constants.h"
 #include "openmc/error.h"
 #include "openmc/math_functions.h"
 #include "openmc/random_dist.h"
@@ -16,6 +17,74 @@
 
 namespace openmc {
 
+//==============================================================================
+// Helper function for computing importance weights from biased sampling
+//==============================================================================
+
+vector<double> compute_importance_weights(
+  const vector<double>& p, const vector<double>& b)
+{
+  std::size_t n = p.size();
+
+  // Normalize original probabilities
+  double sum_p = std::accumulate(p.begin(), p.end(), 0.0);
+  vector<double> p_norm(n);
+  for (std::size_t i = 0; i < n; ++i) {
+    p_norm[i] = p[i] / sum_p;
+  }
+
+  // Normalize bias probabilities
+  double sum_b = std::accumulate(b.begin(), b.end(), 0.0);
+  vector<double> b_norm(n);
+  for (std::size_t i = 0; i < n; ++i) {
+    b_norm[i] = b[i] / sum_b;
+  }
+
+  // Compute importance weights
+  vector<double> weights(n);
+  for (std::size_t i = 0; i < n; ++i) {
+    weights[i] = (b_norm[i] == 0.0) ? INFTY : p_norm[i] / b_norm[i];
+  }
+  return weights;
+}
+
+std::pair<double, double> Distribution::sample(uint64_t* seed) const
+{
+  if (bias_) {
+    // Sample from the bias distribution and compute importance weight
+    double val = bias_->sample_unbiased(seed);
+    double wgt = this->evaluate(val) / bias_->evaluate(val);
+    return {val, wgt};
+  } else {
+    // Unbiased sampling: return sampled value with weight 1.0
+    double val = sample_unbiased(seed);
+    return {val, 1.0};
+  }
+}
+
+// PDF evaluation not supported for all distribution types
+double Distribution::evaluate(double x) const
+{
+  throw std::runtime_error(
+    "PDF evaluation not implemented for this distribution type.");
+}
+
+void Distribution::read_bias_from_xml(pugi::xml_node node)
+{
+  if (check_for_node(node, "bias")) {
+    pugi::xml_node bias_node = node.child("bias");
+
+    if (check_for_node(bias_node, "bias")) {
+      openmc::fatal_error(
+        "Distribution has a bias distribution with its own bias distribution. "
+        "Please ensure bias distributions do not have their own bias.");
+    }
+
+    UPtrDist bias = distribution_from_xml(bias_node);
+    this->set_bias(std::move(bias));
+  }
+}
+
 //==============================================================================
 // DiscreteIndex implementation
 //==============================================================================
@@ -36,7 +105,6 @@ DiscreteIndex::DiscreteIndex(span<const double> p)
 void DiscreteIndex::assign(span<const double> p)
 {
   prob_.assign(p.begin(), p.end());
-
   this->init_alias();
 }
 
@@ -115,24 +183,55 @@ void DiscreteIndex::normalize()
 // Discrete implementation
 //==============================================================================
 
-Discrete::Discrete(pugi::xml_node node) : di_(node)
+Discrete::Discrete(pugi::xml_node node)
 {
   auto params = get_node_array<double>(node, "parameters");
-
   std::size_t n = params.size() / 2;
 
+  // First half is x values, second half is probabilities
   x_.assign(params.begin(), params.begin() + n);
+  const double* p = params.data() + n;
+
+  // Check for bias
+  if (check_for_node(node, "bias")) {
+    // Get bias probabilities
+    auto bias_params = get_node_array<double>(node, "bias");
+    if (bias_params.size() != n) {
+      openmc::fatal_error(
+        "Size mismatch: Attempted to bias Discrete distribution with " +
+        std::to_string(n) + " probability entries using a bias with " +
+        std::to_string(bias_params.size()) +
+        " entries. Please ensure distributions have the same size.");
+    }
+
+    // Compute importance weights
+    vector<double> p_vec(p, p + n);
+    weight_ = compute_importance_weights(p_vec, bias_params);
+
+    // Initialize DiscreteIndex with bias probabilities for sampling
+    di_.assign(bias_params);
+  } else {
+    // Unbiased case: weight_ stays empty
+    di_.assign({p, n});
+  }
 }
 
 Discrete::Discrete(const double* x, const double* p, size_t n) : di_({p, n})
 {
-
   x_.assign(x, x + n);
 }
 
-double Discrete::sample(uint64_t* seed) const
+std::pair<double, double> Discrete::sample(uint64_t* seed) const
 {
-  return x_[di_.sample(seed)];
+  size_t idx = di_.sample(seed);
+  double wgt = weight_.empty() ? 1.0 : weight_[idx];
+  return {x_[idx], wgt};
+}
+
+double Discrete::sample_unbiased(uint64_t* seed) const
+{
+  size_t idx = di_.sample(seed);
+  return x_[idx];
 }
 
 //==============================================================================
@@ -149,13 +248,26 @@ Uniform::Uniform(pugi::xml_node node)
 
   a_ = params.at(0);
   b_ = params.at(1);
+
+  read_bias_from_xml(node);
 }
 
-double Uniform::sample(uint64_t* seed) const
+double Uniform::sample_unbiased(uint64_t* seed) const
 {
   return a_ + prn(seed) * (b_ - a_);
 }
 
+double Uniform::evaluate(double x) const
+{
+  if (x <= a()) {
+    return 0.0;
+  } else if (x >= b()) {
+    return 0.0;
+  } else {
+    return 1 / (b() - a());
+  }
+}
+
 //==============================================================================
 // PowerLaw implementation
 //==============================================================================
@@ -175,9 +287,24 @@ PowerLaw::PowerLaw(pugi::xml_node node)
   offset_ = std::pow(a, n + 1);
   span_ = std::pow(b, n + 1) - offset_;
   ninv_ = 1 / (n + 1);
+
+  read_bias_from_xml(node);
 }
 
-double PowerLaw::sample(uint64_t* seed) const
+double PowerLaw::evaluate(double x) const
+{
+  if (x <= a()) {
+    return 0.0;
+  } else if (x >= b()) {
+    return 0.0;
+  } else {
+    int pwr = n() + 1;
+    double norm = pwr / span_;
+    return norm * std::pow(std::fabs(x), n());
+  }
+}
+
+double PowerLaw::sample_unbiased(uint64_t* seed) const
 {
   return std::pow(offset_ + prn(seed) * span_, ninv_);
 }
@@ -189,13 +316,21 @@ double PowerLaw::sample(uint64_t* seed) const
 Maxwell::Maxwell(pugi::xml_node node)
 {
   theta_ = std::stod(get_node_value(node, "parameters"));
+
+  read_bias_from_xml(node);
 }
 
-double Maxwell::sample(uint64_t* seed) const
+double Maxwell::sample_unbiased(uint64_t* seed) const
 {
   return maxwell_spectrum(theta_, seed);
 }
 
+double Maxwell::evaluate(double x) const
+{
+  double c = (2.0 / SQRT_PI) * std::pow(theta_, -1.5);
+  return c * std::sqrt(x) * std::exp(-x / theta_);
+}
+
 //==============================================================================
 // Watt implementation
 //==============================================================================
@@ -209,13 +344,22 @@ Watt::Watt(pugi::xml_node node)
 
   a_ = params.at(0);
   b_ = params.at(1);
+
+  read_bias_from_xml(node);
 }
 
-double Watt::sample(uint64_t* seed) const
+double Watt::sample_unbiased(uint64_t* seed) const
 {
   return watt_spectrum(a_, b_, seed);
 }
 
+double Watt::evaluate(double x) const
+{
+  double c =
+    2.0 / (std::sqrt(PI * b_) * std::pow(a_, 1.5) * std::exp(a_ * b_ / 4.0));
+  return c * std::exp(-x / a_) * std::sinh(std::sqrt(b_ * x));
+}
+
 //==============================================================================
 // Normal implementation
 //==============================================================================
@@ -229,13 +373,22 @@ Normal::Normal(pugi::xml_node node)
 
   mean_value_ = params.at(0);
   std_dev_ = params.at(1);
+
+  read_bias_from_xml(node);
 }
 
-double Normal::sample(uint64_t* seed) const
+double Normal::sample_unbiased(uint64_t* seed) const
 {
   return normal_variate(mean_value_, std_dev_, seed);
 }
 
+double Normal::evaluate(double x) const
+{
+  return (1.0 / (std::sqrt(2.0 / PI) * std_dev_)) *
+         std::exp(-(std::pow((x - mean_value_), 2.0)) /
+                  (2.0 * std::pow(std_dev_, 2.0)));
+}
+
 //==============================================================================
 // Tabular implementation
 //==============================================================================
@@ -266,6 +419,8 @@ Tabular::Tabular(pugi::xml_node node)
   const double* x = params.data();
   const double* p = x + n;
   init(x, p, n);
+
+  read_bias_from_xml(node);
 }
 
 Tabular::Tabular(const double* x, const double* p, int n, Interpolation interp,
@@ -314,7 +469,7 @@ void Tabular::init(
   }
 }
 
-double Tabular::sample(uint64_t* seed) const
+double Tabular::sample_unbiased(uint64_t* seed) const
 {
   // Sample value of CDF
   double c = prn(seed);
@@ -356,11 +511,39 @@ double Tabular::sample(uint64_t* seed) const
   }
 }
 
+double Tabular::evaluate(double x) const
+{
+  int i;
+
+  if (interp_ == Interpolation::histogram) {
+    i = std::upper_bound(x_.begin(), x_.end(), x) - x_.begin() - 1;
+    if (i < 0 || i >= static_cast<int>(p_.size())) {
+      return 0.0;
+    } else {
+      return p_[i];
+    }
+  } else {
+    i = std::lower_bound(x_.begin(), x_.end(), x) - x_.begin() - 1;
+
+    if (i < 0 || i >= static_cast<int>(p_.size()) - 1) {
+      return 0.0;
+    } else {
+      double x0 = x_[i];
+      double x1 = x_[i + 1];
+      double p0 = p_[i];
+      double p1 = p_[i + 1];
+
+      double t = (x - x0) / (x1 - x0);
+      return (1 - t) * p0 + t * p1;
+    }
+  }
+}
+
 //==============================================================================
 // Equiprobable implementation
 //==============================================================================
 
-double Equiprobable::sample(uint64_t* seed) const
+double Equiprobable::sample_unbiased(uint64_t* seed) const
 {
   std::size_t n = x_.size();
 
@@ -372,13 +555,27 @@ double Equiprobable::sample(uint64_t* seed) const
   return xl + ((n - 1) * r - i) * (xr - xl);
 }
 
+double Equiprobable::evaluate(double x) const
+{
+  double x_min = *std::min_element(x_.begin(), x_.end());
+  double x_max = *std::max_element(x_.begin(), x_.end());
+
+  if (x < x_min || x > x_max) {
+    return 0.0;
+  } else {
+    return 1.0 / (x_max - x_min);
+  }
+}
+
 //==============================================================================
 // Mixture implementation
 //==============================================================================
 
 Mixture::Mixture(pugi::xml_node node)
 {
-  double cumsum = 0.0;
+  vector<double> probabilities;
+
+  // First pass: collect distributions and their probabilities
   for (pugi::xml_node pair : node.children("pair")) {
     // Check that required data exists
     if (!pair.attribute("probability"))
@@ -386,39 +583,60 @@ Mixture::Mixture(pugi::xml_node node)
     if (!pair.child("dist"))
       fatal_error("Mixture pair element does not have a distribution.");
 
-    // cummulative sum of probabilities
+    // Get probability and distribution
     double p = std::stod(pair.attribute("probability").value());
-
-    // Save cummulative probability and distribution
     auto dist = distribution_from_xml(pair.child("dist"));
-    cumsum += p * dist->integral();
 
-    distribution_.push_back(std::make_pair(cumsum, std::move(dist)));
+    // Weight probability by the distribution's integral
+    double weighted_prob = p * dist->integral();
+    probabilities.push_back(weighted_prob);
+    distribution_.push_back(std::move(dist));
   }
 
-  // Save integral of distribution
-  integral_ = cumsum;
+  // Save sum of weighted probabilities
+  integral_ = std::accumulate(probabilities.begin(), probabilities.end(), 0.0);
 
-  // Normalize cummulative probabilities to 1
-  for (auto& pair : distribution_) {
-    pair.first /= cumsum;
+  std::size_t n = probabilities.size();
+
+  // Check for bias
+  if (check_for_node(node, "bias")) {
+    // Get bias probabilities
+    auto bias_params = get_node_array<double>(node, "bias");
+    if (bias_params.size() != n) {
+      openmc::fatal_error(
+        "Size mismatch: Attempted to bias Mixture distribution with " +
+        std::to_string(n) + " components using a bias with " +
+        std::to_string(bias_params.size()) +
+        " entries. Please ensure distributions have the same size.");
+    }
+
+    // Compute importance weights
+    weight_ = compute_importance_weights(probabilities, bias_params);
+
+    // Initialize DiscreteIndex with bias probabilities for sampling
+    di_.assign(bias_params);
+  } else {
+    // Unbiased case: weight_ stays empty
+    di_.assign(probabilities);
   }
 }
 
-double Mixture::sample(uint64_t* seed) const
+std::pair<double, double> Mixture::sample(uint64_t* seed) const
 {
-  // Sample value of CDF
-  const double p = prn(seed);
-
-  // find matching distribution
-  const auto it = std::lower_bound(distribution_.cbegin(), distribution_.cend(),
-    p, [](const DistPair& pair, double p) { return pair.first < p; });
-
-  // This should not happen. Catch it
-  assert(it != distribution_.cend());
+  size_t idx = di_.sample(seed);
 
   // Sample the chosen distribution
-  return it->second->sample(seed);
+  auto [val, sub_wgt] = distribution_[idx]->sample(seed);
+
+  // Multiply by component selection weight
+  double mix_wgt = weight_.empty() ? 1.0 : weight_[idx];
+  return {val, mix_wgt * sub_wgt};
+}
+
+double Mixture::sample_unbiased(uint64_t* seed) const
+{
+  size_t idx = di_.sample(seed);
+  return distribution_[idx]->sample(seed).first;
 }
 
 //==============================================================================
diff --git a/src/distribution_angle.cpp b/src/distribution_angle.cpp
index a571b2a5f..50f1aca11 100644
--- a/src/distribution_angle.cpp
+++ b/src/distribution_angle.cpp
@@ -75,7 +75,7 @@ double AngleDistribution::sample(double E, uint64_t* seed) const
     ++i;
 
   // Sample i-th distribution
-  double mu = distribution_[i]->sample(seed);
+  double mu = distribution_[i]->sample(seed).first;
 
   // Make sure mu is in range [-1,1] and return
   if (std::abs(mu) > 1.0)
diff --git a/src/distribution_multi.cpp b/src/distribution_multi.cpp
index cdb33adc2..857e1c30b 100644
--- a/src/distribution_multi.cpp
+++ b/src/distribution_multi.cpp
@@ -20,7 +20,7 @@ unique_ptr<UnitSphereDistribution> UnitSphereDistribution::create(
   if (check_for_node(node, "type"))
     type = get_node_value(node, "type", true, true);
   if (type == "isotropic") {
-    return UPtrAngle {new Isotropic()};
+    return UPtrAngle {new Isotropic(node)};
   } else if (type == "monodirectional") {
     return UPtrAngle {new Monodirectional(node)};
   } else if (type == "mu-phi") {
@@ -82,27 +82,63 @@ PolarAzimuthal::PolarAzimuthal(pugi::xml_node node)
   }
 }
 
-Direction PolarAzimuthal::sample(uint64_t* seed) const
+std::pair<Direction, double> PolarAzimuthal::sample(uint64_t* seed) const
+{
+  return sample_impl(seed, false);
+}
+
+std::pair<Direction, double> PolarAzimuthal::sample_as_bias(
+  uint64_t* seed) const
+{
+  return sample_impl(seed, true);
+}
+
+std::pair<Direction, double> PolarAzimuthal::sample_impl(
+  uint64_t* seed, bool return_pdf) const
 {
   // Sample cosine of polar angle
-  double mu = mu_->sample(seed);
-  if (mu == 1.0)
-    return u_ref_;
-  if (mu == -1.0)
-    return -u_ref_;
+  auto [mu, mu_wgt] = mu_->sample(seed);
 
   // Sample azimuthal angle
-  double phi = phi_->sample(seed);
+  auto [phi, phi_wgt] = phi_->sample(seed);
+
+  // Compute either the PDF value or the importance weight
+  double weight =
+    return_pdf ? (mu_->evaluate(mu) * phi_->evaluate(phi)) : (mu_wgt * phi_wgt);
+
+  if (mu == 1.0)
+    return {u_ref_, weight};
+  if (mu == -1.0)
+    return {-u_ref_, weight};
 
   double f = std::sqrt(1 - mu * mu);
-
-  return mu * u_ref_ + f * std::cos(phi) * v_ref_ + f * std::sin(phi) * w_ref_;
+  return {mu * u_ref_ + f * std::cos(phi) * v_ref_ + f * std::sin(phi) * w_ref_,
+    weight};
 }
 
 //==============================================================================
 // Isotropic implementation
 //==============================================================================
 
+Isotropic::Isotropic(pugi::xml_node node) : UnitSphereDistribution {node}
+{
+  if (check_for_node(node, "bias")) {
+    pugi::xml_node bias_node = node.child("bias");
+    std::string bias_type = get_node_value(bias_node, "type", true, true);
+    if (bias_type != "mu-phi") {
+      openmc::fatal_error(
+        "Isotropic distributions may only be biased by a PolarAzimuthal.");
+    }
+    auto bias = std::make_unique<PolarAzimuthal>(bias_node);
+    if (bias->mu()->bias() || bias->phi()->bias()) {
+      openmc::fatal_error(
+        "Attempted to bias Isotropic distribution with a biased PolarAzimuthal "
+        "distribution. Please ensure bias distributions are unbiased.");
+    }
+    this->set_bias(std::move(bias));
+  }
+}
+
 Direction isotropic_direction(uint64_t* seed)
 {
   double phi = uniform_distribution(0., 2.0 * PI, seed);
@@ -111,18 +147,23 @@ Direction isotropic_direction(uint64_t* seed)
     std::sqrt(1.0 - mu * mu) * std::sin(phi)};
 }
 
-Direction Isotropic::sample(uint64_t* seed) const
+std::pair<Direction, double> Isotropic::sample(uint64_t* seed) const
 {
-  return isotropic_direction(seed);
+  if (bias()) {
+    auto [val, eval] = bias()->sample_as_bias(seed);
+    return {val, 1.0 / (4.0 * PI * eval)};
+  } else {
+    return {isotropic_direction(seed), 1.0};
+  }
 }
 
 //==============================================================================
 // Monodirectional implementation
 //==============================================================================
 
-Direction Monodirectional::sample(uint64_t* seed) const
+std::pair<Direction, double> Monodirectional::sample(uint64_t* seed) const
 {
-  return u_ref_;
+  return {u_ref_, 1.0};
 }
 
 } // namespace openmc
diff --git a/src/distribution_spatial.cpp b/src/distribution_spatial.cpp
index d2b0f413b..80f8f7de1 100644
--- a/src/distribution_spatial.cpp
+++ b/src/distribution_spatial.cpp
@@ -80,9 +80,13 @@ CartesianIndependent::CartesianIndependent(pugi::xml_node node)
   }
 }
 
-Position CartesianIndependent::sample(uint64_t* seed) const
+std::pair<Position, double> CartesianIndependent::sample(uint64_t* seed) const
 {
-  return {x_->sample(seed), y_->sample(seed), z_->sample(seed)};
+  auto [x_val, x_wgt] = x_->sample(seed);
+  auto [y_val, y_wgt] = y_->sample(seed);
+  auto [z_val, z_wgt] = z_->sample(seed);
+  Position xi {x_val, y_val, z_val};
+  return {xi, x_wgt * y_wgt * z_wgt};
 }
 
 //==============================================================================
@@ -139,14 +143,16 @@ CylindricalIndependent::CylindricalIndependent(pugi::xml_node node)
   }
 }
 
-Position CylindricalIndependent::sample(uint64_t* seed) const
+std::pair<Position, double> CylindricalIndependent::sample(uint64_t* seed) const
 {
-  double r = r_->sample(seed);
-  double phi = phi_->sample(seed);
+  auto [r, r_wgt] = r_->sample(seed);
+  auto [phi, phi_wgt] = phi_->sample(seed);
+  auto [z, z_wgt] = z_->sample(seed);
   double x = r * cos(phi) + origin_.x;
   double y = r * sin(phi) + origin_.y;
-  double z = z_->sample(seed) + origin_.z;
-  return {x, y, z};
+  z += origin_.z;
+  Position xi {x, y, z};
+  return {xi, r_wgt * phi_wgt * z_wgt};
 }
 
 //==============================================================================
@@ -203,16 +209,17 @@ SphericalIndependent::SphericalIndependent(pugi::xml_node node)
   }
 }
 
-Position SphericalIndependent::sample(uint64_t* seed) const
+std::pair<Position, double> SphericalIndependent::sample(uint64_t* seed) const
 {
-  double r = r_->sample(seed);
-  double cos_theta = cos_theta_->sample(seed);
-  double phi = phi_->sample(seed);
+  auto [r, r_wgt] = r_->sample(seed);
+  auto [cos_theta, cos_theta_wgt] = cos_theta_->sample(seed);
+  auto [phi, phi_wgt] = phi_->sample(seed);
   // sin(theta) by sin**2 + cos**2 = 1
   double x = r * std::sqrt(1 - cos_theta * cos_theta) * cos(phi) + origin_.x;
   double y = r * std::sqrt(1 - cos_theta * cos_theta) * sin(phi) + origin_.y;
   double z = r * cos_theta + origin_.z;
-  return {x, y, z};
+  Position xi {x, y, z};
+  return {xi, r_wgt * cos_theta_wgt * phi_wgt};
 }
 
 //==============================================================================
@@ -260,6 +267,37 @@ MeshSpatial::MeshSpatial(pugi::xml_node node)
   }
 
   elem_idx_dist_.assign(strengths);
+
+  if (check_for_node(node, "bias")) {
+    pugi::xml_node bias_node = node.child("bias");
+
+    if (check_for_node(bias_node, "strengths")) {
+      std::vector<double> bias_strengths(n_bins, 1.0);
+      bias_strengths = get_node_array<double>(node, "strengths");
+
+      if (bias_strengths.size() != n_bins) {
+        fatal_error(
+          fmt::format("Number of entries in the bias strengths array {} does "
+                      "not match the number of entities in mesh {} ({}).",
+            bias_strengths.size(), mesh_id, n_bins));
+      }
+
+      if (get_node_value_bool(node, "volume_normalized")) {
+        for (int i = 0; i < n_bins; i++) {
+          bias_strengths[i] *= this->mesh()->volume(i);
+        }
+      }
+
+      // Compute importance weights
+      weight_ = compute_importance_weights(strengths, bias_strengths);
+
+      // Re-initialize DiscreteIndex with bias strengths for sampling
+      elem_idx_dist_.assign(bias_strengths);
+    } else {
+      fatal_error(fmt::format(
+        "Bias node for mesh {} found without strengths array.", mesh_id));
+    }
+  }
 }
 
 MeshSpatial::MeshSpatial(int32_t mesh_idx, span<const double> strengths)
@@ -295,9 +333,11 @@ std::pair<int32_t, Position> MeshSpatial::sample_mesh(uint64_t* seed) const
   return {elem_idx, mesh()->sample_element(elem_idx, seed)};
 }
 
-Position MeshSpatial::sample(uint64_t* seed) const
+std::pair<Position, double> MeshSpatial::sample(uint64_t* seed) const
 {
-  return this->sample_mesh(seed).second;
+  auto [elem_idx, u] = this->sample_mesh(seed);
+  double wgt = weight_.empty() ? 1.0 : weight_[elem_idx];
+  return {u, wgt};
 }
 
 //==============================================================================
@@ -328,6 +368,31 @@ PointCloud::PointCloud(pugi::xml_node node)
   }
 
   point_idx_dist_.assign(strengths);
+
+  if (check_for_node(node, "bias")) {
+    pugi::xml_node bias_node = node.child("bias");
+
+    if (check_for_node(bias_node, "strengths")) {
+      std::vector<double> bias_strengths(point_cloud_.size(), 1.0);
+      bias_strengths = get_node_array<double>(node, "strengths");
+
+      if (bias_strengths.size() != point_cloud_.size()) {
+        fatal_error(
+          fmt::format("Number of entries in the bias strengths array {} does "
+                      "not match the number of spatial points provided {}.",
+            bias_strengths.size(), point_cloud_.size()));
+      }
+
+      // Compute importance weights
+      weight_ = compute_importance_weights(strengths, bias_strengths);
+
+      // Re-initialize DiscreteIndex with bias strengths for sampling
+      point_idx_dist_.assign(bias_strengths);
+    } else {
+      fatal_error(
+        fmt::format("Bias node for PointCloud found without strengths array."));
+    }
+  }
 }
 
 PointCloud::PointCloud(
@@ -337,10 +402,11 @@ PointCloud::PointCloud(
   point_idx_dist_.assign(strengths);
 }
 
-Position PointCloud::sample(uint64_t* seed) const
+std::pair<Position, double> PointCloud::sample(uint64_t* seed) const
 {
   int32_t index = point_idx_dist_.sample(seed);
-  return point_cloud_[index];
+  double wgt = weight_.empty() ? 1.0 : weight_[index];
+  return {point_cloud_[index], wgt};
 }
 
 //==============================================================================
@@ -360,10 +426,10 @@ SpatialBox::SpatialBox(pugi::xml_node node, bool fission)
   upper_right_ = Position {params[3], params[4], params[5]};
 }
 
-Position SpatialBox::sample(uint64_t* seed) const
+std::pair<Position, double> SpatialBox::sample(uint64_t* seed) const
 {
   Position xi {prn(seed), prn(seed), prn(seed)};
-  return lower_left_ + xi * (upper_right_ - lower_left_);
+  return {lower_left_ + xi * (upper_right_ - lower_left_), 1.0};
 }
 
 //==============================================================================
@@ -382,9 +448,9 @@ SpatialPoint::SpatialPoint(pugi::xml_node node)
   r_ = Position {params.data()};
 }
 
-Position SpatialPoint::sample(uint64_t* seed) const
+std::pair<Position, double> SpatialPoint::sample(uint64_t* seed) const
 {
-  return r_;
+  return {r_, 1.0};
 }
 
 } // namespace openmc
diff --git a/src/secondary_correlated.cpp b/src/secondary_correlated.cpp
index 3f26fdb01..e820419b4 100644
--- a/src/secondary_correlated.cpp
+++ b/src/secondary_correlated.cpp
@@ -247,9 +247,9 @@ void CorrelatedAngleEnergy::sample(
   // Find correlated angular distribution for closest outgoing energy bin
   if (r1 - c_k < c_k1 - r1 ||
       distribution_[l].interpolation == Interpolation::histogram) {
-    mu = distribution_[l].angle[k]->sample(seed);
+    mu = distribution_[l].angle[k]->sample(seed).first;
   } else {
-    mu = distribution_[l].angle[k + 1]->sample(seed);
+    mu = distribution_[l].angle[k + 1]->sample(seed).first;
   }
 }
 
diff --git a/src/source.cpp b/src/source.cpp
index f6aa665eb..b30b964d3 100644
--- a/src/source.cpp
+++ b/src/source.cpp
@@ -356,6 +356,8 @@ SourceSite IndependentSource::sample(uint64_t* seed) const
 {
   SourceSite site;
   site.particle = particle_;
+  double r_wgt = 1.0;
+  double E_wgt = 1.0;
 
   // Repeat sampling source location until a good site has been accepted
   bool accepted = false;
@@ -365,7 +367,9 @@ SourceSite IndependentSource::sample(uint64_t* seed) const
   while (!accepted) {
 
     // Sample spatial distribution
-    site.r = space_->sample(seed);
+    auto [r, r_wgt_temp] = space_->sample(seed);
+    site.r = r;
+    r_wgt = r_wgt_temp;
 
     // Check if sampled position satisfies spatial constraints
     accepted = satisfies_spatial_constraints(site.r);
@@ -378,7 +382,10 @@ SourceSite IndependentSource::sample(uint64_t* seed) const
   }
 
   // Sample angle
-  site.u = angle_->sample(seed);
+  auto [u, u_wgt] = angle_->sample(seed);
+  site.u = u;
+
+  site.wgt = r_wgt * u_wgt;
 
   // Sample energy and time for neutron and photon sources
   if (settings::solver_type != SolverType::RANDOM_RAY) {
@@ -395,7 +402,9 @@ SourceSite IndependentSource::sample(uint64_t* seed) const
 
     while (true) {
       // Sample energy spectrum
-      site.E = energy_->sample(seed);
+      auto [E, E_wgt_temp] = energy_->sample(seed);
+      site.E = E;
+      E_wgt = E_wgt_temp;
 
       // Resample if energy falls above maximum particle energy
       if (site.E < data::energy_max[p] &&
@@ -407,7 +416,10 @@ SourceSite IndependentSource::sample(uint64_t* seed) const
     }
 
     // Sample particle creation time
-    site.time = time_->sample(seed);
+    auto [time, time_wgt] = time_->sample(seed);
+    site.time = time;
+
+    site.wgt *= (E_wgt * time_wgt);
   }
 
   // Increment number of accepted samples
@@ -537,9 +549,9 @@ CompiledSourceWrapper::~CompiledSourceWrapper()
 // MeshElementSpatial implementation
 //==============================================================================
 
-Position MeshElementSpatial::sample(uint64_t* seed) const
+std::pair<Position, double> MeshElementSpatial::sample(uint64_t* seed) const
 {
-  return model::meshes[mesh_index_]->sample_element(elem_index_, seed);
+  return {model::meshes[mesh_index_]->sample_element(elem_index_, seed), 1.0};
 }
 
 //==============================================================================
diff --git a/tests/cpp_unit_tests/test_distribution.cpp b/tests/cpp_unit_tests/test_distribution.cpp
index e1a212db5..2024b812e 100644
--- a/tests/cpp_unit_tests/test_distribution.cpp
+++ b/tests/cpp_unit_tests/test_distribution.cpp
@@ -28,7 +28,7 @@ TEST_CASE("Test alias method sampling of a discrete distribution")
   int counter = 0;
 
   for (size_t i = 0; i < n_samples; i++) {
-    auto sample = dist.sample(&seed);
+    auto sample = dist.sample(&seed).first;
     std += sample * sample / n_samples;
     dist_mean += sample;
 
@@ -61,7 +61,7 @@ TEST_CASE("Test alias sampling method for pugixml constructor")
   // Initialize discrete distribution and seed
   openmc::Discrete dist(energy);
   uint64_t seed = openmc::init_seed(0, 0);
-  auto sample = dist.sample(&seed);
+  auto sample = dist.sample(&seed).first;
 
   // Assertions
   REQUIRE(dist.x().size() == 3);
diff --git a/tests/regression_tests/source/results_true.dat b/tests/regression_tests/source/results_true.dat
index 7d03c696d..c671463be 100644
--- a/tests/regression_tests/source/results_true.dat
+++ b/tests/regression_tests/source/results_true.dat
@@ -1,2 +1,2 @@
 k-combined:
-3.080655E-01 4.837707E-03
+2.942254E-01 2.571435E-03
diff --git a/tests/unit_tests/__init__.py b/tests/unit_tests/__init__.py
index e97ab13e2..44b5a5018 100644
--- a/tests/unit_tests/__init__.py
+++ b/tests/unit_tests/__init__.py
@@ -14,3 +14,12 @@ def assert_unbounded(obj):
     ll, ur = obj.bounding_box
     assert ll == pytest.approx((-np.inf, -np.inf, -np.inf))
     assert ur == pytest.approx((np.inf, np.inf, np.inf))
+
+
+def assert_sample_mean(samples, expected_mean):
+    # Calculate sample standard deviation
+    std_dev = samples.std() / np.sqrt(samples.size - 1)
+
+    # Means should agree within 4 sigma 99.993% of the time. Note that this is
+    # expected to fail about 1 out of 16,000 times
+    assert np.abs(expected_mean - samples.mean()) < 4*std_dev
diff --git a/tests/unit_tests/test_source_biasing.py b/tests/unit_tests/test_source_biasing.py
new file mode 100644
index 000000000..12588594c
--- /dev/null
+++ b/tests/unit_tests/test_source_biasing.py
@@ -0,0 +1,276 @@
+"""Tests for source biasing using C++ sampling routines via openmc.lib
+
+This test module validates that the C++ distribution sampling implementations
+correctly handle both unbiased and biased sampling when used in source
+definitions. Each test:
+
+1. Creates a minimal model with a source using a specific energy distribution
+2. Uses model.sample_external_source() to generate samples via openmc.lib
+3. Extracts energies from the returned particle list
+4. Validates that:
+   - Unbiased sampling produces the expected mean
+   - Biased sampling with importance weighting produces the expected mean
+   - Weights are correctly applied (non-unity for biased case)
+
+These tests complement the Python-level tests in test_stats.py by exercising
+the full C++ sampling codepath that is used during actual simulations.
+"""
+
+import numpy as np
+import pytest
+import openmc
+
+from tests.unit_tests import assert_sample_mean
+
+
+@pytest.fixture
+def model():
+    """Create a minimal model for source sampling tests."""
+    sphere = openmc.Sphere(r=100.0, boundary_type='vacuum')
+    cell = openmc.Cell(region=-sphere)
+    geometry = openmc.Geometry([cell])
+    settings = openmc.Settings(particles=100, batches=1)
+    space = openmc.stats.Point()
+    angle = openmc.stats.Monodirectional((1.0, 0.0, 0.0))
+    settings.source = openmc.IndependentSource(space=space, angle=angle)
+    return openmc.Model(geometry=geometry, settings=settings)
+
+
+@pytest.mark.flaky(reruns=1)
+def test_discrete(run_in_tmpdir, model):
+    """Test Discrete distribution sampling via C++ routines."""
+    vals = np.array([1.0, 2.0, 3.0])
+    probs = np.array([0.1, 0.7, 0.2])
+    exp_mean = (vals * probs).sum()
+
+    # Create source with discrete energy distribution
+    model.settings.source[0].energy = energy_dist = openmc.stats.Discrete(vals, probs)
+
+    # Sample using C++ routines and extract energies
+    n_samples = 10_000
+    particles = model.sample_external_source(n_samples)
+    energies = np.array([p.E for p in particles])
+
+    # Check unbiased mean
+    assert_sample_mean(energies, exp_mean)
+
+    # Sample from biased distribution
+    energy_dist.bias = np.array([0.2, 0.1, 0.7])
+    particles = model.sample_external_source(n_samples)
+    energies = np.array([p.E for p in particles])
+    weights = np.array([p.wgt for p in particles])
+
+    # Check biased weighted mean
+    weighted_energies = energies * weights
+    assert_sample_mean(weighted_energies, exp_mean)
+    assert np.any(weights != 1.0)
+
+
+@pytest.mark.flaky(reruns=1)
+def test_uniform(run_in_tmpdir, model):
+    """Test Uniform distribution sampling via C++ routines."""
+    a, b = 5.0, 10.0
+    exp_mean = 0.5 * (a + b)
+
+    # Create source with uniform energy distribution
+    model.settings.source[0].energy = energy_dist = openmc.stats.Uniform(a, b)
+
+    # Sample using C++ routines and extract energies
+    n_samples = 10_000
+    particles = model.sample_external_source(n_samples)
+    energies = np.array([p.E for p in particles])
+
+    # Check unbiased mean
+    assert_sample_mean(energies, exp_mean)
+
+    # Sample from biased distribution
+    energy_dist.bias = openmc.stats.PowerLaw(a, b, 2)
+    particles = model.sample_external_source(n_samples)
+    energies = np.array([p.E for p in particles])
+    weights = np.array([p.wgt for p in particles])
+
+    # Check biased weighted mean
+    weighted_energies = energies * weights
+    assert_sample_mean(weighted_energies, exp_mean)
+    assert np.any(weights != 1.0)
+
+
+@pytest.mark.flaky(reruns=1)
+def test_powerlaw(run_in_tmpdir, model):
+    """Test PowerLaw distribution sampling via C++ routines."""
+    a, b, n = 1.0, 20.0, 2.0
+
+    # Determine mean of distribution
+    exp_mean = (n+1)*(b**(n+2) - a**(n+2))/((n+2)*(b**(n+1) - a**(n+1)))
+
+    # Create source with powerlaw energy distribution
+    model.settings.source[0].energy = energy_dist = openmc.stats.PowerLaw(a, b, n)
+
+    # Sample using C++ routines and extract energies
+    n_samples = 10_000
+    particles = model.sample_external_source(n_samples)
+    energies = np.array([p.E for p in particles])
+
+    # Check unbiased mean
+    assert_sample_mean(energies, exp_mean)
+
+    # Sample from biased distribution
+    energy_dist.bias = openmc.stats.Uniform(a, b)
+    particles = model.sample_external_source(n_samples)
+    energies = np.array([p.E for p in particles])
+    weights = np.array([p.wgt for p in particles])
+
+    # Check biased weighted mean
+    weighted_energies = energies * weights
+    assert_sample_mean(weighted_energies, exp_mean)
+    assert np.any(weights != 1.0)
+
+
+@pytest.mark.flaky(reruns=1)
+def test_maxwell(run_in_tmpdir, model):
+    """Test Maxwell distribution sampling via C++ routines."""
+    theta = 1.2895e6
+    exp_mean = 3/2 * theta
+
+    # Create source with Maxwell energy distribution
+    model.settings.source[0].energy = energy_dist = openmc.stats.Maxwell(theta)
+
+    # Sample using C++ routines and extract energies
+    n_samples = 10_000
+    particles = model.sample_external_source(n_samples)
+    energies = np.array([p.E for p in particles])
+
+    # Check unbiased mean
+    assert_sample_mean(energies, exp_mean)
+
+    # Sample from biased distribution
+    energy_dist.bias = openmc.stats.Maxwell(theta * 1.1)
+    particles = model.sample_external_source(n_samples)
+    energies = np.array([p.E for p in particles])
+    weights = np.array([p.wgt for p in particles])
+
+    # Check biased weighted mean
+    weighted_energies = energies * weights
+    assert_sample_mean(weighted_energies, exp_mean)
+    assert np.any(weights != 1.0)
+
+
+@pytest.mark.flaky(reruns=1)
+def test_watt(run_in_tmpdir, model):
+    """Test Watt distribution sampling via C++ routines."""
+    a, b = 0.965e6, 2.29e-6
+    exp_mean = 3/2 * a + a**2 * b / 4
+
+    # Create source with Watt energy distribution
+    model.settings.source[0].energy = energy_dist = openmc.stats.Watt(a, b)
+
+    # Sample using C++ routines and extract energies
+    n_samples = 10_000
+    particles = model.sample_external_source(n_samples)
+    energies = np.array([p.E for p in particles])
+
+    # Check unbiased mean
+    assert_sample_mean(energies, exp_mean)
+
+    # Sample from biased distribution
+    energy_dist.bias = openmc.stats.Watt(a*1.05, b)
+    particles = model.sample_external_source(n_samples)
+    energies = np.array([p.E for p in particles])
+    weights = np.array([p.wgt for p in particles])
+
+    # Check biased weighted mean
+    weighted_energies = energies * weights
+    assert_sample_mean(weighted_energies, exp_mean)
+    assert np.any(weights != 1.0)
+
+
+@pytest.mark.flaky(reruns=1)
+def test_tabular(run_in_tmpdir, model):
+    """Test Tabular distribution sampling via C++ routines."""
+    # Test linear-linear sampling
+    x = np.array([0.0, 5.0, 7.0, 10.0])
+    p = np.array([10.0, 20.0, 5.0, 6.0])
+
+    # Create tabular distribution and normalize to get expected mean
+    model.settings.source[0].energy = energy_dist = openmc.stats.Tabular(x, p, 'linear-linear')
+    energy_dist.normalize()
+    exp_mean = energy_dist.mean()
+
+    # Sample using C++ routines and extract energies
+    n_samples = 10_000
+    particles = model.sample_external_source(n_samples)
+    energies = np.array([p.E for p in particles])
+
+    # Check unbiased mean
+    assert_sample_mean(energies, exp_mean)
+
+    # Sample from biased distribution
+    energy_dist.bias = openmc.stats.Uniform(x[0], x[-1])
+    particles = model.sample_external_source(n_samples)
+    energies = np.array([p.E for p in particles])
+    weights = np.array([p.wgt for p in particles])
+
+    # Check biased weighted mean
+    weighted_energies = energies * weights
+    assert_sample_mean(weighted_energies, exp_mean)
+    assert np.any(weights != 1.0)
+
+
+@pytest.mark.flaky(reruns=1)
+def test_mixture(run_in_tmpdir, model):
+    """Test Mixture distribution sampling via C++ routines."""
+    d1 = openmc.stats.Uniform(0, 5)
+    d2 = openmc.stats.Uniform(3, 7)
+    p = [0.5, 0.5]
+
+    # Create mixture energy distribution
+    model.settings.source[0].energy = energy_dist = openmc.stats.Mixture(p, [d1, d2])
+    exp_mean = (2.5 + 5.0) / 2
+
+    # Sample using C++ routines and extract energies
+    n_samples = 10_000
+    particles = model.sample_external_source(n_samples)
+    energies = np.array([p.E for p in particles])
+
+    # Check unbiased mean
+    assert_sample_mean(energies, exp_mean)
+
+    # Sample using biased sub-distribution
+    energy_dist.distribution[0].bias = openmc.stats.PowerLaw(0, 5, 2)
+    particles = model.sample_external_source(n_samples)
+    energies = np.array([p.E for p in particles])
+    weights = np.array([p.wgt for p in particles])
+
+    # Check biased weighted mean
+    weighted_energies = energies * weights
+    assert_sample_mean(weighted_energies, exp_mean)
+    assert np.any(weights != 1.0)
+
+
+@pytest.mark.flaky(reruns=1)
+def test_normal(run_in_tmpdir, model):
+    """Test Normal distribution sampling via C++ routines."""
+    mean_val = 25.0
+    std_dev = 2.0
+
+    # Create source with normal energy distribution
+    model.settings.source[0].energy = energy_dist = openmc.stats.Normal(mean_val, std_dev)
+
+    # Sample using C++ routines and extract energies
+    n_samples = 10_000
+    particles = model.sample_external_source(n_samples)
+    energies = np.array([p.E for p in particles])
+
+    # Check unbiased mean
+    assert_sample_mean(energies, mean_val)
+
+    # Sample from biased distribution
+    energy_dist.bias = openmc.stats.Normal(mean_val * 1.1, std_dev)
+    particles = model.sample_external_source(n_samples)
+    energies = np.array([p.E for p in particles])
+    weights = np.array([p.wgt for p in particles])
+
+    # Check biased weighted mean
+    weighted_energies = energies * weights
+    assert_sample_mean(weighted_energies, mean_val)
+    assert np.any(weights != 1.0)
diff --git a/tests/unit_tests/test_stats.py b/tests/unit_tests/test_stats.py
index 998d4b984..e92e9e135 100644
--- a/tests/unit_tests/test_stats.py
+++ b/tests/unit_tests/test_stats.py
@@ -6,14 +6,7 @@ import openmc
 import openmc.stats
 from scipy.integrate import trapezoid
 
-
-def assert_sample_mean(samples, expected_mean):
-    # Calculate sample standard deviation
-    std_dev = samples.std() / np.sqrt(samples.size - 1)
-
-    # Means should agree within 4 sigma 99.993% of the time. Note that this is
-    # expected to fail about 1 out of 16,000 times
-    assert np.abs(expected_mean - samples.mean()) < 4*std_dev
+from tests.unit_tests import assert_sample_mean
 
 
 @pytest.mark.flaky(reruns=1)
@@ -47,8 +40,19 @@ def test_discrete():
     # sample discrete distribution and check that the mean of the samples is
     # within 4 std. dev. of the expected mean
     n_samples = 1_000_000
-    samples = d3.sample(n_samples)
+    samples, weights = d3.sample(n_samples)
     assert_sample_mean(samples, exp_mean)
+    assert np.all(weights == 1.0)
+
+    # Test biased distribution
+    d3.bias = np.array([0.2, 0.1, 0.7])
+    bias_elem = d3.to_xml_element('distribution')
+    d4 = openmc.stats.Univariate.from_xml_element(bias_elem)
+    np.testing.assert_array_equal(d4.bias, [0.2, 0.1, 0.7])
+    samples, weights = d4.sample(n_samples)
+    weighted_sample = samples * weights
+    assert_sample_mean(weighted_sample, exp_mean)
+    assert np.all(weights != 1.0)
 
 
 def test_delta_function():
@@ -83,6 +87,28 @@ def test_merge_discrete():
     assert triple.integral() == pytest.approx(6.0)
 
 
+def test_merge_discrete_with_bias():
+    # Two discrete distributions with different biases
+    d1 = openmc.stats.Discrete([1.0, 2.0], [0.5, 0.5])
+    d2 = openmc.stats.Discrete([2.0, 3.0], [0.3, 0.7], bias=[0.1, 0.9])
+
+    merged = openmc.stats.Discrete.merge([d1, d2], [0.6, 0.4])
+    exp_mean = 0.6 * d1.mean() + 0.4 * d2.mean()
+
+    # Verify merged distribution has correct x values
+    assert set(merged.x) == {1.0, 2.0, 3.0}
+
+    # Bias should not be changed in original distributions
+    assert d1.bias is None
+    assert np.all(d2.bias == [0.1, 0.9])
+
+    # Sample and verify bias is applied correctly
+    samples, weights = merged.sample(10_000)
+
+    # Verify weighted mean matches expected unbiased mean
+    assert_sample_mean(samples*weights, exp_mean)
+
+
 def test_clip_discrete():
     # Create discrete distribution with two points that are not important, one
     # because the x value is very small, and one because the p value is very
@@ -125,8 +151,19 @@ def test_uniform():
     # std. dev. of the expected mean
     exp_mean = 0.5 * (a + b)
     n_samples = 1_000_000
-    samples = d.sample(n_samples)
+    samples, weights = d.sample(n_samples)
     assert_sample_mean(samples, exp_mean)
+    assert np.all(weights == 1.0)
+
+    # Test biased distribution
+    d.bias = openmc.stats.PowerLaw(a, b, 2)
+    bias_elem = d.to_xml_element('distribution')
+    d2 = openmc.stats.Univariate.from_xml_element(bias_elem)
+    assert isinstance (d2.bias, openmc.stats.PowerLaw)
+    samples, weights = d2.sample(n_samples)
+    weighted_sample = samples * weights
+    assert_sample_mean(weighted_sample, exp_mean)
+    assert np.all(weights != 1.0)
 
 
 @pytest.mark.flaky(reruns=1)
@@ -147,8 +184,19 @@ def test_powerlaw():
     # sample power law distribution and check that the mean of the samples is
     # within 4 std. dev. of the expected mean
     n_samples = 1_000_000
-    samples = d.sample(n_samples)
+    samples, weights = d.sample(n_samples)
     assert_sample_mean(samples, exp_mean)
+    assert np.all(weights == 1.0)
+
+    # Test biased distribution
+    d.bias = openmc.stats.Uniform(a, b)
+    bias_elem = d.to_xml_element('distribution')
+    d2 = openmc.stats.Univariate.from_xml_element(bias_elem)
+    assert isinstance (d2.bias, openmc.stats.Uniform)
+    samples, weights = d2.sample(n_samples)
+    weighted_sample = samples * weights
+    assert_sample_mean(weighted_sample, exp_mean)
+    assert np.all(weights != 1.0)
 
 
 @pytest.mark.flaky(reruns=1)
@@ -166,13 +214,25 @@ def test_maxwell():
     # sample maxwell distribution and check that the mean of the samples is
     # within 4 std. dev. of the expected mean
     n_samples = 1_000_000
-    samples = d.sample(n_samples)
+    samples, weights = d.sample(n_samples)
     assert_sample_mean(samples, exp_mean)
+    assert np.all(weights == 1.0)
 
     # A second sample starting from a different seed
-    samples_2 = d.sample(n_samples)
+    samples_2, weights_2 = d.sample(n_samples)
     assert_sample_mean(samples_2, exp_mean)
     assert samples_2.mean() != samples.mean()
+    assert np.all(weights_2 == 1)
+
+    # Test biased distribution
+    d.bias = openmc.stats.Maxwell((theta * 1.1))
+    bias_elem = d.to_xml_element('distribution')
+    d2 = openmc.stats.Univariate.from_xml_element(bias_elem)
+    assert isinstance (d2.bias, openmc.stats.Maxwell)
+    samples, weights = d2.sample(n_samples)
+    weighted_sample = samples * weights
+    assert_sample_mean(weighted_sample, exp_mean)
+    assert np.all(weights != 1.0)
 
 
 @pytest.mark.flaky(reruns=1)
@@ -195,8 +255,19 @@ def test_watt():
     # sample Watt distribution and check that the mean of the samples is within
     # 4 std. dev. of the expected mean
     n_samples = 1_000_000
-    samples = d.sample(n_samples)
+    samples, weights = d.sample(n_samples)
     assert_sample_mean(samples, exp_mean)
+    assert np.all(weights == 1.0)
+
+    # Test biased distribution with 5 percent higher T_e
+    d.bias = openmc.stats.Watt(a*1.05, b)
+    bias_elem = d.to_xml_element('distribution')
+    d2 = openmc.stats.Univariate.from_xml_element(bias_elem)
+    assert isinstance (d2.bias, openmc.stats.Watt)
+    samples, weights = d2.sample(n_samples)
+    weighted_sample = samples * weights
+    assert_sample_mean(weighted_sample, exp_mean)
+    assert np.all(weights != 1.0)
 
 
 @pytest.mark.flaky(reruns=1)
@@ -206,8 +277,9 @@ def test_tabular():
     p = np.array([10.0, 20.0, 5.0, 6.0])
     d = openmc.stats.Tabular(x, p, 'linear-linear')
     n_samples = 100_000
-    samples = d.sample(n_samples)
+    samples, weights = d.sample(n_samples)
     assert_sample_mean(samples, d.mean())
+    assert np.all(weights == 1.0)
 
     # test linear-linear normalization
     d.normalize()
@@ -215,8 +287,9 @@ def test_tabular():
 
     # test histogram sampling
     d = openmc.stats.Tabular(x, p, interpolation='histogram')
-    samples = d.sample(n_samples)
+    samples, weights = d.sample(n_samples)
     assert_sample_mean(samples, d.mean())
+    assert np.all(weights == 1.0)
 
     d.normalize()
     assert d.integral() == pytest.approx(1.0)
@@ -226,7 +299,7 @@ def test_tabular():
     d = openmc.stats.Tabular(x, p[:-1], interpolation='histogram')
     d.cdf()
     d.mean()
-    assert_sample_mean(d.sample(n_samples), d.mean())
+    assert_sample_mean(d.sample(n_samples)[0], d.mean())
 
     # passing a shorter probability set should raise an error for linear-linear
     with pytest.raises(ValueError):
@@ -238,6 +311,16 @@ def test_tabular():
     d = openmc.stats.Tabular(x, p, interpolation='linear-linear')
     d.cdf()
 
+    # Test biased distribution
+    d.bias = openmc.stats.Uniform(x[0], x[-1])
+    bias_elem = d.to_xml_element('distribution')
+    d2 = openmc.stats.Univariate.from_xml_element(bias_elem)
+    assert isinstance (d2.bias, openmc.stats.Uniform)
+    samples, weights = d2.sample(n_samples)
+    weighted_sample = samples * weights
+    assert_sample_mean(weighted_sample, d2.mean())
+    assert np.all(weights != 1.0)
+
 
 def test_tabular_from_xml():
     x = np.array([0.0, 5.0, 7.0, 10.0])
@@ -288,8 +371,9 @@ def test_mixture():
 
     # Sample and make sure sample mean is close to expected mean
     n_samples = 1_000_000
-    samples = mix.sample(n_samples)
+    samples, weights = mix.sample(n_samples)
     assert_sample_mean(samples, (2.5 + 5.0)/2)
+    assert np.all(weights == 1.0)
 
     elem = mix.to_xml_element('distribution')
 
@@ -298,6 +382,26 @@ def test_mixture():
     assert d.distribution == [d1, d2]
     assert len(d) == 4
 
+    # Test biased sub-distribution
+    d.distribution[0].bias = openmc.stats.PowerLaw(0, 5, 2)
+    bias_elem = d.to_xml_element('distribution')
+    d3 = openmc.stats.Univariate.from_xml_element(bias_elem)
+    assert isinstance (d3.distribution[0].bias, openmc.stats.PowerLaw)
+    samples, weights = d3.sample(n_samples)
+    weighted_sample = samples * weights
+    assert_sample_mean(weighted_sample, (2.5 + 5.0)/2)
+
+    # Test biased meta-probability
+    d.distribution[0].bias = None
+    d.bias = [0.25, 0.75]
+    bias_elem_2 = d.to_xml_element('distribution')
+    d4 = openmc.stats.Univariate.from_xml_element(bias_elem_2)
+    assert isinstance (d4.bias, np.ndarray)
+    samples, weights = d4.sample(n_samples)
+    weighted_sample = samples * weights
+    assert_sample_mean(weighted_sample, (2.5 + 5.0)/2)
+    assert np.all(weights != 1.0)
+
 
 def test_mixture_clip():
     # Create mixture distribution containing a discrete distribution with two
@@ -330,6 +434,13 @@ def test_mixture_clip():
     with pytest.warns(UserWarning):
         mix_clip = mix.clip(1e-6)
 
+    # Make sure warning is raised if a biased Discrete is clipped
+    d3 = openmc.stats.Discrete([1.0, 1.001], [1.0, 0.7e-8])
+    d3.bias = [0.9, 0.1]
+    mix = openmc.stats.Mixture([1.0, 1.0], [d3, d2])
+    with pytest.raises(RuntimeError):
+        mix_clip = mix.clip(1e-6)
+
 
 def test_polar_azimuthal():
     # default polar-azimuthal should be uniform in mu and phi
@@ -365,12 +476,17 @@ def test_polar_azimuthal():
 
 def test_isotropic():
     d = openmc.stats.Isotropic()
+    mu = openmc.stats.Uniform(-1.0, 1.0)
+    phi = openmc.stats.PowerLaw(0., 2*np.pi, 2)
+    d2 = openmc.stats.PolarAzimuthal(mu, phi)
+    d.bias = d2
     elem = d.to_xml_element()
     assert elem.tag == 'angle'
     assert elem.attrib['type'] == 'isotropic'
 
     d = openmc.stats.Isotropic.from_xml_element(elem)
     assert isinstance(d, openmc.stats.Isotropic)
+    assert isinstance(d.bias, openmc.stats.PolarAzimuthal)
 
 
 def test_monodirectional():
@@ -387,6 +503,7 @@ def test_cartesian():
     x = openmc.stats.Uniform(-10., 10.)
     y = openmc.stats.Uniform(-10., 10.)
     z = openmc.stats.Uniform(0., 20.)
+    z.bias = openmc.stats.PowerLaw(0., 20., 3)
     d = openmc.stats.CartesianIndependent(x, y, z)
 
     elem = d.to_xml_element()
@@ -402,6 +519,7 @@ def test_cartesian():
 
     d = openmc.stats.Spatial.from_xml_element(elem)
     assert isinstance(d, openmc.stats.CartesianIndependent)
+    assert isinstance (d.z.bias, openmc.stats.PowerLaw)
 
 
 def test_box():
@@ -448,8 +566,19 @@ def test_normal():
 
     # sample normal distribution
     n_samples = 100_000
-    samples = d.sample(n_samples)
+    samples, weights = d.sample(n_samples)
     assert_sample_mean(samples, mean)
+    assert np.all(weights == 1.0)
+
+    # Test biased distribution
+    d.bias = openmc.stats.Normal(10.0, 4.0)
+    bias_elem = d.to_xml_element('distribution')
+    d2 = openmc.stats.Univariate.from_xml_element(bias_elem)
+    assert isinstance (d2.bias, openmc.stats.Normal)
+    samples, weights = d2.sample(n_samples)
+    weighted_sample = samples * weights
+    assert_sample_mean(weighted_sample, mean)
+    assert np.all(weights != 1.0)
 
 
 @pytest.mark.flaky(reruns=1)
@@ -468,8 +597,9 @@ def test_muir():
 
     # sample muir distribution
     n_samples = 100_000
-    samples = d.sample(n_samples)
+    samples, weights = d.sample(n_samples)
     assert_sample_mean(samples, mean)
+    assert np.all(weights == 1.0)
 
 
 @pytest.mark.flaky(reruns=1)
@@ -514,8 +644,27 @@ def test_combine_distributions():
 
     # Sample the combined distribution and make sure the sample mean is within
     # uncertainty of the expected value
-    samples = combined.sample(10_000)
+    samples, weights = combined.sample(10_000)
     assert_sample_mean(samples, 0.25)
+    assert np.all(weights == 1.0)
+
+    # If biased/unbiased Discrete distributions are combined, unbiased probability
+    # should be conserved and points from both original distributions should be
+    # assigned bias probabilities.
+    x1 = [0.0, 1.0, 10.0]
+    p1 = [0.3, 0.2, 0.5]
+    b1 = [0.2, 0.5, 0.3]
+    d1 = openmc.stats.Discrete(x1, p1, b1)
+    x2 = [0.5, 1.0, 5.0]
+    p2 = [0.4, 0.5, 0.1]
+    d2 = openmc.stats.Discrete(x2, p2)
+    combined = openmc.stats.combine_distributions([d1, d2, t1], [0.25, 0.25, 0.5])
+
+    p3 = [0.075, 0.1, 0.175, 0.025, 0.125]
+    b3 = [0.05, 0.1, 0.25, 0.025, 0.075]
+    assert all(combined.distribution[-1].p == p3)
+    assert all(combined.distribution[-1].bias == b3)
+
 
 def test_reference_vwu_projection():
     """When a non-orthogonal vector is provided, the setter should project out