Skip to content

Commit

Permalink
pep8 fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@yardasol
yardasol committed Jul 26, 2022
1 parent 57812aa commit f155719
Show file tree
Hide file tree
Showing 4 changed files with 106 additions and 46 deletions.
100 changes: 69 additions & 31 deletions saltproc/app.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -155,8 +155,9 @@ def get_extraction_processes():
"""Parses ``extraction_processes`` objects from the `.json` file describing
processing system objects.
``extraction_processes`` objects describe components that would perform fuel
processing in a real reactor, such as a gas sparger or a nickel filter.
``extraction_processes`` objects describe components that would perform
fuel processing in a real reactor, such as a gas sparger or a nickel
filter.
Returns
-------
Expand All @@ -166,30 +167,35 @@ def get_extraction_processes():
``key``
Name of burnable material.
``value``
Dictionary mapping process names to :class:`saltproc.process.Process` objects.
Dictionary mapping process names to
:class:`saltproc.process.Process` objects.
"""
extraction_processes = OrderedDict()
with open(spc_inp_file) as f:
j = json.load(f)
for mat_name in j:
for mat_name, procs in j.items():
extraction_processes[mat_name] = OrderedDict()
for proc_name, proc_data in j[mat_name]['extraction_processes'].items():
for proc_name, proc_data in procs['extraction_processes'].items():
print("Processs object data: ", proc_data)
st = proc_data['efficiency']
if proc_name == 'sparger' and st == "self":
extraction_processes[mat_name][proc_name] = Sparger(**proc_data)
extraction_processes[mat_name][proc_name] = \
Sparger(**proc_data)
elif proc_name == 'entrainment_separator' and st == "self":
extraction_processes[mat_name][proc_name] = Separator(**proc_data)
extraction_processes[mat_name][proc_name] = \
Separator(**proc_data)
else:
extraction_processes[mat_name][proc_name] = Process(**proc_data)
extraction_processes[mat_name][proc_name] = \
Process(**proc_data)

gc.collect()
return extraction_processes


def get_feeds():
"""Parses ``feed`` objects from `.json` file describing processing system objects.
"""Parses ``feed`` objects from `.json` file describing processing system
objects.
``feed`` objects describe material flows that replace nuclides needed to
keep the reactor operating that were removed during reprocessing.
Expand All @@ -202,7 +208,8 @@ def get_feeds():
Name of burnable material.
``value``
Dictionary mapping material flow names to
:class:`saltproc.materialflow.Materialflow` objects representing material feeds.
:class:`saltproc.materialflow.Materialflow` objects representing
material feeds.
"""
feeds = OrderedDict()
Expand Down Expand Up @@ -256,8 +263,9 @@ def reprocess_materials(mats):
Parameters
----------
mats : dict of str to Materialflow
Dictionary that contains :class:`saltproc.materialflow.Materialflow` objects with burnable material
data right after irradiation in the core.
Dictionary that contains :class:`saltproc.materialflow.Materialflow`
objects with burnable material data right after irradiation in the
core.
Returns
-------
Expand All @@ -267,45 +275,61 @@ def reprocess_materials(mats):
``key``
Material name.
``value``
Dictionary mapping waste stream names to :class:`saltproc.materialflow.Materialflow`
Dictionary mapping waste stream names to
:class:`saltproc.materialflow.Materialflow`
objects representing waste streams.
extracted_mass: dict of str to float
Dictionary mapping material names to the mass in [g] of that material removed
via reprocessing.
Dictionary mapping material names to the mass in [g] of that material
removed via reprocessing.
"""
inmass = {}
extracted_mass = {}
waste_streams = OrderedDict()
forked_mats = OrderedDict()

extraction_processes = get_extraction_processes()
material_for_extraction, extraction_process_paths = get_extraction_process_paths(dot_inp_file)
for mat_name, processes in extraction_processes.items(): # iterate over materials
material_for_extraction, extraction_process_paths = \
get_extraction_process_paths(dot_inp_file)

# iterate over materials
for mat_name, processes in extraction_processes.items():
initial_material = mats[mat_name]
waste_streams[mat_name] = {}
forked_mats[mat_name] = []

inmass[mat_name] = float(initial_material.mass)
print("Material mass before reprocessing: %f g" % inmass[mat_name])

if mat_name == 'fuel' and material_for_extraction == 'fuel':
for i, path in enumerate(extraction_process_paths):
forked_mats[mat_name].append(initial_material)
print("Material mass: %f" % initial_material.mass)

for proc in path:
# Calculate fraction of the flow going to the process proc
divisor = float(processes[proc].mass_flowrate /
processes['core_outlet'].mass_flowrate)
print('Process: %s, divisor=%f' % (proc, divisor))
# Update materialflow by multiplying it by flow fraction
thru_flow, waste_stream = processes[proc].process_material(divisor * forked_mats[mat_name][i])

