Skip to content

Commit

Permalink
Merge pull request #262 from ilhamv/fix_mesh_tally
Browse files Browse the repository at this point in the history 
Fix mesh tally
  • Loading branch information
@ilhamv
ilhamv authored Dec 4, 2024
2 parents 7a6321f + 3bc8f4e commit c49437a
Show file tree
Hide file tree
Showing 2 changed files with 40 additions and 24 deletions.
17 changes: 10 additions & 7 deletions mcdc/kernel.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1781,14 +1781,17 @@ def mesh_get_energy_index(P_arr, mesh, mode_MG):
# Check if outside grid
outside = False

Ng = mesh["Ng"]

if mode_MG:
return binary_search(P["g"], mesh["g"]), outside
return binary_search_with_length(P["g"], mesh["g"], Ng), outside

else:
E = P["E"]
if E < mesh["g"][0] or E > mesh["g"][-1]:
if E < mesh["g"][0] or E > mesh["g"][Ng]:
outside = True
return 0, outside
return binary_search(P["E"], mesh["g"]), outside
return binary_search_with_length(P["E"], mesh["g"], Ng), outside


# =============================================================================
Expand Down Expand Up @@ -1919,7 +1922,7 @@ def score_mesh_tally(P_arr, distance, tally, data, mcdc):
if mesh_crossed == MESH_X:
if ux > 0.0:
ix += 1
if ix == len(mesh["x"]) - 1:
if ix == mesh["Nx"]:
break
idx += stride["x"]
else:
Expand All @@ -1930,7 +1933,7 @@ def score_mesh_tally(P_arr, distance, tally, data, mcdc):
elif mesh_crossed == MESH_Y:
if uy > 0.0:
iy += 1
if iy == len(mesh["y"]) - 1:
if iy == mesh["Ny"]:
break
idx += stride["y"]
else:
Expand All @@ -1941,7 +1944,7 @@ def score_mesh_tally(P_arr, distance, tally, data, mcdc):
elif mesh_crossed == MESH_Z:
if uz > 0.0:
iz += 1
if iz == len(mesh["z"]) - 1:
if iz == mesh["Nz"]:
break
idx += stride["z"]
else:
Expand All @@ -1951,7 +1954,7 @@ def score_mesh_tally(P_arr, distance, tally, data, mcdc):
idx -= stride["z"]
elif mesh_crossed == MESH_T:
it += 1
if it == len(mesh["t"]) - 1:
if it == mesh["Nt"]:
break
idx += stride["t"]

Expand Down
47 changes: 30 additions & 17 deletions mcdc/main.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1460,25 +1460,38 @@ def generate_hdf5(data, mcdc):
break

mesh = tally["filter"]
f.create_dataset("tallies/mesh_tally_%i/grid/t" % ID, data=mesh["t"])
f.create_dataset("tallies/mesh_tally_%i/grid/x" % ID, data=mesh["x"])
f.create_dataset("tallies/mesh_tally_%i/grid/y" % ID, data=mesh["y"])
f.create_dataset("tallies/mesh_tally_%i/grid/z" % ID, data=mesh["z"])
f.create_dataset("tallies/mesh_tally_%i/grid/mu" % ID, data=mesh["mu"])
f.create_dataset(
"tallies/mesh_tally_%i/grid/azi" % ID, data=mesh["azi"]
)
f.create_dataset("tallies/mesh_tally_%i/grid/g" % ID, data=mesh["g"])

# Shape
Nmu = tally["filter"]["Nmu"]
N_azi = tally["filter"]["N_azi"]
Ng = tally["filter"]["Ng"]
Nx = tally["filter"]["Nx"]
Ny = tally["filter"]["Ny"]
Nz = tally["filter"]["Nz"]
Nt = tally["filter"]["Nt"]
# Filter
Nmu = mesh["Nmu"]
N_azi = mesh["N_azi"]
Ng = mesh["Ng"]
Nx = mesh["Nx"]
Ny = mesh["Ny"]
Nz = mesh["Nz"]
Nt = mesh["Nt"]
N_score = tally["N_score"]
#
f.create_dataset(
"tallies/mesh_tally_%i/grid/t" % ID, data=mesh["t"][: Nt + 1]
)
f.create_dataset(
"tallies/mesh_tally_%i/grid/x" % ID, data=mesh["x"][: Nx + 1]
)
f.create_dataset(
"tallies/mesh_tally_%i/grid/y" % ID, data=mesh["y"][:Ny] + 1
)
f.create_dataset(
"tallies/mesh_tally_%i/grid/z" % ID, data=mesh["z"][: Nz + 1]
)
f.create_dataset(
"tallies/mesh_tally_%i/grid/mu" % ID, data=mesh["mu"][: Nmu + 1]
)
f.create_dataset(
"tallies/mesh_tally_%i/grid/azi" % ID, data=mesh["azi"][: N_azi + 1]
)
f.create_dataset(
"tallies/mesh_tally_%i/grid/g" % ID, data=mesh["g"][: Ng + 1]
)

if mcdc["technique"]["domain_decomposition"]:
Nx *= input_deck.technique["dd_mesh"]["x"].size - 1
Expand Down

0 comments on commit c49437a

Please sign in to comment.