(API Breaking) Finish removal of block.r

armi/mpiActions.py

@@ -138,7 +138,7 @@ def _mpiOperationHelper(self, obj, mpiFunction):
             self.o = self.r = self.cs = None
         try:
             return mpiFunction(obj, root=0)
-        except (cPickle.PicklingError) as error:
+        except cPickle.PicklingError as error:
             runLog.error("Failed to {} {}.".format(mpiFunction.__name__, obj))
             runLog.error(error)
             raise
@@ -553,8 +553,8 @@ def invokeHook(self):
             self.r.core.regenAssemblyLists()
 
         # check to make sure that everything has been properly reattached
-        if self.r.core.getFirstBlock().r is not self.r:
-            raise RuntimeError("Block.r is not self.r. Reattach the blocks!")
+        if self.r.core.getFirstBlock().core.r is not self.r:
+            raise RuntimeError("Block.core.r is not self.r. Reattach the blocks!")
 
         beforeCollection = timeit.default_timer()
 

armi/physics/neutronics/globalFlux/tests/test_globalFluxInterface.py

@@ -432,8 +432,8 @@ def test_calcReactionRates(self):
         """
         b = test_blocks.loadTestBlock()
         test_blocks.applyDummyData(b)
-        self.assertEqual(b.p.rateAbs, 0.0)
-        globalFluxInterface.calcReactionRates(b, 1.01, b.r.core.lib)
+        self.assertAlmostEqual(b.p.rateAbs, 0.0)
+        globalFluxInterface.calcReactionRates(b, 1.01, b.core.lib)
         self.assertGreater(b.p.rateAbs, 0.0)
         vfrac = b.getComponentAreaFrac(Flags.FUEL)
         self.assertEqual(b.p.fisDens, b.p.rateFis / vfrac)

armi/physics/neutronics/tests/test_crossSectionManager.py

@@ -57,7 +57,9 @@
 class TestBlockCollection(unittest.TestCase):
     def setUp(self):
         self.blockList = makeBlocks()
-        self.bc = BlockCollection(self.blockList[0].r.blueprints.allNuclidesInProblem)
+        self.bc = BlockCollection(
+            self.blockList[0].core.r.blueprints.allNuclidesInProblem
+        )
         self.bc.extend(self.blockList)
 
     def test_add(self):
@@ -88,7 +90,7 @@ def setUp(self):
             b.p.percentBu = bi / 4.0 * 100
         self.blockList[0], self.blockList[2] = self.blockList[2], self.blockList[0]
         self.bc = MedianBlockCollection(
-            self.blockList[0].r.blueprints.allNuclidesInProblem
+            self.blockList[0].core.r.blueprints.allNuclidesInProblem
         )
         self.bc.extend(self.blockList)
 
@@ -125,7 +127,7 @@ def setUpClass(cls):
 
     def setUp(self):
         self.bc = AverageBlockCollection(
-            self.blockList[0].r.blueprints.allNuclidesInProblem
+            self.blockList[0].core.r.blueprints.allNuclidesInProblem
         )
         self.bc.extend(self.blockList)
         self.bc.averageByComponent = True
@@ -160,7 +162,7 @@ def test_createRepresentativeBlock(self):
         # check that a new block collection of the representative block has right temperatures
         # this is required for Doppler coefficient calculations
         newBc = AverageBlockCollection(
-            self.blockList[0].r.blueprints.allNuclidesInProblem
+            self.blockList[0].core.r.blueprints.allNuclidesInProblem
         )
         newBc.append(avgB)
         newBc.calcAvgNuclideTemperatures()
@@ -199,7 +201,7 @@ def test_createRepresentativeBlockDissimilar(self):
 
         # U35 has different average temperature because blocks have different U235 content
         newBc = AverageBlockCollection(
-            self.blockList[0].r.blueprints.allNuclidesInProblem
+            self.blockList[0].core.r.blueprints.allNuclidesInProblem
         )
         newBc.append(avgB)
         newBc.calcAvgNuclideTemperatures()
@@ -251,7 +253,7 @@ def setUpClass(cls):
 
     def setUp(self):
         self.bc = AverageBlockCollection(
-            self.blockList[0].r.blueprints.allNuclidesInProblem
+            self.blockList[0].core.r.blueprints.allNuclidesInProblem
         )
         blockCopies = [copy.deepcopy(b) for b in self.blockList]
         self.bc.extend(blockCopies)
@@ -675,7 +677,7 @@ def setUpClass(cls):
 
     def setUp(self):
         self.bc = FluxWeightedAverageBlockCollection(
-            self.blockList[0].r.blueprints.allNuclidesInProblem
+            self.blockList[0].core.r.blueprints.allNuclidesInProblem
         )
         self.bc.extend(self.blockList)
 
@@ -696,7 +698,7 @@ class TestCrossSectionGroupManager(unittest.TestCase):
     def setUp(self):
         cs = settings.Settings()
         self.blockList = makeBlocks(20)
-        self.csm = CrossSectionGroupManager(self.blockList[0].r, cs)
+        self.csm = CrossSectionGroupManager(self.blockList[0].core.r, cs)
         for bi, b in enumerate(self.blockList):
             b.p.percentBu = bi / 19.0 * 100
         self.csm._setBuGroupBounds([3, 10, 30, 100])
@@ -858,7 +860,7 @@ def test_interactBOL(self):
             :tests: R_ARMI_XSGM_FREQ
         """
         self.assertFalse(self.csm.representativeBlocks)