thru_flow, waste_stream = \
processes[proc].process_material(
divisor * forked_mats[mat_name][i])

waste_streams[mat_name]['waste_' + proc] = waste_stream
forked_mats[mat_name][i] = thru_flow

# Sum all forked material objects together
# initilize correct obj instance
mats[mat_name] = forked_mats[mat_name][0]
for idx in range(1, len(forked_mats[mat_name])):
mats[mat_name] += forked_mats[mat_name][idx]
print('1 Forked material mass: %f' % (forked_mats[mat_name][0].mass))
print('2 Forked material mass: %f' % (forked_mats[mat_name][1].mass))

print('1 Forked material mass: %f' %
(forked_mats[mat_name][0].mass))
print('2 Forked material mass: %f' %
(forked_mats[mat_name][1].mass))
print('\nMass balance: %f g = %f + %f + %f + %f + %f + %f' %
(inmass[mat_name],
mats[mat_name].mass,
Expand All @@ -314,13 +338,22 @@ def reprocess_materials(mats):
waste_streams[mat_name]['waste_nickel_filter'].mass,
waste_streams[mat_name]['waste_bypass'].mass,
waste_streams[mat_name]['waste_liquid_metal'].mass))

# Bootstrap for many materials
if mat_name == 'ctrlPois':
thru_flow, waste_stream = processes['removal_tb_dy'].process_material(mats[mat_name])
thru_flow, waste_stream = \
processes['removal_tb_dy'].process_material(mats[mat_name])

waste_streams[mat_name]['removal_tb_dy'] = waste_stream
mats[mat_name] = thru_flow
extracted_mass[mat_name] = inmass[mat_name] - float(mats[mat_name].mass)
del extraction_processes, inmass, mat_name, processes, forked_mats, material_for_extraction, extraction_process_paths, divisor, thru_flow, waste_stream

extracted_mass[mat_name] = \
inmass[mat_name] - float(mats[mat_name].mass)

del extraction_processes, inmass, mat_name, processes, forked_mats
del material_for_extraction, extraction_process_paths, divisor
del thru_flow, waste_stream

return waste_streams, extracted_mass


Expand All @@ -330,20 +363,22 @@ def refill_materials(mats, extracted_mass, waste_streams):
Parameters
----------
mats : dict of str to Materialflow
Dicitionary mapping material names to :class:`saltproc.materialflow.Materialflow` objects
that have already been reprocessed by `reprocess_materials`.
Dicitionary mapping material names to
:class:`saltproc.materialflow.Materialflow` objects that have already
been reprocessed by `reprocess_materials`.
extracted_mass : dict of str to float
Dictionary mapping material names to the mass in [g] of that material removed
via reprocessing.
Dictionary mapping material names to the mass in [g] of that material
removed via reprocessing.
waste_streams : dict of str to dict
Dictionary mapping material names to waste streams from reprocessing
``key``
Material name.
``value``
Dictionary mapping waste stream names to :class:`saltproc.materialflow.Materialflow`
objects representing waste streams.
Dictionary mapping waste stream names to
:class:`saltproc.materialflow.Materialflow` objects representing
waste streams.
Returns
-------
Expand All @@ -363,7 +398,8 @@ def refill_materials(mats, extracted_mass, waste_streams):
refill_mats[mat] = scale * feed
waste_streams[mat]['feed_' + str(feed_name)] = refill_mats[mat]
mats[mat] += refill_mats[mat]
print('Refilled fresh material: %s %f g' % (mat, refill_mats[mat].mass))
print('Refilled fresh material: %s %f g' %
(mat, refill_mats[mat].mass))
print('Refill Material: ^^^', refill_mats[mat].print_attr())
print('Fuel after refill: ^^^', mats[mat].print_attr())
return waste_streams
Expand Down Expand Up @@ -476,7 +512,9 @@ def run():
# print("Mass and volume of ctrlPois after reproc %f g; %f cm3" %
# (mats['ctrlPois'].mass,
# mats['ctrlPois'].vol))
waste_and_feed_streams = refill_materials(mats, extracted_mass, waste_streams)
waste_and_feed_streams = refill_materials(mats,
extracted_mass,
waste_streams)
print("\nMass and volume of fuel after REFILL: %f g; %f cm3" %
(mats['fuel'].mass,
mats['fuel'].vol))
Expand Down
3 changes: 2 additions & 1 deletion saltproc/materialflow.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@


