Skip to content

Commit

Permalink
Remove enrichment method redundant with composite method. (#127)
Browse files Browse the repository at this point in the history
  • Loading branch information
ntouran committed Aug 18, 2020
1 parent e171964 commit 89d589d
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 26 deletions.
4 changes: 0 additions & 4 deletions armi/reactor/batch.py
Original file line number Diff line number Diff line change
Expand Up @@ -297,10 +297,6 @@ def __deepcopy__(self, memo):
"""
return self.copy(newBatchName=self.name)

def getEnrichment(self):
"""Return the uranium enrichment of this batch."""
return self.getMass("U235") / (self.getMass("U235") + self.getMass("U238"))

def getReactionRates(self, nucName):
"""
get reaction rates for (n,gamma), (n,fission), (n,2n), (n,alpha), (n,proton) reactions
Expand Down
23 changes: 1 addition & 22 deletions armi/reactor/blocks.py
Original file line number Diff line number Diff line change
Expand Up @@ -406,27 +406,6 @@ def getTemperature(self, key, sigma=0):

return tempInC

def getEnrichment(self):
"""
Return the mass enrichment of the fuel in the block.
If multiple fuel components exist, this returns the average enrichment.
"""
enrichment = 0.0
if self.hasFlags(Flags.FUEL):
fuels = self.getComponents(Flags.FUEL)
if len(fuels) == 1:
# short circuit to avoid expensive mass read.
return fuels[0].getMassEnrichment()
hm = 0.0
fissile = 0.0
for c in fuels:
hmMass = c.getHMMass()
fissile += c.getMassEnrichment() * hmMass
hm += hmMass
enrichment = fissile / hm
return enrichment

def getMgFlux(self, adjoint=False, average=False, volume=None, gamma=False):
"""
Returns the multigroup neutron flux in [n/cm^2/s]
Expand Down Expand Up @@ -1153,7 +1132,7 @@ def completeInitialLoading(self, bolBlock=None):
self.p.smearDensity = self.getSmearDensity()
except ValueError:
pass
self.p.enrichmentBOL = self.getEnrichment()
self.p.enrichmentBOL = self.getFissileMassEnrich()
massHmBOL = 0.0
sf = self.getSymmetryFactor()
for child in self:
Expand Down

0 comments on commit 89d589d

Please sign in to comment.