Merge 06b4612 into 108e321

armi/reactor/blocks.py

@@ -1352,7 +1352,6 @@ def add(self, c):
         if self.p.percentBuByPin is None or len(self.p.percentBuByPin) < mult:
             # this may be a little wasteful, but we can fix it later...
             self.p.percentBuByPin = [0.0] * mult
-
         self._updatePitchComponent(c)
 
     def addComponent(self, c):
@@ -1846,20 +1845,16 @@ def getPitch(self, returnComp=False):
         setPitch : sets pitch
 
         """
-        c, p = self._pitchDefiningComponent
+        c, _p = self._pitchDefiningComponent
 
-        # Admittedly awkward here, but allows for a clean comparison when adding components to the
-        # block as opposed to initializing _pitchDefiningComponent to (None, None)
         if c is None:
-            p = None
-        else:
-            # ask component for dimensions, since they could have changed
-            p = c.getDimension("op")
+            raise ValueError("{} has no valid pitch defining component".format(self))
 
-        if returnComp:
-            return p, c
-        else:
-            return p
+        # ask component for dimensions, since they could have changed,
+        # due to temperature, for example.
+        p = c.getPitchData()
+
+        return (p, c) if returnComp else p
 
     def hasPinPitch(self):
         """Return True if the block has enough information to calculate pin pitch."""
@@ -2343,7 +2338,8 @@ def breakFuelComponentsIntoIndividuals(self):
         # update moles at BOL for each pin
         self.p.molesHmBOLByPin = []
         for pinNum, pin in enumerate(self.iterComponents(Flags.FUEL)):
-            pin.p.flags = fuelFlags  # Update the fuel component flags to be the same as before the split (i.e., DEPLETABLE)
+            # Update the fuel component flags to be the same as before the split (i.e., DEPLETABLE)
+            pin.p.flags = fuelFlags
             self.p.molesHmBOLByPin.append(pin.getHMMoles())
             pin.p.massHmBOL /= nPins
 
@@ -2432,10 +2428,7 @@ class HexBlock(Block):
 
     LOCATION_CLASS = locations.HexLocation
 
-    PITCH_COMPONENT_TYPE: ClassVar[_PitchDefiningComponent] = (
-        components.UnshapedComponent,
-        components.Hexagon,
-    )
+    PITCH_COMPONENT_TYPE: ClassVar[_PitchDefiningComponent] = (components.Hexagon,)
 
     def __init__(self, name, height=1.0, location=None):
         Block.__init__(self, name, height, location)
@@ -2702,7 +2695,8 @@ def getPinToDuctGap(self, cold=False):
             face to face in cm.
         """
         if self.LOCATION_CLASS is None:
-            return None  # can't assume anything about dimensions if there is no location type
+            # can't assume anything about dimensions if there is no location type
+            return None
 
         wire = self.getComponent(Flags.WIRE)
         ducts = sorted(self.getChildrenWithFlags(Flags.DUCT))
@@ -2882,7 +2876,7 @@ class CartesianBlock(Block):
     LOCATION_CLASS = locations.CartesianLocation
 
     PITCH_DIMENSION = "widthOuter"
-    PITCH_COMPONENT_TYPE = (components.UnshapedComponent, components.Rectangle)
+    PITCH_COMPONENT_TYPE = components.Rectangle
 
     def getMaxArea(self):
         """Get area of this block if it were totally full."""
@@ -2895,30 +2889,6 @@ def setPitch(self, val, updateBolParams=False, updateNumberDensityParams=True):
             "not supported"
         )
 
