From 7805e62674d51ebc0ee0b806268d100307c02138 Mon Sep 17 00:00:00 2001 From: Paul Romano Date: Wed, 8 Jun 2022 09:10:38 -0500 Subject: [PATCH 1/2] Fix assembly assignment in build-assembly.py --- smr/build-assembly-long.py | 15 +++++++-------- smr/build-assembly.py | 13 ++++--------- 2 files changed, 11 insertions(+), 17 deletions(-) diff --git a/smr/build-assembly-long.py b/smr/build-assembly-long.py index 98ade14..623907c 100644 --- a/smr/build-assembly-long.py +++ b/smr/build-assembly-long.py @@ -174,14 +174,13 @@ settings.particles = 10000 settings.output = {'tallies': False, 'summary': False} settings.source = source settings.sourcepoint = {'write': False} - -if args.multipole: - settings.temperature = { - 'multipole': True, - 'tolerance': 1000, - 'default': 531.5, - 'method': 'interpolation', +settings.temperature = { + 'default': 531.5, + 'method': 'interpolation', 'range': (500.0, 1300.0) - } +} +if args.multipole: + settings.temperature['multipole'] = True + settings.temperature['tolerance'] = 1000 settings.export_to_xml(str(directory / 'settings.xml')) diff --git a/smr/build-assembly.py b/smr/build-assembly.py index 123fa91..1b2682e 100644 --- a/smr/build-assembly.py +++ b/smr/build-assembly.py @@ -10,7 +10,6 @@ import openmc from smr.materials import materials, clone from smr.surfaces import surfs, lattice_pitch, bottom_fuel_stack, top_active_core, pellet_OR from smr.assemblies import assembly_universes -from smr.plots import assembly_plots from smr import inlet_temperature @@ -48,10 +47,10 @@ if args.rings > 1: else: ring_radii = None assembly = assembly_universes(ring_radii, args.axial, args.depleted) -lattice_sides = openmc.model.get_rectangular_prism(lattice_pitch, lattice_pitch, - boundary_type='reflective') +lattice_sides = openmc.model.rectangular_prism(lattice_pitch, lattice_pitch, + boundary_type='reflective') main_cell = openmc.Cell( - fill=assembly['Assembly (3.1%) 16BA'], + fill=assembly['Assembly (3.1%)'], region=lattice_sides & +surfs['lower bound'] & -surfs['upper bound'] ) root_univ = openmc.Universe(cells=[main_cell]) @@ -98,7 +97,7 @@ settings.inactive = 100 settings.particles = 10000 settings.output = {'tallies': False, 'summary': False} settings.source = source -settings.sourcepoint_write = False +settings.sourcepoint = {'write': False} settings.temperature = { 'default': inlet_temperature, 'method': 'interpolation', @@ -140,7 +139,3 @@ elif args.tallies == 'mat': tallies.append(tally) tallies.export_to_xml(str(directory / 'tallies.xml')) - -# Create plots -plots = assembly_plots(main_cell.fill) -plots.export_to_xml(str(directory / 'plots.xml')) From ca7d63327fcdfe26d861176322850b9383ebfc36 Mon Sep 17 00:00:00 2001 From: Paul Romano Date: Wed, 8 Jun 2022 11:14:13 -0500 Subject: [PATCH 2/2] Add a --clone argument for build-assembly.py --- smr/build-assembly.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/smr/build-assembly.py b/smr/build-assembly.py index 1b2682e..0a76108 100644 --- a/smr/build-assembly.py +++ b/smr/build-assembly.py @@ -19,6 +19,10 @@ parser.add_argument('--multipole', action='store_true', help='Use multipole cross sections') parser.add_argument('--no-multipole', action='store_false', help='Do not use multipole cross sections') +parser.add_argument('--clone', action='store_true', + help='Clone materials for each cell instance') +parser.add_argument('--no-clone', dest='clone', action='store_false', + help='Do not clone materials for each cell instance') parser.add_argument('-t', '--tallies', choices=('cell', 'mat'), default='mat', help='Whether to use distribmats or distribcells for tallies') parser.add_argument('-r', '--rings', type=int, default=10, @@ -28,7 +32,7 @@ parser.add_argument('-a', '--axial', type=int, default=196, parser.add_argument('-d', '--depleted', action='store_true', help='Whether UO2 compositions should represent depleted fuel') parser.add_argument('-o', '--output-dir', type=Path, default=None) -parser.set_defaults(multipole=True) +parser.set_defaults(clone=False, multipole=True) args = parser.parse_args() # Make directory for inputs @@ -57,7 +61,7 @@ root_univ = openmc.Universe(cells=[main_cell]) geometry = openmc.Geometry(root_univ) #### "Differentiate" the geometry if using distribmats -if args.tallies == 'mat': +if args.clone: # Count the number of instances for each cell and material geometry.determine_paths(instances_only=True)