From 8adfd23009a6f1f8d64780bd903b79483ac2aeb8 Mon Sep 17 00:00:00 2001 From: jstilley Date: Wed, 22 Nov 2023 09:11:33 -0800 Subject: [PATCH] Responding to comments --- armi/reactor/components/component.py | 8 ++++---- armi/reactor/tests/test_composites.py | 8 ++++---- armi/reactor/tests/test_reactors.py | 6 +++++- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/armi/reactor/components/component.py b/armi/reactor/components/component.py index c7e39ff14..60e4c0fbb 100644 --- a/armi/reactor/components/component.py +++ b/armi/reactor/components/component.py @@ -173,6 +173,10 @@ class Component(composites.Composite, metaclass=ComponentType): :id: I_ARMI_COMP_DEF :implements: R_ARMI_COMP_DEF + .. impl:: Order components by there outermost diameter (using the < operator). + :id: I_ARMI_COMP_ORDER + :implements: R_ARMI_COMP_ORDER + Attributes ---------- temperatureInC : float @@ -256,10 +260,6 @@ def __lt__(self, other): True if a circle encompassing this object has a smaller diameter than one encompassing another component. This allows sorting because the Python sort functions only use this method. - - .. impl:: Order components by there outermost diameter. - :id: I_ARMI_COMP_ORDER - :implements: R_ARMI_COMP_ORDER """ thisOD = self.getBoundingCircleOuterDiameter(cold=True) thatOD = other.getBoundingCircleOuterDiameter(cold=True) diff --git a/armi/reactor/tests/test_composites.py b/armi/reactor/tests/test_composites.py index 8670e3c9b..399a1f3b9 100644 --- a/armi/reactor/tests/test_composites.py +++ b/armi/reactor/tests/test_composites.py @@ -113,11 +113,11 @@ def setUp(self): def test_composite(self): """Test basic Composite things. - .. test:: Components are a physical part of the reactor. + .. test:: Composites are a physical part of the reactor. :id: T_ARMI_CMP0 :tests: R_ARMI_CMP - .. test:: Components are part of a hierarchical model. + .. test:: Composites are part of a hierarchical model. :id: T_ARMI_CMP_CHILDREN0 :tests: R_ARMI_CMP_CHILDREN """ @@ -136,11 +136,11 @@ def test_iterComponents(self): def test_getChildren(self): """Test the get children method. - .. test:: Components are a physical part of the reactor. + .. test:: Composites are a physical part of the reactor. :id: T_ARMI_CMP1 :tests: R_ARMI_CMP - .. test:: Components are part of a hierarchical model. + .. test:: Composites are part of a hierarchical model. :id: T_ARMI_CMP_CHILDREN1 :tests: R_ARMI_CMP_CHILDREN """ diff --git a/armi/reactor/tests/test_reactors.py b/armi/reactor/tests/test_reactors.py index e933b05b5..6457a3dbe 100644 --- a/armi/reactor/tests/test_reactors.py +++ b/armi/reactor/tests/test_reactors.py @@ -246,8 +246,12 @@ def test_coreSfp(self): :tests: R_ARMI_R .. test:: The reactor object includes a core and an SFP. - :id: T_ARMI_R_CHILDREN + :id: T_ARMI_R_CHILDREN1 :tests: R_ARMI_R_CHILDREN + + .. test:: Components are a physical part of the reactor. + :id: T_ARMI_CMP2 + :tests: R_ARMI_CMP """ self.assertTrue(isinstance(self.r.core, reactors.Core)) self.assertTrue(isinstance(self.r.sfp, SpentFuelPool))