Merge branch 'main' into add_endfb-VII.1_support

armi/reactor/converters/axialExpansionChanger/__init__.py

@@ -26,4 +26,5 @@
 from armi.reactor.converters.axialExpansionChanger.expansionData import ExpansionData
 from armi.reactor.converters.axialExpansionChanger.expansionData import (
     getSolidComponents,
+    iterSolidComponents,
 )

armi/reactor/converters/axialExpansionChanger/assemblyAxialLinkage.py

@@ -12,16 +12,34 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import typing
+import dataclasses
+import functools
+import itertools
+
 from armi import runLog
-from armi.reactor.components import UnshapedComponent
+from armi.reactor.blocks import Block
+from armi.reactor.components import Component, UnshapedComponent
 from armi.reactor.converters.axialExpansionChanger.expansionData import (
-    getSolidComponents,
+    iterSolidComponents,
 )
 
 
-def _determineLinked(componentA, componentB):
+if typing.TYPE_CHECKING:
+    from armi.reactor.assemblies import Assembly
+
+
+def areAxiallyLinked(componentA: Component, componentB: Component) -> bool:
     """Determine axial component linkage for two components.
 
+    Components are considered linked if the following are found to be true:
+
+    1. Both contain solid materials.
+    2. They have identical types (e.g., ``Circle``).
+    3. Their multiplicities are the same.
+    4. The biggest inner bounding diameter of the two is less than the smallest outer
+       bounding diameter of the two.
+
     Parameters
     ----------
     componentA : :py:class:`Component <armi.reactor.components.component.Component>`
@@ -33,8 +51,6 @@ def _determineLinked(componentA, componentB):
     -----
     - Requires that shapes have the getCircleInnerDiameter and getBoundingCircleOuterDiameter
       defined
-    - For axial linkage to be True, components MUST be solids, the same Component Class,
-      multiplicity, and meet inner and outer diameter requirements.
     - When component dimensions are retrieved, cold=True to ensure that dimensions are evaluated
       at cold/input temperatures. At temperature, solid-solid interfaces in ARMI may produce
       slight overlaps due to thermal expansion. Handling these potential overlaps are out of scope.
@@ -46,7 +62,7 @@ def _determineLinked(componentA, componentB):
     """
     if (
         (componentA.containsSolidMaterial() and componentB.containsSolidMaterial())
-        and isinstance(componentA, type(componentB))
+        and type(componentA) is type(componentB)
         and (componentA.getDimension("mult") == componentB.getDimension("mult"))
     ):
         if isinstance(componentA, UnshapedComponent):
@@ -57,118 +73,151 @@ def _determineLinked(componentA, componentB):
                 "they are going to be assumed to not be linked.",
                 single=True,
             )
-            linked = False
-        else:
-            idA, odA = (
-                componentA.getCircleInnerDiameter(cold=True),
-                componentA.getBoundingCircleOuterDiameter(cold=True),
-            )
-            idB, odB = (
-                componentB.getCircleInnerDiameter(cold=True),
-                componentB.getBoundingCircleOuterDiameter(cold=True),
-            )
+            return False
+        # Check if one component could fit within the other
+        idA = componentA.getCircleInnerDiameter(cold=True)
+        odA = componentA.getBoundingCircleOuterDiameter(cold=True)
+        idB = componentB.getCircleInnerDiameter(cold=True)
+        odB = componentB.getBoundingCircleOuterDiameter(cold=True)
+        biggerID = max(idA, idB)
+        smallerOD = min(odA, odB)
+        return biggerID < smallerOD
+    return False
+
+
+# Make a generic type so we can "template" the axial link class based on what could be above/below a thing
+Comp = typing.TypeVar("Comp", Block, Component)
 
-            biggerID = max(idA, idB)
-            smallerOD = min(odA, odB)
-            if biggerID >= smallerOD:
-                # one object fits inside the other
-                linked = False
-            else:
-                linked = True
 
