diff --git a/armi/reactor/assemblyParameters.py b/armi/reactor/assemblyParameters.py index 9a4bfa8ff..5e5ff700b 100644 --- a/armi/reactor/assemblyParameters.py +++ b/armi/reactor/assemblyParameters.py @@ -319,40 +319,12 @@ def _enforceNotesRestrictions(self, value): pb.defParam("assemNum", units=units.UNITLESS, description="Assembly number") - pb.defParam( - "axExpWorthPT", - units=f"{units.PCM}/{units.PERCENT}/{units.CM}^3", - description="Axial swelling reactivity", - location=ParamLocation.AVERAGE, - ) - - pb.defParam( - "coolFlowingWorthPT", - units=f"{units.PCM}/{units.PERCENT}/{units.CM}^3", - description="Flowing coolant reactivity", - location=ParamLocation.AVERAGE, - ) - - pb.defParam( - "coolWorthPT", - units=f"{units.PCM}/{units.PERCENT}/{units.CM}^3", - description="Coolant reactivity", - location=ParamLocation.AVERAGE, - ) - pb.defParam( "dischargeTime", units=units.YEARS, description="Time the Assembly was removed from the Reactor.", ) - pb.defParam( - "fuelWorthPT", - units=f"{units.PCM}/{units.PERCENT}/{units.CM}^3", - description="Fuel reactivity", - location=ParamLocation.AVERAGE, - ) - pb.defParam( "hotChannelFactors", units=units.UNITLESS, @@ -362,20 +334,6 @@ def _enforceNotesRestrictions(self, value): categories=[parameters.Category.assignInBlueprints], ) - pb.defParam( - "radExpWorthPT", - units=f"{units.PCM}/{units.PERCENT}/{units.CM}^3", - description="Radial swelling reactivity", - location=ParamLocation.AVERAGE, - ) - - pb.defParam( - "structWorthPT", - units=f"{units.PCM}/{units.PERCENT}/{units.CM}^3", - description="Structure reactivity", - location=ParamLocation.AVERAGE, - ) - with pDefs.createBuilder(categories=["radialGeometry"]) as pb: pb.defParam( diff --git a/armi/reactor/blockParameters.py b/armi/reactor/blockParameters.py index 54ba57ba5..0bd3952b5 100644 --- a/armi/reactor/blockParameters.py +++ b/armi/reactor/blockParameters.py @@ -429,187 +429,6 @@ def xsTypeNum(self, value): saveToDB=True, ) - with pDefs.createBuilder( - default=0.0, - location=ParamLocation.AVERAGE, - categories=["reactivity coefficients"], - ) as pb: - - pb.defParam( - "VoideddopplerWorth", - units=f"{units.REACTIVITY}*{units.DEGK}^(n-1)", - description="Distributed Voided Doppler constant.", - ) - - pb.defParam( - "dopplerWorth", - units=f"{units.REACTIVITY}*{units.DEGK}^(n-1)", - description="Distributed Doppler constant.", - ) - - pb.defParam( - "fuelWorth", - units=f"{units.REACTIVITY}/{units.KG}", - description="Reactivity worth of fuel material per unit mass", - ) - - pb.defParam( - "fuelWorthPT", - units=f"{units.PCM}/{units.PERCENT}/{units.CM}^3", - description="Fuel reactivity", - ) - - pb.defParam( - "structWorthPT", - units=f"{units.PCM}/{units.PERCENT}/{units.CM}^3", - description="Structure reactivity", - ) - - pb.defParam( - "radExpWorthPT", - units=f"{units.PCM}/{units.PERCENT}/{units.CM}^3", - description="Radial swelling reactivity", - ) - - pb.defParam( - "coolWorthPT", - units=f"{units.PCM}/{units.PERCENT}/{units.CM}^3", - description="Coolant reactivity", - ) - - pb.defParam( - "coolFlowingWorthPT", - units=f"{units.PCM}/{units.PERCENT}/{units.CM}^3", - description="Flowing coolant reactivity", - ) - - pb.defParam( - "axExpWorthPT", - units=f"{units.PCM}/{units.PERCENT}/{units.CM}^3", - description="Axial swelling reactivity", - ) - - pb.defParam( - "coolantWorth", - units=f"{units.REACTIVITY}/{units.KG}", - description="Reactivity worth of coolant material per unit mass", - ) - - pb.defParam( - "cladWorth", - units=f"{units.REACTIVITY}/{units.KG}", - description="Reactivity worth of clad material per unit mass", - ) - - pb.defParam( - "rxAxialCentsPerK", - units=f"{units.CENTS}/{units.DEGK}", - description="Axial temperature reactivity coefficient", - ) - - pb.defParam( - "rxAxialCentsPerPow", - units=f"{units.CENTS}/{units.DEGK}", - description="Axial power reactivity coefficient", - ) - - pb.defParam( - "rxCoolantCentsPerK", - units=f"{units.CENTS}/{units.DEGK}", - description="Coolant temperature reactivity coefficient", - ) - - pb.defParam( - "rxCoolantCentsPerPow", - units=f"{units.CENTS}/{units.DEGK}", - description="Coolant power reactivity coefficient", - ) - - pb.defParam( - "rxDopplerCentsPerK", - units=f"{units.CENTS}/{units.DEGK}", - description="Doppler temperature reactivity coefficient", - ) - - pb.defParam( - "rxDopplerCentsPerPow", - units=f"{units.CENTS}/{units.DEGK}", - description="Doppler power reactivity coefficient", - ) - - pb.defParam( - "rxFuelCentsPerK", - units=f"{units.CENTS}/{units.DEGK}", - description="Fuel temperature reactivity coefficient", - ) - - pb.defParam( - "rxFuelCentsPerPow", - units=f"{units.CENTS}/{units.DEGK}", - description="Fuel power reactivity coefficient", - ) - - pb.defParam( - "rxNetCentsPerK", - units=f"{units.CENTS}/{units.DEGK}", - description="Net temperature reactivity coefficient", - ) - - pb.defParam( - "rxNetCentsPerPow", - units=f"{units.CENTS}/{units.DEGK}", - description="Net power reactivity coefficient", - location=ParamLocation.AVERAGE, - ) - - pb.defParam( - "rxNetPosNeg", - units=f"{units.CENTS}/{units.DEGK}", - description="Net temperature reactivity coefficient: positive or negative", - ) - - pb.defParam( - "rxNetPosNegPow", - units=f"{units.CENTS}/{units.DEGK}", - description="Net power reactivity coefficient: positive or negative", - ) - - pb.defParam( - "rxRadialCentsPerK", - units=f"{units.CENTS}/{units.DEGK}", - description="Radial temperature reactivity coefficient", - ) - - pb.defParam( - "rxRadialCentsPerPow", - units=f"{units.CENTS}/{units.DEGK}", - description="Radial power reactivity coefficient", - ) - - pb.defParam( - "rxStructCentsPerK", - units=f"{units.CENTS}/{units.DEGK}", - description="Structure temperature reactivity coefficient", - ) - - pb.defParam( - "rxStructCentsPerPow", - units=f"{units.CENTS}/{units.DEGK}", - description="Structure power reactivity coefficient", - ) - - pb.defParam( - "rxVoidedDopplerCentsPerK", - units=f"{units.CENTS}/{units.DEGK}", - description="Voided Doppler temperature reactivity coefficient", - ) - - pb.defParam( - "rxVoidedDopplerCentsPerPow", - units=f"{units.CENTS}/{units.DEGK}", - description="Voided Doppler power reactivity coefficient", - ) - with pDefs.createBuilder( default=0.0, location=ParamLocation.AVERAGE, @@ -883,13 +702,6 @@ def xsTypeNum(self, value): location=ParamLocation.AVERAGE, ) - pb.defParam( - "coolRemFrac", - units=units.UNITLESS, - description="Fractional sodium density change for each block", - location=ParamLocation.AVERAGE, - ) - pb.defParam( "crWastage", units=units.MICRONS, @@ -904,27 +716,6 @@ def xsTypeNum(self, value): location=ParamLocation.AVERAGE, ) - pb.defParam( - "deltaTclad", - units=f"{units.DEGK}/{units.PERCENT}", - description=r"Change in fuel temperature due to 1% rise in power.", - location=ParamLocation.AVERAGE, - ) - - pb.defParam( - "deltaTduct", - units=f"{units.DEGK}/{units.PERCENT}", - description=r"Change in fuel temperature due to 1% rise in power.", - location=ParamLocation.AVERAGE, - ) - - pb.defParam( - "deltaTfuel", - units=f"{units.DEGK}/{units.PERCENT}", - description=r"Change in fuel temperature due to 1% rise in power.", - location=ParamLocation.AVERAGE, - ) - pb.defParam( "heightBOL", units=units.CM, diff --git a/armi/reactor/reactorParameters.py b/armi/reactor/reactorParameters.py index e738535e3..4822d7b45 100644 --- a/armi/reactor/reactorParameters.py +++ b/armi/reactor/reactorParameters.py @@ -521,78 +521,6 @@ def defineCoreParameters(): ), ) - with pDefs.createBuilder( - default=0.0, - location=ParamLocation.AVERAGE, - categories=["reactivity coefficients"], - ) as pb: - - pb.defParam( - "axial", - units=f"{units.CENTS}/{units.DEGK}", - description="Axial expansion coefficient", - ) - - pb.defParam( - "doppler", - units=f"{units.CENTS}/{units.DEGK}", - description="Doppler coefficient", - ) - - pb.defParam( - "dopplerConst", - units=f"{units.CENTS}*{units.DEGK}^(n-1)", - description="Doppler constant", - ) - - pb.defParam( - "fuelDensity", - units=f"{units.CENTS}/{units.DEGK}", - description="Fuel temperature coefficient", - ) - - pb.defParam( - "coolantDensity", - units=f"{units.CENTS}/{units.DEGK}", - description="Coolant temperature coefficient", - ) - - pb.defParam( - "totalCoolantDensity", - units=f"{units.CENTS}/{units.DEGK}", - description="Coolant temperature coefficient weighted to include bond and interstitial effects", - ) - - pb.defParam( - "Voideddoppler", - units=f"{units.CENTS}/{units.DEGK}", - description="Voided Doppler coefficient", - ) - - pb.defParam( - "VoideddopplerConst", - units=f"{units.CENTS}*{units.DEGK}^(n-1)", - description="Voided Doppler constant", - ) - - pb.defParam( - "voidWorth", units=f"{units.DOLLARS}", description="Coolant void worth" - ) - - pb.defParam("voidedKeff", units=units.UNITLESS, description="Voided keff") - - pb.defParam( - "radialHT9", - units=f"{units.CENTS}/{units.DEGK}", - description="Radial expansion coefficient when driven by thermal expansion of HT9.", - ) - - pb.defParam( - "radialSS316", - units=f"{units.CENTS}/{units.DEGK}", - description="Radial expansion coefficient when driven by thermal expansion of SS316.", - ) - with pDefs.createBuilder( default=0.0, location=ParamLocation.AVERAGE, diff --git a/armi/utils/reportPlotting.py b/armi/utils/reportPlotting.py index 277f6cd47..e0b5ced3b 100644 --- a/armi/utils/reportPlotting.py +++ b/armi/utils/reportPlotting.py @@ -451,8 +451,6 @@ def _getNeutronicVals(r): ("Rx. Swing", r.core.p.rxSwing), ("Fast Flux Fr.", r.core.p.fastFluxFrAvg), ("Leakage", r.core.p.leakageFracTotal), - ("Void worth", r.core.p.voidWorth), - ("Doppler", r.core.p.doppler), ("Beta", r.core.p.beta), ("Peak flux", r.core.p.maxFlux), ] diff --git a/armi/utils/tests/test_reportPlotting.py b/armi/utils/tests/test_reportPlotting.py index 61dde08c7..5057857ff 100644 --- a/armi/utils/tests/test_reportPlotting.py +++ b/armi/utils/tests/test_reportPlotting.py @@ -44,11 +44,7 @@ def tearDown(self): def test_radar(self): """Test execution of radar plot. Note this has no asserts and is therefore a smoke test.""" - self.r.core.p.doppler = 0.5 - self.r.core.p.voidWorth = 0.5 r2 = copy.deepcopy(self.r) - r2.core.p.voidWorth = 1.0 - r2.core.p.doppler = 1.0 plotCoreOverviewRadar([self.r, r2], ["Label1", "Label2"]) def test_createPlotMetaData(self): diff --git a/doc/release/0.2.rst b/doc/release/0.2.rst index 631fd05a8..e46cc420e 100644 --- a/doc/release/0.2.rst +++ b/doc/release/0.2.rst @@ -14,6 +14,7 @@ What's new in ARMI #. Downgrading Draft PRs as policy. (`PR#1444 `_) #. Attempt to set representative block number densities by component if possible. (`PR#1412 `_) #. Use functools to preserve function attributes when wrapping with codeTiming.timed (`PR#1466 `_) +#. Remove a number of deprecated block, assembly, and core parameters related to a defunct internal plugin #. TBD Bug fixes