Allow plot, volume, and particle restart run modes directly

2026-07-27 21:55:41 -04:00 · 2017-02-16 17:10:19 -06:00 · 2017-02-16 17:10:19 -06:00 · ffc3bbfd67
commit ffc3bbfd67
parent 5d2ad92769
89 changed files with 499 additions and 584 deletions
--- a/examples/xml/basic/settings.xml
+++ b/examples/xml/basic/settings.xml
@ -1,12 +1,10 @@
 <?xml version="1.0"?>
 <settings>

-  <!-- Parameters for k-eigenvalue calculation -->
-  <eigenvalue>
-    <batches>15</batches>
-    <inactive>5</inactive>
-    <particles>10000</particles>
-  </eigenvalue>
+  <run_mode>eigenvalue</run_mode>
+  <batches>15</batches>
+  <inactive>5</inactive>
+  <particles>10000</particles>

  <!-- Starting source -->
  <source>
--- a/examples/xml/boxes/settings.xml
+++ b/examples/xml/boxes/settings.xml
@ -2,11 +2,10 @@
 <settings>

  <!-- Parameters for k-eigenvalue calculation -->
-  <eigenvalue>
-    <batches>15</batches>
-    <inactive>5</inactive>
-    <particles>10000</particles>
-  </eigenvalue>
+  <run_mode>eigenvalue</run_mode>
+  <batches>15</batches>
+  <inactive>5</inactive>
+  <particles>10000</particles>

  <!-- Starting source -->
  <source>
--- a/examples/xml/lattice/nested/settings.xml
+++ b/examples/xml/lattice/nested/settings.xml
@ -2,11 +2,10 @@
 <settings>

  <!-- Parameters for k-eigenvalue calculation -->
-  <eigenvalue>
-    <batches>20</batches>
-    <inactive>10</inactive>
-    <particles>10000</particles>
-  </eigenvalue>
+  <run_mode>eigenvalue</run_mode>
+  <batches>20</batches>
+  <inactive>10</inactive>
+  <particles>10000</particles>

  <!-- Starting source -->
  <source>
--- a/examples/xml/lattice/simple/settings.xml
+++ b/examples/xml/lattice/simple/settings.xml
@ -2,11 +2,10 @@
 <settings>

  <!-- Parameters for k-eigenvalue calculation -->
-  <eigenvalue>
-    <batches>20</batches>
-    <inactive>10</inactive>
-    <particles>10000</particles>
-  </eigenvalue>
+  <run_mode>eigenvalue</run_mode>
+  <batches>20</batches>
+  <inactive>10</inactive>
+  <particles>10000</particles>

  <!-- Starting source -->
  <source>
--- a/examples/xml/pincell/settings.xml
+++ b/examples/xml/pincell/settings.xml
@ -2,11 +2,10 @@
 <settings>

  <!-- Define how many particles to run and for how many batches -->
-  <eigenvalue>
-    <batches>100</batches>
-    <inactive>10</inactive>
-    <particles>1000</particles>
-  </eigenvalue>
+  <run_mode>eigenvalue</run_mode>
+  <batches>100</batches>
+  <inactive>10</inactive>
+  <particles>1000</particles>

  <!-- The starting source is a uniform distribution over the entire pin
       cell. Note that since this is effectively a 2D model, the z coordinates
@ -29,4 +28,4 @@
    <dimension>10 10 1</dimension>
  </entropy>

-</settings>
+</settings>
--- a/examples/xml/pincell_multigroup/settings.xml
+++ b/examples/xml/pincell_multigroup/settings.xml
@ -1,14 +1,10 @@
 <?xml version='1.0' encoding='utf-8'?>
 <settings>
-    <eigenvalue>
-        <particles>1000</particles>
-        <batches>100</batches>
-        <inactive>10</inactive>
-    </eigenvalue>
-    <source strength="1.0">
-        <space type="box">
-            <parameters>-0.63 -0.63 -1 0.63 0.63 1</parameters>
-        </space>
-    </source>
-    <energy_mode>multi-group</energy_mode>
+  <run_mode>eigenvalue</run_mode>
+  <source strength="1.0">
+    <space type="box">
+      <parameters>-0.63 -0.63 -1 0.63 0.63 1</parameters>
+    </space>
+  </source>
+  <energy_mode>multi-group</energy_mode>
 </settings>
--- a/examples/xml/reflective/settings.xml
+++ b/examples/xml/reflective/settings.xml
@ -2,11 +2,10 @@
 <settings>

  <!-- Parameters for k-eigenvalue calculation -->
-  <eigenvalue>
-    <batches>500</batches>
-    <inactive>10</inactive>
-    <particles>10000</particles>
-  </eigenvalue>
+  <run_mode>eigenvalue</run_mode>
+  <batches>500</batches>
+  <inactive>10</inactive>
+  <particles>10000</particles>

  <!-- Starting source -->
  <source>
--- a/openmc/settings.py
+++ b/openmc/settings.py
@ -11,6 +11,9 @@ from openmc.clean_xml import clean_xml_indentation
 import openmc.checkvalue as cv
 from openmc import Nuclide, VolumeCalculation, Source, Mesh

