Merge 290ef31 into c40a3ca

terrapower · Sep 14, 2022 · 6510d82 · 6510d82
2 parents c40a3ca + 290ef31
commit 6510d82
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/armi/reactor/assemblies.py b/armi/reactor/assemblies.py
@@ -946,6 +946,7 @@ def getBlocksBetweenElevations(self, zLower, zUpper):
         EPS = 1e-10
         blocksHere = []
         allMeshPoints = set()
+
         for b in self:
             if b.p.ztop >= zLower and b.p.zbottom <= zUpper:
                 allMeshPoints.add(b.p.zbottom)
@@ -954,6 +955,8 @@ def getBlocksBetweenElevations(self, zLower, zUpper):
                 top = min(b.p.ztop, zUpper)
                 bottom = max(b.p.zbottom, zLower)
                 heightHere = top - bottom
+                if not heightHere:
+                    continue
 
                 # Filter out blocks that have an extremely small height fraction
                 if heightHere / b.getHeight() > EPS:

diff --git a/armi/reactor/converters/uniformMesh.py b/armi/reactor/converters/uniformMesh.py
@@ -859,3 +859,7 @@ def setNumberDensitiesFromOverlaps(block, overlappingBlockInfo):
                 + numberDensity * overlappingHeightInCm / blockHeightInCm
             )
     block.setNumberDensities(totalDensities)
+    # Set the volume of each component in the block to `None` so that the
+    # volume of each volume is recomputed.
+    for c in block:
+        c.p.volume = None