Skip to content

Commit

Permalink
Merging in main
Browse files Browse the repository at this point in the history
  • Loading branch information
john-science committed Feb 22, 2024
2 parents bac47f2 + cfbc7f6 commit 03fab28
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 8 deletions.
10 changes: 2 additions & 8 deletions armi/reactor/blocks.py
Original file line number Diff line number Diff line change
Expand Up @@ -605,7 +605,7 @@ def getLocation(self):
else:
return "ExCore"

def coords(self, rotationDegreesCCW=0.0):
def coords(self):
"""
Returns the coordinates of the block.
Expand All @@ -617,11 +617,7 @@ def coords(self, rotationDegreesCCW=0.0):
method of the block's ``spatialLocator`` attribute, which recursively
calls itself on all parents of the block to get the coordinates of the
block's centroid in 3D cartesian space.
If ``rotationDegreesCCW`` is non-zero, an error is raised.
"""
if rotationDegreesCCW:
raise NotImplementedError("Cannot get coordinates with rotation.")
return self.spatialLocator.getGlobalCoordinates()

def setBuLimitInfo(self):
Expand Down Expand Up @@ -1677,7 +1673,7 @@ class HexBlock(Block):
def __init__(self, name, height=1.0):
Block.__init__(self, name, height)

def coords(self, rotationDegreesCCW=0.0):
def coords(self):
"""
Returns the coordinates of the block.
Expand All @@ -1692,8 +1688,6 @@ def coords(self, rotationDegreesCCW=0.0):
Will additionally adjust the x and y coordinates based on the block
parameters ``displacementX`` and ``displacementY``.
Note that the ``rotationDegreesCCW`` argument is unused.
"""
x, y, _z = self.spatialLocator.getGlobalCoordinates()
x += self.p.displacementX * 100.0
Expand Down
4 changes: 4 additions & 0 deletions doc/release/0.3.rst
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,19 @@ What's new in ARMI?
API Changes
-----------
#. Renaming ``structuredgrid.py`` to camelCase. (`PR#1650 <https://github.com/terrapower/armi/pull/1650>`_)
#. Removing unused argument from ``Block.coords()``. (`PR#1651 <https://github.com/terrapower/armi/pull/1651>`_)
#. TBD

Bug Fixes
---------
#. Fixed two bugs with "corners up" hex grids. (`PR#1649 <https://github.com/terrapower/armi/pull/1649>`_)
#. TBD

Changes that Affect Requirements
--------------------------------
#. (`PR#1649 <https://github.com/terrapower/armi/pull/1649>`_) - Touched ``HexGrid`` by adding a "cornersUp" property and fixing two bugs.
#. (`PR#1651 <https://github.com/terrapower/armi/pull/1651>`_) - Very minor change to ``Block.coords()``, removing unused argument.
#. TBD


ARMI v0.3.0
Expand Down

0 comments on commit 03fab28

Please sign in to comment.