Merge 428dc36 into 571e4f5

terrapower · Feb 20, 2024 · 68a6f13 · 68a6f13
2 parents 571e4f5 + 428dc36
commit 68a6f13
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 6 deletions.
diff --git a/armi/reactor/blueprints/gridBlueprint.py b/armi/reactor/blueprints/gridBlueprint.py
@@ -161,7 +161,7 @@ class GridBlueprint(yamlize.Object):
         class.
 
         Includes a ``construct`` method, which instantiates an instance of one
-        of the subclasses of :py:class:`~armi.reactor.grids.structuredgrid.StructuredGrid`.
+        of the subclasses of :py:class:`~armi.reactor.grids.structuredGrid.StructuredGrid`.
         This is typically called from within :py:meth:`~armi.reactor.blueprints.blockBlueprint.BlockBlueprint.construct`,
         which then also associates the individual components in the block with
         locations specifed in the grid.

diff --git a/armi/reactor/grids/__init__.py b/armi/reactor/grids/__init__.py
@@ -79,7 +79,7 @@
 )
 
 from armi.reactor.grids.grid import Grid
-from armi.reactor.grids.structuredgrid import StructuredGrid, GridParameters, _tuplify
+from armi.reactor.grids.structuredGrid import StructuredGrid, GridParameters, _tuplify
 from armi.reactor.grids.axial import AxialGrid, axialUnitGrid
 from armi.reactor.grids.cartesian import CartesianGrid
 from armi.reactor.grids.hexagonal import HexGrid, COS30, SIN30, TRIANGLES_IN_HEXAGON

diff --git a/armi/reactor/grids/axial.py b/armi/reactor/grids/axial.py
@@ -17,7 +17,7 @@
 import numpy
 
 from armi.reactor.grids.locations import IJType, LocationBase
-from armi.reactor.grids.structuredgrid import StructuredGrid
+from armi.reactor.grids.structuredGrid import StructuredGrid
 
 if TYPE_CHECKING:
     from armi.reactor.composites import ArmiObject

diff --git a/armi/reactor/grids/cartesian.py b/armi/reactor/grids/cartesian.py
@@ -19,7 +19,7 @@
 from armi.reactor import geometry
 
 from armi.reactor.grids.locations import IJType
-from armi.reactor.grids.structuredgrid import StructuredGrid
+from armi.reactor.grids.structuredGrid import StructuredGrid
 
 
 class CartesianGrid(StructuredGrid):

diff --git a/armi/reactor/grids/hexagonal.py b/armi/reactor/grids/hexagonal.py
@@ -26,7 +26,7 @@
     BOUNDARY_CENTER,
 )
 from armi.reactor.grids.locations import IndexLocation, IJKType, IJType
-from armi.reactor.grids.structuredgrid import StructuredGrid
+from armi.reactor.grids.structuredGrid import StructuredGrid
 
 COS30 = sqrt(3) / 2.0
 SIN30 = 1.0 / 2.0

diff --git a/armi/reactor/grids/structuredgrid.py → armi/reactor/grids/structuredGrid.py b/armi/reactor/grids/structuredgrid.py → armi/reactor/grids/structuredGrid.py
diff --git a/armi/reactor/grids/thetarz.py b/armi/reactor/grids/thetarz.py
@@ -17,7 +17,7 @@
 import numpy
 
 from armi.reactor.grids.locations import IJType, IJKType
-from armi.reactor.grids.structuredgrid import StructuredGrid
+from armi.reactor.grids.structuredGrid import StructuredGrid
 
 if TYPE_CHECKING:
     # Avoid circular imports