Merge branch 'main' into line_length_120

README.rst

@@ -68,25 +68,29 @@ commands. You probably want to do this in a virtual environment as described in
 documentation <https://terrapower.github.io/armi/installation.html>`_. Otherwise, the
 dependencies could conflict with your system dependencies.
 
-::
+First, upgrade your version of pip::
+
+    $ pip install pip>=22.1
+
+Now clone and install ARMI::
 
     $ git clone https://github.com/terrapower/armi
     $ cd armi
     $ pip install -e .
-    $ armi
+    $ armi --help
 
 The easiest way to run the tests is to install `tox <https://tox.readthedocs.io/en/latest/>`_
 and then run::
 
-    $ pip install -e .[test]
+    $ pip install -e ".[test]"
     $ tox -- -n 6
 
 This runs the unit tests in parallel on 6 processes. Omit the ``-n 6`` argument
 to run on a single process.
 
 The tests can also be run directly, using ``pytest``::
 
-    $ pip install -e .[test]
+    $ pip install -e ".[test]"
     $ pytest -n 4 armi
 
 From here, we recommend going through a few of our `gallery examples

armi/reactor/blocks.py

@@ -2280,7 +2280,7 @@ def autoCreateSpatialGrids(self):
         # note that it's the pointed end of the cell hexes that are up (but the
         # macro shape of the pins forms a hex with a flat top fitting in the assembly)
         grid = grids.HexGrid.fromPitch(
-            self.getPinPitch(cold=True), numRings=0, pointedEndUp=True
+            self.getPinPitch(cold=True), numRings=0, cornersUp=True
         )
         spatialLocators = grids.MultiIndexLocation(grid=self.spatialGrid)
         numLocations = 0

armi/reactor/blueprints/gridBlueprint.py

@@ -311,7 +311,7 @@ def _constructSpatialGrid(self):
             spatialGrid = grids.HexGrid.fromPitch(
                 pitch,
                 numRings=maxIndex + 2,
-                pointedEndUp=geom == geometry.HEX_CORNERS_UP,
+                cornersUp=geom == geometry.HEX_CORNERS_UP,
             )
         elif geom == geometry.CARTESIAN:
             # if full core or not cut-off, bump the first assembly from the center of

armi/reactor/blueprints/tests/test_gridBlueprints.py

@@ -361,7 +361,7 @@ def tearDown(self):
     def test_simpleRead(self):
         gridDesign = self.grids["control"]
         _ = gridDesign.construct()
-        self.assertEqual(gridDesign.gridContents[0, -8], "6")
+        self.assertEqual(gridDesign.gridContents[-8, 0], "6")
 
         # Cartesian full, odd
         gridDesign2 = self.grids["sfp"]