Simplify logic in updateDeltaDPApastIncubationDose.

Removed a redundant check to isBeyondIncubationDose. updateDeltaDPApastIncubationDose is only called after isBeyondIncubationDose evaluates as true, so the check does not need to be repeated within updateDeltaDPApastIncubationDose.
terrapower · Mar 11, 2021 · 1c8db6b · 1c8db6b
1 parent a97aab7
commit 1c8db6b
Showing 1 changed file with 1 addition and 6 deletions.
diff --git a/armi/materials/material.py b/armi/materials/material.py
@@ -615,12 +615,7 @@ def updateDeltaDPApastIncubation(self, totalDPA, deltaDPA):
             runLog.warning(msg, single=True, label="Missing incubation dose")
             return deltaDPA
         else:
-            if (totalDPA > self.modelConst["Rincu"]) and (
-                (totalDPA - self.modelConst["Rincu"]) < deltaDPA
-            ):
-                return totalDPA - self.modelConst["Rincu"]
-            else:
-                return deltaDPA
+            return min(totalDPA - self.modelConst["Rincu"], deltaDPA)
 
     def densityTimesHeatCapacity(self, Tk=None, Tc=None):
         r"""