Merge remote-tracking branch 'origin/master' into uniformMeshFixes

.github/workflows/black.yaml

@@ -13,6 +13,6 @@ jobs:
               with:
                 python-version: 3.9
             - name: Install Black
-              run: pip install 'black==20.8b1'
+              run: pip install 'black==20.8b1' 'click==8.0.1'
             - name: Run black --check .
               run: black --check .

MANIFEST.in

@@ -38,7 +38,6 @@ include armi/nuclearDataIO/tests/library-file-generation/mc2v3-dlayxs.inp
 include armi/nuclearDataIO/tests/longLivedRipleData.dat
 include armi/nuclearDataIO/tests/simple_hexz.inp
 include armi/nuclearDataIO/tests/z036.dat
-include armi/settings/tests/old_xml_settings_input.xml
 include armi/tests/1DslabXSByCompTest.yaml
 include armi/tests/armiRun-SHUFFLES.txt
 include armi/tests/armiRun.yaml

armi/cli/compareCases.py

@@ -182,14 +182,7 @@ def invoke(self):
         # contains all tests that user had access to
         allTests = []
         for pat in self.args.patterns + self.args.additional_comparisons:
-            name, ext = os.path.splitext(pat)
             allTests.append(pat)
-            if ext == ".yaml":
-                # auto-add XML variants of yaml settings
-                # to accommodate comparisons against xml suites (e.g. testing)
-                xmlName = name + ".xml"
-                runLog.extra("Including {} in reference patterns.".format(xmlName))
-                allTests.append(xmlName)
         refSuite.discover(
             rootDir=self.args.reference,
             patterns=allTests,

armi/cli/database.py

@@ -120,11 +120,7 @@ def invoke(self):
         with db:
             settings, geom, bp = db.readInputsFromDB()
 
-        settingsExt = ".yaml"
-        if settings.lstrip()[0] == "<":
-            settingsExt = ".xml"
-
-        settingsPath = self.args.output_base + "_settings" + settingsExt
+        settingsPath = self.args.output_base + "_settings.yaml"
         bpPath = self.args.output_base + "_blueprints.yaml"
 
         geomPath = None

armi/cli/migrateInputs.py

@@ -61,7 +61,6 @@ def _migrate(settingsPath, dbPath):
         Notes
         -----
         Some migrations change the paths so we update them one by one.
-        For example, a migration converts a settings file from xml to yaml.
         """
         for migrationI in ACTIVE_MIGRATIONS:
             if (

armi/nuclearDataIO/xsLibraries.py

@@ -406,7 +406,7 @@ def get(self, nuclideLabel, default):
 
     def getNuclide(self, nucName, suffix):
         """
-        Get a nuclide object from the XS library or None.
+        Get a nuclide object from the XS library.
 
         Parameters
         ----------
@@ -420,8 +420,8 @@ def getNuclide(self, nucName, suffix):
         nuclide : Nuclide object
             A nuclide from the library or None
         """
-
         libLabel = nuclideBases.byName[nucName].label + suffix
+
         try:
             return self[libLabel]
         except KeyError:
@@ -512,7 +512,6 @@ def getScatterWeights(self, scatterMatrixKey="elasticScatter"):
         --------
         _buildScatterWeights
         """
-
         if not self._scatterWeights.get(scatterMatrixKey):
             self._scatterWeights[scatterMatrixKey] = self._buildScatterWeights(
                 scatterMatrixKey
@@ -557,7 +556,6 @@ def plotNucXs(
         """
         generates a XS plot for a nuclide on the ISOTXS library
 
-
         nucName : str or list
             The nuclides to plot
         xsName : str or list
@@ -583,7 +581,6 @@ def plotNucXs(
         armi.nucDirectory.nuclide.plotScatterMatrix
 
         """
-
         # convert all input to lists
         if isinstance(nucNames, str):
             nucNames = [nucNames]

armi/operators/settingsValidation.py

@@ -312,13 +312,6 @@ def _inspectSettings(self):
         # import here to avoid cyclic issues
         from armi import operators
 
-        self.addQuery(
-            lambda: self.cs.path.endswith(".xml"),
-            "Your settings were loaded from a XML file. These are being converted to yaml files.",
-            "Would you like to auto-convert it to YAML?",
-            lambda: settings.convertSettingsFromXMLToYaml(self.cs),
-        )
-
         self.addQueryBadLocationWillLikelyFail("operatorLocation")
 
         self.addQuery(

armi/physics/fuelCycle/fuelHandlers.py

@@ -1453,11 +1453,6 @@ def _swapFluxParam(self, incoming, outgoing):
         ----------
         incoming, outgoing : Assembly
             Assembly objects to be swapped
-
-        Notes
-        -----
-        Assumes assemblies have the same block structure. If not, blocks will be swapped one-for-one until
-        the shortest one has been used up and then the process will truncate.
         """
         # Find the block-based mesh points for each assembly
         meshIn = self.r.core.findAllAxialMeshPoints([incoming], False)

armi/reactor/components/__init__.py

@@ -118,9 +118,13 @@ class UnshapedComponent(Component):
     A component with undefined dimensions.
 
     Useful for situations where you just want to enter the area directly.
-    For instance, in filler situations where the exact shape of this component is
-    is unknown but you have some left-over space between other components filled
-    with a known material you might need to model.
+
+    For instance, when you want to model neutronic behavior of an assembly based
+    on only knowing the area fractions of each material in the assembly.
+
+    See Also
+    --------
+    DerivedShape : Useful to just fill leftover space in a block with a material
     """
 
     pDefs = componentParameters.getUnshapedParameterDefinitions()
@@ -159,32 +163,41 @@ def getComponentArea(self, cold=False):
         cold : bool, optional
             Ignored for this component
         """
-        return self.p.area
+        coldArea = self.p.area
+        if cold:
+            return coldArea
 
-    def setArea(self, val):
-        self.p.area = val
-        self.clearCache()
+        return self.getThermalExpansionFactor(self.temperatureInC) ** 2 * coldArea
 
     def getBoundingCircleOuterDiameter(self, Tc=None, cold=False):
         """
         Approximate it as circular and return the radius.
 
         This is the smallest it can possibly be. Since this is used to determine
         the outer component, it will never be allowed to be the outer one.
+
+        Notes
+        -----
+        Tc is not used in this method for this particular component.
         """
-        return math.sqrt(self.p.area / math.pi)
+        return 2 * math.sqrt(self.getComponentArea(cold=cold) / math.pi)
 
     @staticmethod
     def fromComponent(otherComponent):
         """
         Build a new UnshapedComponent that has area equal to that of another component.
 
         This can be used to "freeze" a DerivedShape, among other things.
+
+        Notes
+        -----
+        Components created in this manner will not thermally expand beyond the expanded
+        area of the original component, but will retain their hot temperature.
         """
         newC = UnshapedComponent(
             name=otherComponent.name,
             material=otherComponent.material,
-            Tinput=otherComponent.inputTemperatureInC,
+            Tinput=otherComponent.temperatureInC,
             Thot=otherComponent.temperatureInC,
             area=otherComponent.getComponentArea(),
         )

armi/reactor/tests/test_components.py

@@ -134,7 +134,13 @@ class TestGeneralComponents(unittest.TestCase):
     componentMaterial = "HT9"
     componentDims = {"Tinput": 25.0, "Thot": 25.0}
 
-    def setUp(self):
+    def setUp(self, component=None):
+        """
+        Most of the time nothing will be passed as `component` and the result will
+        be stored in self, but you can also pass a component object as `component`,
+        in which case the object will be returned with the `parent` attribute assigned.
+        """
+
         class _Parent:
             def getSymmetryFactor(self):
                 return 1.0
@@ -150,10 +156,14 @@ def getChildren(self):
 
             derivedMustUpdate = False
 
-        self.component = self.componentCls(
-            "TestComponent", self.componentMaterial, **self.componentDims
-        )
-        self.component.parent = _Parent()
+        if component == None:
+            self.component = self.componentCls(
+                "TestComponent", self.componentMaterial, **self.componentDims
+            )
+            self.component.parent = _Parent()
+        else:
+            component.parent = _Parent()
+            return component
 
 
 class TestComponent(TestGeneralComponents):
@@ -189,14 +199,59 @@ def test_getDimension(self):
 
 class TestUnshapedComponent(TestGeneralComponents):
     componentCls = UnshapedComponent
-    componentMaterial = "Material"
+    componentMaterial = "HT9"
     componentDims = {"Tinput": 25.0, "Thot": 430.0, "area": math.pi}
 
+    def test_getComponentArea(self):
+        # a case without thermal expansion
+        self.assertEqual(self.component.getComponentArea(cold=True), math.pi)
+
+        # a case with thermal expansion
+        self.assertEqual(
+            self.component.getComponentArea(cold=False),
+            math.pi
+            * self.component.getThermalExpansionFactor(self.component.temperatureInC)
+            ** 2,
+        )
+
+        # show that area expansion is consistent with the density change in the material
+        hotDensity = self.component.density()
+        hotArea = self.component.getArea()
+        thermalExpansionFactor = self.component.getThermalExpansionFactor(
+            self.component.temperatureInC
+        )
+
+        coldComponent = self.setUp(
+            UnshapedComponent(
+                name="coldComponent",
+                material=self.componentMaterial,
+                Tinput=self.component.inputTemperatureInC,
+                Thot=self.component.inputTemperatureInC,
+                area=math.pi,
+            )
+        )
+        coldDensity = coldComponent.density()
+        coldArea = coldComponent.getArea()
+
+        self.assertGreater(thermalExpansionFactor, 1)
+        self.assertAlmostEqual(
+            (coldDensity / hotDensity) / (thermalExpansionFactor * hotArea / coldArea),
+            1,
+        )  # account for density being 3D while area is 2D
+
     def test_getBoundingCircleOuterDiameter(self):
-        self.assertEqual(self.component.getBoundingCircleOuterDiameter(cold=True), 1.0)
+        # a case without thermal expansion
+        self.assertEqual(self.component.getBoundingCircleOuterDiameter(cold=True), 2.0)
+
+        # a case with thermal expansion
+        self.assertEqual(
+            self.component.getBoundingCircleOuterDiameter(cold=False),
+            2.0
+            * self.component.getThermalExpansionFactor(self.component.temperatureInC),
+        )
 
     def test_fromComponent(self):
-        circle = components.Circle("testCircle", "Material", 25, 25, 1.0)
+        circle = components.Circle("testCircle", "HT9", 25, 500, 1.0)
         unshaped = components.UnshapedComponent.fromComponent(circle)
         self.assertEqual(circle.getComponentArea(), unshaped.getComponentArea())
 

armi/scripts/migration/__init__.py

@@ -33,15 +33,13 @@
 """
 
 from . import (
-    m0_1_0_settings,
     m0_1_3,
     m0_1_0_newDbFormat,
     crossSectionBlueprintsToSettings,
     m0_1_6_locationLabels,
 )
 
 ACTIVE_MIGRATIONS = [
-    m0_1_0_settings.ConvertXmlSettingsToYaml,
     m0_1_0_newDbFormat.ConvertDB2toDB3,
     m0_1_3.RemoveCentersFromBlueprints,
     m0_1_3.UpdateElementalNuclides,