Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Filling in empty Parameter units and descriptions #1345

Merged
merged 27 commits into from
Jul 18, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
4d2358a
Parameters all have default locations
john-science Jul 13, 2023
1439d20
Increasing consistency of unitless Parameters
john-science Jul 13, 2023
b202013
Increasing consistency of unitless Parameters
john-science Jul 13, 2023
68591af
Unifying more of the Parameter units
john-science Jul 13, 2023
90243a0
Unified empty description strings
john-science Jul 13, 2023
6c5b695
Cleaning up comments
john-science Jul 13, 2023
bea73ca
Adding descriptions to Parameters
john-science Jul 14, 2023
88ff27e
Removing unused Parameter: baseBu
john-science Jul 14, 2023
a2a0caf
Removing unused Parameter: basePBu
john-science Jul 14, 2023
d7a4977
Removing unused Param: avgFuelTemp
john-science Jul 14, 2023
05672c8
Removing unused Param: maxresidence
john-science Jul 14, 2023
cb7dbac
Removing unused param: bu (replaced by percentBu)
john-science Jul 14, 2023
e67b43d
Remove unused param: avgTempRef
john-science Jul 14, 2023
82521e8
Removing the unused Torus geometry and Parameters
john-science Jul 14, 2023
4a90ecb
Cleaning up param descriptions: Cube and RadialSegment
john-science Jul 14, 2023
91672c0
Adding descriptions to Parameters
john-science Jul 14, 2023
4cad3bd
Adding descriptions to Parameters
john-science Jul 14, 2023
b13ca85
Removing 2 unused parameters
john-science Jul 14, 2023
a1f04da
Finalizing units and descriptions
john-science Jul 14, 2023
207d244
Re-adding powerRx param
john-science Jul 17, 2023
a9a5a97
Apply suggestions from code review: Chris K
john-science Jul 17, 2023
2698ef6
Apply suggestions from code review: Chris K
john-science Jul 17, 2023
1692213
Responding to Chris K's comments
john-science Jul 17, 2023
0656c7e
Responding to comments
john-science Jul 17, 2023
e3019c5
Update armi/reactor/reactorParameters.py
john-science Jul 17, 2023
86ffdae
DeprecationWarning: soon Parameters won't build without descriptions
john-science Jul 18, 2023
b8a6efc
Apply suggestions from code review
john-science Jul 18, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion armi/bookkeeping/db/tests/test_comparedb3.py
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ def test_compareDatabaseSim(self):
dbs[1]._fullPath,
timestepCompare=[(0, 0), (0, 1)],
)
self.assertEqual(len(diffs.diffs), 468)
self.assertEqual(len(diffs.diffs), 465)
# Cycle length is only diff (x3)
self.assertEqual(diffs.nDiffs(), 3)

Expand Down
4 changes: 0 additions & 4 deletions armi/bookkeeping/db/tests/test_databaseInterface.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
from armi.reactor import grids
from armi.reactor.flags import Flags
from armi.reactor.tests.test_reactors import loadTestReactor, reduceTestReactorRings
from armi.settings.fwSettings.databaseSettings import CONF_FORCE_DB_PARAMS
from armi.tests import TEST_ROOT
from armi.utils import directoryChangers

Expand All @@ -52,7 +51,6 @@ def getSimpleDBOperator(cs):
newSettings["runType"] = "Standard"
newSettings["geomFile"] = "geom1Assem.xml"
newSettings["nCycles"] = 1
newSettings[CONF_FORCE_DB_PARAMS] = ["baseBu"]
cs = cs.modified(newSettings=newSettings)
genDBCase = case.Case(cs)
settings.setMasterCs(cs)
Expand All @@ -76,7 +74,6 @@ def __init__(self, r, cs, action=None):
self.action = action

def interactEveryNode(self, cycle, node):
self.r.core.getFirstBlock().p.baseBu = 5.0
self.action(cycle, node)


Expand Down Expand Up @@ -161,7 +158,6 @@ def goodMethod(cycle, node):
self.assertIn("geomFile", h5["inputs"])
self.assertIn("settings", h5["inputs"])
self.assertIn("blueprints", h5["inputs"])
self.assertIn("baseBu", h5["c00n02/HexBlock"])

def test_metaDataEndFail(self):
def failMethod(cycle, node):
Expand Down
2 changes: 0 additions & 2 deletions armi/operators/tests/test_operatorSnapshots.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
from armi.operators.runTypes import RunTypes
from armi.operators.snapshots import OperatorSnapshots
from armi.reactor.tests import test_reactors
from armi.settings.fwSettings.databaseSettings import CONF_FORCE_DB_PARAMS


class TestOperatorSnapshots(unittest.TestCase):
Expand All @@ -32,7 +31,6 @@ def setUp(self):
newSettings["verbosity"] = "important"
newSettings["branchVerbosity"] = "important"
newSettings["nCycles"] = 1
newSettings[CONF_FORCE_DB_PARAMS] = ["baseBu"]
newSettings["dumpSnapshot"] = ["000000", "008000", "016005"]
o1, self.r = test_reactors.loadTestReactor(customSettings=newSettings)
self.o = OperatorSnapshots(o1.cs)
Expand Down
18 changes: 9 additions & 9 deletions armi/physics/fuelPerformance/parameters.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ def _getFuelPerformanceBlockParams():

pb.defParam(
"fuelCladLocked",
units="",
units=units.UNITLESS,
default=False,
description="Boolean to indicate if the fuel is locked with the clad."
" This is used to determine the expansion constraints for the fuel during"
Expand All @@ -47,7 +47,7 @@ def gasReleaseFraction(self, value):
pb.defParam(
"gasReleaseFraction",
setter=gasReleaseFraction,
units="fraction",
units=units.UNITLESS,
description="Fraction of generated fission gas that no longer exists in the block.",
categories=["eq cumulative shift"],
)
Expand All @@ -63,7 +63,7 @@ def bondRemoved(self, value):
pb.defParam(
"bondRemoved",
setter=bondRemoved,
units="fraction",
units=units.UNITLESS,
description="Fraction of thermal bond between fuel and clad that has been pushed out.",
categories=["eq cumulative shift"],
)
Expand All @@ -78,43 +78,43 @@ def bondRemoved(self, value):

pb.defParam(
"totalCladStrain",
units="%",
units=units.PERCENT,
description="Total diametral clad strain.",
categories=["eq cumulative shift"],
)

pb.defParam(
"axialGrowthPct",
units="%",
units=units.PERCENT,
description="Axial growth percentage",
categories=["eq cumulative shift"],
)

pb.defParam(
"fpPeakFuelTemp",
units="C",
units=units.DEGC,
description="Fuel performance calculated peak fuel temperature.",
location=ParamLocation.AVERAGE,
)

pb.defParam(
"fpAveFuelTemp",
units="C",
units=units.DEGC,
description="Fuel performance calculated average fuel temperature.",
location=ParamLocation.AVERAGE,
)

pb.defParam(
"gasPorosity",
units="",
units=units.UNITLESS,
description="Fraction of fuel volume that is occupied by gas pores",
default=0.0,
categories=["eq cumulative shift"],
)

pb.defParam(
"liquidPorosity",
units="",
units=units.UNITLESS,
description="Fraction of fuel volume that is occupied by liquid filled pores",
default=0.0,
)
Expand Down
Loading