Add sortAssemsByRing to sort the reactor assemblies by ring #1320
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
onufer
commented
Jun 17, 2023
| @@ -272,7 +272,7 @@ def __iter__(self): | |||
| -------- | |||
| getAssemblies() | |||
| """ | |||
| return iter(sorted(self._children)) | |||
| return iter(self._children) | |||
There was a problem hiding this comment.
not sorting itter will guarantee list accessing and iteration will not be out of sync. otherwise index accessing can be different from itter order
onufer
commented
Jun 17, 2023
| @@ -2681,7 +2681,7 @@ def sort(self): | |||
|
|
|||
| # recursively sort the children below it. | |||
| for c in self._children: | |||
| if issubclass(Composite, c.__class__): | |||
| if issubclass(c.__class__, Composite): | |||
There was a problem hiding this comment.
this is a bug that caused no recursive sorting since its never true.
onufer
commented
Jun 19, 2023
| @@ -272,6 +270,25 @@ def test_factorySortSetting(self): | |||
| a1 = [a.name for a in r1.core] | |||
| self.assertNotEqual(a0, a1) | |||
|
|
|||
| def test_sortChildren(self): | |||
There was a problem hiding this comment.
this test failed on main due to the if issubclass(c.__class__, Composite): issue
onufer
commented
Jun 21, 2023
| @@ -179,7 +179,6 @@ def loadTestReactor( | |||
| assemblies.setAssemNumCounter(assemNum) | |||
| settings.setMasterCs(o.cs) | |||
| o.reattach(r, o.cs) | |||
| r.sort() | |||
There was a problem hiding this comment.
these are not needed since its sorted on initialization as the test below shows.
onufer
commented
Jun 21, 2023
| @@ -53,7 +53,8 @@ | |||
| "metadata": {}, | |||
| "outputs": [], | |||
| "source": [ | |||
| "o=armi.init(fName=\"anl-afci-177.yaml\");" | |||
| "o=armi.init(fName=\"anl-afci-177.yaml\");\n", | |||
| "o.r.core.sortAssemsByRing() # makes innermost assemblies appear first" | |||
opotowsky
reviewed
Jun 21, 2023
Co-authored-by: Arrielle Opotowsky <c-aopotowsky@terrapower.com>
albeanth
approved these changes
Jun 21, 2023
opotowsky
approved these changes
Jun 21, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What is the change?
Fix bug in reactor sorting that didn't recursively sort
Add sortAssemsByRing method to sort assembly from inner to outer.
Why is the change being made?
for ease of postprocessing. a full sort caused many internal unit test issues.
#1305
Checklist
doc/release/0.X.rst) are up-to-date with any important changes.docfolder.setup.py.