Slight refactor and allowing application through Model.run

openmc/model/model.py

@@ -604,7 +604,7 @@ def import_properties(self, filename):
     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, **export_kwargs):
+            export_model_xml=True, apply_tally_results=False, **export_kwargs):
         """Run OpenMC
 
         If the C API has been initialized, then the C API is used, otherwise,
@@ -653,6 +653,11 @@ def run(self, particles=None, threads=None, geometry_debug=False,
             to True.
 
             .. versionadded:: 0.13.3
+        apply_tally_results : bool
+            Whether or not to apply results of the final statepoint file to the
+            model's tally objects.
+
+            .. versionadded:: 0.13.4
         **export_kwargs
             Keyword arguments passed to either :meth:`Model.export_to_model_xml`
             or :meth:`Model.export_to_xml`.
@@ -723,6 +728,9 @@ def run(self, particles=None, threads=None, geometry_debug=False,
                 if mtime >= tstart:  # >= allows for poor clock resolution
                     tstart = mtime
                     last_statepoint = sp
+
+        if apply_tally_results:
+            self.tallies.add_results(last_statepoint)
         return last_statepoint
 
     def calculate_volumes(self, threads=None, output=True, cwd='.',

openmc/statepoint.py

@@ -531,7 +531,18 @@ def add_volume_information(self, volume_calc):
 
     def match_tally(self, tally):
         """
-        Find a tally with an exact specification match
+        Find a tally with an exact specification match.
+
+            .. versionadded 0.13.4
+
+        Parameters
+        ----------
+        tally : openmc.Tally instance
+            The Tally object to match.
+
+        Returns
+        -------
+        None or openmc.Tally
         """
         try:
             sp_tally = self.get_tally(tally.scores,
@@ -553,8 +564,27 @@ def match_tally(self, tally):
         if tally.multiply_density != sp_tally.multiply_density:
             sp_tally = None
 
-        if sp_tally is None:
-            raise LookupError(f'Could not find matching tally in {self._f.filename}')
+        return sp_tally
+
+    def contains_tally(self, tally):
+        """
+        Determine whether or not the statepoint contains an exact match for this tally.
+
+            .. versionadded 0.13.4
+
+        Parameters
+        ----------
+        tally : openmc.Tally instance
+            The Tally object to check for.
+
+        Returns
+        -------
+        True if the tally was matched. False if not.
+        """
+        sp_tally = self.match_tally(tally)
+        return sp_tally is not None
+
+
 
     def get_tally(self, scores=[], filters=[], nuclides=[],
                   name=None, id=None, estimator=None, exact_filters=False,

openmc/tallies.py

@@ -886,6 +886,8 @@ def to_xml_element(self):
     def add_results(self, statepoint):
         """Add results from the provided statepoint file to this tally instance
 
+            .. versionadded: 0.13.4
+
         Parameters
         ----------
         statepoint : openmc.PathLike or openmc.StatePoint instance
@@ -3183,6 +3185,8 @@ def merge_tallies(self):
     def add_results(self, statepoint):
         """Add results from the provided statepoint file the tally objects in this collection
 
+            .. versionadded: 0.13.4
+
         Parameters
         ----------
         statepoint : openmc.PathLike or openmc.StatePoint instance