diff --git a/smr/smr/pins.py b/smr/smr/pins.py index 2994d57..1062166 100644 --- a/smr/smr/pins.py +++ b/smr/smr/pins.py @@ -7,7 +7,7 @@ import openmc from openmc.model import subdivide from .materials import mats -from .surfaces import surfs, pellet_OR, bottom_fuel_rod, top_active_core +from .surfaces import surfs, pellet_OR, bottom_fuel_stack, top_active_core def make_pin(name, surfaces, materials, grid=None): @@ -723,10 +723,11 @@ def pin_universes(num_rings=10, num_axial=196, depleted=False): # performance cost of neighbor lookups if num_axial > 1: zlattice = openmc.RectLattice() - zlattice.lower_left = (-100., -100., bottom_fuel_rod) - zlattice.pitch = (200., 200., (top_active_core - bottom_fuel_rod)/num_axial) + zlattice.lower_left = (-100., -100., bottom_fuel_stack) + zlattice.pitch = (200., 200., (top_active_core - bottom_fuel_stack)/num_axial) zlattice.dimension = (1, 1, num_axial) zlattice.universes = np.full((num_axial, 1, 1), univ) + zlattice.outer = univ return zlattice else: return univ diff --git a/smr/smr/surfaces.py b/smr/smr/surfaces.py index 3aa13a8..b8cd90b 100644 --- a/smr/smr/surfaces.py +++ b/smr/smr/surfaces.py @@ -192,7 +192,7 @@ surfs['bot active core'] = openmc.ZPlane( surfs['top active core'] = openmc.ZPlane( z0=top_active_core, name='top active core') -surfs['top lower thimble'] = copy.deepcopy(surfs['bot active core']) +surfs['top lower thimble'] = surfs['bot active core'] surfs['BA bot'] = openmc.ZPlane( z0=bot_burn_abs, name='bottom of BA')