-        self.blockList[0].r.p.timeNode = 0
+        self.blockList[0].core.r.p.timeNode = 0
         self.csm.cs[CONF_LATTICE_PHYSICS_FREQUENCY] = "BOL"
         self.csm.interactBOL()
         self.assertTrue(self.csm.representativeBlocks)
@@ -871,7 +873,7 @@ def test_interactBOC(self):
             :tests: R_ARMI_XSGM_FREQ
         """
         self.assertFalse(self.csm.representativeBlocks)
-        self.blockList[0].r.p.timeNode = 0
+        self.blockList[0].core.r.p.timeNode = 0
         self.csm.cs[CONF_LATTICE_PHYSICS_FREQUENCY] = "BOC"
         self.csm.interactBOL()
         self.csm.interactBOC()

armi/reactor/blocks.py

@@ -47,6 +47,7 @@
 from armi.utils import units
 from armi.utils.plotting import plotBlockFlux
 from armi.utils.units import TRACE_NUMBER_DENSITY
+from armi.nuclearDataIO import xsCollections
 
 PIN_COMPONENTS = [
     Flags.CONTROL,
@@ -176,42 +177,6 @@ def core(self):
         c = self.getAncestor(lambda c: isinstance(c, Core))
         return c
 
-    @property
-    def r(self):
-        """
-        Look through the ancestors of the Block to find a Reactor, and return it.
-
-        Notes
-        -----
-        Typical hierarchy: Reactor <- Core <- Assembly <- Block
-        A block should only have a reactor through a parent assembly.
-        It may make sense to try to factor out usage of ``b.r``.
-
-        Returns
-        -------
-        core.parent : armi.reactor.reactors.Reactor
-            ARMI reactor object that is an ancestor of the block.
-
-        Raises
-        ------
-        ValueError
-            If the parent of the block's ``core`` is not an ``armi.reactor.reactors.Reactor``.
-        """
-        from armi.reactor.reactors import Reactor
-
-        core = self.core
-        if core is None:
-            return self.getAncestor(lambda o: isinstance(o, Reactor))
-
-        if not isinstance(core.parent, Reactor):
-            raise TypeError(
-                "Parent of Block ({}) core is not a Reactor. Got {} instead".format(
-                    core.parent, type(core.parent)
-                )
-            )
-
-        return core.parent
-
     def makeName(self, assemNum, axialIndex):
         """
         Generate a standard block from assembly number.
@@ -748,7 +713,6 @@ def adjustDensity(self, frac, adjustList, returnMass=False):
         numDensities = self.getNuclideNumberDensities(adjustList)
 
         for nuclideName, dens in zip(adjustList, numDensities):
-
             if not dens:
                 # don't modify zeros.
                 continue
@@ -773,7 +737,7 @@ def _updateDetailedNdens(self, frac, adjustList):
             # BOL assems get expanded to a reference so the first check is needed so it
             # won't call .blueprints on None since BOL assems don't have a core/r
             return
-        if any(nuc in self.r.blueprints.activeNuclides for nuc in adjustList):
+        if any(nuc in self.core.r.blueprints.activeNuclides for nuc in adjustList):
             self.p.detailedNDens *= frac
             # Other power densities do not need to be updated as they are calculated in
             # the global flux interface, which occurs after axial expansion from crucible
@@ -2527,7 +2491,6 @@ def getHydraulicDiameter(self):
 
 
 class CartesianBlock(Block):
-
     PITCH_DIMENSION = "widthOuter"
     PITCH_COMPONENT_TYPE = components.Rectangle
 

armi/reactor/composites.py

@@ -47,7 +47,6 @@
 from armi import utils
 from armi.nucDirectory import elements
 from armi.nucDirectory import nucDir, nuclideBases
-from armi.nuclearDataIO import xsCollections
 from armi.physics.neutronics.fissionProductModel import fissionProductModel
 from armi.reactor import grids
 from armi.reactor import parameters
