Merge 3a86c51 into 0d308ec

terrapower · Nov 21, 2022 · 5db61b7 · 5db61b7
2 parents 0d308ec + 3a86c51
commit 5db61b7
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 64 deletions.
diff --git a/armi/reactor/blockParameters.py b/armi/reactor/blockParameters.py
@@ -465,13 +465,6 @@ def xsTypeNum(self, value):  # pylint: disable=method-hidden
             description="Distributed Doppler constant.",
         )
 
-        pb.defParam(
-            "distortWorth",
-            units="pcm/cm^3",
-            description="Distortion reactivity distribution",
-            default=None,
-        )
-
         pb.defParam(
             "fuelWorth",
             units="dk/kk'-kg",
@@ -653,36 +646,10 @@ def xsTypeNum(self, value):  # pylint: disable=method-hidden
             description="Voided Doppler power reactivity coefficient",
         )
 
-        pb.defParam(
-            "virdentGr",
-            units="pcm/%/cm^3",
-            description="Radial surface leakage reactivity",
-        )
-
-        pb.defParam(
-            "virdentGz",
-            units="pcm/%/cm^3",
-            description="Axial surface leakage reactivity",
-        )
-
-        pb.defParam(
-            "virdentLr",
-            units="pcm/%/cm^3",
-            description="Radial volume leakage reactivity",
-        )
-
-        pb.defParam(
-            "virdentLz",
-            units="pcm/%/cm^3",
-            description="Axial volume leakage reactivity",
-        )
-
         pb.defParam(
             "assemPeakStd", units="pcm/%/cm^3", description="Spectral reactivity"
         )
 
-        pb.defParam("virdentS", units="pcm/%/cm^3", description="Spectral reactivity")
-
     with pDefs.createBuilder(
         default=0.0,
         location=ParamLocation.AVERAGE,
@@ -869,13 +836,6 @@ def xsTypeNum(self, value):  # pylint: disable=method-hidden
 
     with pDefs.createBuilder(default=0.0) as pb:
 
-        pb.defParam(
-            "VirDenTerr",
-            units="%",
-            description="VirDenT error",
-            location=ParamLocation.AVERAGE,
-        )
-
         pb.defParam(
             "assemNum",
             units="None",
@@ -1004,8 +964,6 @@ def xsTypeNum(self, value):  # pylint: disable=method-hidden
             location=ParamLocation.AVERAGE,
         )
 
-        pb.defParam("displacementMAG", units="?", description="?")
-
         pb.defParam(
             "heightBOL",
             units="cm",
@@ -1093,12 +1051,4 @@ def xsTypeNum(self, value):  # pylint: disable=method-hidden
             location=ParamLocation.AVERAGE,
         )
 
-    with pDefs.createBuilder(location=ParamLocation.AVERAGE) as pb:
-
-        pb.defParam("distortionReactivity", units="?", description="?")
-
-        pb.defParam("harmonic", units="?", description="?")
-
-        pb.defParam("harmonicAdj", units="?", description="?")
-
     return pDefs
diff --git a/armi/reactor/reactorParameters.py b/armi/reactor/reactorParameters.py
@@ -212,13 +212,6 @@ def detailedNucKeys(self, value):
             default=None,
         )
 
-        pb.defParam(
-            "breedingRatio2",
-            units="N/A",
-            description="Ratio of fissile Burned and discharged to fissile discharged",
-            saveToDB=False,
-        )
-
         pb.defParam(
             "critSearchSlope", units=None, description="Critical keff search slope"
         )
@@ -229,13 +222,6 @@ def detailedNucKeys(self, value):
             description="K-eff is computed for the perturbed case with a direct calculation",
         )
 
-        pb.defParam(
-            "distortionReactivity",
-            units="pcm",
-            description="The reactivity effect of the current distortions",
-            default=None,
-        )
-
         pb.defParam(
             "doublingTime",
             units="EFPY",