+_RUN_MODES = ['eigenvalue', 'fixed source', 'plot', 'volume',
+              'particle restart']
+

 class Settings(object):
    """Settings used for an OpenMC simulation.
@ -81,7 +84,7 @@ class Settings(object):
        The elastic scattering model to use for resonant isotopes
    run_cmfd : bool
        Indicate if coarse mesh finite difference acceleration is to be used
-    run_mode : {'eigenvalue' or 'fixed source'}
+    run_mode : {'eigenvalue', 'fixed source', 'plot', 'volume', 'particle restart'}
        The type of calculation to perform (default is 'eigenvalue')
    seed : int
        Seed for the linear congruential pseudorandom number generator
@ -388,10 +391,7 @@ class Settings(object):

    @run_mode.setter
    def run_mode(self, run_mode):
-        if run_mode not in ['eigenvalue', 'fixed source']:
-            msg = 'Unable to set run mode to "{0}". Only "eigenvalue" ' \
-                  'and "fixed source" are supported."'.format(run_mode)
-            raise ValueError(msg)
+        cv.check_value('run mode', run_mode, _RUN_MODES)
        self._run_mode = run_mode

    @batches.setter
@ -794,18 +794,8 @@ class Settings(object):
        self._create_fission_neutrons = create_fission_neutrons

    def _create_run_mode_subelement(self, root):
-
-        if self.run_mode == 'eigenvalue':
-            elem = ET.SubElement(root, "eigenvalue")
-            self._create_particles_subelement(elem)
-            self._create_batches_subelement(elem)
-            self._create_inactive_subelement(elem)
-            self._create_generations_per_batch_subelement(elem)
-            self._create_keff_trigger_subelement(elem)
-        else:
-            elem = ET.SubElement(root, "fixed_source")
-            self._create_particles_subelement(elem)
-            self._create_batches_subelement(elem)
+        elem = ET.SubElement(root, "run_mode")
+        elem.text = self._run_mode

    def _create_batches_subelement(self, run_mode_element):
        if self._batches is not None:
@ -814,8 +804,7 @@ class Settings(object):

    def _create_generations_per_batch_subelement(self, run_mode_element):
        if self._generations_per_batch is not None:
-            element = ET.SubElement(run_mode_element,
-                                    "generations_per_batch")
+            element = ET.SubElement(run_mode_element, "generations_per_batch")
            element.text = str(self._generations_per_batch)

    def _create_inactive_subelement(self, run_mode_element):
@ -1081,6 +1070,11 @@ class Settings(object):
        root_element = ET.Element("settings")

        self._create_run_mode_subelement(root_element)
+        self._create_particles_subelement(root_element)
+        self._create_batches_subelement(root_element)
+        self._create_inactive_subelement(root_element)
+        self._create_generations_per_batch_subelement(root_element)
+        self._create_keff_trigger_subelement(root_element)
        self._create_source_subelement(root_element)
        self._create_output_subelement(root_element)
        self._create_statepoint_subelement(root_element)
--- a/src/constants.F90
+++ b/src/constants.F90
@ -424,7 +424,8 @@ module constants
       MODE_FIXEDSOURCE = 1, & ! Fixed source mode
       MODE_EIGENVALUE  = 2, & ! K eigenvalue mode
       MODE_PLOTTING    = 3, & ! Plotting mode
-       MODE_PARTICLE    = 4    ! Particle restart mode
+       MODE_PARTICLE    = 4, & ! Particle restart mode
+       MODE_VOLUME      = 5    ! Volume calculation mode

  !=============================================================================
  ! CMFD CONSTANTS
--- a/src/input_xml.F90
+++ b/src/input_xml.F90
@ -100,7 +100,6 @@ contains
    type(Node), pointer :: node_res_scat  => null()
    type(Node), pointer :: node_scatterer => null()
    type(Node), pointer :: node_trigger   => null()
-    type(Node), pointer :: node_keff_trigger => null()
    type(Node), pointer :: node_vol => null()
    type(Node), pointer :: node_tab_leg => null()
    type(NodeList), pointer :: node_scat_list => null()
@ -224,111 +223,49 @@ contains
      end if
    end if

-    ! Make sure that either eigenvalue or fixed source was specified
-    if (.not. check_for_node(doc, "eigenvalue") .and. &
-         .not. check_for_node(doc, "fixed_source")) then
-      call fatal_error("<eigenvalue> or <fixed_source> not specified.")
-    end if
+    if (check_for_node(doc, "run_mode")) then
+      call get_node_value(doc, "run_mode", temp_str)
+      select case (to_lower(temp_str))
+      case ("eigenvalue")
+        run_mode = MODE_EIGENVALUE
+      case ("fixed source")
+        run_mode = MODE_FIXEDSOURCE
+      case ("plot")
+        run_mode = MODE_PLOTTING
+      case ("particle restart")
+        run_mode = MODE_PARTICLE
+      case ("volume")
+        run_mode = MODE_VOLUME
+      end select

-    ! Eigenvalue information
-    if (check_for_node(doc, "eigenvalue")) then
-      ! Set run mode
-      if (run_mode == NONE) run_mode = MODE_EIGENVALUE
+      ! Assume XML specifics <particles>, <batches>, etc. directly
+      node_mode => doc
+    else
+      call warning("<run_mode> should be specified.")

-      ! Get pointer to eigenvalue XML block
-      call get_node_ptr(doc, "eigenvalue", node_mode)
-
-      ! Check number of particles
-      if (.not. check_for_node(node_mode, "particles")) then
-        call fatal_error("Need to specify number of particles per generation.")
+      ! Make sure that either eigenvalue or fixed source was specified
+      if (.not. check_for_node(doc, "eigenvalue") .and. &
+           .not. check_for_node(doc, "fixed_source")) then
+        call fatal_error("<eigenvalue> or <fixed_source> not specified.")
      end if

-      ! Get number of particles
-      call get_node_value(node_mode, "particles", temp_long)
+      if (check_for_node(doc, "eigenvalue")) then
+        ! Set run mode
+        if (run_mode == NONE) run_mode = MODE_EIGENVALUE

-      ! If the number of particles was specified as a command-line argument, we
-      ! don't set it here
-      if (n_particles == 0) n_particles = temp_long
+        ! Get pointer to eigenvalue XML block
+        call get_node_ptr(doc, "eigenvalue", node_mode)
+      elseif (check_for_node(doc, "fixed_source")) then
+        ! Set run mode
+        if (run_mode == NONE) run_mode = MODE_FIXEDSOURCE

-      ! Get number of basic batches
-      call get_node_value(node_mode, "batches", n_batches)
-      if (.not. trigger_on) then
-        n_max_batches = n_batches
-      end if
-
-      ! Get number of inactive batches
-      call get_node_value(node_mode, "inactive", n_inactive)
-      n_active = n_batches - n_inactive
-      if (check_for_node(node_mode, "generations_per_batch")) then
-        call get_node_value(node_mode, "generations_per_batch", gen_per_batch)
-      end if
-
-      ! Allocate array for batch keff and entropy
-      allocate(k_generation(n_max_batches*gen_per_batch))
-      allocate(entropy(n_max_batches*gen_per_batch))
-      entropy = ZERO
-
-      ! Get the trigger information for keff
-      if (check_for_node(node_mode, "keff_trigger")) then
-        call get_node_ptr(node_mode, "keff_trigger", node_keff_trigger)
-
-        if (check_for_node(node_keff_trigger, "type")) then
-          call get_node_value(node_keff_trigger, "type", temp_str)
-          temp_str = trim(to_lower(temp_str))
-
-          select case (temp_str)
-          case ('std_dev')
-            keff_trigger % trigger_type = STANDARD_DEVIATION
-          case ('variance')
-            keff_trigger % trigger_type = VARIANCE
-          case ('rel_err')
-            keff_trigger % trigger_type = RELATIVE_ERROR
-          case default
-            call fatal_error("Unrecognized keff trigger type " // temp_str)
-          end select
-
-        else
-          call fatal_error("Specify keff trigger type in settings XML")
-        end if
-
-        if (check_for_node(node_keff_trigger, "threshold")) then
-          call get_node_value(node_keff_trigger, "threshold", &
-               keff_trigger % threshold)
-        else
-          call fatal_error("Specify keff trigger threshold in settings XML")
-        end if
+        ! Get pointer to fixed_source XML block
+        call get_node_ptr(doc, "fixed_source", node_mode)
      end if
    end if

-    ! Fixed source calculation information
-    if (check_for_node(doc, "fixed_source")) then
-      ! Set run mode
-      if (run_mode == NONE) run_mode = MODE_FIXEDSOURCE
-
-      ! Get pointer to fixed_source XML block
-      call get_node_ptr(doc, "fixed_source", node_mode)
-
-      ! Check number of particles
-      if (.not. check_for_node(node_mode, "particles")) then
-        call fatal_error("Need to specify number of particles per batch.")
-      end if
-
-      ! Get number of particles
-      call get_node_value(node_mode, "particles", temp_long)
-
-      ! If the number of particles was specified as a command-line argument, we
-      ! don't set it here
-      if (n_particles == 0) n_particles = temp_long
-
-      ! Copy batch information
-      call get_node_value(node_mode, "batches", n_batches)
-      if (.not. trigger_on) then
-        n_max_batches = n_batches
-      end if
-      n_active = n_batches
-      n_inactive    = 0
-      gen_per_batch = 1
-    end if
+    ! Read run parameters
+    call get_run_parameters(node_mode)

    ! Check number of active batches, inactive batches, and particles
    if (n_active <= 0) then
@ -1093,6 +1030,86 @@ contains

  end subroutine read_settings_xml

+!===============================================================================
+! GET_RUN_PARAMETERS
+!===============================================================================
+
+  subroutine get_run_parameters(node_base)
+    type(Node), pointer :: node_base
+
+    integer(8) :: temp_long
+    character(MAX_LINE_LEN) :: temp_str
+    type(Node), pointer :: node_keff_trigger => null()
+
+    ! Check number of particles
+    if (.not. check_for_node(node_base, "particles")) then
+      call fatal_error("Need to specify number of particles.")
+    end if
+
+    ! Get number of particles
+    call get_node_value(node_base, "particles", temp_long)
+
+    ! If the number of particles was specified as a command-line argument, we
+    ! don't set it here
+    if (n_particles == 0) n_particles = temp_long
+
+    ! Get number of basic batches
+    call get_node_value(node_base, "batches", n_batches)
+    if (.not. trigger_on) then
+      n_max_batches = n_batches
+    end if
+    n_inactive = 0
+    gen_per_batch = 1
+
+    ! Get number of inactive batches
+    if (run_mode == MODE_EIGENVALUE) then
+      call get_node_value(node_base, "inactive", n_inactive)
+      if (check_for_node(node_base, "generations_per_batch")) then
+        call get_node_value(node_base, "generations_per_batch", gen_per_batch)
+      end if
+
+      ! Allocate array for batch keff and entropy
+      allocate(k_generation(n_max_batches*gen_per_batch))
+      allocate(entropy(n_max_batches*gen_per_batch))
+      entropy = ZERO
+
+      ! Get the trigger information for keff
+      if (check_for_node(node_base, "keff_trigger")) then
+        call get_node_ptr(node_base, "keff_trigger", node_keff_trigger)
+
+        if (check_for_node(node_keff_trigger, "type")) then
+          call get_node_value(node_keff_trigger, "type", temp_str)
+          temp_str = trim(to_lower(temp_str))
+
+          select case (temp_str)
+          case ('std_dev')
+            keff_trigger % trigger_type = STANDARD_DEVIATION
+          case ('variance')
+            keff_trigger % trigger_type = VARIANCE
+          case ('rel_err')
+            keff_trigger % trigger_type = RELATIVE_ERROR
+          case default
+            call fatal_error("Unrecognized keff trigger type " // temp_str)
+          end select
+
+        else
+          call fatal_error("Specify keff trigger type in settings XML")
+        end if
+
+        if (check_for_node(node_keff_trigger, "threshold")) then
+          call get_node_value(node_keff_trigger, "threshold", &
+               keff_trigger % threshold)
+        else
+          call fatal_error("Specify keff trigger threshold in settings XML")
+        end if
+      end if
+    end if
+
+    ! Determine number of active batches
+    n_active = n_batches - n_inactive
+
+  end subroutine get_run_parameters
+
 !===============================================================================
 ! READ_GEOMETRY_XML reads data from a geometry.xml file and parses it, checking
 ! for errors and placing properly-formatted data in the right data structures
--- a/tests/test_asymmetric_lattice/inputs_true.dat
+++ b/tests/test_asymmetric_lattice/inputs_true.dat
@ -205,11 +205,10 @@
 </materials>
 <?xml version='1.0' encoding='utf-8'?>
 <settings>
-    <eigenvalue>
-        <particles>100</particles>
-        <batches>10</batches>
-        <inactive>5</inactive>
-    </eigenvalue>
+    <run_mode>eigenvalue</run_mode>
+    <particles>100</particles>
+    <batches>10</batches>
+    <inactive>5</inactive>
    <source strength="1.0">
        <space type="fission">
            <parameters>-32 -32 0 32 32 32</parameters>
--- a/tests/test_cmfd_feed/settings.xml
+++ b/tests/test_cmfd_feed/settings.xml
@ -2,11 +2,10 @@
 <settings>

  <!-- Parameters for criticality calculation -->
-  <eigenvalue>
-    <batches>20</batches>
-    <inactive>10</inactive>
-    <particles>1000</particles>
-  </eigenvalue>
+  <run_mode>eigenvalue</run_mode>
+  <batches>20</batches>
+  <inactive>10</inactive>
+  <particles>1000</particles>

  <!-- How verbose output should be -->
  <verbosity value="7" />
@ -19,7 +18,7 @@
    </space>
  </source>

-  <!-- Shannon Entropy --> 
+  <!-- Shannon Entropy -->
  <entropy>
    <dimension> 10 1 1 </dimension>
    <lower_left> -10.0 -1.0 -1.0 </lower_left>
--- a/tests/test_cmfd_nofeed/settings.xml
+++ b/tests/test_cmfd_nofeed/settings.xml
@ -2,11 +2,10 @@
 <settings>

  <!-- Parameters for criticality calculation -->
-  <eigenvalue>
-    <batches>20</batches>
-    <inactive>10</inactive>
-    <particles>1000</particles>
-  </eigenvalue>
+  <run_mode>eigenvalue</run_mode>
+  <batches>20</batches>
+  <inactive>10</inactive>
+  <particles>1000</particles>

  <!-- How verbose output should be -->
  <verbosity value="7" />
@ -19,7 +18,7 @@
    </space>
  </source>

-  <!-- Shannon Entropy --> 
+  <!-- Shannon Entropy -->
  <entropy>
    <dimension> 10 1 1 </dimension>
    <lower_left> -10.0 -1.0 -1.0 </lower_left>
--- a/tests/test_complex_cell/settings.xml
+++ b/tests/test_complex_cell/settings.xml
@ -1,11 +1,10 @@
 <?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>
    <space type="box">
--- a/tests/test_confidence_intervals/settings.xml
+++ b/tests/test_confidence_intervals/settings.xml
@ -3,11 +3,10 @@

  <confidence_intervals>true</confidence_intervals>

-  <eigenvalue>
-    <batches>10</batches>
-    <inactive>2</inactive>
-    <particles>100</particles>
-  </eigenvalue>
+  <run_mode>eigenvalue</run_mode>
+  <batches>10</batches>
+  <inactive>2</inactive>
+  <particles>100</particles>

  <source>
    <space type="box">
--- a/tests/test_create_fission_neutrons/inputs_true.dat
+++ b/tests/test_create_fission_neutrons/inputs_true.dat
@ -18,10 +18,9 @@
 </materials>
 <?xml version='1.0' encoding='utf-8'?>
 <settings>
-    <fixed_source>
-        <particles>100</particles>
-        <batches>10</batches>
-    </fixed_source>
+    <run_mode>fixed source</run_mode>
+    <particles>100</particles>
+    <batches>10</batches>
    <source strength="1.0">
        <space type="box">
            <parameters>-1 -1 -1 1 1 1</parameters>
--- a/tests/test_density/settings.xml
+++ b/tests/test_density/settings.xml
@ -1,11 +1,10 @@
 <?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>
    <space type="box">
--- a/tests/test_diff_tally/inputs_true.dat
+++ b/tests/test_diff_tally/inputs_true.dat
@ -297,11 +297,10 @@
 </materials>
 <?xml version='1.0' encoding='utf-8'?>
 <settings>
-    <eigenvalue>
-        <particles>100</particles>
-        <batches>3</batches>
-        <inactive>0</inactive>
-    </eigenvalue>
+    <run_mode>eigenvalue</run_mode>
+    <particles>100</particles>
+    <batches>3</batches>
+    <inactive>0</inactive>
    <source strength="1.0">
        <space type="box">
            <parameters>-160 -160 -183 160 160 183</parameters>
--- a/tests/test_distribmat/inputs_true.dat
+++ b/tests/test_distribmat/inputs_true.dat
@ -37,11 +37,10 @@
 </materials>
 <?xml version='1.0' encoding='utf-8'?>
 <settings>
-    <eigenvalue>
-        <particles>1000</particles>
-        <batches>5</batches>
-        <inactive>0</inactive>
-    </eigenvalue>
+    <run_mode>eigenvalue</run_mode>
+    <particles>1000</particles>
+    <batches>5</batches>
+    <inactive>0</inactive>
    <source strength="1.0">
        <space type="box">
            <parameters>-1 -1 -1 1 1 1</parameters>
--- a/tests/test_eigenvalue_genperbatch/settings.xml
+++ b/tests/test_eigenvalue_genperbatch/settings.xml
@ -1,12 +1,11 @@
 <?xml version="1.0"?>
 <settings>

-  <eigenvalue>
-    <batches>7</batches>
-    <inactive>3</inactive>
-    <particles>1000</particles>
-    <generations_per_batch>3</generations_per_batch>
-  </eigenvalue>
+  <run_mode>eigenvalue</run_mode>
+  <batches>7</batches>
+  <inactive>3</inactive>
+  <particles>1000</particles>
+  <generations_per_batch>3</generations_per_batch>

  <source>
    <space type="box">
--- a/tests/test_eigenvalue_no_inactive/settings.xml
+++ b/tests/test_eigenvalue_no_inactive/settings.xml
@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <settings>

-  <eigenvalue>
-    <batches>10</batches>
-    <inactive>0</inactive>
-    <particles>1000</particles>
-  </eigenvalue>
+  <run_mode>eigenvalue</run_mode>
+  <batches>10</batches>
+  <inactive>0</inactive>
+  <particles>1000</particles>

  <source>
    <space type="box">
--- a/tests/test_energy_cutoff/inputs_true.dat
+++ b/tests/test_energy_cutoff/inputs_true.dat
@ -17,10 +17,9 @@
 </materials>
 <?xml version='1.0' encoding='utf-8'?>
 <settings>
-    <fixed_source>
-        <particles>100</particles>
-        <batches>10</batches>
-    </fixed_source>
+    <run_mode>fixed source</run_mode>
+    <particles>100</particles>
+    <batches>10</batches>
    <source strength="1.0">
        <space type="box">
            <parameters>-1 -1 -1 1 1 1</parameters>
--- a/tests/test_energy_grid/settings.xml
+++ b/tests/test_energy_grid/settings.xml
@ -3,11 +3,10 @@

  <log_grid_bins>20000</log_grid_bins>

-  <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>
    <space type="box">
--- a/tests/test_energy_laws/settings.xml
+++ b/tests/test_energy_laws/settings.xml
@ -1,10 +1,9 @@
 <?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>
    <space type="point" parameters="0. 0. 0." />
  </source>
--- a/tests/test_entropy/settings.xml
+++ b/tests/test_entropy/settings.xml
@ -1,11 +1,10 @@
 <?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>
    <space type="box">
--- a/tests/test_filter_distribcell/case-1/settings.xml
+++ b/tests/test_filter_distribcell/case-1/settings.xml
@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <settings>

-  <eigenvalue>
-    <batches>1</batches>
-    <inactive>0</inactive>
-    <particles>1000</particles>
-  </eigenvalue>
+  <run_mode>eigenvalue</run_mode>
+  <batches>1</batches>
+  <inactive>0</inactive>
+  <particles>1000</particles>

  <source>
    <space type="box">
--- a/tests/test_filter_distribcell/case-2/settings.xml
+++ b/tests/test_filter_distribcell/case-2/settings.xml
@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <settings>

-  <eigenvalue>
-    <batches>1</batches>
-    <inactive>0</inactive>
-    <particles>1000</particles>
-  </eigenvalue>
+  <run_mode>eigenvalue</run_mode>
+  <batches>1</batches>
+  <inactive>0</inactive>
+  <particles>1000</particles>

  <source>
    <space type="box">
--- a/tests/test_filter_distribcell/case-3/settings.xml
+++ b/tests/test_filter_distribcell/case-3/settings.xml
@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <settings>

-  <eigenvalue>
-    <batches>3</batches>
-    <inactive>0</inactive>
-    <particles>100</particles>
-  </eigenvalue>
+  <run_mode>eigenvalue</run_mode>
+  <batches>3</batches>
+  <inactive>0</inactive>
+  <particles>100</particles>

  <source>
    <space type="box">
--- a/tests/test_filter_distribcell/case-4/settings.xml
+++ b/tests/test_filter_distribcell/case-4/settings.xml
@ -1,13 +1,12 @@
 <?xml version='1.0' encoding='utf-8'?>
 <settings>
-    <eigenvalue>
-        <particles>1000</particles>
-    <batches>1</batches>
-    <inactive>0</inactive>
-    </eigenvalue>
-<source>
-        <space type="box">
-            <parameters>-1 -1 -1 1 1 1</parameters>
-        </space>
-    </source>
+  <run_mode>eigenvalue</run_mode>
+  <particles>1000</particles>
+  <batches>1</batches>
+  <inactive>0</inactive>
+  <source>
+    <space type="box">
+      <parameters>-1 -1 -1 1 1 1</parameters>
+    </space>
+  </source>
 </settings>
--- a/tests/test_filter_energyfun/inputs_true.dat
+++ b/tests/test_filter_energyfun/inputs_true.dat
@ -298,11 +298,10 @@
 </materials>
 <?xml version='1.0' encoding='utf-8'?>
 <settings>
-    <eigenvalue>
-        <particles>100</particles>
-        <batches>10</batches>
-        <inactive>5</inactive>
-    </eigenvalue>
+    <run_mode>eigenvalue</run_mode>
+    <particles>100</particles>
+    <batches>10</batches>
+    <inactive>5</inactive>
    <source strength="1.0">
        <space type="box">
            <parameters>-160 -160 -183 160 160 183</parameters>
--- a/tests/test_filter_mesh/inputs_true.dat
+++ b/tests/test_filter_mesh/inputs_true.dat
@ -297,11 +297,10 @@
 </materials>
 <?xml version='1.0' encoding='utf-8'?>
 <settings>
-    <eigenvalue>
-        <particles>100</particles>
-        <batches>10</batches>
-        <inactive>5</inactive>
-    </eigenvalue>
+    <run_mode>eigenvalue</run_mode>
+    <particles>100</particles>
+    <batches>10</batches>
+    <inactive>5</inactive>
    <source strength="1.0">
        <space type="box">
            <parameters>-160 -160 -183 160 160 183</parameters>
--- a/tests/test_fixed_source/settings.xml
+++ b/tests/test_fixed_source/settings.xml
@ -1,10 +1,9 @@
 <?xml version="1.0"?>
 <settings>

-  <fixed_source>
-    <batches>10</batches>
-    <particles>100</particles>
-  </fixed_source>
+  <run_mode>fixed source</run_mode>
+  <batches>10</batches>
+  <particles>100</particles>

  <temperature_default>294</temperature_default>

--- a/tests/test_infinite_cell/settings.xml
+++ b/tests/test_infinite_cell/settings.xml
@ -1,11 +1,10 @@
 <?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>
    <space type="box">
--- a/tests/test_iso_in_lab/inputs_true.dat
+++ b/tests/test_iso_in_lab/inputs_true.dat
@ -297,11 +297,10 @@
 </materials>
 <?xml version='1.0' encoding='utf-8'?>
 <settings>
-    <eigenvalue>
-        <particles>100</particles>
-        <batches>10</batches>
-        <inactive>5</inactive>
-    </eigenvalue>
+    <run_mode>eigenvalue</run_mode>
+    <particles>100</particles>
+    <batches>10</batches>
+    <inactive>5</inactive>
    <source strength="1.0">
        <space type="box">
            <parameters>-160 -160 -183 160 160 183</parameters>
--- a/tests/test_lattice/settings.xml
+++ b/tests/test_lattice/settings.xml
@ -10,11 +10,10 @@
  ===============================================================
  -->

-  <eigenvalue>
-    <batches>10</batches>
-    <inactive>5</inactive>
-    <particles>100</particles>
-  </eigenvalue>
+  <run_mode>eigenvalue</run_mode>
+  <batches>10</batches>
+  <inactive>5</inactive>
+  <particles>100</particles>

  <source>
    <space type="box">
--- a/tests/test_lattice_hex/settings.xml
+++ b/tests/test_lattice_hex/settings.xml
@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <settings>
-  <eigenvalue>
-    <batches>10</batches>
-    <inactive>5</inactive>
-    <particles>500</particles>
-  </eigenvalue>
+  <run_mode>eigenvalue</run_mode>
+  <batches>10</batches>
+  <inactive>5</inactive>
+  <particles>500</particles>

  <source>
    <space type="box">
--- a/tests/test_lattice_mixed/settings.xml
+++ b/tests/test_lattice_mixed/settings.xml
@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <settings>
-  <eigenvalue>
-    <batches>10</batches>
-    <inactive>5</inactive>
-    <particles>500</particles>
-  </eigenvalue>
+  <run_mode>eigenvalue</run_mode>
+  <batches>10</batches>
+  <inactive>5</inactive>
+  <particles>500</particles>

  <source>
    <space type="box">
--- a/tests/test_lattice_multiple/settings.xml
+++ b/tests/test_lattice_multiple/settings.xml
@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <settings>

-  <eigenvalue>
-    <batches>10</batches>
-    <inactive>5</inactive>
-    <particles>100</particles>
-  </eigenvalue>
+  <run_mode>eigenvalue</run_mode>
+  <batches>10</batches>
+  <inactive>5</inactive>
+  <particles>100</particles>

  <source>
    <space type="box">
--- a/tests/test_mg_basic/inputs_true.dat
+++ b/tests/test_mg_basic/inputs_true.dat
@ -84,11 +84,10 @@
 </materials>
 <?xml version='1.0' encoding='utf-8'?>
 <settings>
-    <eigenvalue>
-        <particles>100</particles>
-        <batches>10</batches>
-        <inactive>5</inactive>
-    </eigenvalue>
+    <run_mode>eigenvalue</run_mode>
+    <particles>100</particles>
+    <batches>10</batches>
+    <inactive>5</inactive>
    <source strength="1.0">
        <space type="box">
            <parameters>0.0 0.0 0.0 10.0 10.0 5.0</parameters>
--- a/tests/test_mg_max_order/inputs_true.dat
+++ b/tests/test_mg_max_order/inputs_true.dat
@ -30,11 +30,10 @@
 </materials>
 <?xml version='1.0' encoding='utf-8'?>
 <settings>
-    <eigenvalue>
-        <particles>100</particles>
-        <batches>10</batches>
-        <inactive>5</inactive>
-    </eigenvalue>
+    <run_mode>eigenvalue</run_mode>
+    <particles>100</particles>
+    <batches>10</batches>
+    <inactive>5</inactive>
    <source strength="1.0">
        <space type="box">
            <parameters>0.0 0.0 0.0 10.0 10.0 5.0</parameters>
--- a/tests/test_mg_nuclide/inputs_true.dat
+++ b/tests/test_mg_nuclide/inputs_true.dat
@ -84,11 +84,10 @@
 </materials>
 <?xml version='1.0' encoding='utf-8'?>
 <settings>
-    <eigenvalue>
-        <particles>100</particles>
-        <batches>10</batches>
-        <inactive>5</inactive>
-    </eigenvalue>
+    <run_mode>eigenvalue</run_mode>
+    <particles>100</particles>
+    <batches>10</batches>
+    <inactive>5</inactive>
    <source strength="1.0">
        <space type="box">
            <parameters>0.0 0.0 0.0 10.0 10.0 5.0</parameters>
--- a/tests/test_mg_tallies/inputs_true.dat
+++ b/tests/test_mg_tallies/inputs_true.dat
@ -84,11 +84,10 @@
 </materials>
 <?xml version='1.0' encoding='utf-8'?>
 <settings>
-    <eigenvalue>
-        <particles>100</particles>
-        <batches>10</batches>
-        <inactive>5</inactive>
-    </eigenvalue>
+    <run_mode>eigenvalue</run_mode>
+    <particles>100</particles>
+    <batches>10</batches>
+    <inactive>5</inactive>
    <source strength="1.0">
        <space type="box">
            <parameters>0.0 0.0 0.0 10.0 10.0 5.0</parameters>
--- a/tests/test_mgxs_library_ce_to_mg/inputs_true.dat
+++ b/tests/test_mgxs_library_ce_to_mg/inputs_true.dat
@ -38,11 +38,10 @@
 </materials>
 <?xml version='1.0' encoding='utf-8'?>
 <settings>
-    <eigenvalue>
-        <particles>100</particles>
-        <batches>10</batches>
-        <inactive>5</inactive>
-    </eigenvalue>
+    <run_mode>eigenvalue</run_mode>
+    <particles>100</particles>
+    <batches>10</batches>
+    <inactive>5</inactive>
    <source strength="1.0">
        <space type="fission">
            <parameters>-0.63 -0.63 -1 0.63 0.63 1</parameters>
--- a/tests/test_mgxs_library_condense/inputs_true.dat
+++ b/tests/test_mgxs_library_condense/inputs_true.dat
@ -38,11 +38,10 @@
 </materials>
 <?xml version='1.0' encoding='utf-8'?>
 <settings>
-    <eigenvalue>
-        <particles>100</particles>
-        <batches>10</batches>
-        <inactive>5</inactive>
-    </eigenvalue>
+    <run_mode>eigenvalue</run_mode>
+    <particles>100</particles>
+    <batches>10</batches>
+    <inactive>5</inactive>
    <source strength="1.0">
        <space type="fission">
            <parameters>-0.63 -0.63 -1 0.63 0.63 1</parameters>
--- a/tests/test_mgxs_library_distribcell/inputs_true.dat
+++ b/tests/test_mgxs_library_distribcell/inputs_true.dat
@ -65,11 +65,10 @@
 </materials>
 <?xml version='1.0' encoding='utf-8'?>
 <settings>
-    <eigenvalue>
-        <particles>100</particles>
-        <batches>10</batches>
-        <inactive>5</inactive>
-    </eigenvalue>
+    <run_mode>eigenvalue</run_mode>
+    <particles>100</particles>
+    <batches>10</batches>
+    <inactive>5</inactive>
    <source strength="1.0">
        <space type="fission">
            <parameters>-10.71 -10.71 -1 10.71 10.71 1</parameters>
--- a/tests/test_mgxs_library_hdf5/inputs_true.dat
+++ b/tests/test_mgxs_library_hdf5/inputs_true.dat
@ -38,11 +38,10 @@
 </materials>
 <?xml version='1.0' encoding='utf-8'?>
 <settings>
-    <eigenvalue>
-        <particles>100</particles>
-        <batches>10</batches>
-        <inactive>5</inactive>
-    </eigenvalue>
+    <run_mode>eigenvalue</run_mode>
+    <particles>100</particles>
+    <batches>10</batches>
+    <inactive>5</inactive>
    <source strength="1.0">
        <space type="fission">
            <parameters>-0.63 -0.63 -1 0.63 0.63 1</parameters>
--- a/tests/test_mgxs_library_mesh/inputs_true.dat
+++ b/tests/test_mgxs_library_mesh/inputs_true.dat
@ -297,11 +297,10 @@
 </materials>
 <?xml version='1.0' encoding='utf-8'?>
 <settings>
-    <eigenvalue>
-        <particles>100</particles>
-        <batches>10</batches>
-        <inactive>5</inactive>
-    </eigenvalue>
+    <run_mode>eigenvalue</run_mode>
+    <particles>100</particles>
+    <batches>10</batches>
+    <inactive>5</inactive>
    <source strength="1.0">
        <space type="box">
            <parameters>-160 -160 -183 160 160 183</parameters>
--- a/tests/test_mgxs_library_no_nuclides/inputs_true.dat
+++ b/tests/test_mgxs_library_no_nuclides/inputs_true.dat
@ -38,11 +38,10 @@
 </materials>
 <?xml version='1.0' encoding='utf-8'?>
 <settings>
-    <eigenvalue>
-        <particles>100</particles>
-        <batches>10</batches>
-        <inactive>5</inactive>
-    </eigenvalue>
+    <run_mode>eigenvalue</run_mode>
+    <particles>100</particles>
+    <batches>10</batches>
+    <inactive>5</inactive>
    <source strength="1.0">
        <space type="fission">
            <parameters>-0.63 -0.63 -1 0.63 0.63 1</parameters>
--- a/tests/test_mgxs_library_nuclides/inputs_true.dat
+++ b/tests/test_mgxs_library_nuclides/inputs_true.dat
@ -38,11 +38,10 @@
 </materials>
 <?xml version='1.0' encoding='utf-8'?>
 <settings>
-    <eigenvalue>
-        <particles>100</particles>
-        <batches>10</batches>
-        <inactive>5</inactive>
-    </eigenvalue>
+    <run_mode>eigenvalue</run_mode>
+    <particles>100</particles>
+    <batches>10</batches>
+    <inactive>5</inactive>
    <source strength="1.0">
        <space type="fission">
            <parameters>-0.63 -0.63 -1 0.63 0.63 1</parameters>
--- a/tests/test_multipole/inputs_true.dat
+++ b/tests/test_multipole/inputs_true.dat
@ -34,11 +34,10 @@
 </materials>
 <?xml version='1.0' encoding='utf-8'?>
 <settings>
-    <eigenvalue>
-        <particles>1000</particles>
-        <batches>5</batches>
-        <inactive>0</inactive>
-    </eigenvalue>
+    <run_mode>eigenvalue</run_mode>
+    <particles>1000</particles>
+    <batches>5</batches>
+    <inactive>0</inactive>
    <source strength="1.0">
        <space type="box">
            <parameters>-1 -1 -1 1 1 1</parameters>
--- a/tests/test_output/settings.xml
+++ b/tests/test_output/settings.xml
@ -3,11 +3,10 @@

  <output summary="true" />

-  <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>
    <space type="box">
--- a/tests/test_particle_restart_eigval/settings.xml
+++ b/tests/test_particle_restart_eigval/settings.xml
@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <settings>

-  <eigenvalue>
-    <batches>12</batches>
-    <inactive>5</inactive>
-    <particles>1200</particles>
-  </eigenvalue>
+  <run_mode>eigenvalue</run_mode>
+  <batches>12</batches>
+  <inactive>5</inactive>
+  <particles>1200</particles>

  <source>
    <space type="box">
--- a/tests/test_particle_restart_fixed/settings.xml
+++ b/tests/test_particle_restart_fixed/settings.xml
@ -1,10 +1,9 @@
 <?xml version="1.0"?>
 <settings>

-  <fixed_source>
-    <batches>12</batches>
-    <particles>1000</particles>
-  </fixed_source>
+  <run_mode>fixed source</run_mode>
+  <batches>12</batches>
+  <particles>1000</particles>

  <source>
    <space type="box">
--- a/tests/test_periodic/inputs_true.dat
+++ b/tests/test_periodic/inputs_true.dat
@ -25,11 +25,10 @@
 </materials>
 <?xml version='1.0' encoding='utf-8'?>
 <settings>
-    <eigenvalue>
-        <particles>1000</particles>
-        <batches>4</batches>
-        <inactive>0</inactive>
-    </eigenvalue>
+    <run_mode>eigenvalue</run_mode>
+    <particles>1000</particles>
+    <batches>4</batches>
+    <inactive>0</inactive>
    <source strength="1.0">
        <space type="box">
            <parameters>-5.0 -5.0 -5.0 5.0 5.0 5.0</parameters>
--- a/tests/test_plot/settings.xml
+++ b/tests/test_plot/settings.xml
@ -1,11 +1,10 @@
 <?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>
    <space type="box">
--- a/tests/test_ptables_off/settings.xml
+++ b/tests/test_ptables_off/settings.xml
@ -3,11 +3,10 @@

  <ptables>false</ptables>

-  <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>
    <space type="box">
--- a/tests/test_quadric_surfaces/settings.xml
+++ b/tests/test_quadric_surfaces/settings.xml
@ -1,11 +1,10 @@
 <?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>
    <space type="point" parameters="0. 0. 0." />
--- a/tests/test_reflective_plane/settings.xml
+++ b/tests/test_reflective_plane/settings.xml
@ -1,11 +1,10 @@
 <?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>
    <space type="box">
--- a/tests/test_resonance_scattering/inputs_true.dat
+++ b/tests/test_resonance_scattering/inputs_true.dat
@ -15,11 +15,10 @@
 </materials>
 <?xml version='1.0' encoding='utf-8'?>
 <settings>
-    <eigenvalue>
-        <particles>1000</particles>
-        <batches>10</batches>
-        <inactive>5</inactive>
-    </eigenvalue>
+    <run_mode>eigenvalue</run_mode>
+    <particles>1000</particles>
+    <batches>10</batches>
+    <inactive>5</inactive>
    <source strength="1.0">
        <space type="box">
            <parameters>-4 -4 -4 4 4 4</parameters>
--- a/tests/test_rotation/settings.xml
+++ b/tests/test_rotation/settings.xml
@ -1,11 +1,10 @@
 <?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>
    <space type="box">
--- a/tests/test_salphabeta/settings.xml
+++ b/tests/test_salphabeta/settings.xml
@ -1,11 +1,10 @@
 <?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>
    <space type="box">
--- a/tests/test_score_current/settings.xml
+++ b/tests/test_score_current/settings.xml
@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <settings>

-  <eigenvalue>
-    <batches>10</batches>
-    <inactive>5</inactive>
-    <particles>100</particles>
-  </eigenvalue>
+  <run_mode>eigenvalue</run_mode>
+  <batches>10</batches>
+  <inactive>5</inactive>
+  <particles>100</particles>

  <source>
    <space type="box">
--- a/tests/test_seed/settings.xml
+++ b/tests/test_seed/settings.xml
@ -3,11 +3,10 @@

  <seed>239407351</seed>

-  <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>
    <space type="box">
--- a/tests/test_source/inputs_true.dat
+++ b/tests/test_source/inputs_true.dat
@ -13,11 +13,10 @@
 </materials>
 <?xml version='1.0' encoding='utf-8'?>
 <settings>
-    <eigenvalue>
-        <particles>1000</particles>
-        <batches>10</batches>
-        <inactive>5</inactive>
-    </eigenvalue>
+    <run_mode>eigenvalue</run_mode>
+    <particles>1000</particles>
+    <batches>10</batches>
+    <inactive>5</inactive>
    <source strength="0.5">
        <space type="cartesian">
            <x parameters="-3.0 3.0" type="uniform" />
--- a/tests/test_sourcepoint_batch/settings.xml
+++ b/tests/test_sourcepoint_batch/settings.xml
@ -4,11 +4,10 @@
  <state_point batches="2 3 4 5 8"/>
  <source_point batches="2 5 8"/>

-  <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>
    <space type="box">
--- a/tests/test_sourcepoint_latest/settings.xml
+++ b/tests/test_sourcepoint_latest/settings.xml
@ -3,11 +3,10 @@

  <source_point batches="0" overwrite_latest="true"/>

-  <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>
    <space type="box">
--- a/tests/test_sourcepoint_restart/settings.xml
+++ b/tests/test_sourcepoint_restart/settings.xml
@ -4,11 +4,10 @@
  <state_point batches="7 10" />
  <source_point batches="7" separate="true" />

-  <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>
    <space type="box">
--- a/tests/test_statepoint_batch/settings.xml
+++ b/tests/test_statepoint_batch/settings.xml
@ -3,11 +3,10 @@

  <state_point batches="3 6 9" />

-  <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>
    <space type="box">
--- a/tests/test_statepoint_restart/settings.xml
+++ b/tests/test_statepoint_restart/settings.xml
@ -3,11 +3,10 @@

  <state_point batches="7 10" />

-  <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>
    <space type="box">
--- a/tests/test_statepoint_sourcesep/settings.xml
+++ b/tests/test_statepoint_sourcesep/settings.xml
@ -4,11 +4,10 @@
  <state_point batches="10" />
  <source_point separate="true" />

-  <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>
    <space type="box">
--- a/tests/test_survival_biasing/settings.xml
+++ b/tests/test_survival_biasing/settings.xml
@ -8,11 +8,10 @@
    <weight_avg>1.2</weight_avg>
  </cutoff>

-  <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>
    <space type="box">
--- a/tests/test_tallies/inputs_true.dat
+++ b/tests/test_tallies/inputs_true.dat
@ -297,11 +297,10 @@
 </materials>
 <?xml version='1.0' encoding='utf-8'?>
 <settings>
-    <eigenvalue>
-        <particles>400</particles>
-        <batches>5</batches>
-        <inactive>0</inactive>
-    </eigenvalue>
+    <run_mode>eigenvalue</run_mode>
+    <particles>400</particles>
+    <batches>5</batches>
+    <inactive>0</inactive>
    <source strength="1.0">
        <space type="box">
            <parameters>-160 -160 -183 160 160 183</parameters>
--- a/tests/test_tally_aggregation/inputs_true.dat
+++ b/tests/test_tally_aggregation/inputs_true.dat
@ -297,11 +297,10 @@
 </materials>
 <?xml version='1.0' encoding='utf-8'?>
 <settings>
-    <eigenvalue>
-        <particles>100</particles>
-        <batches>10</batches>
-        <inactive>5</inactive>
-    </eigenvalue>
+    <run_mode>eigenvalue</run_mode>
+    <particles>100</particles>
+    <batches>10</batches>
+    <inactive>5</inactive>
    <source strength="1.0">
        <space type="box">
            <parameters>-160 -160 -183 160 160 183</parameters>
--- a/tests/test_tally_arithmetic/inputs_true.dat
+++ b/tests/test_tally_arithmetic/inputs_true.dat
@ -297,11 +297,10 @@
 </materials>
 <?xml version='1.0' encoding='utf-8'?>
 <settings>
-    <eigenvalue>
-        <particles>100</particles>
-        <batches>10</batches>
-        <inactive>5</inactive>
-    </eigenvalue>
+    <run_mode>eigenvalue</run_mode>
+    <particles>100</particles>
+    <batches>10</batches>
+    <inactive>5</inactive>
    <source strength="1.0">
        <space type="box">
            <parameters>-160 -160 -183 160 160 183</parameters>
--- a/tests/test_tally_assumesep/settings.xml
+++ b/tests/test_tally_assumesep/settings.xml
@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <settings>

-  <eigenvalue>
-    <batches>10</batches>
-    <inactive>5</inactive>
-    <particles>100</particles>
-  </eigenvalue>
+  <run_mode>eigenvalue</run_mode>
+  <batches>10</batches>
+  <inactive>5</inactive>
+  <particles>100</particles>

  <source>
    <space type="box">
--- a/tests/test_tally_nuclides/settings.xml
+++ b/tests/test_tally_nuclides/settings.xml
@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <settings>

-  <eigenvalue>
-    <batches>10</batches>
-    <inactive>5</inactive>
-    <particles>100</particles>
-  </eigenvalue>
+  <run_mode>eigenvalue</run_mode>
+  <batches>10</batches>
+  <inactive>5</inactive>
+  <particles>100</particles>

  <source>
    <space>
--- a/tests/test_tally_slice_merge/inputs_true.dat
+++ b/tests/test_tally_slice_merge/inputs_true.dat
@ -297,11 +297,10 @@
 </materials>
 <?xml version='1.0' encoding='utf-8'?>
 <settings>
-    <eigenvalue>
-        <particles>100</particles>
-        <batches>10</batches>
-        <inactive>5</inactive>
-    </eigenvalue>
+    <run_mode>eigenvalue</run_mode>
+    <particles>100</particles>
+    <batches>10</batches>
+    <inactive>5</inactive>
    <source strength="1.0">
        <space type="box">
            <parameters>-160 -160 -183 160 160 183</parameters>
--- a/tests/test_trace/settings.xml
+++ b/tests/test_trace/settings.xml
@ -3,11 +3,10 @@

  <trace>5 1 453</trace>

-  <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>
    <space type="box">
--- a/tests/test_track_output/settings.xml
+++ b/tests/test_track_output/settings.xml
@ -1,19 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <settings>

-<!--  <cross_sections> -->
-<!--   cross_sections.xml-->
-<!--  </cross_sections>-->
-
  <!-- Parameters for criticality calculation -->
-  <eigenvalue>
-    <batches>2</batches>
-    <inactive>0</inactive>
-    <particles>100</particles>
-  </eigenvalue>
-
-  <!-- How verbose output should be -->
-  <verbosity value="7" />
+  <run_mode>eigenvalue</run_mode>
+  <batches>2</batches>
+  <inactive>0</inactive>
+  <particles>100</particles>

  <!-- Starting source -->
  <source>
@ -26,5 +18,5 @@
    1 1 1
    1 1 2
  </track>
-  
+
 </settings>
--- a/tests/test_translation/settings.xml
+++ b/tests/test_translation/settings.xml
@ -1,11 +1,10 @@
 <?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>
    <space type="box">
--- a/tests/test_trigger_batch_interval/settings.xml
+++ b/tests/test_trigger_batch_interval/settings.xml
@ -1,14 +1,13 @@
 <?xml version="1.0"?>
 <settings>
-   <eigenvalue>
-    <batches>15</batches>
-    <inactive>5</inactive>
-    <particles>1000</particles>
-    <keff_trigger>
-      <type>std_dev</type>
-      <threshold>0.004</threshold>
-    </keff_trigger>
-  </eigenvalue>
+  <run_mode>eigenvalue</run_mode>
+  <batches>15</batches>
+  <inactive>5</inactive>
+  <particles>1000</particles>
+  <keff_trigger>
+    <type>std_dev</type>
+    <threshold>0.004</threshold>
+  </keff_trigger>

  <trigger>
    <active>true</active>
--- a/tests/test_trigger_no_batch_interval/settings.xml
+++ b/tests/test_trigger_no_batch_interval/settings.xml
@ -1,14 +1,13 @@
 <?xml version="1.0"?>
 <settings>
-   <eigenvalue>
-    <batches>15</batches>
-    <inactive>5</inactive>
-    <particles>1000</particles>
-    <keff_trigger>
-      <type>std_dev</type>
-      <threshold>0.004</threshold>
-    </keff_trigger>
-  </eigenvalue>
+  <run_mode>eigenvalue</run_mode>
+  <batches>15</batches>
+  <inactive>5</inactive>
+  <particles>1000</particles>
+  <keff_trigger>
+    <type>std_dev</type>
+    <threshold>0.004</threshold>
+  </keff_trigger>

  <trigger>
    <active>true</active>
--- a/tests/test_trigger_no_status/settings.xml
+++ b/tests/test_trigger_no_status/settings.xml
@ -1,20 +1,19 @@
 <?xml version="1.0"?>
 <settings>
-   <eigenvalue>
-    <batches>10</batches>
-    <inactive>5</inactive>
-    <particles>1000</particles>
-    <keff_trigger>
-      <type>std_dev</type>
-      <threshold>0.009</threshold>
-    </keff_trigger>
-  </eigenvalue>
+  <run_mode>eigenvalue</run_mode>
+  <batches>10</batches>
+  <inactive>5</inactive>
+  <particles>1000</particles>
+  <keff_trigger>
+    <type>std_dev</type>
+    <threshold>0.009</threshold>
+  </keff_trigger>
  <trigger>
    <active>false</active>
    <max_batches>15</max_batches>
    <batch_interval>1</batch_interval>
  </trigger>
-  
+

  <source>
    <space>
--- a/tests/test_trigger_tallies/settings.xml
+++ b/tests/test_trigger_tallies/settings.xml
@ -1,14 +1,13 @@
 <?xml version="1.0"?>
 <settings>
-   <eigenvalue>
-    <batches>10</batches>
-    <inactive>5</inactive>
-    <particles>1000</particles>
-    <keff_trigger>
-      <type>std_dev</type>
-      <threshold>0.001</threshold>
-    </keff_trigger>
-  </eigenvalue>
+  <run_mode>eigenvalue</run_mode>
+  <batches>10</batches>
+  <inactive>5</inactive>
+  <particles>1000</particles>
+  <keff_trigger>
+    <type>std_dev</type>
+    <threshold>0.001</threshold>
+  </keff_trigger>

  <trigger>
    <active>true</active>
--- a/tests/test_triso/inputs_true.dat
+++ b/tests/test_triso/inputs_true.dat
@ -430,11 +430,10 @@
 </materials>
 <?xml version='1.0' encoding='utf-8'?>
 <settings>
-    <eigenvalue>
-        <particles>100</particles>
-        <batches>5</batches>
-        <inactive>0</inactive>
-    </eigenvalue>
+    <run_mode>eigenvalue</run_mode>
+    <particles>100</particles>
+    <batches>5</batches>
+    <inactive>0</inactive>
    <source strength="1.0">
        <space type="point">
            <parameters>0.0 0.0 0.0</parameters>
--- a/tests/test_uniform_fs/settings.xml
+++ b/tests/test_uniform_fs/settings.xml
@ -1,11 +1,10 @@
 <?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>
    <space type="box" parameters="-10 -10 -10 10 10 10" />
--- a/tests/test_universe/settings.xml
+++ b/tests/test_universe/settings.xml
@ -1,11 +1,10 @@
 <?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>
    <space type="box">
--- a/tests/test_void/settings.xml
+++ b/tests/test_void/settings.xml
@ -1,11 +1,10 @@
 <?xml version="1.0"?>
 <settings>

-  <eigenvalue>
-    <batches>10</batches>
-    <inactive>5</inactive>
-    <particles>100</particles>
-  </eigenvalue>
+  <run_mode>eigenvalue</run_mode>
+  <batches>10</batches>
+  <inactive>5</inactive>
+  <particles>100</particles>

  <source>
    <space>
--- a/tests/test_volume_calc/inputs_true.dat
+++ b/tests/test_volume_calc/inputs_true.dat
@ -26,11 +26,10 @@
 </materials>
 <?xml version='1.0' encoding='utf-8'?>
 <settings>
-    <eigenvalue>
-        <particles>1000</particles>
-        <batches>4</batches>
-        <inactive>0</inactive>
-    </eigenvalue>
+    <run_mode>eigenvalue</run_mode>
+    <particles>1000</particles>
+    <batches>4</batches>
+    <inactive>0</inactive>
    <source strength="1.0">
        <space type="box">
            <parameters>-1.0 -1.0 -5.0 1.0 1.0 5.0</parameters>