-    else:
-        linked = False
+@dataclasses.dataclass
+class AxialLink(typing.Generic[Comp]):
+    """Small class for named references to objects above and below a specific object.
 
-    return linked
+    Axial expansion in ARMI works by identifying what objects occupy the same axial space.
+    For components in blocks, identify which above and below axially align. This is used
+    to determine what, if any, mass needs to be re-assigned across blocks during expansion.
+    For blocks, the linking determines what blocks need to move as a result of a specific block's
+    axial expansion.
+
+    Attributes
+    ----------
+    lower : Composite or None
+        Object below, if any.
+    upper : Composite or None
+        Object above, if any.
+
+    Notes
+    -----
+    This class is "templated" by the type of composite that could be assigned and fetched. A
+    block-to-block linkage could be type-hinted via ``AxialLink[Block]`` or ``AxialLink[Component]``
+    for component-to-component link.
+
+    See Also
+    --------
+    * :attr:`AxialAssemblyLinkage.linkedBlocks`
+    * :attr:`AxialAssemblyLinkage.linkedComponents`
+    """
+
+    lower: typing.Optional[Comp] = dataclasses.field(default=None)
+    upper: typing.Optional[Comp] = dataclasses.field(default=None)
 
 
 class AssemblyAxialLinkage:
     """Determines and stores the block- and component-wise axial linkage for an assembly.
 
+    Parameters
+    ----------
+    assem : armi.reactor.assemblies.Assembly
+        Assembly to be linked
+
     Attributes
     ----------
     a : :py:class:`Assembly <armi.reactor.assemblies.Assembly>`
         reference to original assembly; is directly modified/changed during expansion.
     linkedBlocks : dict
-        - keys = :py:class:`Block <armi.reactor.blocks.Block>`
-        - values = list of axially linked blocks; index 0 = lower linked block; index 1: upper
-          linked block.
+        Keys are blocks in the assembly. Their values are :class:`AxialLink` with
+        ``upper`` and ``lower`` attributes for the blocks potentially above and
+        below this block.
     linkedComponents : dict
-        - keys = :py:class:`Component <armi.reactor.components.component.Component>`
-        - values = list of axially linked components; index 0 = lower linked component;
-          index 1: upper linked component.
+        Keys are solid components in the assembly. Their values are :class:`AxialLink` with
+        ``upper`` and ``lower`` attributes for the solid components potentially above and
+        below this block.
     """
 
-    def __init__(self, StdAssem):
-        self.a = StdAssem
-        self.linkedBlocks = {}
+    linkedBlocks: dict[Block, AxialLink[Block]]
+    linkedComponents: dict[Component, AxialLink[Component]]
+
+    def __init__(self, assem: "Assembly"):
+        self.a = assem
+        self.linkedBlocks = self.getLinkedBlocks(assem)
         self.linkedComponents = {}
         self._determineAxialLinkage()
 
+    @classmethod
+    def getLinkedBlocks(
+        cls,
+        blocks: typing.Sequence[Block],
+    ) -> dict[Block, AxialLink[Block]]:
+        """Produce a mapping showing how blocks are linked.
+
+        Parameters
+        ----------
+        blocks : sequence of armi.reactor.blocks.Block
+            Ordered sequence of blocks from bottom to top. Could just as easily be an
+            :class:`armi.reactor.assemblies.Assembly`.
+
+        Returns
+        -------
+        dict[Block, AxialLink[Block]]
+            Dictionary where keys are individual blocks and their corresponding values point
+            to blocks above and below.
+        """
+        nBlocks = len(blocks)
+        if nBlocks:
+            return cls._getLinkedBlocks(blocks, nBlocks)
+        raise ValueError("No blocks passed. Cannot determine links")
+
+    @staticmethod
+    def _getLinkedBlocks(
+        blocks: typing.Sequence[Block], nBlocks: int
+    ) -> dict[Block, AxialLink[Block]]:
+        # Use islice to avoid making intermediate lists of subsequences of blocks
+        lower = itertools.chain((None,), itertools.islice(blocks, 0, nBlocks - 1))
+        upper = itertools.chain(itertools.islice(blocks, 1, None), (None,))
+        links = {}
+        for low, mid, high in zip(lower, blocks, upper):
+            links[mid] = AxialLink(lower=low, upper=high)
+        return links
+
     def _determineAxialLinkage(self):
         """Gets the block and component based linkage."""
         for b in self.a:
-            self._getLinkedBlocks(b)
-            for c in getSolidComponents(b):
+            for c in iterSolidComponents(b):
                 self._getLinkedComponents(b, c)
 
