improve robustness of type check

terrapower · Mar 31, 2023 · 19d0cc6 · 19d0cc6
1 parent ee30364
commit 19d0cc6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/armi/reactor/converters/axialExpansionChanger.py b/armi/reactor/converters/axialExpansionChanger.py
@@ -851,7 +851,9 @@ def determineTargetComponent(self, b, flagOfInterest=None):
             componentWFlag = [c for c in b.getChildren() if c.hasFlags(flagOfInterest)]
         if len(componentWFlag) == 0:
             # didn't match flags so check type before failing
-            componentWFlag = [c for c in b if c.p.type == b.p.type]
+            componentWFlag = [
+                c for c in b if (c.p.type in b.p.type or b.p.type in c.p.type)
+            ]
         if len(componentWFlag) == 0:
             # if only 1 solid, be smart enought to snag it
             solidMaterials = list(

diff --git a/armi/reactor/converters/tests/test_axialExpansionChanger.py b/armi/reactor/converters/tests/test_axialExpansionChanger.py
@@ -769,7 +769,10 @@ def test_specifyTargetComponent_viaType(self):
         """
         b = HexBlock("detector", height=10.0)
         detectorDims = {"Tinput": 25.0, "Thot": 25.0, "widthOuter": 1.1, "mult": 1.0}
-        detector = Rectangle("detector", "FakeMat", **detectorDims)
+        ductDims = {"Tinput": 25.0, "Thot": 25.0, "op": 17, "ip": 0.0, "mult": 1.0}
+        detector = Rectangle("detector neutron", "FakeMat", **detectorDims)
+        duct = Hexagon("duct", "FakeMat", **ductDims)
+        b.add(duct)
         b.add(detector)
         b.add(self.coolant)
         b.setType("detector")