@@ -1351,124 +1350,6 @@ def getNumberDensities(self, expandFissionProducts=False):
             return self._expandLFPs(numberDensities)
         return numberDensities
 
-    def getNeutronEnergyDepositionConstants(self):
-        """
-        Get the neutron energy deposition group constants for a composite.
-
-        Returns
-        -------
-        energyDepConstants: numpy.array
-            Neutron energy generation group constants (in Joules/cm)
-
-        Raises
-        ------
-        RuntimeError:
-            Reports if a cross section library is not assigned to a reactor.
-        """
-        if not self.r.core.lib:
-            raise RuntimeError(
-                "Cannot get neutron energy deposition group constants without "
-                "a library. Please ensure a library exists."
-            )
-
-        return xsCollections.computeNeutronEnergyDepositionConstants(
-            self.getNumberDensities(), self.r.core.lib, self.getMicroSuffix()
-        )
-
-    def getGammaEnergyDepositionConstants(self):
-        """
-        Get the gamma energy deposition group constants for a composite.
-
-        Returns
-        -------
-        energyDepConstants: numpy.array
-            Energy generation group constants (in Joules/cm)
-
-        Raises
-        ------
-        RuntimeError:
-            Reports if a cross section library is not assigned to a reactor.
-        """
-        if not self.r.core.lib:
-            raise RuntimeError(
-                "Cannot get gamma energy deposition group constants without "
-                "a library. Please ensure a library exists."
-            )
-
-        return xsCollections.computeGammaEnergyDepositionConstants(
-            self.getNumberDensities(), self.r.core.lib, self.getMicroSuffix()
-        )
-
-    def getTotalEnergyGenerationConstants(self):
-        """
-        Get the total energy generation group constants for a composite.
-
-        Gives the total energy generation rates when multiplied by the multigroup flux.
-
-        Returns
-        -------
-        totalEnergyGenConstant: numpy.array
-            Total (fission + capture) energy generation group constants (Joules/cm)
-        """
-        return (
-            self.getFissionEnergyGenerationConstants()
-            + self.getCaptureEnergyGenerationConstants()
-        )
-
-    def getFissionEnergyGenerationConstants(self):
-        """
-        Get the fission energy generation group constants for a composite.
-
-        Gives the fission energy generation rates when multiplied by the multigroup
-        flux.
-
-        Returns
-        -------
-        fissionEnergyGenConstant: numpy.array
-            Energy generation group constants (Joules/cm)
-
-        Raises
-        ------
-        RuntimeError:
-            Reports if a cross section library is not assigned to a reactor.
-        """
-        if not self.r.core.lib:
-            raise RuntimeError(
-                "Cannot compute energy generation group constants without a library"
-                ". Please ensure a library exists."
-            )
-
-        return xsCollections.computeFissionEnergyGenerationConstants(
-            self.getNumberDensities(), self.r.core.lib, self.getMicroSuffix()
-        )
-
-    def getCaptureEnergyGenerationConstants(self):
-        """
-        Get the capture energy generation group constants for a composite.
-
-        Gives the capture energy generation rates when multiplied by the multigroup
-        flux.
-
-        Returns
-        -------
-        fissionEnergyGenConstant: numpy.array
-            Energy generation group constants (Joules/cm)
-
-        Raises
-        ------
-        RuntimeError:
-            Reports if a cross section library is not assigned to a reactor.
-        """
-        if not self.r.core.lib:
-            raise RuntimeError(
-                "Cannot compute energy generation group constants without a library"
-                ". Please ensure a library exists."
-            )
-
-        return xsCollections.computeCaptureEnergyGenerationConstants(
-            self.getNumberDensities(), self.r.core.lib, self.getMicroSuffix()
-        )
-
     def _expandLFPs(self, numberDensities):
         """
         Expand the LFPs on the numberDensities dictionary using this composite's

armi/reactor/tests/test_assemblies.py

@@ -524,7 +524,6 @@ def test_makeAxialSnapList(self):
 
         # add some blocks with a component
         for _i in range(assemNum2):
-
             self.hexDims = {
                 "Tinput": 273.0,
                 "Thot": 273.0,
@@ -665,9 +664,9 @@ def test_duplicate(self):
             else:
                 self.assertEqual(cur, ref)
 
-        # Block level reactor and parent
+        # Block level core and parent
         for b in assembly2:
-            self.assertEqual(b.r, None)
+            self.assertEqual(b.core, None)
             self.assertEqual(b.parent, assembly2)
 
     def test_hasFlags(self):
@@ -728,7 +727,6 @@ def test_getBlockData(self):
             self.assertAlmostEqual(cur, ref, places=places)
 
     def test_getMaxParam(self):
-
         for bi, b in enumerate(self.assembly):
             b.p.power = bi
         self.assertAlmostEqual(