crp/OpenMC
1
0
Fork 0
mirror of https://github.com/openmc-dev/openmc.git synced 2026-07-28 22:26:08 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Simple optimizations to Universe._determine_paths

Browse source
This commit is contained in:
Paul Romano 2017-11-10 10:35:47 -06:00
parent 6e9b8a5ce5
commit 7b5f2bb821
1 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

18
openmc/universe.py
View file

@ -553,14 +553,16 @@ class Universe(IDManagerMixin):
for cell in self.cells.values():
cell_path = '{}->c{}'.format(univ_path, cell.id)
fill = cell._fill
fill_type = cell.fill_type
# If universe-filled, recursively count cells in filling universe
if cell.fill_type == 'universe':
cell.fill._determine_paths(cell_path + '->', instances_only)
if fill_type == 'universe':
fill._determine_paths(cell_path + '->', instances_only)
# If lattice-filled, recursively call for all universes in lattice
elif cell.fill_type == 'lattice':
latt = cell.fill
elif fill_type == 'lattice':
latt = fill
# Count instances in each universe in the lattice
for index in latt._natural_indices:
@ -570,10 +572,10 @@ class Universe(IDManagerMixin):
univ._determine_paths(latt_path, instances_only)
else:
if cell.fill_type == 'material':
mat = cell.fill
elif cell.fill_type == 'distribmat':
mat = cell.fill[cell._num_instances]
if fill_type == 'material':
mat = fill
elif fill_type == 'distribmat':
mat = fill[cell._num_instances]
else:
mat = None