Fix issues with restart runs

armi/bookkeeping/db/database3.py

@@ -806,7 +806,7 @@ def writeToDB(self, reactor, statePointName=None):
         for comps in groupedComps.values():
             self._writeParams(h5group, comps)
 
-    def load(self, cycle, node, cs=None, bp=None):
+    def load(self, cycle, node, cs=None, bp=None, statePointName=None):
         """Load a new reactor from (cycle, node).
 
         Case settings, blueprints, and geom can be provided by the client, or read from
@@ -838,7 +838,7 @@ def load(self, cycle, node, cs=None, bp=None):
         settings.setMasterCs(cs)
         bp = bp or self.loadBlueprints()
 
-        h5group = self.h5db[getH5GroupName(cycle, node)]
+        h5group = self.h5db[getH5GroupName(cycle, node, statePointName)]
 
         layout = Layout(h5group=h5group)
         comps, groupedComps = layout._initComps(cs, bp)

armi/physics/neutronics/globalFlux/globalFluxInterface.py

@@ -45,7 +45,10 @@ class GlobalFluxInterface(interfaces.Interface):
     r"""
     A general abstract interface for global flux calculating modules.
 
-    Should be subclassed
+    Should be subclassed by more specific implementations. This class currently serves
+    as a common ancestor to a handful of DIF3D/REBUS-based neutronics interfaces, and
+    therefore is not as general as it should be. Future revisions will be generalized to
+    support other families of codes.
     """
 
     name = None  # make sure to set this in subclasses

armi/physics/neutronics/parameters.py

@@ -35,6 +35,14 @@ def _getNeutronicsBlockParams():
     pDefs = parameters.ParameterDefinitionCollection()
     with pDefs.createBuilder() as pb:
 
+        pb.defParam(
+            "axMesh",
+            units="",
+            description="number of neutronics axial mesh points in this block",
+            default=None,
+            categories=[parameters.Category.retainOnReplacement],
+        )
+
         def mgFlux(self, value):
             self._p_mgFlux = (
                 value

armi/plugins.py

@@ -168,7 +168,7 @@ def afterConstructionOfAssemblies(assemblies, cs):
 
         - Verify that all assemblies satisfy constraints imposed by active interfaces
           and plugins
-        - Apply modifications to Assemblies based on modeling opetions and active
+        - Apply modifications to Assemblies based on modeling options and active
           interfaces
 
         Implementers may alter the state of the passed Assembly objects.

armi/reactor/blockParameters.py

@@ -1312,14 +1312,6 @@ def buGroupNum(self, buGroupNum):  # pylint: disable=method-hidden
             categories=[parameters.Category.retainOnReplacement],
         )
 
-        pb.defParam(
-            "axMesh",
-            units="",
-            description="number of neutronics axial mesh points in this block",
-            default=None,
-            categories=[parameters.Category.retainOnReplacement],
-        )
-
         def xsType(self, value):  # pylint: disable=method-hidden
             self._p_xsType = value  # pylint: disable=attribute-defined-outside-init
             self._p_xsTypeNum = crossSectionGroupManager.getXSTypeNumberFromLabel(

armi/reactor/blueprints/__init__.py

@@ -347,10 +347,10 @@ def _resolveNuclides(self, cs):
 
         self.elementsToExpand = []
         for nucFlag in self.nuclideFlags:
+            # this returns any nuclides that are flagged specifically for expansion by input
             expandedElements = nucFlag.fileAsActiveOrInert(
                 actives, inerts, undefBurnChainActiveNuclides
             )
-            # this returns any nuclides that are flagged specifically for expansion by input
             self.elementsToExpand.extend(expandedElements)
 
         inerts -= actives

armi/reactor/reactorParameters.py

@@ -969,7 +969,8 @@ def detailedNucKeys(self, value):
         pb.defParam(
             "power",
             units="W",
-            description="Rated thermal power of the reactor core. Corresponds to the nuclear power generated in the core.",
+            description="Rated thermal power of the reactor core. Corresponds to the "
+            "nuclear power generated in the core.",
         )
 
         pb.defParam(

armi/reactor/reactors.py

@@ -998,7 +998,7 @@ def getAssemblies(
         exact=False,
     ):
         """
-        Return an list of all the assemblies in the reactor.
+        Return a list of all the assemblies in the reactor.
 
         Assemblies from the Core itself are sorted based on the Assemblies' comparison
         operators (location-based). This is done so that two reactors with physically