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

Merge pull request #3 from paulromano/newhex-clockwise

Browse source 
Change order of x-oriented hex lattice universes to clockwise
This commit is contained in:
dryuri92 2019-06-09 14:52:31 +03:00 • committed by GitHub
commit 25edd8526d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 64 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

96
openmc/lattice.py
View file

@ -1241,8 +1241,8 @@ class HexLattice(Lattice):
else:
i_within = 5*g - z
if (self._orientation == 'x') and (i_within > 0):
i_within = 6*(self._num_rings - i_ring - 1) - i_within_
if self._orientation == 'x' and g > 0:
i_within = (i_within + 5*g) % (6*g)
if self.num_axial is None:
return (i_ring, i_within)
@ -1376,6 +1376,7 @@ class HexLattice(Lattice):
lat = cls(lat_id, name)
lat.center = [float(i) for i in get_text(elem, 'center').split()]
lat.pitch = [float(i) for i in get_text(elem, 'pitch').split()]
lat.orientation = get_text(elem, 'orientation', 'y')
outer = get_text(elem, 'outer')
if outer is not None:
lat.outer = get_universe(int(outer))
@ -1390,7 +1391,7 @@ class HexLattice(Lattice):
if n_axial > 1:
univs = [deepcopy(univs) for i in range(n_axial)]
# Get flat array of universes numbers
# Get flat array of universes
uarray = np.array([get_universe(int(i)) for i in
get_text(elem, 'universes').split()])
@ -1400,28 +1401,53 @@ class HexLattice(Lattice):
# Get list for a single axial level
axial_level = univs[z] if n_axial > 1 else univs
# Start iterating from top
x, alpha = 0, n_rings - 1
while True:
# Set entry in list based on (x,alpha,z) coordinates
_, i_ring, i_within = lat.get_universe_index((x, alpha, z))
axial_level[i_ring][i_within] = uarray[j]
if lat.orientation == 'y':
# Start iterating from top
x, alpha = 0, n_rings - 1
while True:
# Set entry in list based on (x,alpha,z) coordinates
_, i_ring, i_within = lat.get_universe_index((x, alpha, z))
axial_level[i_ring][i_within] = uarray[j]
# Move to the right
x += 2
alpha -= 1
if not lat.is_valid_index((x, alpha, z)):
# Move down in y direction
alpha += x - 1
x = 1 - x
# Move to the right
x += 2
alpha -= 1
if not lat.is_valid_index((x, alpha, z)):
# Move to the right
x += 2
alpha -= 1
# Move down in y direction
alpha += x - 1
x = 1 - x
if not lat.is_valid_index((x, alpha, z)):
# Reached the bottom
# Move to the right
x += 2
alpha -= 1
if not lat.is_valid_index((x, alpha, z)):
# Reached the bottom
break
j += 1
else:
# Start iterating from top
alpha, y = 1 - n_rings, n_rings - 1
while True:
# Set entry in list based on (alpha,y,z) coordinates
_, i_ring, i_within = lat.get_universe_index((alpha, y, z))
axial_level[i_ring][i_within] = uarray[j]
# Move to the right
alpha += 1
if not lat.is_valid_index((alpha, y, z)):
# Move down to next row
alpha = 1 - n_rings
y -= 1
# Check if we've reached the bottom
if y == -n_rings:
break
j += 1
while not lat.is_valid_index((alpha, y, z)):
# Move to the right
alpha += 1
j += 1
lat.universes = univs
return lat
@ -1469,7 +1495,7 @@ class HexLattice(Lattice):
theta = 0
y = middle
# Climb up the top-right.
# Climb down the bottom-right
for i in range(r):
# Add the universe.
universe = universes[r_prime][theta]
@ -1479,7 +1505,7 @@ class HexLattice(Lattice):
y += 1
theta += 1
# Climb left the top-left.
# Climb left across the bottom
for i in range(r):
# Add the universe.
universe = universes[r_prime][theta]
@ -1488,7 +1514,7 @@ class HexLattice(Lattice):
# Translate the indices.
theta += 1
# Climb down the middle left.
# Climb up the bottom-left
for i in range(r):
# Add the universe.
universe = universes[r_prime][theta]
@ -1498,7 +1524,7 @@ class HexLattice(Lattice):
y -= 1
theta += 1
# Climb down the down left.
# Climb up the top-left
for i in range(r):
# Add the universe.
universe = universes[r_prime][theta]
@ -1508,7 +1534,7 @@ class HexLattice(Lattice):
y -= 1
theta += 1
# Climb right the down right.
# Climb right across the top
for i in range(r):
# Add the universe.
universe = universes[r_prime][theta]
@ -1517,7 +1543,7 @@ class HexLattice(Lattice):
# Translate the indices.
theta += 1
# Climb up the middle-right.
# Climb down the top-right
for i in range(r):
# Add the universe.
universe = universes[r_prime][theta]
@ -1528,7 +1554,7 @@ class HexLattice(Lattice):
theta += 1
# Flip the rows and join each row into a single string.
rows = [pad.join(x) for x in rows[::-1]]
rows = [pad.join(x) for x in rows]
# Pad the beginning of the rows so they line up properly.
for y in range(self._num_rings - 1):
@ -1806,41 +1832,41 @@ class HexLattice(Lattice):
y = middle
for i in range(r):
# Climb up the top-right.
# Climb down the bottom-right
rows[y].append(str_form.format(r_prime, theta))
y += 1
theta += 1
for i in range(r):
# Climb left the top-left.
# Climb left across the bottom
rows[y].insert(0, str_form.format(r_prime, theta))
theta += 1
for i in range(r):
# Climb down the middle left.
# Climb up the bottom-left
rows[y].insert(0, str_form.format(r_prime, theta))
y -= 1
theta += 1
for i in range(r):
# Climb down the down left.
# Climb up the top-left
rows[y].insert(0, str_form.format(r_prime, theta))
y -= 1
theta += 1
for i in range(r):
# Climb right the down right.
# Climb right across the top
rows[y].append(str_form.format(r_prime, theta))
theta += 1
for i in range(r):
# Climb up the middle-right.
# Climb down the top-right
rows[y].append(str_form.format(r_prime, theta))
y += 1
theta += 1
# Flip the rows and join each row into a single string.
rows = [pad.join(x) for x in rows[::-1]]
rows = [pad.join(x) for x in rows]
# Pad the beginning of the rows so they line up properly.
for y in range(num_rings - 1):

6
tests/regression_tests/lattice_hex_x/test.py
View file

@ -161,9 +161,9 @@ class HexLatticeOXTestHarness(PyAPITestHarness):
arr.append(fuel_ch_univ)
universes.append(arr)
universes[-1] = [tube_ch_univ]
channels = [(7, 16), (7, 13), (7, 10), (7, 7), (7, 4), (7, 1), (5, 0),
(4, 33), (5, 25), (4, 27), (5, 20), (4, 21), (5, 15),
(4, 15), (5, 10), (4, 9), (5, 5), (4, 3)]
channels = [(7, 2), (7, 5), (7, 8), (7, 11), (7, 14), (7, 17), (5, 0),
(4, 3), (5, 5), (4, 9), (5, 10), (4, 15), (5, 15),
(4, 21), (5, 20), (4, 27), (5, 25), (4, 33)]
for i, j in channels:
universes[i][j] = abs_ch_univ
lattice = openmc.HexLattice(name="regular fuel assembly")