-    def _getLinkedBlocks(self, b):
-        """Retrieve the axial linkage for block b.
-
-        Parameters
-        ----------
-        b : :py:class:`Block <armi.reactor.blocks.Block>`
-            block to determine axial linkage for
-
-        Notes
-        -----
-        - block linkage is determined by matching ztop/zbottom (see below)
-        - block linkage is stored in self.linkedBlocks[b]
-         _ _
-        |   |
-        | 2 |  Block 2 is linked to block 1.
-        |_ _|
-        |   |
-        | 1 |  Block 1 is linked to both block 0 and 1.
-        |_ _|
-        |   |
-        | 0 |  Block 0 is linked to block 1.
-        |_ _|
-        """
-        lowerLinkedBlock = None
-        upperLinkedBlock = None
-        block_list = self.a.getChildren()
-        for otherBlk in block_list:
-            if b.name != otherBlk.name:
-                if b.p.zbottom == otherBlk.p.ztop:
-                    lowerLinkedBlock = otherBlk
-                elif b.p.ztop == otherBlk.p.zbottom:
-                    upperLinkedBlock = otherBlk
-
-        self.linkedBlocks[b] = [lowerLinkedBlock, upperLinkedBlock]
-
-        if lowerLinkedBlock is None:
-            runLog.debug(
-                "Assembly {0:22s} at location {1:22s}, Block {2:22s}"
-                "is not linked to a block below!".format(
-                    str(self.a.getName()),
-                    str(self.a.getLocation()),
-                    str(b.p.flags),
-                ),
-                single=True,
-            )
-        if upperLinkedBlock is None:
-            runLog.debug(
-                "Assembly {0:22s} at location {1:22s}, Block {2:22s}"
-                "is not linked to a block above!".format(
-                    str(self.a.getName()),
-                    str(self.a.getLocation()),
-                    str(b.p.flags),
-                ),
-                single=True,
-            )
+    def _findComponentLinkedTo(
+        self, c: Component, otherBlock: typing.Optional[Block]
+    ) -> typing.Optional[Component]:
+        if otherBlock is None:
+            return None
+        candidate = None
+        # Iterate over all solid components in the other block that are linked to this one
+        areLinked = functools.partial(self.areAxiallyLinked, c)
+        for otherComp in filter(areLinked, iterSolidComponents(otherBlock)):
+            if candidate is None:
+                candidate = otherComp
+            else:
+                errMsg = (
+                    "Multiple component axial linkages have been found for "
+                    f"Component {c} in Block {c.parent} in Assembly {c.parent.parent}. "
+                    "This is indicative of an error in the blueprints! Linked "
+                    f"components found are {candidate} and {otherComp} in {otherBlock}"
+                )
+                runLog.error(msg=errMsg)
+                raise RuntimeError(errMsg)
+        return candidate
 
-    def _getLinkedComponents(self, b, c):
+    def _getLinkedComponents(self, b: Block, c: Component):
         """Retrieve the axial linkage for component c.
 
         Parameters
@@ -183,31 +232,42 @@ def _getLinkedComponents(self, b, c):
         RuntimeError
             multiple candidate components are found to be axially linked to a component
         """
-        lstLinkedC = [None, None]
-        for ib, linkdBlk in enumerate(self.linkedBlocks[b]):
-            if linkdBlk is not None:
-                for otherC in getSolidComponents(linkdBlk.getChildren()):
-                    if _determineLinked(c, otherC):
-                        if lstLinkedC[ib] is not None:
-                            errMsg = (
-                                "Multiple component axial linkages have been found for "
-                                f"Component {c}; Block {b}; Assembly {b.parent}."
-                                " This is indicative of an error in the blueprints! Linked "
-                                f"components found are {lstLinkedC[ib]} and {otherC}"
-                            )
-                            runLog.error(msg=errMsg)
-                            raise RuntimeError(errMsg)
-                        lstLinkedC[ib] = otherC
-
+        linkedBlocks = self.linkedBlocks[b]
+        lowerC = self._findComponentLinkedTo(c, linkedBlocks.lower)
+        upperC = self._findComponentLinkedTo(c, linkedBlocks.upper)
+        lstLinkedC = AxialLink(lowerC, upperC)
         self.linkedComponents[c] = lstLinkedC
 
-        if lstLinkedC[0] is None:
+        if self.linkedBlocks[b].lower is None and lstLinkedC.lower is None:
             runLog.debug(
                 f"Assembly {self.a}, Block {b}, Component {c} has nothing linked below it!",
                 single=True,
             )
-        if lstLinkedC[1] is None:
+        if self.linkedBlocks[b].upper is None and lstLinkedC.upper is None:
             runLog.debug(
                 f"Assembly {self.a}, Block {b}, Component {c} has nothing linked above it!",
                 single=True,
             )
+
+    @staticmethod
+    def areAxiallyLinked(componentA: Component, componentB: Component) -> bool:
+        """Check if two components are axially linked.
+
+        Parameters
+        ----------
+        componentA : :py:class:`Component <armi.reactor.components.component.Component>`
+            component of interest
+        componentB : :py:class:`Component <armi.reactor.components.component.Component>`
+            component to compare and see if is linked to componentA
+
+        Returns
+        -------
+        bool
+            Status of linkage check
+
+        See Also
+        --------
+        :func:`areAxiallyLinked` for more details, including the criteria for considering components linked.
+        This method is provided to allow subclasses the ability to override the linkage check.
+        """
+        return areAxiallyLinked(componentA, componentB)