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

Fixed bugs in OpenCG compatiblity and Summary Python modules for new z-y-z Universe ordering

Browse source
This commit is contained in:
wbinventor@gmail.com 2015-12-30 14:43:33 -05:00
parent fd712f6483
commit c4b83ced54
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
openmc/opencg_compatible.py
View file

@ -905,7 +905,7 @@ def get_opencg_lattice(openmc_lattice):
for z in range(dimension[2]):
for y in range(dimension[1]):
for x in range(dimension[0]):
universe_id = universes[x][dimension[1]-y-1][z].id
universe_id = universes[z][dimension[1]-y-1][x].id
universe_array[z][y][x] = unique_universes[universe_id]
opencg_lattice = opencg.Lattice(lattice_id, name)
@ -963,7 +963,7 @@ def get_openmc_lattice(opencg_lattice):
outer = opencg_lattice.outside
# Initialize an empty array for the OpenMC nested Universes in this Lattice
universe_array = np.ndarray(tuple(np.array(dimension)),
universe_array = np.ndarray(tuple(np.array(dimension)[::-1]),
dtype=openmc.Universe)
# Create OpenMC Universes for each unique nested Universe in this Lattice
@ -977,7 +977,7 @@ def get_openmc_lattice(opencg_lattice):
for y in range(dimension[1]):
for x in range(dimension[0]):
universe_id = universes[z][y][x].id
universe_array[x][y][z] = unique_universes[universe_id]
universe_array[z][y][x] = unique_universes[universe_id]
# Reverse y-dimension in array to match ordering in OpenCG
universe_array = universe_array[:, ::-1, :]

4
openmc/summary.py
View file

@ -356,8 +356,8 @@ class Summary(object):
self.get_universe_by_id(universe_ids[x, y, z])
# Transpose, reverse y-dimension for appropriate ordering
shape = universes.shape
universes = np.transpose(universes, (1, 0, 2))
shape = universes.shape[::-1]
universes = np.transpose(universes, (2, 1, 0))
universes.shape = shape
universes = universes[:, ::-1, :]
lattice.universes = universes