-    def getPitch(self, returnComp=False):
-        """
-        Get xw and yw of the block.
-
-        See Also
-        --------
-        Block.getPitch
-        """
-        c, _p = self._pitchDefiningComponent
-
-        # Admittedly awkward here, but allows for a clean comparison when adding components to the
-        # block as opposed to initializing _pitchDefiningComponent to (None, None)
-        if c is None:
-            raise ValueError("{} has no valid pitch".format(self))
-        else:
-            # ask component for dimensions, since they could have changed
-            maxLength = c.getDimension("lengthOuter")
-            maxWidth = c.getDimension("widthOuter")
-
-        if returnComp:
-            return (maxLength, maxWidth), c
-        else:
-            return (maxLength, maxWidth)
-
     def getSymmetryFactor(self):
         """
         Return a factor between 1 and N where 1/N is how much cut-off by symmetry lines this mesh

armi/reactor/components/__init__.py

@@ -119,7 +119,6 @@ def __init__(
         Tinput,
         Thot,
         area=numpy.NaN,
-        op=None,
         modArea=None,
         isotopics=None,  # pylint: disable=too-many-arguments
         mergeWith=None,
@@ -136,7 +135,7 @@ def __init__(
             mergeWith=mergeWith,
             components=components,
         )
-        self._linkAndStoreDimensions(components, op=op, modArea=modArea)
+        self._linkAndStoreDimensions(components, modArea=modArea)
 
     def getComponentArea(self, cold=False):
         """

armi/reactor/components/basicShapes.py

@@ -144,6 +144,18 @@ def getPerimeter(self, Tc=None):
         perimeter = 6 * (ip / math.sqrt(3)) * mult
         return perimeter
 
+    def getPitchData(self):
+        """
+        Return the pitch data that should be used to determine block pitch.
+
+        Notes
+        -----
+        This pitch data should only be used if this is the pitch defining component in
+        a block. The block is responsible for determining which component in it is the
+        pitch defining component.
+        """
+        return self.getDimension("op")
+
 
 class Rectangle(ShapedComponent):
     """A rectangle component."""
@@ -209,6 +221,19 @@ def isLatticeComponent(self):
         """Return true if the component is a `lattice component` containing void material and zero area."""
         return self.containsVoidMaterial() and self.getArea() == 0.0
 
+    def getPitchData(self):
+        """
+        Return the pitch data that should be used to determine block pitch.
+
+        Notes
+        -----
+        For rectangular components there are two pitches, one for each dimension.
+        This pitch data should only be used if this is the pitch defining component in
+        a block. The block is responsible for determining which component in it is the
+        pitch defining component.
+        """
+        return (self.getDimension("lengthOuter"), self.getDimension("widthOuter"))
+
 
 class SolidRectangle(Rectangle):
     """Solid rectangle component."""
@@ -318,6 +343,20 @@ def getBoundingCircleOuterDiameter(self, Tc=None, cold=False):
         widthO = self.getDimension("widthOuter", Tc, cold=cold)
         return math.sqrt(widthO ** 2 + widthO ** 2)
 
+    def getPitchData(self):
+        """
+        Return the pitch data that should be used to determine block pitch.
+
+        Notes
+        -----
+        For rectangular components there are two pitches, one for each dimension.
+        This pitch data should only be used if this is the pitch defining component in
+        a block. The block is responsible for determining which component in it is the
+        pitch defining component.
+        """
+        # both dimensions are the same for a square.
+        return (self.getDimension("widthOuter"), self.getDimension("widthOuter"))
+
 
 class Triangle(ShapedComponent):
     """

armi/reactor/components/component.py

@@ -1239,6 +1239,21 @@ def makeCrossSectionTable(self, nuclides=None):
     def getMicroSuffix(self):
         return self.parent.getMicroSuffix()
 
+    def getPitchData(self):
+        """
+        Return the pitch data that should be used to determine block pitch.
+
+        Notes
+        -----
+        This pitch data should only be used if this is the pitch defining component in
+        a block. The block is responsible for determining which component in it is the
+        pitch defining component.
+        """
+        raise NotImplementedError(
+            f"Method not implemented on component {self}. "
+            "Please implement if this component type can be a pitch defining component."
+        )
+
 
 class ShapedComponent(Component):
     """A component with well-defined dimensions."""