class Materialflow(pymat):
""" Class contains information about burnable material flow. Based on :class:`pyne.Material`.
""" Class contains information about burnable material flow. Based on
:class:`pyne.Material`.
"""

def __init__(
Expand Down
21 changes: 14 additions & 7 deletions saltproc/process.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ def __init__(self, *initial_data, **kwargs):
``key``
element name for removal (not isotope)
``value``
removal efficency for the isotope as a weight fraction (float) or a function eps(x,m,t,P,L) (str)
removal efficency for the isotope as a weight fraction (float)
or a function eps(x,m,t,P,L) (str)
optional_parameter : float
user can define any custom parameter in the input file describing
processes and use it in efficiency function
Expand Down Expand Up @@ -76,9 +77,9 @@ def check_mass_conservation(self):
np.testing.assert_array_equal(out_stream, self.inflow)

def process_material(self, inflow):
"""Updates :class:`Materialflow` object `inflow` by removing target nuclides
with specific efficiencies in single component of fuel reprocessing
system and returns waste stream Materialflow object.
"""Updates :class:`Materialflow` object `inflow` by removing target
nuclides with specific efficiencies in single component of fuel
reprocessing system and returns waste stream Materialflow object.
Parameters
----------
Expand All @@ -98,26 +99,32 @@ def process_material(self, inflow):
thru_nucvec = {}
# print("Xe concentration in inflow before % f g" % inflow['Xe136'])
# print("Current time %f" % (t))

for nuc in inflow.comp.keys():
nuc_name = pyname.serpent(nuc).split('-')[0]
if nuc_name in self.efficiency:
# Evaluate removal efficiency for nuc_name (float)
self.efficiency[nuc_name] = self.calculate_removal_efficiency(nuc_name)
self.efficiency[nuc_name] = \
self.calculate_removal_efficiency(nuc_name)

thru_nucvec[nuc] = \
float(inflow.comp[nuc]) * \
float(1.0 - self.efficiency[nuc_name])

waste_nucvec[nuc] = \
float(inflow[nuc]) * self.efficiency[nuc_name]
else:
thru_nucvec[nuc] = float(inflow.comp[nuc])
waste_nucvec[nuc] = 0.0 # zeroes everywhere else

waste_stream = Materialflow(waste_nucvec)
# need to do this copy to pass tests
thru_flow = Materialflow(thru_nucvec)
thru_flow.mass = float(inflow.mass - waste_stream.mass)
thru_flow.norm_comp()

print("Xe concentration in thruflow: %f g" % thru_flow['Xe136'])
print("Waste mass: %f g\n" % waste_stream.mass)

del thru_nucvec, waste_nucvec, nuc_name
return thru_flow, waste_stream

return thru_flow, waste_stream
28 changes: 21 additions & 7 deletions saltproc/tests/test_app.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,16 +72,30 @@ def test_reprocess_materials():
waste_st, rem_mass = app.reprocess_materials(mats)
np.testing.assert_almost_equal(rem_mass['fuel'], 1401.0846504569054)
np.testing.assert_almost_equal(rem_mass['ctrlPois'], 0.0)
np.testing.assert_almost_equal(waste_st['fuel']['waste_sparger']['Xe135'], 11.878661583083327)
np.testing.assert_almost_equal(waste_st['fuel']['waste_nickel_filter']['I135'], 0.90990472940444)
np.testing.assert_almost_equal(waste_st['fuel']['waste_liquid_metal']['Sr90'], 0.7486923392931839)
np.testing.assert_almost_equal(
waste_st['fuel']['waste_sparger']['Xe135'],
11.878661583083327)
np.testing.assert_almost_equal(
waste_st['fuel']['waste_nickel_filter']['I135'],
0.90990472940444)
np.testing.assert_almost_equal(
waste_st['fuel']['waste_liquid_metal']['Sr90'],
0.7486923392931839)


def test_refill_materials():
mats = serpent.read_dep_comp(True)
waste_st, rem_mass = app.reprocess_materials(mats)
m_after_refill = app.refill_materials(mats, rem_mass, waste_st)
np.testing.assert_almost_equal(m_after_refill['fuel']['feed_leu']['U235'], 43.573521906078334)
np.testing.assert_almost_equal(m_after_refill['fuel']['feed_leu']['U238'], 827.8969156550545)
np.testing.assert_almost_equal(m_after_refill['fuel']['feed_leu']['F19'], 461.8575149906222)
np.testing.assert_almost_equal(m_after_refill['fuel']['feed_leu']['Li7'], 67.75331008246572)
np.testing.assert_almost_equal(
m_after_refill['fuel']['feed_leu']['U235'],
43.573521906078334)
np.testing.assert_almost_equal(
m_after_refill['fuel']['feed_leu']['U238'],
827.8969156550545)
np.testing.assert_almost_equal(
m_after_refill['fuel']['feed_leu']['F19'],
461.8575149906222)
np.testing.assert_almost_equal(
m_after_refill['fuel']['feed_leu']['Li7'],
67.75331008246572)

0 comments on commit f155719

Please sign in to comment.