Skip to content

Commit

Permalink
Merge ea87ce5 into d3889e0
Browse files Browse the repository at this point in the history
  • Loading branch information
jakehader committed May 26, 2022
2 parents d3889e0 + ea87ce5 commit 2020999
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
10 changes: 6 additions & 4 deletions armi/reactor/assemblyParameters.py
Expand Up @@ -196,9 +196,10 @@ def detailedNDens(self, value):
)

pb.defParam(
"crEndingElevation",
"crInsertedElevation",
units="cm",
description="The final elevation of the bottom of the control material when fully inserted.",
description=("The final elevation of the bottom of the control material when fully inserted. Note that this should "
"be considered a lower elevation than the ``crWithdrawnElevation`` by definition and modeling semantics."),
categories=[parameters.Category.assignInBlueprints],
saveToDB=True,
)
Expand All @@ -211,9 +212,10 @@ def detailedNDens(self, value):
)

pb.defParam(
"crStartingElevation",
"crWithdrawnElevation",
units="cm",
description="The initial starting elevation of the moveable section of a control rod assembly when fully withdrawn.",
description=("The initial starting elevation of the moveable section of a control rod assembly when fully withdrawn. Note that this should "
"be considered a higher elevation than the ``crInsertedElevation`` by definition and modeling semantics."),
categories=[parameters.Category.assignInBlueprints],
saveToDB=True,
)
Expand Down
1 change: 1 addition & 0 deletions doc/release/0.2.rst
Expand Up @@ -14,6 +14,7 @@ What's new in ARMI
#. Minor code re-org, moving math utilities into their own module.
#. Removed the ``PyYaml`` dependency.
#. Removed all bare ``import armi`` statements, for code clarity.
#. Renamed control rod assembly parameters for generic implementations of control rod handling.
#. TBD

Bug fixes
Expand Down

0 comments on commit 2020999

Please sign in to comment.